Es grammars fix (#477)

CrazyWinner · web-flow · commit 03b5b17ef79b · 2025-07-28T16:00:18.000+02:00
* Es-grammars 2016...2021 fix

* revert 2022

* fixed overrides
diff --git a/packages/es-grammars/gen/es2015.grammar.ohm b/packages/es-grammars/gen/es2015.grammar.ohm
diff --git a/packages/es-grammars/gen/es2016.grammar.ohm b/packages/es-grammars/gen/es2016.grammar.ohm
@@ -506,11 +506,11 @@ ES2016 {
     | NewExpression<guardYield>
 
   UpdateExpression<guardYield> = 
-    | LeftHandSideExpression<guardYield> -- alt1
     | LeftHandSideExpression<guardYield> ~lineTerminator "++" -- alt2
     | LeftHandSideExpression<guardYield> ~lineTerminator "--" -- alt3
     | "++" UnaryExpression<guardYield> -- alt4
     | "--" UnaryExpression<guardYield> -- alt5
+	| LeftHandSideExpression<guardYield> -- alt1
 
   UnaryExpression<guardYield> = 
     | delete UnaryExpression<guardYield> -- alt2
diff --git a/packages/es-grammars/gen/es2017.grammar.ohm b/packages/es-grammars/gen/es2017.grammar.ohm
@@ -541,11 +541,11 @@ ES2017 {
     | MemberExpression<guardYield, guardAwait> Arguments<guardYield, guardAwait> -- alt1
 
   UpdateExpression<guardYield, guardAwait> = 
-    | LeftHandSideExpression<guardYield, guardAwait> -- alt1
     | LeftHandSideExpression<guardYield, guardAwait> ~lineTerminator "++" -- alt2
     | LeftHandSideExpression<guardYield, guardAwait> ~lineTerminator "--" -- alt3
     | "++" UnaryExpression<guardYield, guardAwait> -- alt4
     | "--" UnaryExpression<guardYield, guardAwait> -- alt5
+	| LeftHandSideExpression<guardYield, guardAwait> -- alt1
 
   UnaryExpression<guardYield, guardAwait> = 
     | delete UnaryExpression<guardYield, guardAwait> -- alt2
diff --git a/packages/es-grammars/gen/es2018.grammar.ohm b/packages/es-grammars/gen/es2018.grammar.ohm
@@ -538,11 +538,11 @@ ES2018 {
     | MemberExpression<guardYield, guardAwait> Arguments<guardYield, guardAwait> -- alt1
 
   UpdateExpression<guardYield, guardAwait> = 
-    | LeftHandSideExpression<guardYield, guardAwait> -- alt1
     | LeftHandSideExpression<guardYield, guardAwait> ~lineTerminator "++" -- alt2
     | LeftHandSideExpression<guardYield, guardAwait> ~lineTerminator "--" -- alt3
     | "++" UnaryExpression<guardYield, guardAwait> -- alt4
     | "--" UnaryExpression<guardYield, guardAwait> -- alt5
+	| LeftHandSideExpression<guardYield, guardAwait> -- alt1
 
   UnaryExpression<guardYield, guardAwait> = 
     | delete UnaryExpression<guardYield, guardAwait> -- alt2
diff --git a/packages/es-grammars/gen/es2019.grammar.ohm b/packages/es-grammars/gen/es2019.grammar.ohm
@@ -542,11 +542,11 @@ ES2019 {
     | MemberExpression<guardYield, guardAwait> Arguments<guardYield, guardAwait> -- alt1
 
   UpdateExpression<guardYield, guardAwait> = 
-    | LeftHandSideExpression<guardYield, guardAwait> -- alt1
     | LeftHandSideExpression<guardYield, guardAwait> ~lineTerminator "++" -- alt2
     | LeftHandSideExpression<guardYield, guardAwait> ~lineTerminator "--" -- alt3
     | "++" UnaryExpression<guardYield, guardAwait> -- alt4
     | "--" UnaryExpression<guardYield, guardAwait> -- alt5
+	| LeftHandSideExpression<guardYield, guardAwait> -- alt1
 
   UnaryExpression<guardYield, guardAwait> = 
     | delete UnaryExpression<guardYield, guardAwait> -- alt2
diff --git a/packages/es-grammars/gen/es2020.grammar.ohm b/packages/es-grammars/gen/es2020.grammar.ohm
@@ -577,11 +577,11 @@ ES2020 {
     | MemberExpression<guardYield, guardAwait> Arguments<guardYield, guardAwait> -- alt1
 
   UpdateExpression<guardYield, guardAwait> = 
-    | LeftHandSideExpression<guardYield, guardAwait> -- alt1
     | LeftHandSideExpression<guardYield, guardAwait> ~lineTerminator "++" -- alt2
     | LeftHandSideExpression<guardYield, guardAwait> ~lineTerminator "--" -- alt3
     | "++" UnaryExpression<guardYield, guardAwait> -- alt4
     | "--" UnaryExpression<guardYield, guardAwait> -- alt5
+	| LeftHandSideExpression<guardYield, guardAwait> -- alt1
 
   UnaryExpression<guardYield, guardAwait> = 
     | delete UnaryExpression<guardYield, guardAwait> -- alt2
diff --git a/packages/es-grammars/gen/es2021.grammar.ohm b/packages/es-grammars/gen/es2021.grammar.ohm
@@ -187,7 +187,7 @@ ES2021 {
 
   decimalIntegerLiteral = 
     | "0" -- alt1
-    | nonZeroDigit -- alt2
+    | nonZeroDigit decimalDigits<withSep>? -- alt2
     | nonZeroDigit numericLiteralSeparator? decimalDigits<withSep> -- alt3
 
   decimalDigits<guardSep> = 
@@ -586,11 +586,11 @@ ES2021 {
     | MemberExpression<guardYield, guardAwait> Arguments<guardYield, guardAwait> -- alt1
 
   UpdateExpression<guardYield, guardAwait> = 
-    | LeftHandSideExpression<guardYield, guardAwait> -- alt1
     | LeftHandSideExpression<guardYield, guardAwait> ~lineTerminator "++" -- alt2
     | LeftHandSideExpression<guardYield, guardAwait> ~lineTerminator "--" -- alt3
     | "++" UnaryExpression<guardYield, guardAwait> -- alt4
     | "--" UnaryExpression<guardYield, guardAwait> -- alt5
+	| LeftHandSideExpression<guardYield, guardAwait> -- alt1
 
   UnaryExpression<guardYield, guardAwait> = 
     | delete UnaryExpression<guardYield, guardAwait> -- alt2
diff --git a/packages/es-grammars/spec/es2016/overrides.json b/packages/es-grammars/spec/es2016/overrides.json
@@ -58,6 +58,13 @@
       "postlude": "\n    | UpdateExpression<guardYield> -- alt1",
       "replacement": ""
     },
+    {
+      "_comment_": " Move LeftHandSideExpression to the very end.",
+      "name": "UpdateExpression",
+      "pattern": "    | LeftHandSideExpression<guardYield> -- alt1\n",
+      "postlude": "\n    | LeftHandSideExpression<guardYield> -- alt1",
+      "replacement": ""
+    },
     {
       "_comment_": " The first alternative is a subset of the second one, so flip the order.",
       "name": "ConditionalExpression",
diff --git a/packages/es-grammars/spec/es2017/overrides.json b/packages/es-grammars/spec/es2017/overrides.json
@@ -58,6 +58,13 @@
       "postlude": "\n    | UpdateExpression<guardYield, guardAwait> -- alt1",
       "replacement": ""
     },
+    {
+      "_comment_": " Move LeftHandSideExpression to the very end.",
+      "name": "UpdateExpression",
+      "pattern": "    | LeftHandSideExpression<guardYield, guardAwait> -- alt1\n",
+      "postlude": "\n    | LeftHandSideExpression<guardYield, guardAwait> -- alt1",
+      "replacement": ""
+    },
     {
       "_comment_": "The first alternative is a subset of the second one, so flip the order.",
       "name": "ConditionalExpression",
diff --git a/packages/es-grammars/spec/es2018/overrides.json b/packages/es-grammars/spec/es2018/overrides.json
@@ -58,6 +58,13 @@
       "postlude": "\n    | UpdateExpression<guardYield, guardAwait> -- alt1",
       "replacement": ""
     },
+    {
+      "_comment_": " Move LeftHandSideExpression to the very end.",
+      "name": "UpdateExpression",
+      "pattern": "    | LeftHandSideExpression<guardYield, guardAwait> -- alt1\n",
+      "postlude": "\n    | LeftHandSideExpression<guardYield, guardAwait> -- alt1",
+      "replacement": ""
+    },
     {
       "_comment_": "The first alternative is a subset of the second one, so flip the order.",
       "name": "ConditionalExpression",
diff --git a/packages/es-grammars/spec/es2019/overrides.json b/packages/es-grammars/spec/es2019/overrides.json
@@ -58,6 +58,13 @@
       "postlude": "\n    | UpdateExpression<guardYield, guardAwait> -- alt1",
       "replacement": ""
     },
+    {
+      "_comment_": " Move LeftHandSideExpression to the very end.",
+      "name": "UpdateExpression",
+      "pattern": "    | LeftHandSideExpression<guardYield, guardAwait> -- alt1\n",
+      "postlude": "\n    | LeftHandSideExpression<guardYield, guardAwait> -- alt1",
+      "replacement": ""
+    },
     {
       "_comment_": "The first alternative is a subset of the second one, so flip the order.",
       "name": "ConditionalExpression",
diff --git a/packages/es-grammars/spec/es2020/overrides.json b/packages/es-grammars/spec/es2020/overrides.json
@@ -58,6 +58,13 @@
       "postlude": "\n    | UpdateExpression<guardYield, guardAwait> -- alt1",
       "replacement": ""
     },
+    {
+      "_comment_": " Move LeftHandSideExpression to the very end.",
+      "name": "UpdateExpression",
+      "pattern": "    | LeftHandSideExpression<guardYield, guardAwait> -- alt1\n",
+      "postlude": "\n    | LeftHandSideExpression<guardYield, guardAwait> -- alt1",
+      "replacement": ""
+    },
     {
       "_comment_": "The first alternative is a subset of the second one, so flip the order.",
       "name": "ConditionalExpression",
diff --git a/packages/es-grammars/spec/es2021/overrides.json b/packages/es-grammars/spec/es2021/overrides.json
@@ -18,6 +18,11 @@
       "pattern": "| \"*\" postAsteriskCommentChars?",
       "replacement": "| \"*\" ~\"/\" postAsteriskCommentChars?"
     },
+    {
+      "name": "decimalIntegerLiteral",
+      "pattern": "| nonZeroDigit -- alt2",
+      "replacement": "| nonZeroDigit decimalDigits<withSep>? -- alt2"
+    },
     {
       "name": "LeftHandSideExpression",
       "pattern": "| NewExpression<guardYield, guardAwait>\n    | CallExpression<guardYield, guardAwait>",
@@ -58,6 +63,13 @@
       "postlude": "\n    | UpdateExpression<guardYield, guardAwait> -- alt1",
       "replacement": ""
     },
+    {
+      "_comment_": " Move LeftHandSideExpression to the very end.",
+      "name": "UpdateExpression",
+      "pattern": "    | LeftHandSideExpression<guardYield, guardAwait> -- alt1\n",
+      "postlude": "\n    | LeftHandSideExpression<guardYield, guardAwait> -- alt1",
+      "replacement": ""
+    },
     {
       "_comment_": "The first alternative is a subset of the second one, so flip the order.",
       "name": "ConditionalExpression",
