Simplify

src/elements/script.rs

@@ -2,8 +2,9 @@
 //SPDX-License-Identifier: BSD-3-Clause
 
 use super::job::Job;
+use crate::error::parse;
+use crate::error::parse::ParseError;
 use crate::{Feeder, ShellCore};
-use crate::error;
 
 enum Status{
     UnexpectedSymbol(String),
@@ -105,8 +106,8 @@ impl Script {
                 },
                 Status::UnexpectedSymbol(s) => {
                     let _ = core.db.set_param("LINENO", &feeder.lineno.to_string(), None);
-                    let s = format!("Unexpected token: {}", s);
-                    error::print(&s, core);
+                    let e = ParseError::UnexpectedSymbol(s.clone());
+                    parse::print_error(e, core);
                     core.db.exit_status = 2;
                     break;
                 },

src/error/parse.rs

@@ -1,6 +1,8 @@
 //SPDX-FileCopyrightText: 2024 Ryuichi Ueda [email protected]
 //SPDX-License-Identifier: BSD-3-Clause
 
+use crate::ShellCore;
+
 #[derive(Debug)]
 pub enum ParseError {
     UnexpectedSymbol(String),
@@ -17,3 +19,14 @@ impl From<ParseError> for String {
         }
     }
 }
+
+pub fn print_error(e: ParseError, core: &mut ShellCore) {
+    let name = core.db.get_param("0").unwrap();
+    let s: String = From::<ParseError>::from(e);
+    if core.db.flags.contains('i') {
+        eprintln!("{}: {}", &name, &s);
+    }else{
+        let lineno = core.db.get_param("LINENO").unwrap_or("".to_string());
+        eprintln!("{}: line {}: {}", &name, &lineno, s);
+    }
+}