WIP globbing

casey#1641
neunenak · Sep 17, 2024 · 4a050ff · 4a050ff
1 parent ab7105a
commit 4a050ff
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/analyzer.rs b/src/analyzer.rs
@@ -84,9 +84,9 @@ impl<'src> Analyzer<'src> {
             assignments.push(assignment);
           }
           Item::Comment(_) => (),
-          Item::Import { absolute, .. } => {
-            if let Some(absolute) = absolute {
-              stack.push(asts.get(absolute).unwrap());
+          Item::Import { absolute_paths, .. } => {
+            for p in absolute_paths {
+              stack.push(asts.get(p).unwrap());
             }
           }
           Item::Module {

diff --git a/src/compiler.rs b/src/compiler.rs
@@ -64,7 +64,7 @@ impl Compiler {
           }
           Item::Import {
             relative,
-            absolute,
+            absolute_paths,
             optional,
             path,
           } => {
@@ -75,14 +75,17 @@ impl Compiler {
               .join(Self::expand_tilde(&relative.cooked)?)
               .lexiclean();
 
+            println!("IMPORT: {}", import.display());
+
             if import.is_file() {
               if current.file_path.contains(&import) {
                 return Err(Error::CircularImport {
                   current: current.path,
                   import,
                 });
               }
-              *absolute = Some(import.clone());
+              //*absolute = Some(import.clone());
+              *absolute_paths = vec![import.clone()];
               stack.push(current.import(import, path.offset));
             } else if !*optional {
               return Err(Error::MissingImportFile { path: *path });

diff --git a/src/item.rs b/src/item.rs
@@ -7,7 +7,7 @@ pub(crate) enum Item<'src> {
   Assignment(Assignment<'src>),
   Comment(&'src str),
   Import {
-    absolute: Option<PathBuf>,
+    absolute_paths: Vec<PathBuf>,
     optional: bool,
     path: Token<'src>,
     relative: StringLiteral<'src>,

diff --git a/src/parser.rs b/src/parser.rs
@@ -365,7 +365,7 @@ impl<'run, 'src> Parser<'run, 'src> {
             let optional = self.accepted(QuestionMark)?;
             let (path, relative) = self.parse_string_literal_token()?;
             items.push(Item::Import {
-              absolute: None,
+              absolute_paths: vec![],
               optional,
               path,
               relative,