Change field name

shellgei · Jan 17, 2024 · e452de3 · e452de3
1 parent 1469357
commit e452de3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/core.rs b/src/core.rs
@@ -22,7 +22,7 @@ pub struct ShellCore {
     pub flags: String,
     pub vars: HashMap<String, String>,
     pub builtins: HashMap<String, fn(&mut ShellCore, &mut Vec<String>) -> i32>,
-    pub nest: Vec<(String, Vec<String>)>,
+    pub command_nest: Vec<(String, Vec<String>)>,
     pub sigint: Arc<AtomicBool>,
     pub is_subshell: bool,
     pub tty_fd: RawFd,
@@ -54,7 +54,7 @@ impl ShellCore {
             flags: String::new(),
             vars: HashMap::new(),
             builtins: HashMap::new(),
-            nest: vec![("".to_string(), vec![])],
+            command_nest: vec![("".to_string(), vec![])],
             sigint: Arc::new(AtomicBool::new(false)),
             is_subshell: false,
             tty_fd: -1,

diff --git a/src/elements/command.rs b/src/elements/command.rs
@@ -66,10 +66,10 @@ pub fn eat_inner_script(feeder: &mut Feeder, core: &mut ShellCore,
    if ! feeder.starts_with(left) {
        return false;
     }
-    core.nest.push( (left.to_string(), right.iter().map(|e| e.to_string()).collect()) );
+    core.command_nest.push( (left.to_string(), right.iter().map(|e| e.to_string()).collect()) );
     feeder.consume(left.len());
     *ans = Script::parse(feeder, core);
-    core.nest.pop();
+    core.command_nest.pop();
     ! ans.is_none()
 }
 

diff --git a/src/elements/script.rs b/src/elements/script.rs
@@ -53,7 +53,7 @@ impl Script {
     }
 
     fn check_nest(feeder: &mut Feeder, core: &mut ShellCore, jobnum: usize) -> Status {
-        let nest = core.nest.last().expect("SUSHI INTERNAL ERROR (empty nest)");
+        let nest = core.command_nest.last().expect("SUSHI INTERNAL ERROR (empty nest)");
 
         match ( nest.1.iter().find(|e| feeder.starts_with(e)), jobnum ) {
             ( Some(end), 0 ) => return Status::UnexpectedSymbol(end.to_string()),