re-order enums in grammar

NomicFoundation · Aug 11, 2024 · 9545003 · 9545003
1 parent 34e8c4b
commit 9545003
Show file tree

Hide file tree

Showing 16 changed files with 248 additions and 276 deletions.
diff --git a/crates/solidity/inputs/language/src/definition.rs b/crates/solidity/inputs/language/src/definition.rs
@@ -2835,25 +2835,25 @@ codegen_language_macros::compile!(Language(
                         Enum(
                             name = Statement,
                             variants = [
-                                // Simple statements
-                                EnumVariant(reference = ExpressionStatement),
-                                EnumVariant(reference = VariableDeclarationStatement),
-                                EnumVariant(reference = TupleDeconstructionStatement),
-                                // Control statements
-                                EnumVariant(reference = IfStatement),
-                                EnumVariant(reference = ForStatement),
-                                EnumVariant(reference = WhileStatement),
-                                EnumVariant(reference = DoWhileStatement),
-                                EnumVariant(reference = ContinueStatement),
+                                // Variants that can be identified using the first token:
+                                EnumVariant(reference = AssemblyStatement),
+                                EnumVariant(reference = Block),
                                 EnumVariant(reference = BreakStatement),
+                                EnumVariant(reference = ContinueStatement),
+                                EnumVariant(reference = DoWhileStatement),
+                                EnumVariant(reference = EmitStatement, enabled = From("0.4.21")),
+                                EnumVariant(reference = ForStatement),
+                                EnumVariant(reference = IfStatement),
                                 EnumVariant(reference = ReturnStatement),
+                                EnumVariant(reference = RevertStatement, enabled = From("0.8.4")),
                                 EnumVariant(reference = ThrowStatement, enabled = Till("0.5.0")),
-                                EnumVariant(reference = EmitStatement, enabled = From("0.4.21")),
                                 EnumVariant(reference = TryStatement, enabled = From("0.6.0")),
-                                EnumVariant(reference = RevertStatement, enabled = From("0.8.4")),
-                                EnumVariant(reference = AssemblyStatement),
-                                EnumVariant(reference = Block),
-                                EnumVariant(reference = UncheckedBlock, enabled = From("0.8.0"))
+                                EnumVariant(reference = UncheckedBlock, enabled = From("0.8.0")),
+                                EnumVariant(reference = WhileStatement),
+                                // These variants are more complex, and require backtracking:
+                                EnumVariant(reference = VariableDeclarationStatement),
+                                EnumVariant(reference = TupleDeconstructionStatement),
+                                EnumVariant(reference = ExpressionStatement)
                             ]
                         ),
                         Struct(

diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/language/generated/mod.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/language/generated/mod.rs
diff --git a/crates/solidity/outputs/npm/package/src/generated/ast/generated/ast_types.ts b/crates/solidity/outputs/npm/package/src/generated/ast/generated/ast_types.ts
diff --git a/crates/solidity/outputs/spec/generated/grammar.ebnf b/crates/solidity/outputs/spec/generated/grammar.ebnf