From ed2c5c45e5580b03e5fe26bce21dd25a2fe5eaf8 Mon Sep 17 00:00:00 2001 From: Greg Shuflin Date: Mon, 3 Jun 2024 16:02:13 -0700 Subject: [PATCH] Store modules on analyzer struct --- src/analyzer.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/analyzer.rs b/src/analyzer.rs index 28bc34a..e384f9a 100644 --- a/src/analyzer.rs +++ b/src/analyzer.rs @@ -6,6 +6,7 @@ pub(crate) struct Analyzer<'src> { aliases: Table<'src, Alias<'src, Name<'src>>>, sets: Table<'src, Set<'src>>, warnings: Vec, + modules: Table<'src, Justfile<'src>>, } impl<'src> Analyzer<'src> { @@ -24,8 +25,6 @@ impl<'src> Analyzer<'src> { let mut stack = Vec::new(); stack.push(asts.get(root).unwrap()); - let mut modules: Table = Table::new(); - let mut definitions: HashMap<&str, (&'static str, Name)> = HashMap::new(); let mut define = |name: Name<'src>, @@ -74,7 +73,9 @@ impl<'src> Analyzer<'src> { Item::Module { absolute, name, .. } => { if let Some(absolute) = absolute { define(*name, "module", false)?; - modules.insert(Self::analyze(loaded, paths, asts, absolute, Some(*name))?); + analyzer + .modules + .insert(Self::analyze(loaded, paths, asts, absolute, Some(*name))?); } } Item::Recipe(recipe) => { @@ -152,7 +153,7 @@ impl<'src> Analyzer<'src> { }), }), loaded: loaded.into(), - modules, + modules: analyzer.modules, name, recipes, settings,