correct versioning for SourceUnitMember and ContractMember rules (#…

…558)
NomicFoundation · Jul 29, 2023 · 95bbc50 · 95bbc50
1 parent 7c2602f
commit 95bbc50
Show file tree

Hide file tree

Showing 82 changed files with 3,361 additions and 428 deletions.
diff --git a/.changeset/ten-doors-scream.md b/.changeset/ten-doors-scream.md
@@ -0,0 +1,5 @@
+---
+"changelog": patch
+---
+
+Correct versioning for `SourceUnitMember` and `ContractMember` children.
diff --git a/crates/solidity/inputs/language/definition/01-file-structure/02-source-unit/productions.yml b/crates/solidity/inputs/language/definition/01-file-structure/02-source-unit/productions.yml
@@ -21,29 +21,83 @@
   versioned:
     0.4.11:
       choice:
+        - reference: "PragmaDirective"
+        - reference: "ImportDirective"
         - reference: "ContractDefinition"
+        - reference: "InterfaceDefinition"
         - reference: "LibraryDefinition"
+    0.6.0:
+      choice:
+        - reference: "PragmaDirective"
+        - reference: "ImportDirective"
+        - reference: "ContractDefinition"
         - reference: "InterfaceDefinition"
+        - reference: "LibraryDefinition"
+        # added"
         - reference: "StructDefinition"
         - reference: "EnumDefinition"
-        - reference: "ConstantDefinition"
+    0.7.1:
+      choice:
+        - reference: "PragmaDirective"
+        - reference: "ImportDirective"
+        - reference: "ContractDefinition"
+        - reference: "InterfaceDefinition"
+        - reference: "LibraryDefinition"
+        - reference: "StructDefinition"
+        - reference: "EnumDefinition"
+        # added
         - reference: "FunctionDefinition"
-        - reference: "ErrorDefinition"
+    0.7.4:
+      choice:
+        - reference: "PragmaDirective"
         - reference: "ImportDirective"
+        - reference: "ContractDefinition"
+        - reference: "InterfaceDefinition"
+        - reference: "LibraryDefinition"
+        - reference: "StructDefinition"
+        - reference: "EnumDefinition"
+        - reference: "FunctionDefinition"
+        # added
+        - reference: "ConstantDefinition"
+    0.8.4:
+      choice:
         - reference: "PragmaDirective"
-        - reference: "UsingDirective"
+        - reference: "ImportDirective"
+        - reference: "ContractDefinition"
+        - reference: "InterfaceDefinition"
+        - reference: "LibraryDefinition"
+        - reference: "StructDefinition"
+        - reference: "EnumDefinition"
+        - reference: "FunctionDefinition"
+        - reference: "ConstantDefinition"
+        # added:
+        - reference: "ErrorDefinition"
     0.8.8:
       choice:
+        - reference: "PragmaDirective"
+        - reference: "ImportDirective"
         - reference: "ContractDefinition"
-        - reference: "LibraryDefinition"
         - reference: "InterfaceDefinition"
+        - reference: "LibraryDefinition"
         - reference: "StructDefinition"
         - reference: "EnumDefinition"
-        - reference: "ConstantDefinition"
         - reference: "FunctionDefinition"
+        - reference: "ConstantDefinition"
         - reference: "ErrorDefinition"
-        - reference: "ImportDirective"
-        - reference: "PragmaDirective"
-        - reference: "UsingDirective"
         # added:
         - reference: "UserDefinedValueTypeDefinition"
+    0.8.13:
+      choice:
+        - reference: "PragmaDirective"
+        - reference: "ImportDirective"
+        - reference: "ContractDefinition"
+        - reference: "InterfaceDefinition"
+        - reference: "LibraryDefinition"
+        - reference: "StructDefinition"
+        - reference: "EnumDefinition"
+        - reference: "FunctionDefinition"
+        - reference: "ConstantDefinition"
+        - reference: "ErrorDefinition"
+        - reference: "UserDefinedValueTypeDefinition"
+        # added:
+        - reference: "UsingDirective"
diff --git a/crates/solidity/inputs/language/definition/01-file-structure/07-keywords/productions.yml b/crates/solidity/inputs/language/definition/01-file-structure/07-keywords/productions.yml
@@ -214,12 +214,13 @@
 
 - name: "ErrorKeyword"
   kind: "Scanner"
-  unversioned:
-    trailingContext:
-      scanner:
-        terminal: "error"
-      notFollowedBy:
-        reference: "IdentifierPart"
+  versioned:
+    0.8.4:
+      trailingContext:
+        scanner:
+          terminal: "error"
+        notFollowedBy:
+          reference: "IdentifierPart"
 
 - name: "EtherKeyword"
   kind: "Scanner"

diff --git a/crates/solidity/inputs/language/definition/02-definitions/01-contracts/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/01-contracts/productions.yml
@@ -78,7 +78,6 @@
         - reference: "StructDefinition"
         - reference: "EnumDefinition"
         - reference: "EventDefinition"
-        - reference: "ErrorDefinition"
         - reference: "StateVariableDefinition"
     0.4.22:
       # added: "ConstructorDefinition"
@@ -91,12 +90,24 @@
         - reference: "StructDefinition"
         - reference: "EnumDefinition"
         - reference: "EventDefinition"
-        - reference: "ErrorDefinition"
         - reference: "StateVariableDefinition"
     0.6.0:
       # added: "ReceiveFunctionDefinition"
       # added: "FallbackFunctionDefinition"
       # removed: "UnnamedFunctionDefinition"
+      choice:
+        - reference: "UsingDirective"
+        - reference: "ConstructorDefinition"
+        - reference: "FunctionDefinition"
+        - reference: "FallbackFunctionDefinition"
+        - reference: "ReceiveFunctionDefinition"
+        - reference: "ModifierDefinition"
+        - reference: "StructDefinition"
+        - reference: "EnumDefinition"
+        - reference: "EventDefinition"
+        - reference: "StateVariableDefinition"
+    0.8.4:
+      # added: "ErrorDefinition"
       choice:
         - reference: "UsingDirective"
         - reference: "ConstructorDefinition"

diff --git a/crates/solidity/inputs/language/definition/02-definitions/06-constants/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/06-constants/productions.yml
@@ -2,14 +2,15 @@
 
 - name: "ConstantDefinition"
   kind: "Parser"
-  unversioned:
-    terminatedBy:
-      parser:
-        sequence:
-          - reference: "TypeName"
-          - reference: "ConstantKeyword"
-          - reference: "Identifier"
-          - reference: "Equal"
-          - reference: "Expression"
-      terminator:
-        reference: "Semicolon"
+  versioned:
+    0.7.4:
+      terminatedBy:
+        parser:
+          sequence:
+            - reference: "TypeName"
+            - reference: "ConstantKeyword"
+            - reference: "Identifier"
+            - reference: "Equal"
+            - reference: "Expression"
+        terminator:
+          reference: "Semicolon"
diff --git a/crates/solidity/inputs/language/definition/02-definitions/12-errors/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/12-errors/productions.yml
@@ -2,36 +2,39 @@
 
 - name: "ErrorDefinition"
   kind: "Parser"
-  unversioned:
-    terminatedBy:
-      parser:
-        sequence:
-          - reference: "ErrorKeyword"
-          - reference: "Identifier"
-          - delimitedBy:
-              open:
-                reference: "OpenParen"
-              parser:
-                optional:
-                  reference: "ErrorParametersList"
-              close:
-                reference: "CloseParen"
-      terminator:
-        reference: "Semicolon"
+  versioned:
+    0.8.4:
+      terminatedBy:
+        parser:
+          sequence:
+            - reference: "ErrorKeyword"
+            - reference: "Identifier"
+            - delimitedBy:
+                open:
+                  reference: "OpenParen"
+                parser:
+                  optional:
+                    reference: "ErrorParametersList"
+                close:
+                  reference: "CloseParen"
+        terminator:
+          reference: "Semicolon"
 
 - name: "ErrorParametersList"
   kind: "Parser"
-  unversioned:
-    separatedBy:
-      separator:
-        reference: "Comma"
-      parser:
-        reference: "ErrorParameter"
+  versioned:
+    0.8.4:
+      separatedBy:
+        separator:
+          reference: "Comma"
+        parser:
+          reference: "ErrorParameter"
 
 - name: "ErrorParameter"
   kind: "Parser"
-  unversioned:
-    sequence:
-      - reference: "TypeName"
-      - optional:
-          reference: "Identifier"
+  versioned:
+    0.8.4:
+      sequence:
+        - reference: "TypeName"
+        - optional:
+            reference: "Identifier"
diff --git a/crates/solidity/outputs/cargo/crate/src/legacy/generated/language.rs b/crates/solidity/outputs/cargo/crate/src/legacy/generated/language.rs