From 3176382386fcbe34ea8b45602dadf8a7ae0d1b97 Mon Sep 17 00:00:00 2001 From: Hippolyte Chauvin Date: Wed, 1 Nov 2023 14:48:13 +0100 Subject: [PATCH] =?UTF-8?q?Refactoring=20pour=20tout=20remettre=20=C3=A0?= =?UTF-8?q?=20la=20racine=20car=20c'est=20plus=20pratique?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/{io/in.rs => input.rs} | 0 src/io/mod.rs | 25 ------------------------- src/main.rs | 24 +++++++++++++++++++++--- src/{io/out.rs => output.rs} | 0 src/{io/parser/mod.rs => parser.rs} | 0 5 files changed, 21 insertions(+), 28 deletions(-) rename src/{io/in.rs => input.rs} (100%) delete mode 100644 src/io/mod.rs rename src/{io/out.rs => output.rs} (100%) rename src/{io/parser/mod.rs => parser.rs} (100%) diff --git a/src/io/in.rs b/src/input.rs similarity index 100% rename from src/io/in.rs rename to src/input.rs diff --git a/src/io/mod.rs b/src/io/mod.rs deleted file mode 100644 index 99768cf..0000000 --- a/src/io/mod.rs +++ /dev/null @@ -1,25 +0,0 @@ -mod r#in; -mod r#out; -mod parser; - -pub fn run() -> i32 { - let mut buffer = r#in::Buffer::new(); - let mut bytes_read: usize = 1; - let mut command_line: String; - let mut argv: Vec; - - while bytes_read != 0 { - out::print_ps1(); - bytes_read = buffer.read_line(); - - if ! buffer.is_empty() { - command_line = buffer.get_buffer().to_string(); - argv = parser::parse(&command_line); - println!("{:?}", argv); - } - } - - println!(); - - 0 -} diff --git a/src/main.rs b/src/main.rs index c05e11f..a30723d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,9 +1,27 @@ use std::process::exit; -mod io; +mod input; +mod output; +mod parser; fn main() { - let last_exit_code: i32 = io::run(); + let mut buffer = input::Buffer::new(); + let mut bytes_read: usize = 1; + let mut command_line: String; + let mut argv: Vec; - exit(last_exit_code); + while bytes_read != 0 { + output::print_ps1(); + bytes_read = buffer.read_line(); + + if ! buffer.is_empty() { + command_line = buffer.get_buffer().to_string(); + argv = parser::parse(&command_line); + println!("{:?}", argv); + } + } + + println!(); + + exit(0); } diff --git a/src/io/out.rs b/src/output.rs similarity index 100% rename from src/io/out.rs rename to src/output.rs diff --git a/src/io/parser/mod.rs b/src/parser.rs similarity index 100% rename from src/io/parser/mod.rs rename to src/parser.rs