allow parsing ColonEqual as two separate tokens before 0.5.5

NomicFoundation · Feb 28, 2024 · 541ca08 · 541ca08
1 parent 67dfde8
commit 541ca08
Show file tree

Hide file tree

Showing 41 changed files with 386 additions and 88 deletions.
diff --git a/.changeset/modern-rocks-change.md b/.changeset/modern-rocks-change.md
@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/slang": patch
+---
+
+allow parsing `ColonEqual` as two separate tokens before `0.5.5`
diff --git a/crates/solidity/inputs/language/src/definition.rs b/crates/solidity/inputs/language/src/definition.rs
@@ -1849,7 +1849,12 @@ codegen_language_macros::compile!(Language(
                         ),
                         Token(
                             name = Colon,
-                            definitions = [TokenDefinition(scanner = Atom(":"))]
+                            definitions = [TokenDefinition(
+                                scanner = TrailingContext(
+                                    scanner = Atom(":"),
+                                    not_followed_by = Atom("=")
+                                )
+                            )]
                         ),
                         Token(
                             name = ColonEqual,
@@ -4061,18 +4066,30 @@ codegen_language_macros::compile!(Language(
                         Struct(
                             name = YulVariableDeclarationValue,
                             fields = (
-                                colon_equal = Required(ColonEqual),
+                                assignment = Required(YulAssignmentOperator),
                                 expression = Required(YulExpression)
                             )
                         ),
                         Struct(
                             name = YulAssignmentStatement,
                             fields = (
                                 names = Required(YulIdentifierPaths),
-                                colon_equal = Required(ColonEqual),
+                                assignment = Required(YulAssignmentOperator),
                                 expression = Required(YulExpression)
                             )
                         ),
+                        Enum(
+                            name = YulAssignmentOperator,
+                            variants = [
+                                EnumVariant(reference = YulColonAndEqual, enabled = Till("0.5.5")),
+                                EnumVariant(reference = ColonEqual)
+                            ]
+                        ),
+                        Struct(
+                            name = YulColonAndEqual,
+                            enabled = Till("0.5.5"),
+                            fields = (colon = Required(Colon), equal = Required(Equal))
+                        ),
                         Struct(
                             name = YulIfStatement,
                             fields = (

diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/kinds.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/kinds.rs
diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/language.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/language.rs
diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/napi_interface/ast_selectors.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/napi_interface/ast_selectors.rs
diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/YulAssignmentStatement.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/YulAssignmentStatement.rs
diff --git a/.../solidity/outputs/cargo/tests/src/cst_output/generated/YulVariableDeclarationStatement.rs b/.../solidity/outputs/cargo/tests/src/cst_output/generated/YulVariableDeclarationStatement.rs
diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/mod.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/mod.rs