Update @lezer/lr + enrich grammar to reproduce infinite loop

backmask · Sep 24, 2021 · 913df5e · 913df5e
1 parent 75eb49b
commit 913df5e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "type": "module",
   "dependencies": {
-    "@lezer/lr": "^0.15.2"
+    "@lezer/lr": "^0.15.3"
   },
   "scripts": {
     "generate": "lezer-generator src/lezer.grammar -o src/GeneratedLang",

diff --git a/patches/@lezer+lr+0.15.2.patch → patches/@lezer+lr+0.15.3.patch b/patches/@lezer+lr+0.15.2.patch → patches/@lezer+lr+0.15.3.patch
diff --git a/src/lezer.grammar b/src/lezer.grammar
@@ -21,9 +21,15 @@ ComparisonExpression { expression !comparison_expression ComparisonOp expression
 InExpression { expression !in_expression In Enumeration }
 BinaryExpression { expression !binary_expression Times expression }
 
+OnClause {
+  On LParen expression (Comma expression)+ RParen
+}
+
 AtomExpression {
     IntegerLiteral
   | VariableAtom
+  | ModifierAtom
+  | AttributeAtom
 }
 
 VariableAtom {
@@ -48,26 +54,40 @@ AtomParen { !atom_paren LParen expression RParen }
 
 CumulateFunc { Cumulate LParen expression Comma Name (Comma expression)? RParen }
 
+ModifierAtom { AtomExpression LBracket SelectExpression (Semicolon SelectExpression)* RBracket }
+
+AttributeAtom { AtomExpression Point Name }
+
+SelectExpression { Select Aggregation? Colon expression }
+
+Aggregation { Name OnClause? }
+
 @tokens {
   @precedence {
     Cumulate,
-    In,
+    In, On,
     ComparisonOp,
+    Select,
     Name
   }
 
   Cumulate { "cumulate" }
-  
+
   In { "in" }
+  On { "on" }
 
+  Point { "." }
   Colon { ":" }
+  Semicolon { ";" }
   Comma { "," }
   Scope { "@" }
   Times { "*" }
+  LBracket { "[" }
+  RBracket { "]" }
   LParen { "(" }
   RParen { ")" }
-
   ComparisonOp { ">=" | ">" | "<=" | "<" | "==" | "=" | "!=" | "<>" | "indef" }
+  Select { "select" }
 
   IntegerLiteral { $[0-9]+ }