Refactor

src/error.rs

@@ -2,17 +2,20 @@
 //SPDX-License-Identifier: BSD-3-Clause
 
 pub mod exec;
+pub mod input;
 pub mod parse;
 
 use crate::ShellCore;
 use nix::sys::signal::Signal;
 use nix::unistd::Pid;
 
+/*
 #[derive(Debug)]
 pub enum InputError {
     Interrupt,
     Eof,
 }
+*/
 
 pub fn print(s: &str, core: &mut ShellCore) {
     let name = core.db.get_param("0").unwrap();

src/error/input.rs

@@ -0,0 +1,8 @@
+//SPDX-FileCopyrightText: 2024 Ryuichi Ueda [email protected]
+//SPDX-License-Identifier: BSD-3-Clause
+
+#[derive(Debug)]
+pub enum InputError {
+    Interrupt,
+    Eof,
+}

src/feeder.rs

@@ -9,7 +9,7 @@ use std::fs::File;
 use std::io::{BufRead, BufReader, Lines};
 use crate::ShellCore;
 use crate::utils::exit;
-use crate::error::InputError;
+use crate::error::input::InputError;
 use crate::error::parse::ParseError;
 use std::sync::atomic::Ordering::Relaxed;
 

src/feeder/terminal.rs

@@ -5,7 +5,7 @@ mod completion;
 
 use crate::{file_check, ShellCore};
 use crate::utils::file;
-use crate::error::{InputError};
+use crate::error::input::InputError;
 use std::io;
 use std::fs::File;
 use std::io::{Write, Stdout};

src/main.rs

@@ -17,7 +17,7 @@ use crate::error::exec;
 use crate::elements::script::Script;
 use crate::feeder::Feeder;
 use utils::{exit, file_check, arg};
-use error::InputError;
+use error::input::InputError;
 
 fn show_version() {
     const V: &'static str = env!("CARGO_PKG_VERSION");

test/ok

@@ -6,6 +6,6 @@
 ./test_builtins.bash
 ./test_others.bash
 ./test_calculation.bash
-./test_compound.bash
 ./test_parameters.bash
+./test_compound.bash
 ./test_job.bash