---

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

@@ -51,6 +51,7 @@ codegen_language_macros::compile!(Language(
                         Enum(
                             name = SourceUnitMember,
                             variants = [
+                                // Variants that can be identified using the first token:
                                 EnumVariant(reference = PragmaDirective),
                                 EnumVariant(reference = ImportDirective),
                                 EnumVariant(reference = ContractDefinition),
@@ -62,17 +63,18 @@ codegen_language_macros::compile!(Language(
                                     reference = FunctionDefinition,
                                     enabled = From("0.7.1")
                                 ),
-                                EnumVariant(
-                                    reference = ConstantDefinition,
-                                    enabled = From("0.7.4")
-                                ),
                                 EnumVariant(reference = ErrorDefinition, enabled = From("0.8.4")),
                                 EnumVariant(
                                     reference = UserDefinedValueTypeDefinition,
                                     enabled = From("0.8.8")
                                 ),
                                 EnumVariant(reference = UsingDirective, enabled = From("0.8.13")),
-                                EnumVariant(reference = EventDefinition, enabled = From("0.8.22"))
+                                EnumVariant(reference = EventDefinition, enabled = From("0.8.22")),
+                                // These variants are more complex, and require backtracking:
+                                EnumVariant(
+                                    reference = ConstantDefinition,
+                                    enabled = From("0.7.4")
+                                )
                             ]
                         )
                     ]
@@ -2120,6 +2122,7 @@ codegen_language_macros::compile!(Language(
                         Enum(
                             name = ContractMember,
                             variants = [
+                                // Variants that can be identified using the first token:
                                 EnumVariant(reference = UsingDirective),
                                 EnumVariant(reference = FunctionDefinition),
                                 EnumVariant(
@@ -2142,12 +2145,13 @@ codegen_language_macros::compile!(Language(
                                 EnumVariant(reference = StructDefinition),
                                 EnumVariant(reference = EnumDefinition),
                                 EnumVariant(reference = EventDefinition),
-                                EnumVariant(reference = StateVariableDefinition),
                                 EnumVariant(reference = ErrorDefinition, enabled = From("0.8.4")),
                                 EnumVariant(
                                     reference = UserDefinedValueTypeDefinition,
                                     enabled = From("0.8.8")
-                                )
+                                ),
+                                // These variants are more complex, and require backtracking:
+                                EnumVariant(reference = StateVariableDefinition)
                             ]
                         )
                     ]