diff --git a/.changeset/giant-wasps-invite.md b/.changeset/giant-wasps-invite.md new file mode 100644 index 0000000000..329e66e384 --- /dev/null +++ b/.changeset/giant-wasps-invite.md @@ -0,0 +1,5 @@ +--- +"@nomicfoundation/slang": patch +--- + +support Yul multiple variables declaration diff --git a/crates/solidity/inputs/language/src/definition.rs b/crates/solidity/inputs/language/src/definition.rs index 498871d520..7e57a98adf 100644 --- a/crates/solidity/inputs/language/src/definition.rs +++ b/crates/solidity/inputs/language/src/definition.rs @@ -4202,11 +4202,11 @@ codegen_language_macros::compile!(Language( name = YulReturnsDeclaration, fields = ( minus_greater_than = Required(MinusGreaterThan), - variables = Required(YulReturnVariables) + variables = Required(YulVariableNames) ) ), Separated( - name = YulReturnVariables, + name = YulVariableNames, reference = YulIdentifier, separator = Comma ), @@ -4214,7 +4214,7 @@ codegen_language_macros::compile!(Language( name = YulVariableDeclarationStatement, fields = ( let_keyword = Required(YulLetKeyword), - names = Required(YulIdentifier), + variables = Required(YulVariableNames), value = Optional(reference = YulVariableDeclarationValue) ) ), @@ -4228,7 +4228,7 @@ codegen_language_macros::compile!(Language( Struct( name = YulVariableAssignmentStatement, fields = ( - names = Required(YulPaths), + variables = Required(YulPaths), assignment = Required(YulAssignmentOperator), expression = Required(YulExpression) ) diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/kinds/generated/mod.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/kinds/generated/mod.rs index 6f7765c17b..2f6eb62f2a 100644 --- a/crates/solidity/outputs/cargo/slang_solidity/src/generated/kinds/generated/mod.rs +++ b/crates/solidity/outputs/cargo/slang_solidity/src/generated/kinds/generated/mod.rs @@ -222,7 +222,6 @@ pub enum NonterminalKind { YulPath, YulPathComponent, YulPaths, - YulReturnVariables, YulReturnsDeclaration, YulStackAssignmentStatement, YulStatement, @@ -234,6 +233,7 @@ pub enum NonterminalKind { YulVariableAssignmentStatement, YulVariableDeclarationStatement, YulVariableDeclarationValue, + YulVariableNames, } impl metaslang_cst::NonterminalKind for NonterminalKind {} @@ -341,7 +341,6 @@ pub enum EdgeLabel { MinusGreaterThan, ModifierKeyword, Name, - Names, NewKeyword, OpenBrace, OpenBracket, diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/language/generated/mod.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/language/generated/mod.rs index 8bda8853cd..1b26a8b4b1 100644 --- a/crates/solidity/outputs/cargo/slang_solidity/src/generated/language/generated/mod.rs +++ b/crates/solidity/outputs/cargo/slang_solidity/src/generated/language/generated/mod.rs @@ -6741,24 +6741,6 @@ impl Language { .with_kind(NonterminalKind::YulPaths) } - #[allow(unused_assignments, unused_parens)] - fn yul_return_variables(&self, input: &mut ParserContext<'_>) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::Yul>( - input, - self, - |input| { - self.parse_terminal_with_trivia::( - input, - TerminalKind::YulIdentifier, - ) - .with_label(EdgeLabel::Item) - }, - TerminalKind::Comma, - EdgeLabel::Separator, - ) - .with_kind(NonterminalKind::YulReturnVariables) - } - #[allow(unused_assignments, unused_parens)] fn yul_returns_declaration(&self, input: &mut ParserContext<'_>) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -6769,7 +6751,7 @@ impl Language { TerminalKind::MinusGreaterThan, ), )?; - seq.elem_labeled(EdgeLabel::Variables, self.yul_return_variables(input))?; + seq.elem_labeled(EdgeLabel::Variables, self.yul_variable_names(input))?; seq.finish() }) .with_kind(NonterminalKind::YulReturnsDeclaration) @@ -6896,7 +6878,7 @@ impl Language { #[allow(unused_assignments, unused_parens)] fn yul_variable_assignment_statement(&self, input: &mut ParserContext<'_>) -> ParserResult { SequenceHelper::run(|mut seq| { - seq.elem_labeled(EdgeLabel::Names, self.yul_paths(input))?; + seq.elem_labeled(EdgeLabel::Variables, self.yul_paths(input))?; seq.elem_labeled(EdgeLabel::Assignment, self.yul_assignment_operator(input))?; seq.elem_labeled(EdgeLabel::Expression, self.yul_expression(input))?; seq.finish() @@ -6914,13 +6896,7 @@ impl Language { TerminalKind::YulLetKeyword, ), )?; - seq.elem_labeled( - EdgeLabel::Names, - self.parse_terminal_with_trivia::( - input, - TerminalKind::YulIdentifier, - ), - )?; + seq.elem_labeled(EdgeLabel::Variables, self.yul_variable_names(input))?; seq.elem_labeled( EdgeLabel::Value, OptionalHelper::transform(self.yul_variable_declaration_value(input)), @@ -6940,6 +6916,24 @@ impl Language { .with_kind(NonterminalKind::YulVariableDeclarationValue) } + #[allow(unused_assignments, unused_parens)] + fn yul_variable_names(&self, input: &mut ParserContext<'_>) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::Yul>( + input, + self, + |input| { + self.parse_terminal_with_trivia::( + input, + TerminalKind::YulIdentifier, + ) + .with_label(EdgeLabel::Item) + }, + TerminalKind::Comma, + EdgeLabel::Separator, + ) + .with_kind(NonterminalKind::YulVariableNames) + } + #[allow(unused_assignments, unused_parens)] fn leading_trivia(&self, input: &mut ParserContext<'_>) -> ParserResult { OneOrMoreHelper::run(input, |input| { @@ -9485,7 +9479,6 @@ impl Language { NonterminalKind::YulPath => Self::yul_path.parse(self, input), NonterminalKind::YulPathComponent => Self::yul_path_component.parse(self, input), NonterminalKind::YulPaths => Self::yul_paths.parse(self, input), - NonterminalKind::YulReturnVariables => Self::yul_return_variables.parse(self, input), NonterminalKind::YulReturnsDeclaration => { Self::yul_returns_declaration.parse(self, input) } @@ -9507,6 +9500,7 @@ impl Language { NonterminalKind::YulVariableDeclarationValue => { Self::yul_variable_declaration_value.parse(self, input) } + NonterminalKind::YulVariableNames => Self::yul_variable_names.parse(self, input), } } } diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/napi_interface/generated/ast_selectors.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/napi_interface/generated/ast_selectors.rs index df40006053..c4c753cc45 100644 --- a/crates/solidity/outputs/cargo/slang_solidity/src/generated/napi_interface/generated/ast_selectors.rs +++ b/crates/solidity/outputs/cargo/slang_solidity/src/generated/napi_interface/generated/ast_selectors.rs @@ -1600,7 +1600,7 @@ impl Selector { ) -> Result>>> { Ok(vec![ Some(self.select(EdgeLabel::LetKeyword)?), - Some(self.select(EdgeLabel::Names)?), + Some(self.select(EdgeLabel::Variables)?), self.try_select(EdgeLabel::Value), ]) } @@ -1622,7 +1622,7 @@ impl Selector { &mut self, ) -> Result>>> { Ok(vec![ - Some(self.select(EdgeLabel::Names)?), + Some(self.select(EdgeLabel::Variables)?), Some(self.select(EdgeLabel::Assignment)?), Some(self.select(EdgeLabel::Expression)?), ]) diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/yul_variable_declaration_statement.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/yul_variable_declaration_statement.rs index 4f8008c175..6a8646b5b1 100644 --- a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/yul_variable_declaration_statement.rs +++ b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/yul_variable_declaration_statement.rs @@ -43,3 +43,16 @@ fn keyword_ufixed8x0() -> Result<()> { fn keyword_ufixed8x8() -> Result<()> { run("YulVariableDeclarationStatement", "keyword_ufixed8x8") } + +#[test] +fn multiple_variables() -> Result<()> { + run("YulVariableDeclarationStatement", "multiple_variables") +} + +#[test] +fn multiple_variables_with_value() -> Result<()> { + run( + "YulVariableDeclarationStatement", + "multiple_variables_with_value", + ) +} diff --git a/crates/solidity/outputs/npm/package/src/generated/ast/generated/ast_types.ts b/crates/solidity/outputs/npm/package/src/generated/ast/generated/ast_types.ts index 668d3d3c7f..70d7a41e44 100644 --- a/crates/solidity/outputs/npm/package/src/generated/ast/generated/ast_types.ts +++ b/crates/solidity/outputs/npm/package/src/generated/ast/generated/ast_types.ts @@ -3335,7 +3335,7 @@ export class YulReturnsDeclaration { return { minusGreaterThan: $minusGreaterThan as TerminalNode, - variables: new YulReturnVariables($variables as NonterminalNode), + variables: new YulVariableNames($variables as NonterminalNode), }; }); @@ -3347,18 +3347,18 @@ export class YulReturnsDeclaration { return this.fetch().minusGreaterThan; } - public get variables(): YulReturnVariables { + public get variables(): YulVariableNames { return this.fetch().variables; } } export class YulVariableDeclarationStatement { private readonly fetch = once(() => { - const [$letKeyword, $names, $value] = ast_internal.selectSequence(this.cst); + const [$letKeyword, $variables, $value] = ast_internal.selectSequence(this.cst); return { letKeyword: $letKeyword as TerminalNode, - names: $names as TerminalNode, + variables: new YulVariableNames($variables as NonterminalNode), value: $value === null ? undefined : new YulVariableDeclarationValue($value as NonterminalNode), }; }); @@ -3371,8 +3371,8 @@ export class YulVariableDeclarationStatement { return this.fetch().letKeyword; } - public get names(): TerminalNode { - return this.fetch().names; + public get variables(): YulVariableNames { + return this.fetch().variables; } public get value(): YulVariableDeclarationValue | undefined { @@ -3405,10 +3405,10 @@ export class YulVariableDeclarationValue { export class YulVariableAssignmentStatement { private readonly fetch = once(() => { - const [$names, $assignment, $expression] = ast_internal.selectSequence(this.cst); + const [$variables, $assignment, $expression] = ast_internal.selectSequence(this.cst); return { - names: new YulPaths($names as NonterminalNode), + variables: new YulPaths($variables as NonterminalNode), assignment: new YulAssignmentOperator($assignment as NonterminalNode), expression: new YulExpression($expression as NonterminalNode), }; @@ -3418,8 +3418,8 @@ export class YulVariableAssignmentStatement { assertKind(this.cst.kind, NonterminalKind.YulVariableAssignmentStatement); } - public get names(): YulPaths { - return this.fetch().names; + public get variables(): YulPaths { + return this.fetch().variables; } public get assignment(): YulAssignmentOperator { @@ -5831,7 +5831,7 @@ export class YulParameters { } } -export class YulReturnVariables { +export class YulVariableNames { private readonly fetch = once(() => { const [items, separators] = ast_internal.selectSeparated(this.cst); @@ -5839,7 +5839,7 @@ export class YulReturnVariables { }); public constructor(public readonly cst: NonterminalNode) { - assertKind(this.cst.kind, NonterminalKind.YulReturnVariables); + assertKind(this.cst.kind, NonterminalKind.YulVariableNames); } public get items(): readonly TerminalNode[] { diff --git a/crates/solidity/outputs/npm/package/src/generated/napi-bindings/generated/index.d.ts b/crates/solidity/outputs/npm/package/src/generated/napi-bindings/generated/index.d.ts index e3410881dc..7dc4b5448c 100644 --- a/crates/solidity/outputs/npm/package/src/generated/napi-bindings/generated/index.d.ts +++ b/crates/solidity/outputs/npm/package/src/generated/napi-bindings/generated/index.d.ts @@ -213,7 +213,6 @@ export namespace kinds { YulPath = "YulPath", YulPathComponent = "YulPathComponent", YulPaths = "YulPaths", - YulReturnVariables = "YulReturnVariables", YulReturnsDeclaration = "YulReturnsDeclaration", YulStackAssignmentStatement = "YulStackAssignmentStatement", YulStatement = "YulStatement", @@ -225,6 +224,7 @@ export namespace kinds { YulVariableAssignmentStatement = "YulVariableAssignmentStatement", YulVariableDeclarationStatement = "YulVariableDeclarationStatement", YulVariableDeclarationValue = "YulVariableDeclarationValue", + YulVariableNames = "YulVariableNames", } export enum EdgeLabel { Item = "Item", @@ -310,7 +310,6 @@ export namespace kinds { MinusGreaterThan = "MinusGreaterThan", ModifierKeyword = "ModifierKeyword", Name = "Name", - Names = "Names", NewKeyword = "NewKeyword", OpenBrace = "OpenBrace", OpenBracket = "OpenBracket", diff --git a/crates/solidity/outputs/spec/generated/grammar.ebnf b/crates/solidity/outputs/spec/generated/grammar.ebnf index 08c7e9c4b1..1aa0487ee2 100644 --- a/crates/solidity/outputs/spec/generated/grammar.ebnf +++ b/crates/solidity/outputs/spec/generated/grammar.ebnf @@ -1641,18 +1641,18 @@ YulParametersDeclaration = (* open_paren: *) OPEN_PAREN YulParameters = ((* item: *) YUL_IDENTIFIER ((* separator: *) COMMA (* item: *) YUL_IDENTIFIER)*)?; YulReturnsDeclaration = (* minus_greater_than: *) MINUS_GREATER_THAN - (* variables: *) YulReturnVariables; + (* variables: *) YulVariableNames; -YulReturnVariables = (* item: *) YUL_IDENTIFIER ((* separator: *) COMMA (* item: *) YUL_IDENTIFIER)*; +YulVariableNames = (* item: *) YUL_IDENTIFIER ((* separator: *) COMMA (* item: *) YUL_IDENTIFIER)*; YulVariableDeclarationStatement = (* let_keyword: *) YUL_LET_KEYWORD - (* names: *) YUL_IDENTIFIER + (* variables: *) YulVariableNames (* value: *) YulVariableDeclarationValue?; YulVariableDeclarationValue = (* assignment: *) YulAssignmentOperator (* expression: *) YulExpression; -YulVariableAssignmentStatement = (* names: *) YulPaths +YulVariableAssignmentStatement = (* variables: *) YulPaths (* assignment: *) YulAssignmentOperator (* expression: *) YulExpression; diff --git a/crates/solidity/outputs/spec/generated/public/06-yul/01-yul-statements.md b/crates/solidity/outputs/spec/generated/public/06-yul/01-yul-statements.md index fb68ce7a0c..22f958f869 100644 --- a/crates/solidity/outputs/spec/generated/public/06-yul/01-yul-statements.md +++ b/crates/solidity/outputs/spec/generated/public/06-yul/01-yul-statements.md @@ -44,19 +44,19 @@ ``` -
YulReturnsDeclaration = (* minus_greater_than: *) MINUS_GREATER_THAN
                        (* variables: *) YulReturnVariables;
+
YulReturnsDeclaration = (* minus_greater_than: *) MINUS_GREATER_THAN
                        (* variables: *) YulVariableNames;
-```{ .ebnf #YulReturnVariables } +```{ .ebnf #YulVariableNames } ``` -
YulReturnVariables = (* item: *) YUL_IDENTIFIER ((* separator: *) COMMA (* item: *) YUL_IDENTIFIER)*;
+
YulVariableNames = (* item: *) YUL_IDENTIFIER ((* separator: *) COMMA (* item: *) YUL_IDENTIFIER)*;
```{ .ebnf #YulVariableDeclarationStatement } ``` -
YulVariableDeclarationStatement = (* let_keyword: *) YUL_LET_KEYWORD
                                  (* names: *) YUL_IDENTIFIER
                                  (* value: *) YulVariableDeclarationValue?;
+
YulVariableDeclarationStatement = (* let_keyword: *) YUL_LET_KEYWORD
                                  (* variables: *) YulVariableNames
                                  (* value: *) YulVariableDeclarationValue?;
```{ .ebnf #YulVariableDeclarationValue } @@ -68,7 +68,7 @@ ``` -
YulVariableAssignmentStatement = (* names: *) YulPaths
                                 (* assignment: *) YulAssignmentOperator
                                 (* expression: *) YulExpression;
+
YulVariableAssignmentStatement = (* variables: *) YulPaths
                                 (* assignment: *) YulAssignmentOperator
                                 (* expression: *) YulExpression;
```{ .ebnf #YulStackAssignmentStatement } diff --git a/crates/solidity/testing/snapshots/cst_output/YulBlock/function_def/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulBlock/function_def/generated/0.4.11-success.yml index c60726c96c..9e784a4a05 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulBlock/function_def/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulBlock/function_def/generated/0.4.11-success.yml @@ -30,7 +30,7 @@ Tree: - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - - (variables꞉ YulReturnVariables): # " result" (25..32) + - (variables꞉ YulVariableNames): # " result" (25..32) - (leading_trivia꞉ Whitespace): " " # (25..26) - (item꞉ YulIdentifier): "result" # (26..32) - (body꞉ YulBlock): # " {\n\t\tresult := mul(a, b)\n\t}\n" (32..60) @@ -39,7 +39,7 @@ Tree: - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n" (35..57) - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - - (names꞉ YulPaths): # "\t\tresult" (35..43) + - (variables꞉ YulPaths): # "\t\tresult" (35..43) - (item꞉ YulPath): # "\t\tresult" (35..43) - (item꞉ YulPathComponent): # "\t\tresult" (35..43) - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) diff --git a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.4.11-failure.yml index fc7a485210..be3ae26ea3 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.4.11-failure.yml @@ -40,7 +40,7 @@ Tree: - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - - (variables꞉ YulReturnVariables): # " result" (25..32) + - (variables꞉ YulVariableNames): # " result" (25..32) - (leading_trivia꞉ Whitespace): " " # (25..26) - (item꞉ YulIdentifier): "result" # (26..32) - (body꞉ YulBlock): # " {\n\t\tresult := mul(a, b)\n\t\tresult := [mul(a, b)\n\t}..." (32..83) @@ -49,7 +49,7 @@ Tree: - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n\t\tresult" (35..65) - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - - (names꞉ YulPaths): # "\t\tresult" (35..43) + - (variables꞉ YulPaths): # "\t\tresult" (35..43) - (item꞉ YulPath): # "\t\tresult" (35..43) - (item꞉ YulPathComponent): # "\t\tresult" (35..43) - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) diff --git a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.4.12-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.4.12-failure.yml index f00c48e3c9..8e41079264 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.4.12-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.4.12-failure.yml @@ -40,7 +40,7 @@ Tree: - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - - (variables꞉ YulReturnVariables): # " result" (25..32) + - (variables꞉ YulVariableNames): # " result" (25..32) - (leading_trivia꞉ Whitespace): " " # (25..26) - (item꞉ YulIdentifier): "result" # (26..32) - (body꞉ YulBlock): # " {\n\t\tresult := mul(a, b)\n\t\tresult := [mul(a, b)\n\t}..." (32..83) @@ -49,7 +49,7 @@ Tree: - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n\t\tresult" (35..65) - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - - (names꞉ YulPaths): # "\t\tresult" (35..43) + - (variables꞉ YulPaths): # "\t\tresult" (35..43) - (item꞉ YulPath): # "\t\tresult" (35..43) - (item꞉ YulPathComponent): # "\t\tresult" (35..43) - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) diff --git a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.5.0-failure.yml index 6500a586b4..e42c3bd62b 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.5.0-failure.yml @@ -40,7 +40,7 @@ Tree: - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - - (variables꞉ YulReturnVariables): # " result" (25..32) + - (variables꞉ YulVariableNames): # " result" (25..32) - (leading_trivia꞉ Whitespace): " " # (25..26) - (item꞉ YulIdentifier): "result" # (26..32) - (body꞉ YulBlock): # " {\n\t\tresult := mul(a, b)\n\t\tresult := [mul(a, b)\n\t}..." (32..83) @@ -49,7 +49,7 @@ Tree: - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n\t\tresult" (35..65) - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - - (names꞉ YulPaths): # "\t\tresult" (35..43) + - (variables꞉ YulPaths): # "\t\tresult" (35..43) - (item꞉ YulPath): # "\t\tresult" (35..43) - (item꞉ YulPathComponent): # "\t\tresult" (35..43) - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) diff --git a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.6.0-failure.yml index 78c0718bd3..4ae4b40e34 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.6.0-failure.yml @@ -40,7 +40,7 @@ Tree: - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - - (variables꞉ YulReturnVariables): # " result" (25..32) + - (variables꞉ YulVariableNames): # " result" (25..32) - (leading_trivia꞉ Whitespace): " " # (25..26) - (item꞉ YulIdentifier): "result" # (26..32) - (body꞉ YulBlock): # " {\n\t\tresult := mul(a, b)\n\t\tresult := [mul(a, b)\n\t}..." (32..83) @@ -49,7 +49,7 @@ Tree: - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n\t\tresult" (35..65) - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - - (names꞉ YulPaths): # "\t\tresult" (35..43) + - (variables꞉ YulPaths): # "\t\tresult" (35..43) - (item꞉ YulPath): # "\t\tresult" (35..43) - (item꞉ YulPathComponent): # "\t\tresult" (35..43) - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) diff --git a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.10-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.10-failure.yml index 5c176bd152..43f766b12c 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.10-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.10-failure.yml @@ -40,7 +40,7 @@ Tree: - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - - (variables꞉ YulReturnVariables): # " result" (25..32) + - (variables꞉ YulVariableNames): # " result" (25..32) - (leading_trivia꞉ Whitespace): " " # (25..26) - (item꞉ YulIdentifier): "result" # (26..32) - (body꞉ YulBlock): # " {\n\t\tresult := mul(a, b)\n\t\tresult := [mul(a, b)\n\t}..." (32..83) @@ -49,7 +49,7 @@ Tree: - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n\t\tresult" (35..65) - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - - (names꞉ YulPaths): # "\t\tresult" (35..43) + - (variables꞉ YulPaths): # "\t\tresult" (35..43) - (item꞉ YulPath): # "\t\tresult" (35..43) - (item꞉ YulPathComponent): # "\t\tresult" (35..43) - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) diff --git a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.18-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.18-failure.yml index de99d3ef6f..fa8bbf6eac 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.18-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.18-failure.yml @@ -40,7 +40,7 @@ Tree: - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - - (variables꞉ YulReturnVariables): # " result" (25..32) + - (variables꞉ YulVariableNames): # " result" (25..32) - (leading_trivia꞉ Whitespace): " " # (25..26) - (item꞉ YulIdentifier): "result" # (26..32) - (body꞉ YulBlock): # " {\n\t\tresult := mul(a, b)\n\t\tresult := [mul(a, b)\n\t}..." (32..83) @@ -49,7 +49,7 @@ Tree: - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n\t\tresult" (35..65) - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - - (names꞉ YulPaths): # "\t\tresult" (35..43) + - (variables꞉ YulPaths): # "\t\tresult" (35..43) - (item꞉ YulPath): # "\t\tresult" (35..43) - (item꞉ YulPathComponent): # "\t\tresult" (35..43) - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) diff --git a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.24-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.24-failure.yml index b678b85cbd..0b20aae96e 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.24-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.24-failure.yml @@ -40,7 +40,7 @@ Tree: - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - - (variables꞉ YulReturnVariables): # " result" (25..32) + - (variables꞉ YulVariableNames): # " result" (25..32) - (leading_trivia꞉ Whitespace): " " # (25..26) - (item꞉ YulIdentifier): "result" # (26..32) - (body꞉ YulBlock): # " {\n\t\tresult := mul(a, b)\n\t\tresult := [mul(a, b)\n\t}..." (32..83) @@ -49,7 +49,7 @@ Tree: - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n\t\tresult" (35..65) - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - - (names꞉ YulPaths): # "\t\tresult" (35..43) + - (variables꞉ YulPaths): # "\t\tresult" (35..43) - (item꞉ YulPath): # "\t\tresult" (35..43) - (item꞉ YulPathComponent): # "\t\tresult" (35..43) - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) diff --git a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.7-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.7-failure.yml index 5c176bd152..43f766b12c 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.7-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.8.7-failure.yml @@ -40,7 +40,7 @@ Tree: - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - - (variables꞉ YulReturnVariables): # " result" (25..32) + - (variables꞉ YulVariableNames): # " result" (25..32) - (leading_trivia꞉ Whitespace): " " # (25..26) - (item꞉ YulIdentifier): "result" # (26..32) - (body꞉ YulBlock): # " {\n\t\tresult := mul(a, b)\n\t\tresult := [mul(a, b)\n\t}..." (32..83) @@ -49,7 +49,7 @@ Tree: - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n\t\tresult" (35..65) - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - - (names꞉ YulPaths): # "\t\tresult" (35..43) + - (variables꞉ YulPaths): # "\t\tresult" (35..43) - (item꞉ YulPath): # "\t\tresult" (35..43) - (item꞉ YulPathComponent): # "\t\tresult" (35..43) - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) diff --git a/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.4.11-failure.yml index 75636f7319..8c5486d36e 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.4.11-failure.yml @@ -24,7 +24,7 @@ Tree: - (open_brace꞉ OpenBrace): "{" # (0..1) - (trailing_trivia꞉ EndOfLine): "\n" # (1..2) - (statements꞉ YulStatements): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..163) - - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement) ► (names꞉ YulPaths): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..163) + - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement) ► (variables꞉ YulPaths): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..163) - (item꞉ YulPath): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..163) - (item꞉ YulPathComponent): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..162) - (leading_trivia꞉ Whitespace): "\t" # (2..3) diff --git a/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.5.8-success.yml b/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.5.8-success.yml index 2acff4f5d0..8c053dde71 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.5.8-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.5.8-success.yml @@ -16,7 +16,7 @@ Tree: - (trailing_trivia꞉ EndOfLine): "\n" # (1..2) - (statements꞉ YulStatements): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..212) - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..185) - - (names꞉ YulPaths): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..170) + - (variables꞉ YulPaths): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..170) - (item꞉ YulPath): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..170) - (item꞉ YulPathComponent): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..170) - (leading_trivia꞉ Whitespace): "\t" # (2..3) @@ -33,7 +33,7 @@ Tree: - (variant꞉ YulIdentifier): "newAddress" # (174..184) - (trailing_trivia꞉ EndOfLine): "\n" # (184..185) - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement): # "\tf.selector := newSelector\n" (185..212) - - (names꞉ YulPaths): # "\tf.selector" (185..196) + - (variables꞉ YulPaths): # "\tf.selector" (185..196) - (item꞉ YulPath): # "\tf.selector" (185..196) - (item꞉ YulPathComponent): # "\tf.selector" (185..196) - (leading_trivia꞉ Whitespace): "\t" # (185..186) diff --git a/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.7.0-failure.yml index 75636f7319..8c5486d36e 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.7.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.7.0-failure.yml @@ -24,7 +24,7 @@ Tree: - (open_brace꞉ OpenBrace): "{" # (0..1) - (trailing_trivia꞉ EndOfLine): "\n" # (1..2) - (statements꞉ YulStatements): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..163) - - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement) ► (names꞉ YulPaths): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..163) + - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement) ► (variables꞉ YulPaths): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..163) - (item꞉ YulPath): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..163) - (item꞉ YulPathComponent): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..162) - (leading_trivia꞉ Whitespace): "\t" # (2..3) diff --git a/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.8.10-success.yml b/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.8.10-success.yml index 6d64c1376c..9ee50c3fb0 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.8.10-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulStatements/function_pointer/generated/0.8.10-success.yml @@ -16,7 +16,7 @@ Tree: - (trailing_trivia꞉ EndOfLine): "\n" # (1..2) - (statements꞉ YulStatements): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..212) - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..185) - - (names꞉ YulPaths): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..170) + - (variables꞉ YulPaths): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..170) - (item꞉ YulPath): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..170) - (item꞉ YulPathComponent): # "\t// https://github.com/ethereum/solidity/blob/ebdc..." (2..162) - (leading_trivia꞉ Whitespace): "\t" # (2..3) @@ -35,7 +35,7 @@ Tree: - (variant꞉ YulIdentifier): "newAddress" # (174..184) - (trailing_trivia꞉ EndOfLine): "\n" # (184..185) - (item꞉ YulStatement) ► (variant꞉ YulVariableAssignmentStatement): # "\tf.selector := newSelector\n" (185..212) - - (names꞉ YulPaths): # "\tf.selector" (185..196) + - (variables꞉ YulPaths): # "\tf.selector" (185..196) - (item꞉ YulPath): # "\tf.selector" (185..196) - (item꞉ YulPathComponent): # "\tf" (185..187) - (leading_trivia꞉ Whitespace): "\t" # (185..186) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/colon_equal_separated/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/colon_equal_separated/generated/0.4.11-success.yml index 85ca21fd49..d25c9af2dc 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/colon_equal_separated/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/colon_equal_separated/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # '// ColonEqual was two separate tokens before "0.5....' (0..64) - - (names꞉ YulPaths): # '// ColonEqual was two separate tokens before "0.5....' (0..57) + - (variables꞉ YulPaths): # '// ColonEqual was two separate tokens before "0.5....' (0..57) - (item꞉ YulPath): # '// ColonEqual was two separate tokens before "0.5....' (0..57) - (item꞉ YulPathComponent): # '// ColonEqual was two separate tokens before "0.5....' (0..57) - (leading_trivia꞉ SingleLineComment): '// ColonEqual was two separate tokens before "0.5....' # (0..53) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/colon_equal_separated/generated/0.5.5-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/colon_equal_separated/generated/0.5.5-failure.yml index 1be2aaa37f..a7c6e1231a 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/colon_equal_separated/generated/0.5.5-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/colon_equal_separated/generated/0.5.5-failure.yml @@ -16,7 +16,7 @@ Errors: # 1 total Tree: - (YulVariableAssignmentStatement): # '// ColonEqual was two separate tokens before "0.5....' (0..64) - - (names꞉ YulPaths): # '// ColonEqual was two separate tokens before "0.5....' (0..57) + - (variables꞉ YulPaths): # '// ColonEqual was two separate tokens before "0.5....' (0..57) - (item꞉ YulPath): # '// ColonEqual was two separate tokens before "0.5....' (0..57) - (item꞉ YulPathComponent): # '// ColonEqual was two separate tokens before "0.5....' (0..57) - (leading_trivia꞉ SingleLineComment): '// ColonEqual was two separate tokens before "0.5....' # (0..53) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_address/generated/0.8.10-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_address/generated/0.8.10-success.yml index aa2ac9e7d1..ea99fa8506 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_address/generated/0.8.10-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_address/generated/0.8.10-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "address := 0\n" (0..13) - - (names꞉ YulPaths): # "address" (0..7) + - (variables꞉ YulPaths): # "address" (0..7) - (item꞉ YulPath): # "address" (0..7) - (item꞉ YulPathComponent) ► (variant꞉ YulAddressKeyword): "address" # (0..7) - (assignment꞉ YulAssignmentOperator): # " :=" (7..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_basefee/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_basefee/generated/0.4.11-success.yml index 1b7a31d42a..553c4da1f4 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_basefee/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_basefee/generated/0.4.11-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "basefee := 0\n" (0..13) - - (names꞉ YulPaths): # "basefee" (0..7) + - (variables꞉ YulPaths): # "basefee" (0..7) - (item꞉ YulPath): # "basefee" (0..7) - (item꞉ YulPathComponent) ► (variant꞉ YulIdentifier): "basefee" # (0..7) - (assignment꞉ YulAssignmentOperator): # " :=" (7..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_chainid/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_chainid/generated/0.4.11-success.yml index dcb9a15dad..cdb35acd28 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_chainid/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_chainid/generated/0.4.11-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "chainid := 0\n" (0..13) - - (names꞉ YulPaths): # "chainid" (0..7) + - (variables꞉ YulPaths): # "chainid" (0..7) - (item꞉ YulPath): # "chainid" (0..7) - (item꞉ YulPathComponent) ► (variant꞉ YulIdentifier): "chainid" # (0..7) - (assignment꞉ YulAssignmentOperator): # " :=" (7..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_create2/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_create2/generated/0.4.11-success.yml index a0be35816c..678427714a 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_create2/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_create2/generated/0.4.11-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "create2 := 0\n" (0..13) - - (names꞉ YulPaths): # "create2" (0..7) + - (variables꞉ YulPaths): # "create2" (0..7) - (item꞉ YulPath): # "create2" (0..7) - (item꞉ YulPathComponent) ► (variant꞉ YulIdentifier): "create2" # (0..7) - (assignment꞉ YulAssignmentOperator): # " :=" (7..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_extcodehash/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_extcodehash/generated/0.4.11-success.yml index 14c175e56a..ec4200ec28 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_extcodehash/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_extcodehash/generated/0.4.11-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "extcodehash := 0\n" (0..17) - - (names꞉ YulPaths): # "extcodehash" (0..11) + - (variables꞉ YulPaths): # "extcodehash" (0..11) - (item꞉ YulPath): # "extcodehash" (0..11) - (item꞉ YulPathComponent) ► (variant꞉ YulIdentifier): "extcodehash" # (0..11) - (assignment꞉ YulAssignmentOperator): # " :=" (11..14) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_keccak256/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_keccak256/generated/0.4.11-success.yml index 60d938f672..49cd5a9ee0 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_keccak256/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_keccak256/generated/0.4.11-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "keccak256 := 0\n" (0..15) - - (names꞉ YulPaths): # "keccak256" (0..9) + - (variables꞉ YulPaths): # "keccak256" (0..9) - (item꞉ YulPath): # "keccak256" (0..9) - (item꞉ YulPathComponent) ► (variant꞉ YulIdentifier): "keccak256" # (0..9) - (assignment꞉ YulAssignmentOperator): # " :=" (9..12) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_prevrandao/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_prevrandao/generated/0.4.11-success.yml index 56eebf120f..9a7596a566 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_prevrandao/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_prevrandao/generated/0.4.11-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "prevrandao := 0\n" (0..16) - - (names꞉ YulPaths): # "prevrandao" (0..10) + - (variables꞉ YulPaths): # "prevrandao" (0..10) - (item꞉ YulPath): # "prevrandao" (0..10) - (item꞉ YulPathComponent) ► (variant꞉ YulIdentifier): "prevrandao" # (0..10) - (assignment꞉ YulAssignmentOperator): # " :=" (10..13) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_returndatacopy/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_returndatacopy/generated/0.4.11-success.yml index 772b269bda..1d488082f9 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_returndatacopy/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_returndatacopy/generated/0.4.11-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "returndatacopy := 0\n" (0..20) - - (names꞉ YulPaths): # "returndatacopy" (0..14) + - (variables꞉ YulPaths): # "returndatacopy" (0..14) - (item꞉ YulPath): # "returndatacopy" (0..14) - (item꞉ YulPathComponent) ► (variant꞉ YulIdentifier): "returndatacopy" # (0..14) - (assignment꞉ YulAssignmentOperator): # " :=" (14..17) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_returndatasize/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_returndatasize/generated/0.4.11-success.yml index da0c4aa349..c687064348 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_returndatasize/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_returndatasize/generated/0.4.11-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "returndatasize := 0\n" (0..20) - - (names꞉ YulPaths): # "returndatasize" (0..14) + - (variables꞉ YulPaths): # "returndatasize" (0..14) - (item꞉ YulPath): # "returndatasize" (0..14) - (item꞉ YulPathComponent) ► (variant꞉ YulIdentifier): "returndatasize" # (0..14) - (assignment꞉ YulAssignmentOperator): # " :=" (14..17) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_sar/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_sar/generated/0.4.11-success.yml index c89a8b249e..9d15bbcbc4 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_sar/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_sar/generated/0.4.11-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "sar := 0\n" (0..9) - - (names꞉ YulPaths): # "sar" (0..3) + - (variables꞉ YulPaths): # "sar" (0..3) - (item꞉ YulPath): # "sar" (0..3) - (item꞉ YulPathComponent) ► (variant꞉ YulIdentifier): "sar" # (0..3) - (assignment꞉ YulAssignmentOperator): # " :=" (3..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_selfbalance/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_selfbalance/generated/0.4.11-success.yml index a4c74aad30..d5f5c258e1 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_selfbalance/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_selfbalance/generated/0.4.11-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "selfbalance := 0\n" (0..17) - - (names꞉ YulPaths): # "selfbalance" (0..11) + - (variables꞉ YulPaths): # "selfbalance" (0..11) - (item꞉ YulPath): # "selfbalance" (0..11) - (item꞉ YulPathComponent) ► (variant꞉ YulIdentifier): "selfbalance" # (0..11) - (assignment꞉ YulAssignmentOperator): # " :=" (11..14) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_sha3/generated/0.5.0-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_sha3/generated/0.5.0-success.yml index 548fee7dc6..cb75824229 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_sha3/generated/0.5.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_sha3/generated/0.5.0-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "sha3 := 0\n" (0..10) - - (names꞉ YulPaths): # "sha3" (0..4) + - (variables꞉ YulPaths): # "sha3" (0..4) - (item꞉ YulPath): # "sha3" (0..4) - (item꞉ YulPathComponent) ► (variant꞉ YulIdentifier): "sha3" # (0..4) - (assignment꞉ YulAssignmentOperator): # " :=" (4..7) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_shl/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_shl/generated/0.4.11-success.yml index c9b00ee65a..47db775a8a 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_shl/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_shl/generated/0.4.11-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "shl := 0\n" (0..9) - - (names꞉ YulPaths): # "shl" (0..3) + - (variables꞉ YulPaths): # "shl" (0..3) - (item꞉ YulPath): # "shl" (0..3) - (item꞉ YulPathComponent) ► (variant꞉ YulIdentifier): "shl" # (0..3) - (assignment꞉ YulAssignmentOperator): # " :=" (3..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_shr/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_shr/generated/0.4.11-success.yml index 8cf1d0607c..034ba39553 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_shr/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_shr/generated/0.4.11-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "shr := 0\n" (0..9) - - (names꞉ YulPaths): # "shr" (0..3) + - (variables꞉ YulPaths): # "shr" (0..3) - (item꞉ YulPath): # "shr" (0..3) - (item꞉ YulPathComponent) ► (variant꞉ YulIdentifier): "shr" # (0..3) - (assignment꞉ YulAssignmentOperator): # " :=" (3..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_staticcall/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_staticcall/generated/0.4.11-success.yml index dcb9f80491..18aae8eaa8 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_staticcall/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_staticcall/generated/0.4.11-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "staticcall := 0\n" (0..16) - - (names꞉ YulPaths): # "staticcall" (0..10) + - (variables꞉ YulPaths): # "staticcall" (0..10) - (item꞉ YulPath): # "staticcall" (0..10) - (item꞉ YulPathComponent) ► (variant꞉ YulIdentifier): "staticcall" # (0..10) - (assignment꞉ YulAssignmentOperator): # " :=" (10..13) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_suicide/generated/0.5.0-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_suicide/generated/0.5.0-success.yml index 17c82b7ae3..bfef325e21 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_suicide/generated/0.5.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableAssignmentStatement/identifier_suicide/generated/0.5.0-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - (YulVariableAssignmentStatement): # "suicide := 0\n" (0..13) - - (names꞉ YulPaths): # "suicide" (0..7) + - (variables꞉ YulPaths): # "suicide" (0..7) - (item꞉ YulPath): # "suicide" (0..7) - (item꞉ YulPathComponent) ► (variant꞉ YulIdentifier): "suicide" # (0..7) - (assignment꞉ YulAssignmentOperator): # " :=" (7..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/colon_equal_separated/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/colon_equal_separated/generated/0.4.11-success.yml index 5b3e5c9eae..639bdcbbb1 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/colon_equal_separated/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/colon_equal_separated/generated/0.4.11-success.yml @@ -11,8 +11,9 @@ Tree: - (leading_trivia꞉ SingleLineComment): '// ColonEqual was two separate tokens before "0.5....' # (0..53) - (leading_trivia꞉ EndOfLine): "\n" # (53..54) - (let_keyword꞉ YulLetKeyword): "let" # (54..57) - - (leading_trivia꞉ Whitespace): " " # (57..58) - - (names꞉ YulIdentifier): "foo" # (58..61) + - (variables꞉ YulVariableNames): # " foo" (57..61) + - (leading_trivia꞉ Whitespace): " " # (57..58) + - (item꞉ YulIdentifier): "foo" # (58..61) - (value꞉ YulVariableDeclarationValue): # " : = 0\n" (61..68) - (assignment꞉ YulAssignmentOperator) ► (variant꞉ YulColonEqual): # " : =" (61..65) - (leading_trivia꞉ Whitespace): " " # (61..62) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/colon_equal_separated/generated/0.5.5-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/colon_equal_separated/generated/0.5.5-failure.yml index 46133a8694..b9f8b74c32 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/colon_equal_separated/generated/0.5.5-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/colon_equal_separated/generated/0.5.5-failure.yml @@ -19,7 +19,8 @@ Tree: - (leading_trivia꞉ SingleLineComment): '// ColonEqual was two separate tokens before "0.5....' # (0..53) - (leading_trivia꞉ EndOfLine): "\n" # (53..54) - (let_keyword꞉ YulLetKeyword): "let" # (54..57) - - (leading_trivia꞉ Whitespace): " " # (57..58) - - (names꞉ YulIdentifier): "foo" # (58..61) + - (variables꞉ YulVariableNames): # " foo" (57..61) + - (leading_trivia꞉ Whitespace): " " # (57..58) + - (item꞉ YulIdentifier): "foo" # (58..61) - (leading_trivia꞉ Whitespace): " " # (61..62) - (UNRECOGNIZED): ": = 0\n" # (62..68) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.4.11-failure.yml index 950ceb4f9c..da210e704f 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.4.11-failure.yml @@ -16,6 +16,7 @@ Errors: # 1 total Tree: - (YulVariableDeclarationStatement): # "let a.b.c := 1\n" (0..15) - (let_keyword꞉ YulLetKeyword): "let" # (0..3) - - (leading_trivia꞉ Whitespace): " " # (3..4) - - (names꞉ YulIdentifier): "a" # (4..5) + - (variables꞉ YulVariableNames): # " a" (3..5) + - (leading_trivia꞉ Whitespace): " " # (3..4) + - (item꞉ YulIdentifier): "a" # (4..5) - (UNRECOGNIZED): ".b.c := 1\n" # (5..15) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.5.5-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.5.5-failure.yml index e600935a76..db9a70932b 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.5.5-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.5.5-failure.yml @@ -16,6 +16,7 @@ Errors: # 1 total Tree: - (YulVariableDeclarationStatement): # "let a.b.c := 1\n" (0..15) - (let_keyword꞉ YulLetKeyword): "let" # (0..3) - - (leading_trivia꞉ Whitespace): " " # (3..4) - - (names꞉ YulIdentifier): "a" # (4..5) + - (variables꞉ YulVariableNames): # " a" (3..5) + - (leading_trivia꞉ Whitespace): " " # (3..4) + - (item꞉ YulIdentifier): "a" # (4..5) - (UNRECOGNIZED): ".b.c := 1\n" # (5..15) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.5.8-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.5.8-success.yml index 8769f989de..ed87bb53be 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.5.8-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.5.8-success.yml @@ -8,8 +8,9 @@ Errors: [] Tree: - (YulVariableDeclarationStatement): # "let a.b.c := 1\n" (0..15) - (let_keyword꞉ YulLetKeyword): "let" # (0..3) - - (leading_trivia꞉ Whitespace): " " # (3..4) - - (names꞉ YulIdentifier): "a.b.c" # (4..9) + - (variables꞉ YulVariableNames): # " a.b.c" (3..9) + - (leading_trivia꞉ Whitespace): " " # (3..4) + - (item꞉ YulIdentifier): "a.b.c" # (4..9) - (value꞉ YulVariableDeclarationValue): # " := 1\n" (9..15) - (assignment꞉ YulAssignmentOperator): # " :=" (9..12) - (leading_trivia꞉ Whitespace): " " # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.7.0-failure.yml index e600935a76..db9a70932b 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.7.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/identifier_with_dots/generated/0.7.0-failure.yml @@ -16,6 +16,7 @@ Errors: # 1 total Tree: - (YulVariableDeclarationStatement): # "let a.b.c := 1\n" (0..15) - (let_keyword꞉ YulLetKeyword): "let" # (0..3) - - (leading_trivia꞉ Whitespace): " " # (3..4) - - (names꞉ YulIdentifier): "a" # (4..5) + - (variables꞉ YulVariableNames): # " a" (3..5) + - (leading_trivia꞉ Whitespace): " " # (3..4) + - (item꞉ YulIdentifier): "a" # (4..5) - (UNRECOGNIZED): ".b.c := 1\n" # (5..15) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes/generated/0.7.1-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes/generated/0.7.1-success.yml index dbca055b22..3ca9a1359e 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes/generated/0.7.1-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes/generated/0.7.1-success.yml @@ -11,6 +11,7 @@ Tree: - (leading_trivia꞉ SingleLineComment): "// Unreserved in Yul specifically since 0.7.1:" # (0..46) - (leading_trivia꞉ EndOfLine): "\n" # (46..47) - (let_keyword꞉ YulLetKeyword): "let" # (47..50) - - (leading_trivia꞉ Whitespace): " " # (50..51) - - (names꞉ YulIdentifier): "bytes" # (51..56) - - (trailing_trivia꞉ EndOfLine): "\n" # (56..57) + - (variables꞉ YulVariableNames): # " bytes\n" (50..57) + - (leading_trivia꞉ Whitespace): " " # (50..51) + - (item꞉ YulIdentifier): "bytes" # (51..56) + - (trailing_trivia꞉ EndOfLine): "\n" # (56..57) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes1/generated/0.7.1-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes1/generated/0.7.1-success.yml index a9aa2ee722..888b572572 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes1/generated/0.7.1-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes1/generated/0.7.1-success.yml @@ -11,6 +11,7 @@ Tree: - (leading_trivia꞉ SingleLineComment): "// Unreserved in Yul specifically since 0.7.1:" # (0..46) - (leading_trivia꞉ EndOfLine): "\n" # (46..47) - (let_keyword꞉ YulLetKeyword): "let" # (47..50) - - (leading_trivia꞉ Whitespace): " " # (50..51) - - (names꞉ YulIdentifier): "bytes1" # (51..57) - - (trailing_trivia꞉ EndOfLine): "\n" # (57..58) + - (variables꞉ YulVariableNames): # " bytes1\n" (50..58) + - (leading_trivia꞉ Whitespace): " " # (50..51) + - (item꞉ YulIdentifier): "bytes1" # (51..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (57..58) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes11/generated/0.7.1-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes11/generated/0.7.1-success.yml index de2f66444c..1bf7daa93a 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes11/generated/0.7.1-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes11/generated/0.7.1-success.yml @@ -11,6 +11,7 @@ Tree: - (leading_trivia꞉ SingleLineComment): "// Unreserved in Yul specifically since 0.7.1:" # (0..46) - (leading_trivia꞉ EndOfLine): "\n" # (46..47) - (let_keyword꞉ YulLetKeyword): "let" # (47..50) - - (leading_trivia꞉ Whitespace): " " # (50..51) - - (names꞉ YulIdentifier): "bytes11" # (51..58) - - (trailing_trivia꞉ EndOfLine): "\n" # (58..59) + - (variables꞉ YulVariableNames): # " bytes11\n" (50..59) + - (leading_trivia꞉ Whitespace): " " # (50..51) + - (item꞉ YulIdentifier): "bytes11" # (51..58) + - (trailing_trivia꞉ EndOfLine): "\n" # (58..59) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.11-success.yml index e08ad0057b..c02c5e155c 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.11-success.yml @@ -11,6 +11,7 @@ Tree: - (leading_trivia꞉ SingleLineComment): "// This form is reserved only since 0.4.14 until 0..." # (0..62) - (leading_trivia꞉ EndOfLine): "\n" # (62..63) - (let_keyword꞉ YulLetKeyword): "let" # (63..66) - - (leading_trivia꞉ Whitespace): " " # (66..67) - - (names꞉ YulIdentifier): "ufixed184x80" # (67..79) - - (trailing_trivia꞉ EndOfLine): "\n" # (79..80) + - (variables꞉ YulVariableNames): # " ufixed184x80\n" (66..80) + - (leading_trivia꞉ Whitespace): " " # (66..67) + - (item꞉ YulIdentifier): "ufixed184x80" # (67..79) + - (trailing_trivia꞉ EndOfLine): "\n" # (79..80) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed184x80/generated/0.7.1-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed184x80/generated/0.7.1-success.yml index e08ad0057b..c02c5e155c 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed184x80/generated/0.7.1-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed184x80/generated/0.7.1-success.yml @@ -11,6 +11,7 @@ Tree: - (leading_trivia꞉ SingleLineComment): "// This form is reserved only since 0.4.14 until 0..." # (0..62) - (leading_trivia꞉ EndOfLine): "\n" # (62..63) - (let_keyword꞉ YulLetKeyword): "let" # (63..66) - - (leading_trivia꞉ Whitespace): " " # (66..67) - - (names꞉ YulIdentifier): "ufixed184x80" # (67..79) - - (trailing_trivia꞉ EndOfLine): "\n" # (79..80) + - (variables꞉ YulVariableNames): # " ufixed184x80\n" (66..80) + - (leading_trivia꞉ Whitespace): " " # (66..67) + - (item꞉ YulIdentifier): "ufixed184x80" # (67..79) + - (trailing_trivia꞉ EndOfLine): "\n" # (79..80) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.11-success.yml index a0c0c9cde7..4c8c8b513b 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.11-success.yml @@ -11,6 +11,7 @@ Tree: - (leading_trivia꞉ SingleLineComment): "// This form is reserved only since 0.4.14 until 0..." # (0..62) - (leading_trivia꞉ EndOfLine): "\n" # (62..63) - (let_keyword꞉ YulLetKeyword): "let" # (63..66) - - (leading_trivia꞉ Whitespace): " " # (66..67) - - (names꞉ YulIdentifier): "ufixed8x0" # (67..76) - - (trailing_trivia꞉ EndOfLine): "\n" # (76..77) + - (variables꞉ YulVariableNames): # " ufixed8x0\n" (66..77) + - (leading_trivia꞉ Whitespace): " " # (66..67) + - (item꞉ YulIdentifier): "ufixed8x0" # (67..76) + - (trailing_trivia꞉ EndOfLine): "\n" # (76..77) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x0/generated/0.7.1-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x0/generated/0.7.1-success.yml index a0c0c9cde7..4c8c8b513b 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x0/generated/0.7.1-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x0/generated/0.7.1-success.yml @@ -11,6 +11,7 @@ Tree: - (leading_trivia꞉ SingleLineComment): "// This form is reserved only since 0.4.14 until 0..." # (0..62) - (leading_trivia꞉ EndOfLine): "\n" # (62..63) - (let_keyword꞉ YulLetKeyword): "let" # (63..66) - - (leading_trivia꞉ Whitespace): " " # (66..67) - - (names꞉ YulIdentifier): "ufixed8x0" # (67..76) - - (trailing_trivia꞉ EndOfLine): "\n" # (76..77) + - (variables꞉ YulVariableNames): # " ufixed8x0\n" (66..77) + - (leading_trivia꞉ Whitespace): " " # (66..67) + - (item꞉ YulIdentifier): "ufixed8x0" # (67..76) + - (trailing_trivia꞉ EndOfLine): "\n" # (76..77) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x8/generated/0.7.1-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x8/generated/0.7.1-success.yml index 1ea50acca6..e0dc8e1765 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x8/generated/0.7.1-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x8/generated/0.7.1-success.yml @@ -11,6 +11,7 @@ Tree: - (leading_trivia꞉ SingleLineComment): "// This form is always reserved until 0.7.1 in Yul..." # (0..51) - (leading_trivia꞉ EndOfLine): "\n" # (51..52) - (let_keyword꞉ YulLetKeyword): "let" # (52..55) - - (leading_trivia꞉ Whitespace): " " # (55..56) - - (names꞉ YulIdentifier): "ufixed8x8" # (56..65) - - (trailing_trivia꞉ EndOfLine): "\n" # (65..66) + - (variables꞉ YulVariableNames): # " ufixed8x8\n" (55..66) + - (leading_trivia꞉ Whitespace): " " # (55..56) + - (item꞉ YulIdentifier): "ufixed8x8" # (56..65) + - (trailing_trivia꞉ EndOfLine): "\n" # (65..66) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/multiple_variables/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/multiple_variables/generated/0.4.11-success.yml new file mode 100644 index 0000000000..e7e219538a --- /dev/null +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/multiple_variables/generated/0.4.11-success.yml @@ -0,0 +1,20 @@ +# This file is generated automatically by infrastructure scripts. Please don't edit by hand. + +Source: > + 1 │ let x, y, z │ 0..11 + +Errors: [] + +Tree: + - (YulVariableDeclarationStatement): # "let x, y, z\n" (0..12) + - (let_keyword꞉ YulLetKeyword): "let" # (0..3) + - (variables꞉ YulVariableNames): # " x, y, z\n" (3..12) + - (leading_trivia꞉ Whitespace): " " # (3..4) + - (item꞉ YulIdentifier): "x" # (4..5) + - (separator꞉ Comma): "," # (5..6) + - (leading_trivia꞉ Whitespace): " " # (6..7) + - (item꞉ YulIdentifier): "y" # (7..8) + - (separator꞉ Comma): "," # (8..9) + - (leading_trivia꞉ Whitespace): " " # (9..10) + - (item꞉ YulIdentifier): "z" # (10..11) + - (trailing_trivia꞉ EndOfLine): "\n" # (11..12) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/multiple_variables/input.sol b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/multiple_variables/input.sol new file mode 100644 index 0000000000..d03bab9090 --- /dev/null +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/multiple_variables/input.sol @@ -0,0 +1 @@ +let x, y, z diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/multiple_variables_with_value/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/multiple_variables_with_value/generated/0.4.11-success.yml new file mode 100644 index 0000000000..9d3f3fe9e8 --- /dev/null +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/multiple_variables_with_value/generated/0.4.11-success.yml @@ -0,0 +1,32 @@ +# This file is generated automatically by infrastructure scripts. Please don't edit by hand. + +Source: > + 1 │ let x, y, z := foo() │ 0..20 + +Errors: [] + +Tree: + - (YulVariableDeclarationStatement): # "let x, y, z := foo()\n" (0..21) + - (let_keyword꞉ YulLetKeyword): "let" # (0..3) + - (variables꞉ YulVariableNames): # " x, y, z" (3..11) + - (leading_trivia꞉ Whitespace): " " # (3..4) + - (item꞉ YulIdentifier): "x" # (4..5) + - (separator꞉ Comma): "," # (5..6) + - (leading_trivia꞉ Whitespace): " " # (6..7) + - (item꞉ YulIdentifier): "y" # (7..8) + - (separator꞉ Comma): "," # (8..9) + - (leading_trivia꞉ Whitespace): " " # (9..10) + - (item꞉ YulIdentifier): "z" # (10..11) + - (value꞉ YulVariableDeclarationValue): # " := foo()\n" (11..21) + - (assignment꞉ YulAssignmentOperator): # " :=" (11..14) + - (leading_trivia꞉ Whitespace): " " # (11..12) + - (variant꞉ ColonEqual): ":=" # (12..14) + - (expression꞉ YulExpression) ► (variant꞉ YulFunctionCallExpression): # " foo()\n" (14..21) + - (operand꞉ YulExpression) ► (variant꞉ YulPath): # " foo" (14..18) + - (item꞉ YulPathComponent): # " foo" (14..18) + - (leading_trivia꞉ Whitespace): " " # (14..15) + - (variant꞉ YulIdentifier): "foo" # (15..18) + - (open_paren꞉ OpenParen): "(" # (18..19) + - (arguments꞉ YulArguments): [] # (19..19) + - (close_paren꞉ CloseParen): ")" # (19..20) + - (trailing_trivia꞉ EndOfLine): "\n" # (20..21) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/multiple_variables_with_value/input.sol b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/multiple_variables_with_value/input.sol new file mode 100644 index 0000000000..6350b23784 --- /dev/null +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/multiple_variables_with_value/input.sol @@ -0,0 +1 @@ +let x, y, z := foo()