greg/just
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Store modules on analyzer struct

Browse Source
This commit is contained in:
Greg Shuflin 2024-06-03 16:02:13 -07:00
parent ed11e76600
commit ed2c5c45e5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/analyzer.rs
View File

@ -6,6 +6,7 @@ pub(crate) struct Analyzer<'src> {
aliases: Table<'src, Alias<'src, Name<'src>>>, aliases: Table<'src, Alias<'src, Name<'src>>>,
sets: Table<'src, Set<'src>>, sets: Table<'src, Set<'src>>,
warnings: Vec<Warning>, warnings: Vec<Warning>,
modules: Table<'src, Justfile<'src>>,
} }
impl<'src> Analyzer<'src> { impl<'src> Analyzer<'src> {
@ -24,8 +25,6 @@ impl<'src> Analyzer<'src> {
let mut stack = Vec::new(); let mut stack = Vec::new();
stack.push(asts.get(root).unwrap()); stack.push(asts.get(root).unwrap());
let mut modules: Table<Justfile> = Table::new();
let mut definitions: HashMap<&str, (&'static str, Name)> = HashMap::new(); let mut definitions: HashMap<&str, (&'static str, Name)> = HashMap::new();
let mut define = |name: Name<'src>, let mut define = |name: Name<'src>,
@ -74,7 +73,9 @@ impl<'src> Analyzer<'src> {
Item::Module { absolute, name, .. } => { Item::Module { absolute, name, .. } => {
if let Some(absolute) = absolute { if let Some(absolute) = absolute {
define(*name, "module", false)?; 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) => { Item::Recipe(recipe) => {
@ -152,7 +153,7 @@ impl<'src> Analyzer<'src> {
}), }),
}), }),
loaded: loaded.into(), loaded: loaded.into(),
modules, modules: analyzer.modules,
name, name,
recipes, recipes,
settings, settings,