Refactor

Author: ryuichiueda

src/core.rs

@@ -18,7 +18,7 @@ use crate::{proc_ctrl, signal};
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 
-type BuiltinFunc = fn(&mut ShellCore, &mut [String]) -> i32;
+type BuiltinFunc = fn(&mut ShellCore, &[String]) -> i32;
 
 #[derive(Default)]
 pub struct ShellCore {

src/core/builtins.rs

@@ -21,19 +21,19 @@ impl ShellCore {
     }
 }
 
-pub fn exit(core: &mut ShellCore, args: &mut [String]) -> i32 {
+pub fn exit(core: &mut ShellCore, args: &[String]) -> i32 {
     eprintln!("exit");
     if args.len() > 1 {
         let _ = core.db.set_param("?", &args[1], None);
     }
     exit::normal(core)
 }
 
-pub fn false_(_: &mut ShellCore, _: &mut [String]) -> i32 {
+pub fn false_(_: &mut ShellCore, _: &[String]) -> i32 {
     1
 }
 
-pub fn return_(core: &mut ShellCore, args: &mut[String]) -> i32 {
+pub fn return_(core: &mut ShellCore, args: &[String]) -> i32 {
     if core.source_function_level <= 0 {
         eprintln!("sush: return: can only `return' from a function or sourced script");
         return 2;
@@ -50,6 +50,6 @@ pub fn return_(core: &mut ShellCore, args: &mut[String]) -> i32 {
     2
 }
 
-pub fn true_(_: &mut ShellCore, _: &mut [String]) -> i32 {
+pub fn true_(_: &mut ShellCore, _: &[String]) -> i32 {
     0
 }

src/core/builtins/cd.rs

@@ -5,7 +5,7 @@
 use crate::ShellCore;
 use super::utils;
 
-pub fn cd(core: &mut ShellCore, args: &mut [String]) -> i32 {
+pub fn cd(core: &mut ShellCore, args: &[String]) -> i32 {
     if args.len() > 2 {
         eprintln!("sush: cd: too many arguments");
         return 1;
@@ -23,15 +23,16 @@ pub fn cd(core: &mut ShellCore, args: &mut [String]) -> i32 {
     }
 }
 
-fn cd_1arg(core: &mut ShellCore, args: &mut [String]) -> i32 {
+fn cd_1arg(core: &mut ShellCore, args: &[String]) -> i32 {
     let var = "~".to_string();
     let mut args = args.to_vec();
     args.push(var);
     set_oldpwd(core);
     change_directory(core, &mut args)
 }
 
-fn cd_oldpwd(core: &mut ShellCore, args: &mut [String]) -> i32 {
+fn cd_oldpwd(core: &mut ShellCore, args: &[String]) -> i32 {
+    let mut args = args.to_vec();
     if let Ok(old) = core.db.get_param("OLDPWD") {
         println!("{}", &old);
         args[1] = old.to_string();
@@ -41,7 +42,7 @@ fn cd_oldpwd(core: &mut ShellCore, args: &mut [String]) -> i32 {
     }
 
     set_oldpwd(core);
-    change_directory(core, args)
+    change_directory(core, &mut args)
 }
 
 fn set_oldpwd(core: &mut ShellCore) {
@@ -50,7 +51,7 @@ fn set_oldpwd(core: &mut ShellCore) {
     };
 }
 
-fn change_directory(core: &mut ShellCore, args: &mut [String]) -> i32 {
+fn change_directory(core: &mut ShellCore, args: &[String]) -> i32 {
     let path = utils::make_canonical_path(core, &args[1]);
     if core.set_current_directory(&path).is_ok() {
         let _ = core.db.set_param("PWD", &path.display().to_string(), None);

src/core/builtins/pwd.rs

@@ -4,7 +4,7 @@
 
 use crate::ShellCore;
 
-pub fn pwd(core: &mut ShellCore, args: &mut [String]) -> i32 {
+pub fn pwd(core: &mut ShellCore, args: &[String]) -> i32 {
     if args.len() == 1 || &args[1][..1] != "-" { // $ pwd, $ pwd aaa
         return show_pwd(core, false);
     }

src/elements/command/function_def.rs

@@ -34,7 +34,7 @@ impl Command for FunctionDefinition {
 }
 
 impl FunctionDefinition {
-    pub fn run_as_command(&mut self, args: &mut Vec<String>, core: &mut ShellCore) {
+    pub fn run_as_command(&mut self, args: &mut [String], core: &mut ShellCore) {
         args[0] = core.db.position_parameters[0][0].clone();
         core.db.position_parameters.push(args.to_vec());
 

src/elements/command/simple.rs

@@ -2,6 +2,7 @@
 //SPDX-License-Identifier: BSD-3-Clause
 
 mod parser;
+mod run_internal;
 
 use crate::{ShellCore, proc_ctrl};
 use crate::error::exec::ExecError;
@@ -56,10 +57,9 @@ impl Command for SimpleCommand {
             e.print(core);
         }
 
-        if ! core.run_function(&mut self.args) 
-        && ! core.run_builtin(&mut self.args) {
+        if !run_internal::run(self, core)? {
             self.set_environment_variables(core)?;
-            proc_ctrl::exec_command(&mut self.args)
+            proc_ctrl::exec_command(&self.args);
         }
 
         core.db.pop_local();

src/elements/command/simple/run_internal.rs

@@ -0,0 +1,38 @@
+//SPDX-FileCopyrightText: 2025 Ryuichi Ueda ryuichiueda@gmail.com
+//SPDX-License-Identifier: BSD-3-Clause
+
+use super::SimpleCommand;
+use crate::error::exec::ExecError;
+use crate::ShellCore;
+
+pub fn run(com: &mut SimpleCommand, core: &mut ShellCore) -> Result<bool, ExecError> {
+    let ans = run_function(&mut com.args, core)
+        || run_builtin(com, core)?;
+    Ok(ans)
+}
+
+fn run_function(args: &mut [String], core: &mut ShellCore) -> bool {
+    match core.db.functions.get_mut(&args[0]) {
+        Some(f) => {
+            f.clone().run_as_command(args, core);
+            true
+        }
+        None => false,
+    }
+}
+
+pub fn run_builtin(com: &mut SimpleCommand, core: &mut ShellCore) -> Result<bool, ExecError> {
+    if com.args.is_empty() {
+        eprintln!("ShellCore::run_builtin");
+        return Ok(false);
+    }
+
+    if !core.builtins.contains_key(&com.args[0]) {
+        return Ok(false);
+    }
+
+    let func = core.builtins[&com.args[0]];
+    let exit_status = func(core, &com.args[..]);
+    let _ = core.db.set_param("?", &exit_status.to_string(), Some(0));
+    Ok(true)
+}