DSL v2 grammar fixes

- use the correct `lexical_context` for `AssemblyStatement`.
OmarTawfik-forks · Nov 24, 2023 · d545e65 · d545e65
1 parent 0434b68
commit d545e65
Showing 1 changed file with 26 additions and 26 deletions.
diff --git a/crates/solidity/inputs/language/src/definition.rs b/crates/solidity/inputs/language/src/definition.rs
@@ -2883,6 +2883,32 @@ codegen_language_macros::compile!(Language(
                                 expression = Required(NonTerminal(Expression)),
                                 semicolon = Required(Terminal([Semicolon]))
                             )
+                        ),
+                        Struct(
+                            name = AssemblyStatement,
+                            fields = (
+                                assembly_keyword = Required(Terminal([AssemblyKeyword])),
+                                label = Optional(kind = Terminal([AsciiStringLiteral])),
+                                flags = Optional(kind = NonTerminal(AssemblyFlagsDeclaration)),
+                                body = Required(NonTerminal(YulBlock))
+                            )
+                        ),
+                        Struct(
+                            name = AssemblyFlagsDeclaration,
+                            error_recovery = FieldsErrorRecovery(
+                                delimiters =
+                                    FieldDelimiters(open = open_paren, close = close_paren)
+                            ),
+                            fields = (
+                                open_paren = Required(Terminal([OpenParen])),
+                                flags = Required(NonTerminal(AssemblyFlags)),
+                                close_paren = Required(Terminal([CloseParen]))
+                            )
+                        ),
+                        Separated(
+                            name = AssemblyFlags,
+                            separated = AsciiStringLiteral,
+                            separator = Comma
                         )
                     ]
                 ),
@@ -3966,32 +3992,6 @@ codegen_language_macros::compile!(Language(
                     title = "Yul Statements",
                     lexical_context = Yul,
                     items = [
-                        Struct(
-                            name = AssemblyStatement,
-                            fields = (
-                                assembly_keyword = Required(Terminal([AssemblyKeyword])),
-                                label = Optional(kind = Terminal([AsciiStringLiteral])),
-                                flags = Optional(kind = NonTerminal(AssemblyFlagsDeclaration)),
-                                body = Required(NonTerminal(YulBlock))
-                            )
-                        ),
-                        Struct(
-                            name = AssemblyFlagsDeclaration,
-                            error_recovery = FieldsErrorRecovery(
-                                delimiters =
-                                    FieldDelimiters(open = open_paren, close = close_paren)
-                            ),
-                            fields = (
-                                open_paren = Required(Terminal([OpenParen])),
-                                flags = Required(NonTerminal(AssemblyFlags)),
-                                close_paren = Required(Terminal([CloseParen]))
-                            )
-                        ),
-                        Separated(
-                            name = AssemblyFlags,
-                            separated = AsciiStringLiteral,
-                            separator = Comma
-                        ),
                         Struct(
                             name = YulBlock,
                             error_recovery = FieldsErrorRecovery(