Give flamework

src/elements/word.rs

@@ -4,6 +4,8 @@
 mod brace_expansion;
 mod tilde_expansion;
 mod substitution;
+mod path_expansion;
+mod split;
 
 use crate::{Feeder, ShellCore};
 use crate::elements::subword;
@@ -20,7 +22,7 @@ impl Word {
         let mut ws = vec![];
         for w in brace_expansion::eval(&mut self.clone()) {
             match w.tilde_and_dollar_expansion(core) {
-                Some(w) => ws.push(w),
+                Some(w) => ws.append( &mut w.split_and_path_expansion(core) ),
                 None    => return None,
             };
         }
@@ -36,6 +38,14 @@ impl Word {
         }
     }
 
+    pub fn split_and_path_expansion(&self, core: &mut ShellCore) -> Vec<Word> {
+        let mut ans = vec![];
+        for mut w in split::eval(self, core) {
+            ans.append(&mut path_expansion::eval(&mut w) );
+        }
+        ans
+    }
+
     fn make_args(words: &mut Vec<Word>) -> Vec<String> {
         words.iter_mut()
               .map(|w| w.make_unquoted_word())

src/elements/word/path_expansion.rs

@@ -0,0 +1,8 @@
+//SPDX-FileCopyrightText: 2024 Ryuichi Ueda ryuichiueda@gmail.com
+//SPDX-License-Identifier: BSD-3-Clause
+
+use crate::elements::word::Word;
+
+pub fn eval(word: &mut Word) -> Vec<Word> {
+    vec![word.clone()]
+}

src/elements/word/split.rs

@@ -0,0 +1,9 @@
+//SPDX-FileCopyrightText: 2024 Ryuichi Ueda <ryuichiueda@gmail.com>
+//SPDX-License-Identifier: BSD-3-Clause
+
+use crate::ShellCore;
+use crate::elements::word::Word;
+
+pub fn eval(word: &Word, _: &mut ShellCore) -> Vec<Word> {
+    vec![word.clone()]
+}