minor changes due to integration

avast · Apr 8, 2024 · bc3a227 · bc3a227
1 parent 63e8b6a
commit bc3a227
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 16 deletions.
diff --git a/src/parser/grammar/expressions.rs b/src/parser/grammar/expressions.rs
@@ -755,7 +755,6 @@ fn quantifier(p: &mut Parser) {
 }
 
 fn iterable(p: &mut Parser) {
-    let m = p.start();
     match p.current() {
         T!['('] => {
             let n = p.start();
@@ -776,10 +775,11 @@ fn iterable(p: &mut Parser) {
             }
         }
         _ => {
+            let n = p.start();
             expr(p, None, 1);
+            n.complete(p, NESTED_EXPR);
         }
     }
-    m.complete(p, ITERABLE);
 }
 
 fn boolean_expr_tuple(p: &mut Parser) {

diff --git a/src/syntax/ast/expr_ext.rs b/src/syntax/ast/expr_ext.rs
@@ -174,6 +174,16 @@ impl ast::BooleanTermExpr {
         support::children(self.syntax()).nth(1)
     }
 }
+
+impl ast::VariableWildcard {
+    pub fn matches(&self, ident: &str) -> bool {
+        if self.star_token().is_some() {
+            ident.starts_with(self.variable_token().unwrap().text())
+        } else {
+            ident == self.variable_token().unwrap().text()
+        }
+    }
+}
 //
 //#[derive(Clone, Debug, PartialEq, Eq, Hash)]
 //pub enum LiteralKind {

diff --git a/src/syntax/ast/generated/nodes.rs b/src/syntax/ast/generated/nodes.rs
@@ -580,7 +580,7 @@ impl ForExpr {
     pub fn l_paren_token(&self) -> Option<SyntaxToken> {
         support::token(&self.syntax, T!['('])
     }
-    pub fn boolean_expr(&self) -> Option<BooleanExpr> {
+    pub fn expression(&self) -> Option<Expression> {
         support::child(&self.syntax)
     }
     pub fn r_paren_token(&self) -> Option<SyntaxToken> {

diff --git a/tests/test38.out b/tests/test38.out
@@ -33,18 +33,17 @@ [email protected]
                 [email protected] " "
                 [email protected] "in"
                 [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "("
-                    [email protected]
-                      [email protected] "1"
-                    [email protected] ","
-                    [email protected]
-                      [email protected] "2"
-                    [email protected] ","
-                    [email protected]
-                      [email protected] "3"
-                    [email protected] ")"
+                [email protected]
+                  [email protected] "("
+                  [email protected]
+                    [email protected] "1"
+                  [email protected] ","
+                  [email protected]
+                    [email protected] "2"
+                  [email protected] ","
+                  [email protected]
+                    [email protected] "3"
+                  [email protected] ")"
                 [email protected] " "
                 [email protected] ":"
                 [email protected] " "

diff --git a/yara.ungram b/yara.ungram
@@ -203,7 +203,7 @@ ForExpr =
         'for' Quantifier 'of' ('them' | PatternIdentTuple)
     |   'for' Quantifier (IdentifierNode (',' IdentifierNode)*) 'in' Iterable
     )
-    ':' '(' BooleanExpr ')'
+    ':' '(' Expression ')'
 
 Quantifier = 
     'all'