fix: Mark global binding in the using directive as introduced in 0.…

…8.13

See ethereum/solidity#12288

It's impossible to specify a newly introduced keyword optionally in the
YML spec directly or even as an additional inline parser (`null`
definitions are treated as an undefined parser and error out), so this
adds versioning to the UsingDirective to add the new `global` contextual
keyword.

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"

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

@@ -66,7 +66,6 @@ slang_grammar! {
             | ForKeyword
             | FromKeyword
             | FunctionKeyword
-            | GlobalKeyword
             | HexKeyword
             | HoursKeyword
             | IfKeyword
@@ -160,6 +159,9 @@ slang_grammar! {
             // Introduced in 0.8.4
             | ErrorKeyword
             | RevertKeyword
+
+            // Introduced in 0.8.13
+            | GlobalKeyword
         ) ;
 
         parser ABICoderPragma = (ABICoderKeyword Identifier) ;
@@ -540,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) ;
 
@@ -888,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" ;
@@ -982,4 +983,6 @@ slang_grammar! {
     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" } ;
 }