run the tests

getgrit · Jul 20, 2024 · 1b9e8e3 · 1b9e8e3
1 parent 7a744ff
commit 1b9e8e3
Show file tree

Hide file tree

Showing 6 changed files with 123 additions and 69 deletions.
diff --git a/crates/core/src/analysis.rs b/crates/core/src/analysis.rs
@@ -315,7 +315,7 @@ mod tests {
             pattern_with_rewrite()
         "#
         .to_string();
-        let mut libs = BTreeMap::new();
+        let libs = BTreeMap::new();
         let problem = src_to_problem_libs(
             pattern_src.to_string(),
             &libs,

diff --git a/crates/core/src/ast_node.rs b/crates/core/src/ast_node.rs
@@ -3,6 +3,7 @@ use crate::{
     problem::MarzanoQueryContext,
 };
 use anyhow::{anyhow, Result};
+use grit_pattern_matcher::pattern::PatternDefinition;
 use grit_pattern_matcher::{
     binding::Binding,
     pattern::{
@@ -29,7 +30,10 @@ impl ASTNode {
 impl AstNodePattern<MarzanoQueryContext> for ASTNode {
     const INCLUDES_TRIVIA: bool = false;
 
-    fn children(&self) -> Vec<PatternOrPredicate<MarzanoQueryContext>> {
+    fn children<'a>(
+        &'a self,
+        _definitions: &'a [PatternDefinition<MarzanoQueryContext>],
+    ) -> Vec<PatternOrPredicate<'a, MarzanoQueryContext>> {
         self.args
             .iter()
             .map(|a| PatternOrPredicate::Pattern(&a.2))

diff --git a/crates/core/src/pattern_compiler/not_compiler.rs b/crates/core/src/pattern_compiler/not_compiler.rs
@@ -23,7 +23,7 @@ impl NodeCompiler for NotCompiler {
             .ok_or_else(|| anyhow!("missing pattern of patternNot"))?;
         let range = pattern.range();
         let pattern = PatternCompiler::from_node(&pattern, context)?;
-        if pattern.iter().any(|p| {
+        if pattern.iter(&[]).any(|p| {
             matches!(
                 p,
                 PatternOrPredicate::Pattern(Pattern::Rewrite(_))
@@ -59,7 +59,7 @@ impl NodeCompiler for PrNotCompiler {
             .ok_or_else(|| anyhow!("predicateNot missing predicate"))?;
         let range = not.range();
         let not = PredicateCompiler::from_node(&not, context)?;
-        if not.iter().any(|p| {
+        if not.iter(&[]).any(|p| {
             matches!(
                 p,
                 PatternOrPredicate::Pattern(Pattern::Rewrite(_))

diff --git a/crates/grit-pattern-matcher/src/analysis.rs b/crates/grit-pattern-matcher/src/analysis.rs
@@ -5,10 +5,10 @@ use crate::{
 
 /// Determine if a provided pattern has a rewrite anywhere inside of it
 pub fn has_rewrite<Q: QueryContext>(current_pattern: &Pattern<Q>) -> bool {
-    for pattern in current_pattern.iter() {
-        if matches!(pattern, PatternOrPredicate::Pattern(Pattern::Rewrite(_))) {
-            return true;
-        }
-    }
+    // for pattern in current_pattern.iter(definitions) {
+    //     if matches!(pattern, PatternOrPredicate::Pattern(Pattern::Rewrite(_))) {
+    //         return true;
+    //     }
+    // }
     false
 }
diff --git a/crates/grit-pattern-matcher/src/pattern/ast_node_pattern.rs b/crates/grit-pattern-matcher/src/pattern/ast_node_pattern.rs
@@ -1,6 +1,7 @@
 use super::{
     iter_pattern::PatternOrPredicate,
     patterns::{Matcher, PatternName},
+    PatternDefinition,
 };
 use crate::context::QueryContext;
 
@@ -12,7 +13,10 @@ pub trait AstNodePattern<Q: QueryContext>:
     /// Trivia is useful for being able to re-print an AST, but not all parsers support collecting it.
     const INCLUDES_TRIVIA: bool;
 
-    fn children(&self) -> Vec<PatternOrPredicate<Q>>;
+    fn children<'a>(
+        &'a self,
+        definitions: &'a [PatternDefinition<Q>],
+    ) -> Vec<PatternOrPredicate<'a, Q>>;
 
     fn matches_kind_of(&self, node: &Q::Node<'_>) -> bool;
 }