Skip to content

Commit

Permalink
allow var in TupleDeconstructionStatement before 0.5.0 (#840)
Browse files Browse the repository at this point in the history
  • Loading branch information
OmarTawfik committed Feb 22, 2024
1 parent 44b4e75 commit 7fb0d20
Show file tree
Hide file tree
Showing 13 changed files with 87 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .changeset/wet-tigers-collect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nomicfoundation/slang": patch
---

allow `var` in `TupleDeconstructionStatement` before `0.5.0`
2 changes: 2 additions & 0 deletions crates/solidity/inputs/language/src/definition.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2789,6 +2789,8 @@ codegen_language_macros::compile!(Language(
FieldDelimiters(open = open_paren, close = close_paren)
),
fields = (
var_keyword =
Optional(reference = VarKeyword, enabled = Till("0.5.0")),
open_paren = Required(OpenParen),
elements = Required(TupleDeconstructionElements),
close_paren = Required(CloseParen),
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion crates/solidity/outputs/spec/generated/grammar.ebnf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# This file is generated automatically by infrastructure scripts. Please don't edit by hand.

Source: >
1 │ // "var" should be disabled in "0.5.0": │ 0..39
2 │ var (foo, bar) = rhs; │ 40..61
Errors: []

Tree:
- (TupleDeconstructionStatement): # '// "var" should be disabled in "0.5.0":\nvar (foo, ...' (0..62)
- (LeadingTrivia): # '// "var" should be disabled in "0.5.0":\n' (0..40)
- (SingleLineComment): '// "var" should be disabled in "0.5.0":' # (0..39)
- (EndOfLine): "\n" # (39..40)
- (var_keyword꞉ VarKeyword): "var" # (40..43)
- (LeadingTrivia) ► (Whitespace): " " # (43..44)
- (open_paren꞉ OpenParen): "(" # (44..45)
- (elements꞉ TupleDeconstructionElements): # "foo, bar" (45..53)
- (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ UntypedTupleMember) ► (name꞉ Identifier): "foo" # (45..48)
- (separator꞉ Comma): "," # (48..49)
- (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ UntypedTupleMember): # " bar" (49..53)
- (LeadingTrivia) ► (Whitespace): " " # (49..50)
- (name꞉ Identifier): "bar" # (50..53)
- (close_paren꞉ CloseParen): ")" # (53..54)
- (LeadingTrivia) ► (Whitespace): " " # (54..55)
- (equal꞉ Equal): "=" # (55..56)
- (expression꞉ Expression): # " rhs" (56..60)
- (LeadingTrivia) ► (Whitespace): " " # (56..57)
- (variant꞉ Identifier): "rhs" # (57..60)
- (semicolon꞉ Semicolon): ";" # (60..61)
- (TrailingTrivia) ► (EndOfLine): "\n" # (61..62)
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# This file is generated automatically by infrastructure scripts. Please don't edit by hand.

Source: >
1 │ // "var" should be disabled in "0.5.0": │ 0..39
2 │ var (foo, bar) = rhs; │ 40..61
Errors: # 1 total
- >
Error: Expected OpenParen.
╭─[crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_var/input.sol:1:1]
1 │ ╭─▶ // "var" should be disabled in "0.5.0":
2 │ ├─▶ var (foo, bar) = rhs;
│ │
│ ╰─────────────────────────── Error occurred here.
───╯
Tree:
- (SKIPPED): '// "var" should be disabled in "0.5.0":\nvar (foo, ...' # (0..62)
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// "var" should be disabled in "0.5.0":
var (foo, bar) = rhs;

0 comments on commit 7fb0d20

Please sign in to comment.