Add if.rs

src/elements/command.rs

@@ -5,12 +5,14 @@ pub mod simple;
 pub mod paren;
 pub mod brace;
 pub mod r#while;
+pub mod r#if;
 
 use crate::{ShellCore, Feeder, Script};
 use self::simple::SimpleCommand;
 use self::paren::ParenCommand;
 use self::brace::BraceCommand;
 use self::r#while::WhileCommand;
+use self::r#if::IfCommand;
 use std::fmt;
 use std::fmt::Debug;
 use super::{io, Pipe};
@@ -99,5 +101,6 @@ pub fn parse(feeder: &mut Feeder, core: &mut ShellCore) -> Option<Box<dyn Comman
     else if let Some(a) = ParenCommand::parse(feeder, core) { Some(Box::new(a)) }
     else if let Some(a) = BraceCommand::parse(feeder, core) { Some(Box::new(a)) }
     else if let Some(a) = WhileCommand::parse(feeder, core) { Some(Box::new(a)) }
+    else if let Some(a) = IfCommand::parse(feeder, core) { Some(Box::new(a)) }
     else{ None }
 }

src/elements/command/if.rs

@@ -0,0 +1,28 @@
+//SPDX-FileCopyrightText: 2023 Ryuichi Ueda <ryuichiueda@gmail.com>
+//SPDX-License-Identifier: BSD-3-Clause
+
+use crate::{ShellCore, Feeder, Script};
+use nix::unistd::Pid;
+use super::{Command, Pipe, Redirect};
+
+#[derive(Debug)]
+pub struct IfCommand {
+    pub text: String,
+    pub if_elif_scripts: Vec<Script>,
+    pub then_scripts: Vec<Script>,
+    pub else_script: Option<Script>,
+    pub redirects: Vec<Redirect>,
+    force_fork: bool,
+}
+
+impl Command for IfCommand {
+    fn exec(&mut self, _: &mut ShellCore, _: &mut Pipe) -> Option<Pid> {None}
+    fn run_command(&mut self, _: &mut ShellCore, _: bool) {}
+    fn get_text(&self) -> String { self.text.clone() }
+    fn get_redirects(&mut self) -> &mut Vec<Redirect> { &mut self.redirects }
+    fn set_force_fork(&mut self) { self.force_fork = true; }
+}
+
+impl IfCommand {
+    pub fn parse(_: &mut Feeder, _: &mut ShellCore) -> Option<IfCommand> {None}
+}

src/elements/command/simple.rs

@@ -13,7 +13,7 @@ use nix::errno::Errno;
 
 fn reserved(w: &str) -> bool {
     match w {
-        "{" | "}" | "while" | "do" | "done" => true,
+        "{" | "}" | "while" | "do" | "done" | "if" | "then" | "elif" | "else" | "fi" => true,
         _ => false,
     }
 }

src/elements/script.rs

@@ -61,7 +61,7 @@ impl Script {
             ( None, _)       => {}, 
         }
 
-        let ng_ends = vec![")", "}", "then", "else", "fi", "elif", "do", "done", "while", "||", "&&", "|", "&"];
+        let ng_ends = vec![")", "}", "then", "else", "if", "fi", "elif", "do", "done", "while", "||", "&&", "|", "&"];
         match ( ng_ends.iter().find(|e| feeder.starts_with(e)), nest.1.len() ) {
             (Some(end), _) => return Status::UnexpectedSymbol(end.to_string()),
             (None, 0)      => return Status::NormalEnd,