Skip to content

Commit c2327a7

Browse files
OmarTawfikOmarTawfik
committed
re-order enums in grammar
1 parent e8dc494 commit c2327a7

28 files changed

Lines changed: 272 additions & 302 deletions

File tree

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

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@ codegen_language_macros::compile!(Language(
6262
reference = FunctionDefinition,
6363
enabled = From("0.7.1")
6464
),
65-
EnumVariant(
66-
reference = ConstantDefinition,
67-
enabled = From("0.7.4")
68-
),
6965
EnumVariant(reference = ErrorDefinition, enabled = From("0.8.4")),
7066
EnumVariant(
7167
reference = UserDefinedValueTypeDefinition,
7268
enabled = From("0.8.8")
7369
),
7470
EnumVariant(reference = UsingDirective, enabled = From("0.8.13")),
75-
EnumVariant(reference = EventDefinition, enabled = From("0.8.22"))
71+
EnumVariant(reference = EventDefinition, enabled = From("0.8.22")),
72+
EnumVariant(
73+
reference = ConstantDefinition,
74+
enabled = From("0.7.4")
75+
)
7676
]
7777
)
7878
]
@@ -2142,12 +2142,12 @@ codegen_language_macros::compile!(Language(
21422142
EnumVariant(reference = StructDefinition),
21432143
EnumVariant(reference = EnumDefinition),
21442144
EnumVariant(reference = EventDefinition),
2145-
EnumVariant(reference = StateVariableDefinition),
21462145
EnumVariant(reference = ErrorDefinition, enabled = From("0.8.4")),
21472146
EnumVariant(
21482147
reference = UserDefinedValueTypeDefinition,
21492148
enabled = From("0.8.8")
2150-
)
2149+
),
2150+
EnumVariant(reference = StateVariableDefinition)
21512151
]
21522152
)
21532153
]
@@ -2835,11 +2835,6 @@ codegen_language_macros::compile!(Language(
28352835
Enum(
28362836
name = Statement,
28372837
variants = [
2838-
// Simple statements
2839-
EnumVariant(reference = ExpressionStatement),
2840-
EnumVariant(reference = VariableDeclarationStatement),
2841-
EnumVariant(reference = TupleDeconstructionStatement),
2842-
// Control statements
28432838
EnumVariant(reference = IfStatement),
28442839
EnumVariant(reference = ForStatement),
28452840
EnumVariant(reference = WhileStatement),
@@ -2853,7 +2848,10 @@ codegen_language_macros::compile!(Language(
28532848
EnumVariant(reference = RevertStatement, enabled = From("0.8.4")),
28542849
EnumVariant(reference = AssemblyStatement),
28552850
EnumVariant(reference = Block),
2856-
EnumVariant(reference = UncheckedBlock, enabled = From("0.8.0"))
2851+
EnumVariant(reference = UncheckedBlock, enabled = From("0.8.0")),
2852+
EnumVariant(reference = TupleDeconstructionStatement),
2853+
EnumVariant(reference = VariableDeclarationStatement),
2854+
EnumVariant(reference = ExpressionStatement)
28572855
]
28582856
),
28592857
Struct(
@@ -3028,9 +3026,9 @@ codegen_language_macros::compile!(Language(
30283026
Enum(
30293027
name = ForStatementInitialization,
30303028
variants = [
3031-
EnumVariant(reference = ExpressionStatement),
3032-
EnumVariant(reference = VariableDeclarationStatement),
30333029
EnumVariant(reference = TupleDeconstructionStatement),
3030+
EnumVariant(reference = VariableDeclarationStatement),
3031+
EnumVariant(reference = ExpressionStatement),
30343032
EnumVariant(reference = Semicolon)
30353033
]
30363034
),
@@ -4163,8 +4161,6 @@ codegen_language_macros::compile!(Language(
41634161
variants = [
41644162
EnumVariant(reference = YulBlock),
41654163
EnumVariant(reference = YulFunctionDefinition),
4166-
EnumVariant(reference = YulVariableDeclarationStatement),
4167-
EnumVariant(reference = YulVariableAssignmentStatement),
41684164
EnumVariant(
41694165
reference = YulStackAssignmentStatement,
41704166
enabled = Till("0.5.0")
@@ -4176,6 +4172,8 @@ codegen_language_macros::compile!(Language(
41764172
EnumVariant(reference = YulBreakStatement),
41774173
EnumVariant(reference = YulContinueStatement),
41784174
EnumVariant(reference = YulLabel, enabled = Till("0.5.0")),
4175+
EnumVariant(reference = YulVariableDeclarationStatement),
4176+
EnumVariant(reference = YulVariableAssignmentStatement),
41794177
EnumVariant(reference = YulExpression)
41804178
]
41814179
),
@@ -4245,8 +4243,8 @@ codegen_language_macros::compile!(Language(
42454243
Enum(
42464244
name = YulAssignmentOperator,
42474245
variants = [
4248-
EnumVariant(reference = YulColonAndEqual, enabled = Till("0.5.5")),
4249-
EnumVariant(reference = ColonEqual)
4246+
EnumVariant(reference = ColonEqual),
4247+
EnumVariant(reference = YulColonAndEqual, enabled = Till("0.5.5"))
42504248
]
42514249
),
42524250
Struct(
@@ -4266,8 +4264,8 @@ codegen_language_macros::compile!(Language(
42664264
name = YulStackAssignmentOperator,
42674265
enabled = Till("0.5.0"),
42684266
variants = [
4269-
EnumVariant(reference = YulEqualAndColon),
4270-
EnumVariant(reference = EqualColon)
4267+
EnumVariant(reference = EqualColon),
4268+
EnumVariant(reference = YulEqualAndColon)
42714269
]
42724270
),
42734271
Struct(

‎crates/solidity/outputs/cargo/slang_solidity/src/generated/language/generated/mod.rs‎

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)