analyzer: definition tracker

src/analyzer.rs

@@ -1,49 +1,18 @@
 use {super::*, CompileErrorKind::*};
 
 #[derive(Default)]
-pub(crate) struct Analyzer<'src> {
+struct DefinitionTracker<'src> {
-  assignments: Table<'src, Assignment<'src>>,
+  definitions: HashMap<&'src str, (&'static str, Name<'src>)>,
-  aliases: Table<'src, Alias<'src, Name<'src>>>,
-  sets: Table<'src, Set<'src>>,
 }
 
-impl<'src> Analyzer<'src> {
+impl<'src> DefinitionTracker<'src> {
-  pub(crate) fn analyze(
+  fn define(
-    loaded: &[PathBuf],
+    &mut self,
-    paths: &HashMap<PathBuf, PathBuf>,
+    name: Name<'src>,
-    asts: &HashMap<PathBuf, Ast<'src>>,
-    root: &Path,
-    name: Option<Name<'src>>,
-  ) -> CompileResult<'src, Justfile<'src>> {
-    Self::default().justfile(loaded, paths, asts, root, name)
-  }
-
-  fn justfile(
-    mut self,
-    loaded: &[PathBuf],
-    paths: &HashMap<PathBuf, PathBuf>,
-    asts: &HashMap<PathBuf, Ast<'src>>,
-    root: &Path,
-    name: Option<Name<'src>>,
-  ) -> CompileResult<'src, Justfile<'src>> {
-    let mut recipes = Vec::new();
-
-    let mut assignments = Vec::new();
-
-    let mut stack = Vec::new();
-    stack.push(asts.get(root).unwrap());
-
-    let mut warnings = Vec::new();
-
-    let mut modules: Table<Justfile> = Table::new();
-
-    let mut definitions: HashMap<&str, (&'static str, Name)> = HashMap::new();
-
-    let mut define = |name: Name<'src>,
     second_type: &'static str,
-                      duplicates_allowed: bool|
+    duplicates_allowed: bool,
-     -> CompileResult<'src> {
+  ) -> CompileResult<'src> {
-      if let Some((first_type, original)) = definitions.get(name.lexeme()) {
+    if let Some((first_type, original)) = self.definitions.get(name.lexeme()) {
       if !(*first_type == second_type && duplicates_allowed) {
         let (original, redefinition) = if name.line < original.line {
           (name, *original)
@@ -60,21 +29,47 @@ impl<'src> Analyzer<'src> {
       }
     }
 
-      definitions.insert(name.lexeme(), (second_type, name));
+    self.definitions.insert(name.lexeme(), (second_type, name));
-
     Ok(())
-    };
+  }
+}
+
+#[derive(Default)]
+pub(crate) struct Analyzer<'src> {
+  assignments: Table<'src, Assignment<'src>>,
+  aliases: Table<'src, Alias<'src, Name<'src>>>,
+  sets: Table<'src, Set<'src>>,
+  warnings: Vec<Warning>,
+  modules: Table<'src, Justfile<'src>>,
+}
+
+impl<'src> Analyzer<'src> {
+  pub(crate) fn analyze(
+    loaded: &[PathBuf],
+    paths: &HashMap<PathBuf, PathBuf>,
+    asts: &HashMap<PathBuf, Ast<'src>>,
+    root: &Path,
+    name: Option<Name<'src>>,
+  ) -> CompileResult<'src, Justfile<'src>> {
+    let mut analyzer = Self::default();
+
+    let mut definitions = DefinitionTracker::default();
+    let mut unprocessed_recipes = Vec::new();
+    let mut unprocessed_assignments = Vec::new();
+
+    let mut stack = Vec::new();
+    stack.push(asts.get(root).unwrap());
 
     while let Some(ast) = stack.pop() {
       for item in &ast.items {
         match item {
           Item::Alias(alias) => {
-            define(alias.name, "alias", false)?;
+            definitions.define(alias.name, "alias", false)?;
             Self::analyze_alias(alias)?;
-            self.aliases.insert(alias.clone());
+            analyzer.aliases.insert(alias.clone());
           }
           Item::Assignment(assignment) => {
-            assignments.push(assignment);
+            unprocessed_assignments.push(assignment);
           }
           Item::Comment(_) => (),
           Item::Import { absolute, .. } => {
@@ -84,52 +79,54 @@ impl<'src> Analyzer<'src> {
           }
           Item::Module { absolute, name, .. } => {
             if let Some(absolute) = absolute {
-              define(*name, "module", false)?;
+              definitions.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) => {
             if recipe.enabled() {
               Self::analyze_recipe(recipe)?;
-              recipes.push(recipe);
+              unprocessed_recipes.push(recipe);
             }
           }
           Item::Set(set) => {
-            self.analyze_set(set)?;
+            analyzer.analyze_set(set)?;
-            self.sets.insert(set.clone());
+            analyzer.sets.insert(set.clone());
           }
         }
       }
 
-      warnings.extend(ast.warnings.iter().cloned());
+      analyzer.warnings.extend(ast.warnings.iter().cloned());
     }
 
-    let settings = Settings::from_setting_iter(self.sets.into_iter().map(|(_, set)| set.value));
+    let settings = Settings::from_setting_iter(analyzer.sets.into_iter().map(|(_, set)| set.value));
 
-    let mut recipe_table: Table<'src, UnresolvedRecipe<'src>> = Table::default();
+    for assignment in unprocessed_assignments {
-
-    for assignment in assignments {
       if !settings.allow_duplicate_variables
-        && self.assignments.contains_key(assignment.name.lexeme())
+        && analyzer.assignments.contains_key(assignment.name.lexeme())
       {
         return Err(assignment.name.token.error(DuplicateVariable {
           variable: assignment.name.lexeme(),
         }));
       }
 
-      if self
+      if analyzer
         .assignments
         .get(assignment.name.lexeme())
         .map_or(true, |original| assignment.depth <= original.depth)
       {
-        self.assignments.insert(assignment.clone());
+        analyzer.assignments.insert(assignment.clone());
       }
     }
 
-    AssignmentResolver::resolve_assignments(&self.assignments)?;
+    AssignmentResolver::resolve_assignments(&analyzer.assignments)?;
 
-    for recipe in recipes {
+    let recipes = {
-      define(recipe.name, "recipe", settings.allow_duplicate_recipes)?;
+      let mut recipe_table: Table<'src, UnresolvedRecipe<'src>> = Table::default();
+      for recipe in unprocessed_recipes {
+        definitions.define(recipe.name, "recipe", settings.allow_duplicate_recipes)?;
         if recipe_table
           .get(recipe.name.lexeme())
           .map_or(true, |original| recipe.file_depth <= original.file_depth)
@@ -138,10 +135,11 @@ impl<'src> Analyzer<'src> {
         }
       }
 
-    let recipes = RecipeResolver::resolve_recipes(recipe_table, &self.assignments)?;
+      RecipeResolver::resolve_recipes(recipe_table, &analyzer.assignments)?
+    };
 
     let mut aliases = Table::new();
-    while let Some(alias) = self.aliases.pop() {
+    while let Some(alias) = analyzer.aliases.pop() {
       aliases.insert(Self::resolve_alias(&recipes, alias)?);
     }
 
@@ -149,7 +147,7 @@ impl<'src> Analyzer<'src> {
 
     Ok(Justfile {
       aliases,
-      assignments: self.assignments,
+      assignments: analyzer.assignments,
       default: recipes
         .values()
         .filter(|recipe| recipe.name.path == root)
@@ -162,12 +160,12 @@ impl<'src> Analyzer<'src> {
           }),
         }),
       loaded: loaded.into(),
-      modules,
+      modules: analyzer.modules,
       name,
       recipes,
       settings,
       source: root.into(),
-      warnings,
+      warnings: analyzer.warnings,
     })
   }