From 4249e4ce06d6abe8ac1d224231ff9e93a4ed2908 Mon Sep 17 00:00:00 2001
From: Ryuichi Ueda <ryuichiueda@gmail.com>
Date: Fri, 17 Jan 2025 09:49:58 +0900
Subject: [PATCH] Refactor

---
 src/error.rs           | 3 +++
 src/error/input.rs     | 8 ++++++++
 src/feeder.rs          | 2 +-
 src/feeder/terminal.rs | 2 +-
 src/main.rs            | 2 +-
 test/ok                | 2 +-
 6 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 src/error/input.rs

diff --git a/src/error.rs b/src/error.rs
index bc59766e..7171c1ad 100644
--- a/src/error.rs
+++ b/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();
diff --git a/src/error/input.rs b/src/error/input.rs
new file mode 100644
index 00000000..be1fb673
--- /dev/null
+++ b/src/error/input.rs
@@ -0,0 +1,8 @@
+//SPDX-FileCopyrightText: 2024 Ryuichi Ueda ryuichiueda@gmail.com
+//SPDX-License-Identifier: BSD-3-Clause
+
+#[derive(Debug)]
+pub enum InputError {
+    Interrupt,
+    Eof,
+}
diff --git a/src/feeder.rs b/src/feeder.rs
index b58e58d8..900ac76b 100644
--- a/src/feeder.rs
+++ b/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;
 
diff --git a/src/feeder/terminal.rs b/src/feeder/terminal.rs
index 841a02c6..b7b87573 100644
--- a/src/feeder/terminal.rs
+++ b/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};
diff --git a/src/main.rs b/src/main.rs
index d93588f9..e968cec0 100644
--- a/src/main.rs
+++ b/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");
diff --git a/test/ok b/test/ok
index dca1e47d..1bd62e29 100644
--- a/test/ok
+++ b/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