Merge remote-tracking branch 'upstream/main' into error-recovery-sepa…

…rated

.changeset/rich-fans-mate.md

@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/slang": patch
+---
+
+Use correct versions for the `revert` and `global` keywords

crates/solidity/inputs/language/definition/01-file-structure/04-imports/productions.yml

@@ -69,22 +69,38 @@
 
 - name: "UsingDirective"
   kind: "Parser"
-  unversioned:
-    terminatedBy:
-      parser:
-        sequence:
-          - reference: "UsingKeyword"
-          - choice:
-              - reference: "UsingDirectivePath"
-              - reference: "UsingDirectiveDeconstruction"
-          - reference: "ForKeyword"
-          - choice:
-              - reference: "Asterisk"
-              - reference: "TypeName"
-          - optional:
-              reference: "GlobalKeyword"
-      terminator:
-        reference: "Semicolon"
+  versioned:
+    0.4.11:
+      terminatedBy:
+        parser:
+          sequence:
+            - reference: "UsingKeyword"
+            - choice:
+                - reference: "UsingDirectivePath"
+                - reference: "UsingDirectiveDeconstruction"
+            - reference: "ForKeyword"
+            - choice:
+                - reference: "Asterisk"
+                - reference: "TypeName"
+        terminator:
+          reference: "Semicolon"
+    # Added an optional `global` keyword
+    0.8.13:
+      terminatedBy:
+        parser:
+          sequence:
+            - reference: "UsingKeyword"
+            - choice:
+                - reference: "UsingDirectivePath"
+                - reference: "UsingDirectiveDeconstruction"
+            - reference: "ForKeyword"
+            - choice:
+                - reference: "Asterisk"
+                - reference: "TypeName"
+            - optional:
+                reference: "GlobalKeyword"
+        terminator:
+          reference: "Semicolon"
 
 - name: "UsingDirectivePath"
   kind: "Parser"

crates/solidity/inputs/language/definition/01-file-structure/07-keywords/productions.yml

@@ -316,12 +316,13 @@
 
 - name: "GlobalKeyword"
   kind: "Scanner"
-  unversioned:
-    trailingContext:
-      scanner:
-        terminal: "global"
-      notFollowedBy:
-        reference: "IdentifierPart"
+  versioned:
+    0.8.13:
+      trailingContext:
+        scanner:
+          terminal: "global"
+        notFollowedBy:
+          reference: "IdentifierPart"
 
 - name: "GweiKeyword"
   kind: "Scanner"
@@ -562,12 +563,13 @@
 
 - name: "RevertKeyword"
   kind: "Scanner"
-  unversioned:
-    trailingContext:
-      scanner:
-        terminal: "revert"
-      notFollowedBy:
-        reference: "IdentifierPart"
+  versioned:
+    0.8.4:
+      trailingContext:
+        scanner:
+          terminal: "revert"
+        notFollowedBy:
+          reference: "IdentifierPart"
 
 - name: "SecondsKeyword"
   kind: "Scanner"

crates/solidity/inputs/language/definition/04-statements/01-blocks/productions.yml

@@ -50,7 +50,6 @@
         - reference: "BreakStatement"
         - reference: "DeleteStatement"
         - reference: "ReturnStatement"
-        - reference: "RevertStatement"
         - reference: "ThrowStatement"
     0.4.21:
       choice:
@@ -63,7 +62,6 @@
         - reference: "BreakStatement"
         - reference: "DeleteStatement"
         - reference: "ReturnStatement"
-        - reference: "RevertStatement"
         - reference: "ThrowStatement"
         - reference: "EmitStatement"
     0.5.0:
@@ -77,7 +75,6 @@
         - reference: "BreakStatement"
         - reference: "DeleteStatement"
         - reference: "ReturnStatement"
-        - reference: "RevertStatement"
         - reference: "EmitStatement"
     0.6.0:
       choice:
@@ -90,6 +87,19 @@
         - reference: "BreakStatement"
         - reference: "DeleteStatement"
         - reference: "ReturnStatement"
+        - reference: "EmitStatement"
+        - reference: "TryStatement"
+    0.8.4:
+      choice:
+        # added: "RevertStatement"
+        - reference: "IfStatement"
+        - reference: "ForStatement"
+        - reference: "WhileStatement"
+        - reference: "DoWhileStatement"
+        - reference: "ContinueStatement"
+        - reference: "BreakStatement"
+        - reference: "DeleteStatement"
+        - reference: "ReturnStatement"
         - reference: "RevertStatement"
         - reference: "EmitStatement"
         - reference: "TryStatement"

crates/solidity/inputs/language/definition/04-statements/04-error-handling/productions.yml

@@ -40,16 +40,17 @@
 
 - name: "RevertStatement"
   kind: "Parser"
-  unversioned:
-    terminatedBy:
-      parser:
-        sequence:
-          - reference: "RevertKeyword"
-          - optional:
-              reference: "IdentifierPath"
-          - reference: "ArgumentsDeclaration"
-      terminator:
-        reference: "Semicolon"
+  versioned:
+    0.8.4:
+      terminatedBy:
+        parser:
+          sequence:
+            - reference: "RevertKeyword"
+            - optional:
+                reference: "IdentifierPath"
+            - reference: "ArgumentsDeclaration"
+        terminator:
+          reference: "Semicolon"
 
 - name: "ThrowStatement"
   kind: "Parser"

crates/solidity/inputs/language/src/dsl.rs

@@ -66,7 +66,6 @@ slang_grammar! {
             | ForKeyword
             | FromKeyword
             | FunctionKeyword
-            | GlobalKeyword
             | HexKeyword
             | HoursKeyword
             | IfKeyword
@@ -97,7 +96,6 @@ slang_grammar! {
             | RelocatableKeyword
             | ReturnKeyword
             | ReturnsKeyword
-            | RevertKeyword
             | SecondsKeyword
             | SolidityKeyword
             | StaticKeyword
@@ -160,6 +158,10 @@ slang_grammar! {
 
             // Introduced in 0.8.4
             | ErrorKeyword
+            | RevertKeyword
+
+            // Introduced in 0.8.13
+            | GlobalKeyword
         ) ;
 
         parser ABICoderPragma = (ABICoderKeyword Identifier) ;
@@ -235,10 +237,11 @@ slang_grammar! {
         parser ContractMembersList = (ContractMember +) ;
 
         inline parser ControlStatement = (
-            IfStatement | ForStatement | WhileStatement | DoWhileStatement | ContinueStatement | BreakStatement | DeleteStatement | ReturnStatement | RevertStatement |
-            { introduced in "0.4.21" EmitStatement} |
+            IfStatement | ForStatement | WhileStatement | DoWhileStatement | ContinueStatement | BreakStatement | DeleteStatement | ReturnStatement |
+            { introduced in "0.4.21" EmitStatement } |
             { removed in "0.5.0"     ThrowStatement } |
-            { introduced in "0.6.0"  TryStatement}
+            { introduced in "0.6.0"  TryStatement } |
+            { introduced in "0.8.4"  RevertStatement }
         ) ;
 
         inline parser DataLocation = (
@@ -539,7 +542,7 @@ slang_grammar! {
 
         parser UserDefinedValueTypeDefinition = { introduced in "0.8.8" ((TypeKeyword Identifier IsKeyword ElementaryType) terminated by Semicolon) } ;
 
-        parser UsingDirective = ((UsingKeyword (UsingDirectivePath | UsingDirectiveDeconstruction) ForKeyword (Asterisk | TypeName) (GlobalKeyword ?)) terminated by Semicolon) ;
+        parser UsingDirective = ((UsingKeyword (UsingDirectivePath | UsingDirectiveDeconstruction) ForKeyword (Asterisk | TypeName) ({ introduced in "0.8.13" GlobalKeyword } ?)) terminated by Semicolon) ;
 
         parser UsingDirectiveDeconstruction = (UsingDirectiveSymbolsList delimited by OpenBrace and CloseBrace) ;
 
@@ -887,7 +890,6 @@ slang_grammar! {
     scanner ForKeyword = "for" ;
     scanner FromKeyword = "from" ;
     scanner FunctionKeyword = "function" ;
-    scanner GlobalKeyword = "global" ;
     scanner HexKeyword = "hex" ;
     scanner HoursKeyword = "hours" ;
     scanner IfKeyword = "if" ;
@@ -918,7 +920,6 @@ slang_grammar! {
     scanner RelocatableKeyword = "relocatable" ;
     scanner ReturnKeyword = "return" ;
     scanner ReturnsKeyword = "returns" ;
-    scanner RevertKeyword = "revert" ;
     scanner SecondsKeyword = "seconds" ;
     scanner SolidityKeyword = "solidity" ;
     scanner StaticKeyword = "static" ;
@@ -979,6 +980,9 @@ slang_grammar! {
     scanner UncheckedKeyword = { introduced in "0.8.0" "unchecked" } ;
 
     // Introduced in 0.8.4
-    scanner ErrorKeyword = { introduced in "0.8.4" "error" } ;
+    scanner ErrorKeyword =  { introduced in "0.8.4" "error" } ;
+    scanner RevertKeyword = { introduced in "0.8.4" "revert" } ;
 
+    // Introduced in 0.8.13
+    scanner GlobalKeyword = { introduced in "0.8.13" "global" } ;
 }