Fix some language definitions in DSL v1/v2

crates/solidity/inputs/language/definition/02-definitions/10-events/productions.yml

@@ -8,19 +8,24 @@
         sequence:
           - reference: "EventKeyword"
           - reference: "Identifier"
-          - delimitedBy:
-              open:
-                reference: "OpenParen"
-              parser:
-                optional:
-                  reference: "EventParametersList"
-              close:
-                reference: "CloseParen"
+          - reference: "EventParametersDeclaration"
           - optional:
               reference: "AnonymousKeyword"
       terminator:
         reference: "Semicolon"
 
+- name: "EventParametersDeclaration"
+  kind: "Parser"
+  unversioned:
+    delimitedBy:
+      open:
+        reference: "OpenParen"
+      parser:
+        optional:
+          reference: "EventParametersList"
+      close:
+        reference: "CloseParen"
+
 - name: "EventParametersList"
   kind: "Parser"
   unversioned:

crates/solidity/inputs/language/definition/02-definitions/12-errors/productions.yml

@@ -9,17 +9,23 @@
           sequence:
             - reference: "ErrorKeyword"
             - reference: "Identifier"
-            - delimitedBy:
-                open:
-                  reference: "OpenParen"
-                parser:
-                  optional:
-                    reference: "ErrorParametersList"
-                close:
-                  reference: "CloseParen"
+            - reference: "ErrorParametersDeclaration"
         terminator:
           reference: "Semicolon"
 
+- name: "ErrorParametersDeclaration"
+  kind: "Parser"
+  versioned:
+    0.8.4:
+      delimitedBy:
+        open:
+          reference: "OpenParen"
+        parser:
+          optional:
+            reference: "ErrorParametersList"
+        close:
+          reference: "CloseParen"
+
 - name: "ErrorParametersList"
   kind: "Parser"
   versioned:

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

@@ -100,9 +100,9 @@
         - reference: "BreakStatement"
         - reference: "DeleteStatement"
         - reference: "ReturnStatement"
-        - reference: "RevertStatement"
         - reference: "EmitStatement"
         - reference: "TryStatement"
+        - reference: "RevertStatement"
 
 - name: "SimpleStatement"
   kind: "Parser"

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

@@ -2607,8 +2607,7 @@ codegen_language_macros::compile!(Language(
                             fields = (
                                 event_keyword = Required(Terminal([EventKeyword])),
                                 name = Required(Terminal([Identifier])),
-                                parameters =
-                                    Optional(kind = NonTerminal(EventParametersDeclaration)),
+                                parameters = Required(NonTerminal(EventParametersDeclaration)),
                                 anonymous_keyword = Optional(kind = Terminal([AnonymousKeyword])),
                                 semicolon = Required(Terminal([Semicolon]))
                             )
@@ -2621,15 +2620,14 @@ codegen_language_macros::compile!(Language(
                             ),
                             fields = (
                                 open_paren = Required(Terminal([OpenParen])),
-                                parameters = Required(NonTerminal(EventParameters)),
+                                parameters = Optional(kind = NonTerminal(EventParameters)),
                                 close_paren = Required(Terminal([CloseParen]))
                             )
                         ),
                         Separated(
                             name = EventParameters,
                             separated = EventParameter,
-                            separator = Comma,
-                            allow_empty = true
+                            separator = Comma
                         ),
                         Struct(
                             name = EventParameter,
@@ -2865,14 +2863,17 @@ codegen_language_macros::compile!(Language(
                         Enum(
                             name = Statement,
                             variants = [
-                                EnumVariant(
-                                    name = TupleDeconstruction,
-                                    reference = TupleDeconstructionStatement
-                                ),
+                                // Simple statements
+                                EnumVariant(name = Expression, reference = ExpressionStatement),
                                 EnumVariant(
                                     name = VariableDeclaration,
                                     reference = VariableDeclarationStatement
                                 ),
+                                EnumVariant(
+                                    name = TupleDeconstruction,
+                                    reference = TupleDeconstructionStatement
+                                ),
+                                // Control statements
                                 EnumVariant(name = If, reference = IfStatement),
                                 EnumVariant(name = For, reference = ForStatement),
                                 EnumVariant(name = While, reference = WhileStatement),
@@ -2907,8 +2908,7 @@ codegen_language_macros::compile!(Language(
                                     name = UncheckedBlock,
                                     enabled = From("0.8.0"),
                                     reference = UncheckedBlock
-                                ),
-                                EnumVariant(name = Expression, reference = ExpressionStatement)
+                                )
                             ]
                         ),
                         Struct(
@@ -3044,8 +3044,8 @@ codegen_language_macros::compile!(Language(
                         Struct(
                             name = ElseBranch,
                             fields = (
-                                else_keyword = Optional(kind = Terminal([ElseKeyword])),
-                                body = Optional(kind = NonTerminal(Statement))
+                                else_keyword = Required(Terminal([ElseKeyword])),
+                                body = Required(NonTerminal(Statement))
                             )
                         ),
                         Struct(

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

@@ -35,7 +35,7 @@ slang_grammar! {
     lexical context Default = {
 
         inline parser SolidityKeywordsOverAllVersions = (
-              ABICoderKeyword
+              AbicoderKeyword
             | AbstractKeyword
             | AddressKeyword
             | AfterKeyword
@@ -165,7 +165,7 @@ slang_grammar! {
             | GlobalKeyword
         ) ;
 
-        parser ABICoderPragma = (ABICoderKeyword Identifier) ;
+        parser ABICoderPragma = (AbicoderKeyword Identifier) ;
 
         inline parser AddSubOperator = (Plus | Minus) ;
 
@@ -271,13 +271,17 @@ slang_grammar! {
 
         inline parser EqualityComparisonOperator = (EqualEqual | BangEqual) ;
 
-        parser ErrorDefinition = { introduced in "0.8.4" ((ErrorKeyword Identifier ((ErrorParametersList ?) delimited by OpenParen and CloseParen)) terminated by Semicolon) } ;
+        parser ErrorDefinition = { introduced in "0.8.4" ((ErrorKeyword Identifier ErrorParametersDeclaration) terminated by Semicolon) } ;
+
+        parser ErrorParametersDeclaration = { introduced in "0.8.4" ((ErrorParametersList ?) delimited by OpenParen and CloseParen) } ;
 
         parser ErrorParameter = { introduced in "0.8.4" (TypeName (Identifier ?)) } ;
 
         parser ErrorParametersList = { introduced in "0.8.4" (ErrorParameter separated by Comma) } ;
 
-        parser EventDefinition = ((EventKeyword Identifier ((EventParametersList ?) delimited by OpenParen and CloseParen) (AnonymousKeyword ?)) terminated by Semicolon) ;
+        parser EventDefinition = ((EventKeyword Identifier EventParametersDeclaration (AnonymousKeyword ?)) terminated by Semicolon) ;
+
+        parser EventParametersDeclaration = ((EventParametersList ?) delimited by OpenParen and CloseParen);
 
         parser EventParameter = (TypeName (IndexedKeyword ?) (Identifier ?)) ;
 
@@ -554,9 +558,9 @@ slang_grammar! {
 
         parser UsingDirectivePath = IdentifierPath ;
 
-        parser UsingDirectiveSymbol = (
-            IdentifierPath { introduced in "0.8.19" ((AsKeyword UsingDirectiveOperator) ?) }
-        ) ;
+        parser UsingDirectiveSymbol = {
+            introduced in "0.8.13" (IdentifierPath { introduced in "0.8.19" ((AsKeyword UsingDirectiveOperator) ?) } )
+        } ;
 
         parser UsingDirectiveSymbolsList = (UsingDirectiveSymbol separated by Comma) ;
 
@@ -664,8 +668,8 @@ slang_grammar! {
 
         parser YulStatement = (
             YulBlock | YulFunctionDefinition | YulDeclarationStatement | YulAssignmentStatement | YulIfStatement |
-            YulForStatement | YulSwitchStatement | YulBreakStatement | YulContinueStatement | YulExpression |
-            { introduced in "0.6.0" YulLeaveStatement }
+            YulForStatement | YulSwitchStatement | { introduced in "0.6.0" YulLeaveStatement } |
+            YulBreakStatement | YulContinueStatement | YulExpression
         ) ;
 
         parser YulStatementsList = (YulStatement +) ;
@@ -852,7 +856,7 @@ slang_grammar! {
 
     // Keywords
 
-    scanner ABICoderKeyword = "abicoder" ;
+    scanner AbicoderKeyword = "abicoder" ;
     scanner AbstractKeyword = "abstract" ;
     scanner AddressKeyword = "address" ;
     scanner AfterKeyword = "after" ;