Backport a couple of added/removed grammar nodes from v2 to v0/v1 (#664)

Part of #652

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

@@ -75,7 +75,7 @@
         parser:
           sequence:
             - reference: "UsingKeyword"
-            - reference: "UsingDirectivePath"
+            - reference: "IdentifierPath"
             - reference: "ForKeyword"
             - choice:
                 - reference: "Asterisk"
@@ -89,7 +89,7 @@
           sequence:
             - reference: "UsingKeyword"
             - choice:
-                - reference: "UsingDirectivePath"
+                - reference: "IdentifierPath"
                 - reference: "UsingDirectiveDeconstruction"
             - reference: "ForKeyword"
             - choice:
@@ -100,11 +100,6 @@
         terminator:
           reference: "Semicolon"
 
-- name: "UsingDirectivePath"
-  kind: "Parser"
-  unversioned:
-    reference: "IdentifierPath"
-
 - name: "UsingDirectiveDeconstruction"
   kind: "Parser"
   versioned:

crates/solidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml

@@ -49,32 +49,28 @@
     terminatedBy:
       parser:
         sequence:
-          - reference: "VariableDeclaration"
+          - reference: "VariableDeclarationType"
+          - optional:
+              reference: "DataLocation"
+          - reference: "Identifier"
           - optional:
               sequence:
                 - reference: "Equal"
                 - reference: "Expression"
       terminator:
         reference: "Semicolon"
 
-- name: "VariableDeclaration"
+- name: "VariableDeclarationType"
   kind: "Parser"
+  inlined: true
   versioned:
     0.4.11:
-      sequence:
-        - choice:
-            - reference: "VarKeyword"
-            - reference: "TypeName"
-        - optional:
-            reference: "DataLocation"
-        - reference: "Identifier"
+      choice:
+        - reference: "VarKeyword"
+        - reference: "TypeName"
     0.5.0:
       # removed "VarKeyword"
-      sequence:
-        - reference: "TypeName"
-        - optional:
-            reference: "DataLocation"
-        - reference: "Identifier"
+      reference: "TypeName"
 
 - name: "DataLocation"
   kind: "Parser"

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

@@ -550,25 +550,23 @@ slang_grammar! {
 
         parser UserDefinedValueTypeDefinition = { introduced in "0.8.8" ((TypeKeyword Identifier IsKeyword ElementaryType) terminated by Semicolon) } ;
 
-        parser UsingDirective = ((UsingKeyword (UsingDirectivePath | UsingDirectiveDeconstruction) ForKeyword (Asterisk | TypeName) ({ introduced in "0.8.13" GlobalKeyword } ?)) terminated by Semicolon) ;
+        parser UsingDirective = ((UsingKeyword (IdentifierPath | UsingDirectiveDeconstruction) ForKeyword (Asterisk | TypeName) ({ introduced in "0.8.13" GlobalKeyword } ?)) terminated by Semicolon) ;
 
         parser UsingDirectiveDeconstruction = { introduced in "0.8.13" (UsingDirectiveSymbolsList delimited by OpenBrace and CloseBrace) };
 
         inline parser UsingDirectiveOperator = {
             introduced in "0.8.19" (Ampersand | Asterisk | BangEqual | Bar | Caret | EqualEqual | GreaterThan | GreaterThanEqual | LessThan | LessThanEqual | Minus | Percent | Plus | Slash | Tilde)
         } ;
 
-        parser UsingDirectivePath = IdentifierPath ;
-
         parser UsingDirectiveSymbol = {
             introduced in "0.8.13" (IdentifierPath { introduced in "0.8.19" ((AsKeyword UsingDirectiveOperator) ?) } )
         } ;
 
         parser UsingDirectiveSymbolsList = (UsingDirectiveSymbol separated by Comma) ;
 
-        parser VariableDeclaration = (
-            ({ removed in "0.5.0" VarKeyword } | TypeName) (DataLocation ?) Identifier
-        ) ;
+        parser VariableDeclaration = (VariableDeclarationType (DataLocation ?) Identifier) ;
+
+        inline parser VariableDeclarationType = ({ removed in "0.5.0" VarKeyword } | TypeName) ;
 
         parser VariableDeclarationStatement = ((VariableDeclaration ((Equal Expression) ?)) terminated by Semicolon) ;