Merge branch 'dev-test-command'

shellgei · Sep 15, 2024 · e2c7da1 · e2c7da1
2 parents 7480b71 + a9a378e
commit e2c7da1
Show file tree

Hide file tree

Showing 18 changed files with 364 additions and 339 deletions.
diff --git a/src/elements.rs b/src/elements.rs
@@ -11,6 +11,6 @@ pub mod word;
 pub mod subscript;
 pub mod substitution;
 pub mod subword;
-pub mod arithmetic_expr;
+pub mod expr;
 
 use self::io::pipe::Pipe;
diff --git a/src/elements/command/arithmetic.rs b/src/elements/command/arithmetic.rs
@@ -3,7 +3,7 @@
 
 use crate::{ShellCore, Feeder};
 use super::{Command, Redirect};
-use crate::elements::arithmetic_expr::ArithmeticExpr;
+use crate::elements::expr::arithmetic::ArithmeticExpr;
 
 #[derive(Debug, Clone)]
 pub struct ArithmeticCommand {

diff --git a/src/elements/command/for.rs b/src/elements/command/for.rs
@@ -5,7 +5,7 @@ use crate::{error_message, ShellCore, Feeder, Script};
 use super::{Command, Redirect};
 use crate::elements::command;
 use crate::elements::word::Word;
-use crate::elements::arithmetic_expr::ArithmeticExpr;
+use crate::elements::expr::arithmetic::ArithmeticExpr;
 use std::sync::atomic::Ordering::Relaxed;
 
 #[derive(Debug, Clone)]