allow parsing ColonEqual as two separate tokens before 0.5.5 (#852)

ethereum/solidity#6023
NomicFoundation · Feb 29, 2024 · ca79eca · ca79eca
1 parent 4b8970b
commit ca79eca
Show file tree

Hide file tree

Showing 41 changed files with 367 additions and 79 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
@@ -4062,18 +4062,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/mod.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/mod.rs
diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/yul_assignment_statement.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/yul_assignment_statement.rs
diff --git a/...lidity/outputs/cargo/tests/src/cst_output/generated/yul_variable_declaration_statement.rs b/...lidity/outputs/cargo/tests/src/cst_output/generated/yul_variable_declaration_statement.rs