diff --git a/.changeset/soft-ties-sort.md b/.changeset/soft-ties-sort.md new file mode 100644 index 0000000000..81e7db29a7 --- /dev/null +++ b/.changeset/soft-ties-sort.md @@ -0,0 +1,5 @@ +--- +"@nomicfoundation/slang": minor +--- + +Flatten the trivia syntax nodes into sibling tokens diff --git a/crates/codegen/grammar/src/constructor.rs b/crates/codegen/grammar/src/constructor.rs index 3590b85e79..9847ec9eb4 100644 --- a/crates/codegen/grammar/src/constructor.rs +++ b/crates/codegen/grammar/src/constructor.rs @@ -45,12 +45,12 @@ impl GrammarConstructorDslV2 for Grammar { let leading_trivia = Rc::new(NamedTriviaParser { name: "LeadingTrivia", - def: resolve_trivia(lang.leading_trivia.clone(), &mut ctx), + def: resolve_trivia(lang.leading_trivia.clone(), TriviaKind::Leading, &mut ctx), }) as Rc; let trailing_trivia = Rc::new(NamedTriviaParser { name: "TrailingTrivia", - def: resolve_trivia(lang.trailing_trivia.clone(), &mut ctx), + def: resolve_trivia(lang.trailing_trivia.clone(), TriviaKind::Trailing, &mut ctx), }) as Rc; for (_lex_ctx, item) in items.values() { @@ -507,35 +507,43 @@ fn resolve_keyword_value(value: model::KeywordValue) -> KeywordScannerDefinition } } -fn resolve_trivia(parser: model::TriviaParser, ctx: &mut ResolveCtx<'_>) -> ParserDefinitionNode { +fn resolve_trivia( + parser: model::TriviaParser, + kind: TriviaKind, + ctx: &mut ResolveCtx<'_>, +) -> ParserDefinitionNode { match parser { model::TriviaParser::Optional { parser } => { - ParserDefinitionNode::Optional(Box::new(resolve_trivia(*parser, ctx))) + ParserDefinitionNode::Optional(Box::new(resolve_trivia(*parser, kind, ctx))) } model::TriviaParser::OneOrMore { parser } => ParserDefinitionNode::OneOrMore( - Labeled::anonymous(Box::new(resolve_trivia(*parser, ctx))), + Labeled::anonymous(Box::new(resolve_trivia(*parser, kind, ctx))), ), model::TriviaParser::ZeroOrMore { parser } => ParserDefinitionNode::ZeroOrMore( - Labeled::anonymous(Box::new(resolve_trivia(*parser, ctx))), + Labeled::anonymous(Box::new(resolve_trivia(*parser, kind, ctx))), ), model::TriviaParser::Sequence { parsers } => ParserDefinitionNode::Sequence( parsers .into_iter() - .map(|scanner| Labeled::anonymous(resolve_trivia(scanner, ctx))) + .map(|scanner| Labeled::anonymous(resolve_trivia(scanner, kind, ctx))) .collect(), ), model::TriviaParser::Choice { parsers } => { ParserDefinitionNode::Choice(Labeled::anonymous( parsers .into_iter() - .map(|scanner| resolve_trivia(scanner, ctx)) + .map(|scanner| resolve_trivia(scanner, kind, ctx)) .collect(), )) } model::TriviaParser::Trivia { reference } => { match resolve_grammar_element(&reference, ctx) { GrammarElement::ScannerDefinition(parser) => { - ParserDefinitionNode::ScannerDefinition(parser) + // Hack: This is a sequence of a single scanner in order to emit the names + ParserDefinitionNode::Sequence(vec![Labeled::with_builtin_label( + kind.label(), + ParserDefinitionNode::ScannerDefinition(parser), + )]) } _ => panic!("Expected {reference} to be a ScannerDefinition"), } @@ -793,6 +801,21 @@ fn resolve_precedence( } } +#[derive(Clone, Copy)] +enum TriviaKind { + Leading, + Trailing, +} + +impl TriviaKind { + fn label(self) -> BuiltInLabel { + match self { + TriviaKind::Leading => BuiltInLabel::LeadingTrivia, + TriviaKind::Trailing => BuiltInLabel::TrailingTrivia, + } + } +} + trait IntoParserDefNode { fn into_parser_def_node(self) -> ParserDefinitionNode; } @@ -861,6 +884,8 @@ enum BuiltInLabel { Operand, LeftOperand, RightOperand, + LeadingTrivia, + TrailingTrivia, } impl LabeledExt for Labeled { diff --git a/crates/codegen/parser/generator/src/rust_generator.rs b/crates/codegen/parser/generator/src/rust_generator.rs index 29530d2347..5a6c9a6f52 100644 --- a/crates/codegen/parser/generator/src/rust_generator.rs +++ b/crates/codegen/parser/generator/src/rust_generator.rs @@ -32,7 +32,6 @@ pub struct RustGenerator { rule_kinds: BTreeSet<&'static str>, token_kinds: BTreeSet<&'static str>, - trivia_kinds: BTreeSet<&'static str>, trivia_scanner_names: BTreeSet<&'static str>, labels: BTreeSet, @@ -41,6 +40,7 @@ pub struct RustGenerator { keyword_compound_scanners: BTreeMap<&'static str, String>, // (name of the KW scanner, code) parser_functions: BTreeMap<&'static str, String>, // (name of parser, code) + trivia_parser_functions: BTreeMap<&'static str, String>, // (name of parser, code) #[serde(skip)] top_level_scanner_names: BTreeSet<&'static str>, @@ -280,6 +280,8 @@ impl GrammarVisitor for RustGenerator { self.labels.remove("operand"); self.labels.remove("left_operand"); self.labels.remove("right_operand"); + self.labels.remove("leading_trivia"); + self.labels.remove("trailing_trivia"); // Just being anal about tidying up :) self.all_scanners.clear(); @@ -306,12 +308,9 @@ impl GrammarVisitor for RustGenerator { fn trivia_parser_definition_enter(&mut self, parser: &TriviaParserDefinitionRef) { self.set_current_context(parser.context()); - self.rule_kinds.insert(parser.name()); - self.trivia_kinds.insert(parser.name()); let trivia_scanners = { use codegen_grammar::Visitable as _; - // TODO(#737): This will be cleaned up once we don't emit rule kinds for trivia parsers - // Visit each node and only collect the scanner definition names: + #[derive(Default)] struct CollectTriviaScanners { scanner_names: BTreeSet<&'static str>, @@ -328,15 +327,8 @@ impl GrammarVisitor for RustGenerator { }; self.trivia_scanner_names.extend(trivia_scanners); - self.parser_functions.insert( - parser.name(), - { - let code = parser.to_parser_code(); - let rule_kind = format_ident!("{}", parser.name()); - quote! { #code.with_kind(RuleKind::#rule_kind) } - } - .to_string(), - ); + self.trivia_parser_functions + .insert(parser.name(), parser.to_parser_code().to_string()); } fn parser_definition_enter(&mut self, parser: &ParserDefinitionRef) { diff --git a/crates/codegen/parser/runtime/src/cst.rs b/crates/codegen/parser/runtime/src/cst.rs index 7110b2fa13..a7eab69d4e 100644 --- a/crates/codegen/parser/runtime/src/cst.rs +++ b/crates/codegen/parser/runtime/src/cst.rs @@ -160,7 +160,7 @@ impl Node { pub fn is_trivia(&self) -> bool { match self { - Self::Rule(rule) => rule.kind.is_trivia(), + Self::Rule(_) => false, Self::Token(token) => token.kind.is_trivia(), } } diff --git a/crates/codegen/parser/runtime/src/kinds.rs b/crates/codegen/parser/runtime/src/kinds.rs index 28027677c1..519e38591a 100644 --- a/crates/codegen/parser/runtime/src/kinds.rs +++ b/crates/codegen/parser/runtime/src/kinds.rs @@ -53,12 +53,6 @@ pub enum RuleKind { Rule3, } -impl RuleKind { - pub fn is_trivia(&self) -> bool { - unreachable!("Expanded by the template") - } -} - #[derive( Debug, Eq, @@ -82,6 +76,8 @@ pub enum NodeLabel { Operand, LeftOperand, RightOperand, + LeadingTrivia, + TrailingTrivia, // Used for testing this crate, this is generated in the client code Label1, Label2, diff --git a/crates/codegen/parser/runtime/src/parser_support/parser_function.rs b/crates/codegen/parser/runtime/src/parser_support/parser_function.rs index 0cbb8ce679..cba495fb1c 100644 --- a/crates/codegen/parser/runtime/src/parser_support/parser_function.rs +++ b/crates/codegen/parser/runtime/src/parser_support/parser_function.rs @@ -13,7 +13,7 @@ pub trait ParserFunction where Self: Fn(&L, &mut ParserContext<'_>) -> ParserResult, { - fn parse(&self, language: &L, input: &str, collect_trivia: bool) -> ParseOutput; + fn parse(&self, language: &L, input: &str) -> ParseOutput; } impl ParserFunction for F @@ -21,33 +21,30 @@ where L: Lexer, F: Fn(&L, &mut ParserContext<'_>) -> ParserResult, { - fn parse(&self, language: &L, input: &str, collect_trivia: bool) -> ParseOutput { + fn parse(&self, language: &L, input: &str) -> ParseOutput { let mut stream = ParserContext::new(input); let mut result = self(language, &mut stream); // For a succesful/recovered parse, collect any remaining trivia as part of the parse result - // TODO(#737): Remove this once we unconditionally collect trivia - if collect_trivia { - if let ParserResult::Match(r#match) = &mut result { - let [topmost] = r#match.nodes.as_mut_slice() else { - unreachable!( - "Match at the top level of a parse does not have exactly one Rule node" - ) - }; - - let eof_trivia = match Lexer::leading_trivia(language, &mut stream) { - ParserResult::Match(eof_trivia) if !eof_trivia.nodes.is_empty() => { - Some(eof_trivia.nodes) - } - _ => None, - }; + if let ParserResult::Match(r#match) = &mut result { + let [topmost] = r#match.nodes.as_mut_slice() else { + unreachable!( + "Match at the top level of a parse does not have exactly one Rule node" + ) + }; + + let eof_trivia = match Lexer::leading_trivia(language, &mut stream) { + ParserResult::Match(eof_trivia) if !eof_trivia.nodes.is_empty() => { + Some(eof_trivia.nodes) + } + _ => None, + }; - if let (cst::Node::Rule(rule), Some(eof_trivia)) = (&mut topmost.node, eof_trivia) { - let mut new_children = rule.children.clone(); - new_children.extend(eof_trivia); + if let (cst::Node::Rule(rule), Some(eof_trivia)) = (&mut topmost.node, eof_trivia) { + let mut new_children = rule.children.clone(); + new_children.extend(eof_trivia); - topmost.node = cst::Node::rule(rule.kind, new_children); - } + topmost.node = cst::Node::rule(rule.kind, new_children); } } diff --git a/crates/codegen/parser/runtime/src/parser_support/parser_result.rs b/crates/codegen/parser/runtime/src/parser_support/parser_result.rs index 5c705125a2..9c6b44adc3 100644 --- a/crates/codegen/parser/runtime/src/parser_support/parser_result.rs +++ b/crates/codegen/parser/runtime/src/parser_support/parser_result.rs @@ -82,6 +82,14 @@ impl ParserResult { { *prev_label = Some(label); } + // Also allow to name a single trivia token node + else if let ParserResult::Match(Match { nodes, .. }) = &mut self { + if let [node] = nodes.as_mut_slice() { + if node.as_token().is_some_and(|tok| tok.kind.is_trivia()) { + node.label = Some(label); + } + } + } self } diff --git a/crates/codegen/parser/runtime/src/parser_support/sequence_helper.rs b/crates/codegen/parser/runtime/src/parser_support/sequence_helper.rs index 003d265eac..23472b7c0b 100644 --- a/crates/codegen/parser/runtime/src/parser_support/sequence_helper.rs +++ b/crates/codegen/parser/runtime/src/parser_support/sequence_helper.rs @@ -123,17 +123,27 @@ impl SequenceHelper { return; } - let tokens: Vec<_> = - next.nodes.iter().filter_map(|node| node.as_token()).collect(); - let mut rules = next.nodes.iter().filter_map(|node| node.as_rule()); - - let is_single_token_with_trivia = - tokens.len() == 1 && rules.all(|rule| rule.kind.is_trivia()); - let next_token = tokens.first().map(|token| token.kind); - - // NOTE: We only support skipping to a single token (optionally with trivia) - debug_assert!(is_single_token_with_trivia); - debug_assert_eq!(next_token, Some(running.found)); + // We only support skipping to a single, significant token. + // Sanity check that we are recovering to the expected one. + let next_token = next.nodes.iter().try_fold(None, |acc, node| { + match &**node { + cst::Node::Token(token) if token.kind.is_trivia() => Ok(acc), + cst::Node::Token(token) => { + match acc { + None => Ok(Some(token.kind)), + Some(..) => { + debug_assert!(false, "Recovery skipped to multiple tokens: {acc:?}, {token:?}"); + Err(()) + } + } + } + cst::Node::Rule(rule) => { + debug_assert!(false, "Recovery skipped to a rule: {rule:?}"); + Err(()) + } + } + }); + debug_assert_eq!(next_token, Ok(Some(running.found))); running.nodes.push(LabeledNode::anonymous(cst::Node::token( TokenKind::SKIPPED, diff --git a/crates/codegen/parser/runtime/src/templates/kinds.rs.jinja2 b/crates/codegen/parser/runtime/src/templates/kinds.rs.jinja2 index 0e124a99c4..be0fe421b2 100644 --- a/crates/codegen/parser/runtime/src/templates/kinds.rs.jinja2 +++ b/crates/codegen/parser/runtime/src/templates/kinds.rs.jinja2 @@ -22,18 +22,6 @@ pub enum RuleKind { {%- endfor -%} } -impl RuleKind { - pub fn is_trivia(&self) -> bool { - #[allow(clippy::match_like_matches_macro)] - match self { - {%- for variant in generator.trivia_kinds -%} - Self::{{ variant }} => true, - {%- endfor -%} - _ => false, - } - } -} - #[derive( Debug, Eq, @@ -58,6 +46,8 @@ pub enum NodeLabel { Operand, LeftOperand, RightOperand, + LeadingTrivia, + TrailingTrivia, // Generated {% for variant in generator.labels -%} {{ variant | pascal_case }}, diff --git a/crates/codegen/parser/runtime/src/templates/language.rs.jinja2 b/crates/codegen/parser/runtime/src/templates/language.rs.jinja2 index b63221d071..6a00f566b5 100644 --- a/crates/codegen/parser/runtime/src/templates/language.rs.jinja2 +++ b/crates/codegen/parser/runtime/src/templates/language.rs.jinja2 @@ -84,6 +84,11 @@ impl Language { fn {{ parser_name | snake_case }}(&self, input: &mut ParserContext<'_>) -> ParserResult { {{ parser_code }} } {% endfor %} + {% for parser_name, parser_code in generator.trivia_parser_functions %} + #[allow(unused_assignments, unused_parens)] + fn {{ parser_name | snake_case }}(&self, input: &mut ParserContext<'_>) -> ParserResult { {{ parser_code }} } + {% endfor %} + /******************************************** * Scanner Functions ********************************************/ @@ -102,12 +107,7 @@ impl Language { pub fn parse(&self, kind: RuleKind, input: &str) -> ParseOutput { match kind { {%- for parser_name, _ in generator.parser_functions -%} - {# TODO(#737): Remove the special case once we stop generating RuleKind for trivia #} - {%- if parser_name is ending_with("Trivia") -%} - RuleKind::{{ parser_name }} => Self::{{ parser_name | snake_case }}.parse(self, input, false), - {%- else -%} - RuleKind::{{ parser_name }} => Self::{{ parser_name | snake_case }}.parse(self, input, true), - {%- endif -%} + RuleKind::{{ parser_name }} => Self::{{ parser_name | snake_case }}.parse(self, input), {%- endfor -%} } } diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/cst.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/cst.rs index fe454e0a31..bdc126ca60 100644 --- a/crates/solidity/outputs/cargo/slang_solidity/src/generated/cst.rs +++ b/crates/solidity/outputs/cargo/slang_solidity/src/generated/cst.rs @@ -162,7 +162,7 @@ impl Node { pub fn is_trivia(&self) -> bool { match self { - Self::Rule(rule) => rule.kind.is_trivia(), + Self::Rule(_) => false, Self::Token(token) => token.kind.is_trivia(), } } diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/kinds.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/kinds.rs index 4fa045e30e..993237e2cd 100644 --- a/crates/solidity/outputs/cargo/slang_solidity/src/generated/kinds.rs +++ b/crates/solidity/outputs/cargo/slang_solidity/src/generated/kinds.rs @@ -104,7 +104,6 @@ pub enum RuleKind { InheritanceTypes, InterfaceDefinition, InterfaceMembers, - LeadingTrivia, LibraryDefinition, LibraryMembers, MappingKey, @@ -164,7 +163,6 @@ pub enum RuleKind { StructMember, StructMembers, ThrowStatement, - TrailingTrivia, TryStatement, TupleDeconstructionElement, TupleDeconstructionElements, @@ -236,17 +234,6 @@ pub enum RuleKind { YulVariableDeclarationValue, } -impl RuleKind { - pub fn is_trivia(&self) -> bool { - #[allow(clippy::match_like_matches_macro)] - match self { - Self::LeadingTrivia => true, - Self::TrailingTrivia => true, - _ => false, - } - } -} - #[derive( Debug, Eq, @@ -270,6 +257,8 @@ pub enum NodeLabel { Operand, LeftOperand, RightOperand, + LeadingTrivia, + TrailingTrivia, // Generated AbicoderKeyword, AbstractKeyword, diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/language.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/language.rs index cd42ebe90c..c163fe8582 100644 --- a/crates/solidity/outputs/cargo/slang_solidity/src/generated/language.rs +++ b/crates/solidity/outputs/cargo/slang_solidity/src/generated/language.rs @@ -3129,40 +3129,6 @@ impl Language { .with_kind(RuleKind::InterfaceMembers) } - #[allow(unused_assignments, unused_parens)] - fn leading_trivia(&self, input: &mut ParserContext<'_>) -> ParserResult { - OneOrMoreHelper::run(input, |input| { - ChoiceHelper::run(input, |mut choice, input| { - let result = - self.parse_token::(input, TokenKind::Whitespace); - choice.consider(input, result)?; - let result = - self.parse_token::(input, TokenKind::EndOfLine); - choice.consider(input, result)?; - let result = self.parse_token::( - input, - TokenKind::SingleLineComment, - ); - choice.consider(input, result)?; - let result = self - .parse_token::(input, TokenKind::MultiLineComment); - choice.consider(input, result)?; - let result = self.parse_token::( - input, - TokenKind::SingleLineNatSpecComment, - ); - choice.consider(input, result)?; - let result = self.parse_token::( - input, - TokenKind::MultiLineNatSpecComment, - ); - choice.consider(input, result)?; - choice.finish(input) - }) - }) - .with_kind(RuleKind::LeadingTrivia) - } - #[allow(unused_assignments, unused_parens)] fn library_definition(&self, input: &mut ParserContext<'_>) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -4628,24 +4594,6 @@ impl Language { .with_kind(RuleKind::ThrowStatement) } - #[allow(unused_assignments, unused_parens)] - fn trailing_trivia(&self, input: &mut ParserContext<'_>) -> ParserResult { - SequenceHelper::run(|mut seq| { - seq.elem(OptionalHelper::transform( - self.parse_token::(input, TokenKind::Whitespace), - ))?; - seq.elem(OptionalHelper::transform( - self.parse_token::( - input, - TokenKind::SingleLineComment, - ), - ))?; - seq.elem(self.parse_token::(input, TokenKind::EndOfLine))?; - seq.finish() - }) - .with_kind(RuleKind::TrailingTrivia) - } - #[allow(unused_assignments, unused_parens)] fn try_statement(&self, input: &mut ParserContext<'_>) -> ParserResult { if self.version_is_at_least_0_6_0 { @@ -6844,6 +6792,67 @@ impl Language { .with_kind(RuleKind::YulVariableDeclarationValue) } + #[allow(unused_assignments, unused_parens)] + fn leading_trivia(&self, input: &mut ParserContext<'_>) -> ParserResult { + OneOrMoreHelper::run(input, |input| { + ChoiceHelper::run(input, |mut choice, input| { + let result = self + .parse_token::(input, TokenKind::Whitespace) + .with_label(NodeLabel::LeadingTrivia); + choice.consider(input, result)?; + let result = self + .parse_token::(input, TokenKind::EndOfLine) + .with_label(NodeLabel::LeadingTrivia); + choice.consider(input, result)?; + let result = self + .parse_token::(input, TokenKind::SingleLineComment) + .with_label(NodeLabel::LeadingTrivia); + choice.consider(input, result)?; + let result = self + .parse_token::(input, TokenKind::MultiLineComment) + .with_label(NodeLabel::LeadingTrivia); + choice.consider(input, result)?; + let result = self + .parse_token::( + input, + TokenKind::SingleLineNatSpecComment, + ) + .with_label(NodeLabel::LeadingTrivia); + choice.consider(input, result)?; + let result = self + .parse_token::( + input, + TokenKind::MultiLineNatSpecComment, + ) + .with_label(NodeLabel::LeadingTrivia); + choice.consider(input, result)?; + choice.finish(input) + }) + }) + } + + #[allow(unused_assignments, unused_parens)] + fn trailing_trivia(&self, input: &mut ParserContext<'_>) -> ParserResult { + SequenceHelper::run(|mut seq| { + seq.elem(OptionalHelper::transform( + self.parse_token::(input, TokenKind::Whitespace) + .with_label(NodeLabel::TrailingTrivia), + ))?; + seq.elem(OptionalHelper::transform( + self.parse_token::( + input, + TokenKind::SingleLineComment, + ) + .with_label(NodeLabel::TrailingTrivia), + ))?; + seq.elem( + self.parse_token::(input, TokenKind::EndOfLine) + .with_label(NodeLabel::TrailingTrivia), + )?; + seq.finish() + }) + } + /******************************************** * Scanner Functions ********************************************/ @@ -8902,339 +8911,293 @@ impl Language { pub fn parse(&self, kind: RuleKind, input: &str) -> ParseOutput { match kind { - RuleKind::ABICoderPragma => Self::abi_coder_pragma.parse(self, input, true), - RuleKind::AdditiveExpression => Self::additive_expression.parse(self, input, true), - RuleKind::AddressType => Self::address_type.parse(self, input, true), - RuleKind::AndExpression => Self::and_expression.parse(self, input, true), - RuleKind::ArgumentsDeclaration => Self::arguments_declaration.parse(self, input, true), - RuleKind::ArrayExpression => Self::array_expression.parse(self, input, true), - RuleKind::ArrayTypeName => Self::array_type_name.parse(self, input, true), - RuleKind::ArrayValues => Self::array_values.parse(self, input, true), - RuleKind::AssemblyFlags => Self::assembly_flags.parse(self, input, true), + RuleKind::ABICoderPragma => Self::abi_coder_pragma.parse(self, input), + RuleKind::AdditiveExpression => Self::additive_expression.parse(self, input), + RuleKind::AddressType => Self::address_type.parse(self, input), + RuleKind::AndExpression => Self::and_expression.parse(self, input), + RuleKind::ArgumentsDeclaration => Self::arguments_declaration.parse(self, input), + RuleKind::ArrayExpression => Self::array_expression.parse(self, input), + RuleKind::ArrayTypeName => Self::array_type_name.parse(self, input), + RuleKind::ArrayValues => Self::array_values.parse(self, input), + RuleKind::AssemblyFlags => Self::assembly_flags.parse(self, input), RuleKind::AssemblyFlagsDeclaration => { - Self::assembly_flags_declaration.parse(self, input, true) - } - RuleKind::AssemblyStatement => Self::assembly_statement.parse(self, input, true), - RuleKind::AssignmentExpression => Self::assignment_expression.parse(self, input, true), - RuleKind::BitwiseAndExpression => Self::bitwise_and_expression.parse(self, input, true), - RuleKind::BitwiseOrExpression => Self::bitwise_or_expression.parse(self, input, true), - RuleKind::BitwiseXorExpression => Self::bitwise_xor_expression.parse(self, input, true), - RuleKind::Block => Self::block.parse(self, input, true), - RuleKind::BreakStatement => Self::break_statement.parse(self, input, true), - RuleKind::CatchClause => Self::catch_clause.parse(self, input, true), - RuleKind::CatchClauseError => Self::catch_clause_error.parse(self, input, true), - RuleKind::CatchClauses => Self::catch_clauses.parse(self, input, true), - RuleKind::ComparisonExpression => Self::comparison_expression.parse(self, input, true), - RuleKind::ConditionalExpression => { - Self::conditional_expression.parse(self, input, true) - } - RuleKind::ConstantDefinition => Self::constant_definition.parse(self, input, true), - RuleKind::ConstructorAttribute => Self::constructor_attribute.parse(self, input, true), - RuleKind::ConstructorAttributes => { - Self::constructor_attributes.parse(self, input, true) - } - RuleKind::ConstructorDefinition => { - Self::constructor_definition.parse(self, input, true) - } - RuleKind::ContinueStatement => Self::continue_statement.parse(self, input, true), - RuleKind::ContractDefinition => Self::contract_definition.parse(self, input, true), - RuleKind::ContractMember => Self::contract_member.parse(self, input, true), - RuleKind::ContractMembers => Self::contract_members.parse(self, input, true), - RuleKind::DecimalNumberExpression => { - Self::decimal_number_expression.parse(self, input, true) - } - RuleKind::DeleteStatement => Self::delete_statement.parse(self, input, true), - RuleKind::DoWhileStatement => Self::do_while_statement.parse(self, input, true), - RuleKind::ElementaryType => Self::elementary_type.parse(self, input, true), - RuleKind::ElseBranch => Self::else_branch.parse(self, input, true), - RuleKind::EmitStatement => Self::emit_statement.parse(self, input, true), - RuleKind::EnumDefinition => Self::enum_definition.parse(self, input, true), - RuleKind::EnumMembers => Self::enum_members.parse(self, input, true), - RuleKind::EqualityExpression => Self::equality_expression.parse(self, input, true), - RuleKind::ErrorDefinition => Self::error_definition.parse(self, input, true), - RuleKind::ErrorParameter => Self::error_parameter.parse(self, input, true), - RuleKind::ErrorParameters => Self::error_parameters.parse(self, input, true), + Self::assembly_flags_declaration.parse(self, input) + } + RuleKind::AssemblyStatement => Self::assembly_statement.parse(self, input), + RuleKind::AssignmentExpression => Self::assignment_expression.parse(self, input), + RuleKind::BitwiseAndExpression => Self::bitwise_and_expression.parse(self, input), + RuleKind::BitwiseOrExpression => Self::bitwise_or_expression.parse(self, input), + RuleKind::BitwiseXorExpression => Self::bitwise_xor_expression.parse(self, input), + RuleKind::Block => Self::block.parse(self, input), + RuleKind::BreakStatement => Self::break_statement.parse(self, input), + RuleKind::CatchClause => Self::catch_clause.parse(self, input), + RuleKind::CatchClauseError => Self::catch_clause_error.parse(self, input), + RuleKind::CatchClauses => Self::catch_clauses.parse(self, input), + RuleKind::ComparisonExpression => Self::comparison_expression.parse(self, input), + RuleKind::ConditionalExpression => Self::conditional_expression.parse(self, input), + RuleKind::ConstantDefinition => Self::constant_definition.parse(self, input), + RuleKind::ConstructorAttribute => Self::constructor_attribute.parse(self, input), + RuleKind::ConstructorAttributes => Self::constructor_attributes.parse(self, input), + RuleKind::ConstructorDefinition => Self::constructor_definition.parse(self, input), + RuleKind::ContinueStatement => Self::continue_statement.parse(self, input), + RuleKind::ContractDefinition => Self::contract_definition.parse(self, input), + RuleKind::ContractMember => Self::contract_member.parse(self, input), + RuleKind::ContractMembers => Self::contract_members.parse(self, input), + RuleKind::DecimalNumberExpression => Self::decimal_number_expression.parse(self, input), + RuleKind::DeleteStatement => Self::delete_statement.parse(self, input), + RuleKind::DoWhileStatement => Self::do_while_statement.parse(self, input), + RuleKind::ElementaryType => Self::elementary_type.parse(self, input), + RuleKind::ElseBranch => Self::else_branch.parse(self, input), + RuleKind::EmitStatement => Self::emit_statement.parse(self, input), + RuleKind::EnumDefinition => Self::enum_definition.parse(self, input), + RuleKind::EnumMembers => Self::enum_members.parse(self, input), + RuleKind::EqualityExpression => Self::equality_expression.parse(self, input), + RuleKind::ErrorDefinition => Self::error_definition.parse(self, input), + RuleKind::ErrorParameter => Self::error_parameter.parse(self, input), + RuleKind::ErrorParameters => Self::error_parameters.parse(self, input), RuleKind::ErrorParametersDeclaration => { - Self::error_parameters_declaration.parse(self, input, true) + Self::error_parameters_declaration.parse(self, input) } - RuleKind::EventDefinition => Self::event_definition.parse(self, input, true), - RuleKind::EventParameter => Self::event_parameter.parse(self, input, true), - RuleKind::EventParameters => Self::event_parameters.parse(self, input, true), + RuleKind::EventDefinition => Self::event_definition.parse(self, input), + RuleKind::EventParameter => Self::event_parameter.parse(self, input), + RuleKind::EventParameters => Self::event_parameters.parse(self, input), RuleKind::EventParametersDeclaration => { - Self::event_parameters_declaration.parse(self, input, true) + Self::event_parameters_declaration.parse(self, input) } - RuleKind::ExperimentalFeature => Self::experimental_feature.parse(self, input, true), - RuleKind::ExperimentalPragma => Self::experimental_pragma.parse(self, input, true), + RuleKind::ExperimentalFeature => Self::experimental_feature.parse(self, input), + RuleKind::ExperimentalPragma => Self::experimental_pragma.parse(self, input), RuleKind::ExponentiationExpression => { - Self::exponentiation_expression.parse(self, input, true) + Self::exponentiation_expression.parse(self, input) } - RuleKind::Expression => Self::expression.parse(self, input, true), - RuleKind::ExpressionStatement => Self::expression_statement.parse(self, input, true), + RuleKind::Expression => Self::expression.parse(self, input), + RuleKind::ExpressionStatement => Self::expression_statement.parse(self, input), RuleKind::FallbackFunctionAttribute => { - Self::fallback_function_attribute.parse(self, input, true) + Self::fallback_function_attribute.parse(self, input) } RuleKind::FallbackFunctionAttributes => { - Self::fallback_function_attributes.parse(self, input, true) + Self::fallback_function_attributes.parse(self, input) } RuleKind::FallbackFunctionDefinition => { - Self::fallback_function_definition.parse(self, input, true) - } - RuleKind::ForStatement => Self::for_statement.parse(self, input, true), - RuleKind::ForStatementCondition => { - Self::for_statement_condition.parse(self, input, true) + Self::fallback_function_definition.parse(self, input) } + RuleKind::ForStatement => Self::for_statement.parse(self, input), + RuleKind::ForStatementCondition => Self::for_statement_condition.parse(self, input), RuleKind::ForStatementInitialization => { - Self::for_statement_initialization.parse(self, input, true) - } - RuleKind::FunctionAttribute => Self::function_attribute.parse(self, input, true), - RuleKind::FunctionAttributes => Self::function_attributes.parse(self, input, true), - RuleKind::FunctionBody => Self::function_body.parse(self, input, true), - RuleKind::FunctionCallExpression => { - Self::function_call_expression.parse(self, input, true) - } - RuleKind::FunctionCallOptions => Self::function_call_options.parse(self, input, true), - RuleKind::FunctionDefinition => Self::function_definition.parse(self, input, true), - RuleKind::FunctionName => Self::function_name.parse(self, input, true), - RuleKind::FunctionType => Self::function_type.parse(self, input, true), - RuleKind::FunctionTypeAttribute => { - Self::function_type_attribute.parse(self, input, true) - } - RuleKind::FunctionTypeAttributes => { - Self::function_type_attributes.parse(self, input, true) - } - RuleKind::HexNumberExpression => Self::hex_number_expression.parse(self, input, true), - RuleKind::HexStringLiteral => Self::hex_string_literal.parse(self, input, true), - RuleKind::HexStringLiterals => Self::hex_string_literals.parse(self, input, true), - RuleKind::IdentifierPath => Self::identifier_path.parse(self, input, true), - RuleKind::IfStatement => Self::if_statement.parse(self, input, true), - RuleKind::ImportAlias => Self::import_alias.parse(self, input, true), - RuleKind::ImportClause => Self::import_clause.parse(self, input, true), - RuleKind::ImportDeconstruction => Self::import_deconstruction.parse(self, input, true), + Self::for_statement_initialization.parse(self, input) + } + RuleKind::FunctionAttribute => Self::function_attribute.parse(self, input), + RuleKind::FunctionAttributes => Self::function_attributes.parse(self, input), + RuleKind::FunctionBody => Self::function_body.parse(self, input), + RuleKind::FunctionCallExpression => Self::function_call_expression.parse(self, input), + RuleKind::FunctionCallOptions => Self::function_call_options.parse(self, input), + RuleKind::FunctionDefinition => Self::function_definition.parse(self, input), + RuleKind::FunctionName => Self::function_name.parse(self, input), + RuleKind::FunctionType => Self::function_type.parse(self, input), + RuleKind::FunctionTypeAttribute => Self::function_type_attribute.parse(self, input), + RuleKind::FunctionTypeAttributes => Self::function_type_attributes.parse(self, input), + RuleKind::HexNumberExpression => Self::hex_number_expression.parse(self, input), + RuleKind::HexStringLiteral => Self::hex_string_literal.parse(self, input), + RuleKind::HexStringLiterals => Self::hex_string_literals.parse(self, input), + RuleKind::IdentifierPath => Self::identifier_path.parse(self, input), + RuleKind::IfStatement => Self::if_statement.parse(self, input), + RuleKind::ImportAlias => Self::import_alias.parse(self, input), + RuleKind::ImportClause => Self::import_clause.parse(self, input), + RuleKind::ImportDeconstruction => Self::import_deconstruction.parse(self, input), RuleKind::ImportDeconstructionSymbol => { - Self::import_deconstruction_symbol.parse(self, input, true) + Self::import_deconstruction_symbol.parse(self, input) } RuleKind::ImportDeconstructionSymbols => { - Self::import_deconstruction_symbols.parse(self, input, true) - } - RuleKind::ImportDirective => Self::import_directive.parse(self, input, true), - RuleKind::IndexAccessEnd => Self::index_access_end.parse(self, input, true), - RuleKind::IndexAccessExpression => { - Self::index_access_expression.parse(self, input, true) - } - RuleKind::InheritanceSpecifier => Self::inheritance_specifier.parse(self, input, true), - RuleKind::InheritanceType => Self::inheritance_type.parse(self, input, true), - RuleKind::InheritanceTypes => Self::inheritance_types.parse(self, input, true), - RuleKind::InterfaceDefinition => Self::interface_definition.parse(self, input, true), - RuleKind::InterfaceMembers => Self::interface_members.parse(self, input, true), - RuleKind::LeadingTrivia => Self::leading_trivia.parse(self, input, false), - RuleKind::LibraryDefinition => Self::library_definition.parse(self, input, true), - RuleKind::LibraryMembers => Self::library_members.parse(self, input, true), - RuleKind::MappingKey => Self::mapping_key.parse(self, input, true), - RuleKind::MappingKeyType => Self::mapping_key_type.parse(self, input, true), - RuleKind::MappingType => Self::mapping_type.parse(self, input, true), - RuleKind::MappingValue => Self::mapping_value.parse(self, input, true), - RuleKind::MemberAccess => Self::member_access.parse(self, input, true), - RuleKind::MemberAccessExpression => { - Self::member_access_expression.parse(self, input, true) - } - RuleKind::ModifierAttribute => Self::modifier_attribute.parse(self, input, true), - RuleKind::ModifierAttributes => Self::modifier_attributes.parse(self, input, true), - RuleKind::ModifierDefinition => Self::modifier_definition.parse(self, input, true), - RuleKind::ModifierInvocation => Self::modifier_invocation.parse(self, input, true), + Self::import_deconstruction_symbols.parse(self, input) + } + RuleKind::ImportDirective => Self::import_directive.parse(self, input), + RuleKind::IndexAccessEnd => Self::index_access_end.parse(self, input), + RuleKind::IndexAccessExpression => Self::index_access_expression.parse(self, input), + RuleKind::InheritanceSpecifier => Self::inheritance_specifier.parse(self, input), + RuleKind::InheritanceType => Self::inheritance_type.parse(self, input), + RuleKind::InheritanceTypes => Self::inheritance_types.parse(self, input), + RuleKind::InterfaceDefinition => Self::interface_definition.parse(self, input), + RuleKind::InterfaceMembers => Self::interface_members.parse(self, input), + RuleKind::LibraryDefinition => Self::library_definition.parse(self, input), + RuleKind::LibraryMembers => Self::library_members.parse(self, input), + RuleKind::MappingKey => Self::mapping_key.parse(self, input), + RuleKind::MappingKeyType => Self::mapping_key_type.parse(self, input), + RuleKind::MappingType => Self::mapping_type.parse(self, input), + RuleKind::MappingValue => Self::mapping_value.parse(self, input), + RuleKind::MemberAccess => Self::member_access.parse(self, input), + RuleKind::MemberAccessExpression => Self::member_access_expression.parse(self, input), + RuleKind::ModifierAttribute => Self::modifier_attribute.parse(self, input), + RuleKind::ModifierAttributes => Self::modifier_attributes.parse(self, input), + RuleKind::ModifierDefinition => Self::modifier_definition.parse(self, input), + RuleKind::ModifierInvocation => Self::modifier_invocation.parse(self, input), RuleKind::MultiplicativeExpression => { - Self::multiplicative_expression.parse(self, input, true) + Self::multiplicative_expression.parse(self, input) } - RuleKind::NamedArgument => Self::named_argument.parse(self, input, true), - RuleKind::NamedArgumentGroup => Self::named_argument_group.parse(self, input, true), - RuleKind::NamedArgumentGroups => Self::named_argument_groups.parse(self, input, true), - RuleKind::NamedArguments => Self::named_arguments.parse(self, input, true), + RuleKind::NamedArgument => Self::named_argument.parse(self, input), + RuleKind::NamedArgumentGroup => Self::named_argument_group.parse(self, input), + RuleKind::NamedArgumentGroups => Self::named_argument_groups.parse(self, input), + RuleKind::NamedArguments => Self::named_arguments.parse(self, input), RuleKind::NamedArgumentsDeclaration => { - Self::named_arguments_declaration.parse(self, input, true) + Self::named_arguments_declaration.parse(self, input) } - RuleKind::NamedImport => Self::named_import.parse(self, input, true), - RuleKind::NewExpression => Self::new_expression.parse(self, input, true), - RuleKind::NumberUnit => Self::number_unit.parse(self, input, true), - RuleKind::OrExpression => Self::or_expression.parse(self, input, true), - RuleKind::OverridePaths => Self::override_paths.parse(self, input, true), + RuleKind::NamedImport => Self::named_import.parse(self, input), + RuleKind::NewExpression => Self::new_expression.parse(self, input), + RuleKind::NumberUnit => Self::number_unit.parse(self, input), + RuleKind::OrExpression => Self::or_expression.parse(self, input), + RuleKind::OverridePaths => Self::override_paths.parse(self, input), RuleKind::OverridePathsDeclaration => { - Self::override_paths_declaration.parse(self, input, true) - } - RuleKind::OverrideSpecifier => Self::override_specifier.parse(self, input, true), - RuleKind::Parameter => Self::parameter.parse(self, input, true), - RuleKind::Parameters => Self::parameters.parse(self, input, true), - RuleKind::ParametersDeclaration => { - Self::parameters_declaration.parse(self, input, true) - } - RuleKind::PathImport => Self::path_import.parse(self, input, true), - RuleKind::PositionalArguments => Self::positional_arguments.parse(self, input, true), + Self::override_paths_declaration.parse(self, input) + } + RuleKind::OverrideSpecifier => Self::override_specifier.parse(self, input), + RuleKind::Parameter => Self::parameter.parse(self, input), + RuleKind::Parameters => Self::parameters.parse(self, input), + RuleKind::ParametersDeclaration => Self::parameters_declaration.parse(self, input), + RuleKind::PathImport => Self::path_import.parse(self, input), + RuleKind::PositionalArguments => Self::positional_arguments.parse(self, input), RuleKind::PositionalArgumentsDeclaration => { - Self::positional_arguments_declaration.parse(self, input, true) + Self::positional_arguments_declaration.parse(self, input) } - RuleKind::PostfixExpression => Self::postfix_expression.parse(self, input, true), - RuleKind::Pragma => Self::pragma.parse(self, input, true), - RuleKind::PragmaDirective => Self::pragma_directive.parse(self, input, true), - RuleKind::PrefixExpression => Self::prefix_expression.parse(self, input, true), + RuleKind::PostfixExpression => Self::postfix_expression.parse(self, input), + RuleKind::Pragma => Self::pragma.parse(self, input), + RuleKind::PragmaDirective => Self::pragma_directive.parse(self, input), + RuleKind::PrefixExpression => Self::prefix_expression.parse(self, input), RuleKind::ReceiveFunctionAttribute => { - Self::receive_function_attribute.parse(self, input, true) + Self::receive_function_attribute.parse(self, input) } RuleKind::ReceiveFunctionAttributes => { - Self::receive_function_attributes.parse(self, input, true) + Self::receive_function_attributes.parse(self, input) } RuleKind::ReceiveFunctionDefinition => { - Self::receive_function_definition.parse(self, input, true) - } - RuleKind::ReturnStatement => Self::return_statement.parse(self, input, true), - RuleKind::ReturnsDeclaration => Self::returns_declaration.parse(self, input, true), - RuleKind::RevertStatement => Self::revert_statement.parse(self, input, true), - RuleKind::ShiftExpression => Self::shift_expression.parse(self, input, true), - RuleKind::SourceUnit => Self::source_unit.parse(self, input, true), - RuleKind::SourceUnitMember => Self::source_unit_member.parse(self, input, true), - RuleKind::SourceUnitMembers => Self::source_unit_members.parse(self, input, true), - RuleKind::StateVariableAttribute => { - Self::state_variable_attribute.parse(self, input, true) - } - RuleKind::StateVariableAttributes => { - Self::state_variable_attributes.parse(self, input, true) - } - RuleKind::StateVariableDefinition => { - Self::state_variable_definition.parse(self, input, true) - } + Self::receive_function_definition.parse(self, input) + } + RuleKind::ReturnStatement => Self::return_statement.parse(self, input), + RuleKind::ReturnsDeclaration => Self::returns_declaration.parse(self, input), + RuleKind::RevertStatement => Self::revert_statement.parse(self, input), + RuleKind::ShiftExpression => Self::shift_expression.parse(self, input), + RuleKind::SourceUnit => Self::source_unit.parse(self, input), + RuleKind::SourceUnitMember => Self::source_unit_member.parse(self, input), + RuleKind::SourceUnitMembers => Self::source_unit_members.parse(self, input), + RuleKind::StateVariableAttribute => Self::state_variable_attribute.parse(self, input), + RuleKind::StateVariableAttributes => Self::state_variable_attributes.parse(self, input), + RuleKind::StateVariableDefinition => Self::state_variable_definition.parse(self, input), RuleKind::StateVariableDefinitionValue => { - Self::state_variable_definition_value.parse(self, input, true) - } - RuleKind::Statement => Self::statement.parse(self, input, true), - RuleKind::Statements => Self::statements.parse(self, input, true), - RuleKind::StorageLocation => Self::storage_location.parse(self, input, true), - RuleKind::StringExpression => Self::string_expression.parse(self, input, true), - RuleKind::StringLiteral => Self::string_literal.parse(self, input, true), - RuleKind::StringLiterals => Self::string_literals.parse(self, input, true), - RuleKind::StructDefinition => Self::struct_definition.parse(self, input, true), - RuleKind::StructMember => Self::struct_member.parse(self, input, true), - RuleKind::StructMembers => Self::struct_members.parse(self, input, true), - RuleKind::ThrowStatement => Self::throw_statement.parse(self, input, true), - RuleKind::TrailingTrivia => Self::trailing_trivia.parse(self, input, false), - RuleKind::TryStatement => Self::try_statement.parse(self, input, true), + Self::state_variable_definition_value.parse(self, input) + } + RuleKind::Statement => Self::statement.parse(self, input), + RuleKind::Statements => Self::statements.parse(self, input), + RuleKind::StorageLocation => Self::storage_location.parse(self, input), + RuleKind::StringExpression => Self::string_expression.parse(self, input), + RuleKind::StringLiteral => Self::string_literal.parse(self, input), + RuleKind::StringLiterals => Self::string_literals.parse(self, input), + RuleKind::StructDefinition => Self::struct_definition.parse(self, input), + RuleKind::StructMember => Self::struct_member.parse(self, input), + RuleKind::StructMembers => Self::struct_members.parse(self, input), + RuleKind::ThrowStatement => Self::throw_statement.parse(self, input), + RuleKind::TryStatement => Self::try_statement.parse(self, input), RuleKind::TupleDeconstructionElement => { - Self::tuple_deconstruction_element.parse(self, input, true) + Self::tuple_deconstruction_element.parse(self, input) } RuleKind::TupleDeconstructionElements => { - Self::tuple_deconstruction_elements.parse(self, input, true) + Self::tuple_deconstruction_elements.parse(self, input) } RuleKind::TupleDeconstructionStatement => { - Self::tuple_deconstruction_statement.parse(self, input, true) - } - RuleKind::TupleExpression => Self::tuple_expression.parse(self, input, true), - RuleKind::TupleMember => Self::tuple_member.parse(self, input, true), - RuleKind::TupleValue => Self::tuple_value.parse(self, input, true), - RuleKind::TupleValues => Self::tuple_values.parse(self, input, true), - RuleKind::TypeExpression => Self::type_expression.parse(self, input, true), - RuleKind::TypeName => Self::type_name.parse(self, input, true), - RuleKind::TypedTupleMember => Self::typed_tuple_member.parse(self, input, true), - RuleKind::UncheckedBlock => Self::unchecked_block.parse(self, input, true), - RuleKind::UnicodeStringLiteral => Self::unicode_string_literal.parse(self, input, true), - RuleKind::UnicodeStringLiterals => { - Self::unicode_string_literals.parse(self, input, true) - } + Self::tuple_deconstruction_statement.parse(self, input) + } + RuleKind::TupleExpression => Self::tuple_expression.parse(self, input), + RuleKind::TupleMember => Self::tuple_member.parse(self, input), + RuleKind::TupleValue => Self::tuple_value.parse(self, input), + RuleKind::TupleValues => Self::tuple_values.parse(self, input), + RuleKind::TypeExpression => Self::type_expression.parse(self, input), + RuleKind::TypeName => Self::type_name.parse(self, input), + RuleKind::TypedTupleMember => Self::typed_tuple_member.parse(self, input), + RuleKind::UncheckedBlock => Self::unchecked_block.parse(self, input), + RuleKind::UnicodeStringLiteral => Self::unicode_string_literal.parse(self, input), + RuleKind::UnicodeStringLiterals => Self::unicode_string_literals.parse(self, input), RuleKind::UnnamedFunctionAttribute => { - Self::unnamed_function_attribute.parse(self, input, true) + Self::unnamed_function_attribute.parse(self, input) } RuleKind::UnnamedFunctionAttributes => { - Self::unnamed_function_attributes.parse(self, input, true) + Self::unnamed_function_attributes.parse(self, input) } RuleKind::UnnamedFunctionDefinition => { - Self::unnamed_function_definition.parse(self, input, true) + Self::unnamed_function_definition.parse(self, input) } - RuleKind::UntypedTupleMember => Self::untyped_tuple_member.parse(self, input, true), + RuleKind::UntypedTupleMember => Self::untyped_tuple_member.parse(self, input), RuleKind::UserDefinedValueTypeDefinition => { - Self::user_defined_value_type_definition.parse(self, input, true) + Self::user_defined_value_type_definition.parse(self, input) } - RuleKind::UsingAlias => Self::using_alias.parse(self, input, true), - RuleKind::UsingClause => Self::using_clause.parse(self, input, true), - RuleKind::UsingDeconstruction => Self::using_deconstruction.parse(self, input, true), + RuleKind::UsingAlias => Self::using_alias.parse(self, input), + RuleKind::UsingClause => Self::using_clause.parse(self, input), + RuleKind::UsingDeconstruction => Self::using_deconstruction.parse(self, input), RuleKind::UsingDeconstructionSymbol => { - Self::using_deconstruction_symbol.parse(self, input, true) + Self::using_deconstruction_symbol.parse(self, input) } RuleKind::UsingDeconstructionSymbols => { - Self::using_deconstruction_symbols.parse(self, input, true) + Self::using_deconstruction_symbols.parse(self, input) } - RuleKind::UsingDirective => Self::using_directive.parse(self, input, true), - RuleKind::UsingOperator => Self::using_operator.parse(self, input, true), - RuleKind::UsingTarget => Self::using_target.parse(self, input, true), + RuleKind::UsingDirective => Self::using_directive.parse(self, input), + RuleKind::UsingOperator => Self::using_operator.parse(self, input), + RuleKind::UsingTarget => Self::using_target.parse(self, input), RuleKind::VariableDeclarationStatement => { - Self::variable_declaration_statement.parse(self, input, true) - } - RuleKind::VariableDeclarationType => { - Self::variable_declaration_type.parse(self, input, true) + Self::variable_declaration_statement.parse(self, input) } + RuleKind::VariableDeclarationType => Self::variable_declaration_type.parse(self, input), RuleKind::VariableDeclarationValue => { - Self::variable_declaration_value.parse(self, input, true) - } - RuleKind::VersionPragma => Self::version_pragma.parse(self, input, true), - RuleKind::VersionPragmaExpression => { - Self::version_pragma_expression.parse(self, input, true) + Self::variable_declaration_value.parse(self, input) } + RuleKind::VersionPragma => Self::version_pragma.parse(self, input), + RuleKind::VersionPragmaExpression => Self::version_pragma_expression.parse(self, input), RuleKind::VersionPragmaExpressions => { - Self::version_pragma_expressions.parse(self, input, true) + Self::version_pragma_expressions.parse(self, input) } RuleKind::VersionPragmaOrExpression => { - Self::version_pragma_or_expression.parse(self, input, true) + Self::version_pragma_or_expression.parse(self, input) } RuleKind::VersionPragmaPrefixExpression => { - Self::version_pragma_prefix_expression.parse(self, input, true) + Self::version_pragma_prefix_expression.parse(self, input) } RuleKind::VersionPragmaRangeExpression => { - Self::version_pragma_range_expression.parse(self, input, true) - } - RuleKind::VersionPragmaSpecifier => { - Self::version_pragma_specifier.parse(self, input, true) - } - RuleKind::WhileStatement => Self::while_statement.parse(self, input, true), - RuleKind::YulArguments => Self::yul_arguments.parse(self, input, true), - RuleKind::YulAssignmentOperator => { - Self::yul_assignment_operator.parse(self, input, true) - } - RuleKind::YulAssignmentStatement => { - Self::yul_assignment_statement.parse(self, input, true) - } - RuleKind::YulBlock => Self::yul_block.parse(self, input, true), - RuleKind::YulBreakStatement => Self::yul_break_statement.parse(self, input, true), - RuleKind::YulBuiltInFunction => Self::yul_built_in_function.parse(self, input, true), - RuleKind::YulColonAndEqual => Self::yul_colon_and_equal.parse(self, input, true), - RuleKind::YulContinueStatement => Self::yul_continue_statement.parse(self, input, true), - RuleKind::YulDefaultCase => Self::yul_default_case.parse(self, input, true), - RuleKind::YulExpression => Self::yul_expression.parse(self, input, true), - RuleKind::YulForStatement => Self::yul_for_statement.parse(self, input, true), + Self::version_pragma_range_expression.parse(self, input) + } + RuleKind::VersionPragmaSpecifier => Self::version_pragma_specifier.parse(self, input), + RuleKind::WhileStatement => Self::while_statement.parse(self, input), + RuleKind::YulArguments => Self::yul_arguments.parse(self, input), + RuleKind::YulAssignmentOperator => Self::yul_assignment_operator.parse(self, input), + RuleKind::YulAssignmentStatement => Self::yul_assignment_statement.parse(self, input), + RuleKind::YulBlock => Self::yul_block.parse(self, input), + RuleKind::YulBreakStatement => Self::yul_break_statement.parse(self, input), + RuleKind::YulBuiltInFunction => Self::yul_built_in_function.parse(self, input), + RuleKind::YulColonAndEqual => Self::yul_colon_and_equal.parse(self, input), + RuleKind::YulContinueStatement => Self::yul_continue_statement.parse(self, input), + RuleKind::YulDefaultCase => Self::yul_default_case.parse(self, input), + RuleKind::YulExpression => Self::yul_expression.parse(self, input), + RuleKind::YulForStatement => Self::yul_for_statement.parse(self, input), RuleKind::YulFunctionCallExpression => { - Self::yul_function_call_expression.parse(self, input, true) - } - RuleKind::YulFunctionDefinition => { - Self::yul_function_definition.parse(self, input, true) - } - RuleKind::YulIdentifierPath => Self::yul_identifier_path.parse(self, input, true), - RuleKind::YulIdentifierPaths => Self::yul_identifier_paths.parse(self, input, true), - RuleKind::YulIfStatement => Self::yul_if_statement.parse(self, input, true), - RuleKind::YulLabel => Self::yul_label.parse(self, input, true), - RuleKind::YulLeaveStatement => Self::yul_leave_statement.parse(self, input, true), - RuleKind::YulLiteral => Self::yul_literal.parse(self, input, true), - RuleKind::YulParameters => Self::yul_parameters.parse(self, input, true), + Self::yul_function_call_expression.parse(self, input) + } + RuleKind::YulFunctionDefinition => Self::yul_function_definition.parse(self, input), + RuleKind::YulIdentifierPath => Self::yul_identifier_path.parse(self, input), + RuleKind::YulIdentifierPaths => Self::yul_identifier_paths.parse(self, input), + RuleKind::YulIfStatement => Self::yul_if_statement.parse(self, input), + RuleKind::YulLabel => Self::yul_label.parse(self, input), + RuleKind::YulLeaveStatement => Self::yul_leave_statement.parse(self, input), + RuleKind::YulLiteral => Self::yul_literal.parse(self, input), + RuleKind::YulParameters => Self::yul_parameters.parse(self, input), RuleKind::YulParametersDeclaration => { - Self::yul_parameters_declaration.parse(self, input, true) - } - RuleKind::YulReturnVariables => Self::yul_return_variables.parse(self, input, true), - RuleKind::YulReturnsDeclaration => { - Self::yul_returns_declaration.parse(self, input, true) - } - RuleKind::YulStatement => Self::yul_statement.parse(self, input, true), - RuleKind::YulStatements => Self::yul_statements.parse(self, input, true), - RuleKind::YulSwitchCase => Self::yul_switch_case.parse(self, input, true), - RuleKind::YulSwitchCases => Self::yul_switch_cases.parse(self, input, true), - RuleKind::YulSwitchStatement => Self::yul_switch_statement.parse(self, input, true), - RuleKind::YulValueCase => Self::yul_value_case.parse(self, input, true), + Self::yul_parameters_declaration.parse(self, input) + } + RuleKind::YulReturnVariables => Self::yul_return_variables.parse(self, input), + RuleKind::YulReturnsDeclaration => Self::yul_returns_declaration.parse(self, input), + RuleKind::YulStatement => Self::yul_statement.parse(self, input), + RuleKind::YulStatements => Self::yul_statements.parse(self, input), + RuleKind::YulSwitchCase => Self::yul_switch_case.parse(self, input), + RuleKind::YulSwitchCases => Self::yul_switch_cases.parse(self, input), + RuleKind::YulSwitchStatement => Self::yul_switch_statement.parse(self, input), + RuleKind::YulValueCase => Self::yul_value_case.parse(self, input), RuleKind::YulVariableDeclarationStatement => { - Self::yul_variable_declaration_statement.parse(self, input, true) + Self::yul_variable_declaration_statement.parse(self, input) } RuleKind::YulVariableDeclarationValue => { - Self::yul_variable_declaration_value.parse(self, input, true) + Self::yul_variable_declaration_value.parse(self, input) } } } diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/parser_support/parser_function.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/parser_support/parser_function.rs index fffdf93c8f..c38482610d 100644 --- a/crates/solidity/outputs/cargo/slang_solidity/src/generated/parser_support/parser_function.rs +++ b/crates/solidity/outputs/cargo/slang_solidity/src/generated/parser_support/parser_function.rs @@ -15,7 +15,7 @@ pub trait ParserFunction where Self: Fn(&L, &mut ParserContext<'_>) -> ParserResult, { - fn parse(&self, language: &L, input: &str, collect_trivia: bool) -> ParseOutput; + fn parse(&self, language: &L, input: &str) -> ParseOutput; } impl ParserFunction for F @@ -23,33 +23,30 @@ where L: Lexer, F: Fn(&L, &mut ParserContext<'_>) -> ParserResult, { - fn parse(&self, language: &L, input: &str, collect_trivia: bool) -> ParseOutput { + fn parse(&self, language: &L, input: &str) -> ParseOutput { let mut stream = ParserContext::new(input); let mut result = self(language, &mut stream); // For a succesful/recovered parse, collect any remaining trivia as part of the parse result - // TODO(#737): Remove this once we unconditionally collect trivia - if collect_trivia { - if let ParserResult::Match(r#match) = &mut result { - let [topmost] = r#match.nodes.as_mut_slice() else { - unreachable!( - "Match at the top level of a parse does not have exactly one Rule node" - ) - }; - - let eof_trivia = match Lexer::leading_trivia(language, &mut stream) { - ParserResult::Match(eof_trivia) if !eof_trivia.nodes.is_empty() => { - Some(eof_trivia.nodes) - } - _ => None, - }; + if let ParserResult::Match(r#match) = &mut result { + let [topmost] = r#match.nodes.as_mut_slice() else { + unreachable!( + "Match at the top level of a parse does not have exactly one Rule node" + ) + }; + + let eof_trivia = match Lexer::leading_trivia(language, &mut stream) { + ParserResult::Match(eof_trivia) if !eof_trivia.nodes.is_empty() => { + Some(eof_trivia.nodes) + } + _ => None, + }; - if let (cst::Node::Rule(rule), Some(eof_trivia)) = (&mut topmost.node, eof_trivia) { - let mut new_children = rule.children.clone(); - new_children.extend(eof_trivia); + if let (cst::Node::Rule(rule), Some(eof_trivia)) = (&mut topmost.node, eof_trivia) { + let mut new_children = rule.children.clone(); + new_children.extend(eof_trivia); - topmost.node = cst::Node::rule(rule.kind, new_children); - } + topmost.node = cst::Node::rule(rule.kind, new_children); } } diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/parser_support/parser_result.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/parser_support/parser_result.rs index 9a885edd44..21b61c668e 100644 --- a/crates/solidity/outputs/cargo/slang_solidity/src/generated/parser_support/parser_result.rs +++ b/crates/solidity/outputs/cargo/slang_solidity/src/generated/parser_support/parser_result.rs @@ -84,6 +84,14 @@ impl ParserResult { { *prev_label = Some(label); } + // Also allow to name a single trivia token node + else if let ParserResult::Match(Match { nodes, .. }) = &mut self { + if let [node] = nodes.as_mut_slice() { + if node.as_token().is_some_and(|tok| tok.kind.is_trivia()) { + node.label = Some(label); + } + } + } self } diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/parser_support/sequence_helper.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/parser_support/sequence_helper.rs index 1d5b1b4596..d7d2a55d84 100644 --- a/crates/solidity/outputs/cargo/slang_solidity/src/generated/parser_support/sequence_helper.rs +++ b/crates/solidity/outputs/cargo/slang_solidity/src/generated/parser_support/sequence_helper.rs @@ -125,17 +125,27 @@ impl SequenceHelper { return; } - let tokens: Vec<_> = - next.nodes.iter().filter_map(|node| node.as_token()).collect(); - let mut rules = next.nodes.iter().filter_map(|node| node.as_rule()); - - let is_single_token_with_trivia = - tokens.len() == 1 && rules.all(|rule| rule.kind.is_trivia()); - let next_token = tokens.first().map(|token| token.kind); - - // NOTE: We only support skipping to a single token (optionally with trivia) - debug_assert!(is_single_token_with_trivia); - debug_assert_eq!(next_token, Some(running.found)); + // We only support skipping to a single, significant token. + // Sanity check that we are recovering to the expected one. + let next_token = next.nodes.iter().try_fold(None, |acc, node| { + match &**node { + cst::Node::Token(token) if token.kind.is_trivia() => Ok(acc), + cst::Node::Token(token) => { + match acc { + None => Ok(Some(token.kind)), + Some(..) => { + debug_assert!(false, "Recovery skipped to multiple tokens: {acc:?}, {token:?}"); + Err(()) + } + } + } + cst::Node::Rule(rule) => { + debug_assert!(false, "Recovery skipped to a rule: {rule:?}"); + Err(()) + } + } + }); + debug_assert_eq!(next_token, Ok(Some(running.found))); running.nodes.push(LabeledNode::anonymous(cst::Node::token( TokenKind::SKIPPED, diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/leading_trivia.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/leading_trivia.rs deleted file mode 100644 index cb493c63fc..0000000000 --- a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/leading_trivia.rs +++ /dev/null @@ -1,40 +0,0 @@ -// This file is generated automatically by infrastructure scripts. Please don't edit by hand. - -use anyhow::Result; - -use crate::cst_output::runner::run; - -#[test] -fn multi_line() -> Result<()> { - run("LeadingTrivia", "multi_line") -} - -#[test] -fn multi_line_natspec_comment() -> Result<()> { - run("LeadingTrivia", "multi_line_natspec_comment") -} - -#[test] -fn multi_line_trailing_double_star() -> Result<()> { - run("LeadingTrivia", "multi_line_trailing_double_star") -} - -#[test] -fn new_line() -> Result<()> { - run("LeadingTrivia", "new_line") -} - -#[test] -fn single_line_comment() -> Result<()> { - run("LeadingTrivia", "single_line_comment") -} - -#[test] -fn single_line_natspec_comment() -> Result<()> { - run("LeadingTrivia", "single_line_natspec_comment") -} - -#[test] -fn whitespace() -> Result<()> { - run("LeadingTrivia", "whitespace") -} 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 index 7d9522ffec..62d0fc9aeb 100644 --- a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/mod.rs +++ b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/mod.rs @@ -23,7 +23,6 @@ mod hex_number_expression; mod hex_string_literals; mod import_directive; mod interface_definition; -mod leading_trivia; mod mapping_type; mod new_expression; mod pragma_directive; @@ -35,7 +34,6 @@ mod string_literal; mod string_literals; mod struct_definition; mod throw_statement; -mod trailing_trivia; mod try_statement; mod tuple_deconstruction_statement; mod tuple_expression; diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/source_unit.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/source_unit.rs index e4bc12f8ec..491465736a 100644 --- a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/source_unit.rs +++ b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/source_unit.rs @@ -54,6 +54,44 @@ fn everything() -> Result<()> { run("SourceUnit", "everything") } +#[test] +fn leading_trivia_multi_line() -> Result<()> { + run("SourceUnit", "leading_trivia_multi_line") +} + +#[test] +fn leading_trivia_multi_line_natspec_comment() -> Result<()> { + run("SourceUnit", "leading_trivia_multi_line_natspec_comment") +} + +#[test] +fn leading_trivia_multi_line_trailing_double_star() -> Result<()> { + run( + "SourceUnit", + "leading_trivia_multi_line_trailing_double_star", + ) +} + +#[test] +fn leading_trivia_new_line() -> Result<()> { + run("SourceUnit", "leading_trivia_new_line") +} + +#[test] +fn leading_trivia_single_line_comment() -> Result<()> { + run("SourceUnit", "leading_trivia_single_line_comment") +} + +#[test] +fn leading_trivia_single_line_natspec_comment() -> Result<()> { + run("SourceUnit", "leading_trivia_single_line_natspec_comment") +} + +#[test] +fn leading_trivia_whitespace() -> Result<()> { + run("SourceUnit", "leading_trivia_whitespace") +} + #[test] fn partial_definition() -> Result<()> { run("SourceUnit", "partial_definition") @@ -79,6 +117,24 @@ fn trailing_trivia() -> Result<()> { run("SourceUnit", "trailing_trivia") } +#[test] +fn trailing_trivia_multi_line_spanning_multiple_lines() -> Result<()> { + run( + "SourceUnit", + "trailing_trivia_multi_line_spanning_multiple_lines", + ) +} + +#[test] +fn trailing_trivia_multi_line_without_newline() -> Result<()> { + run("SourceUnit", "trailing_trivia_multi_line_without_newline") +} + +#[test] +fn trailing_trivia_only_until_newline() -> Result<()> { + run("SourceUnit", "trailing_trivia_only_until_newline") +} + #[test] fn using_directive() -> Result<()> { run("SourceUnit", "using_directive") diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/trailing_trivia.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/trailing_trivia.rs deleted file mode 100644 index 02ebfeef62..0000000000 --- a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/trailing_trivia.rs +++ /dev/null @@ -1,20 +0,0 @@ -// This file is generated automatically by infrastructure scripts. Please don't edit by hand. - -use anyhow::Result; - -use crate::cst_output::runner::run; - -#[test] -fn multi_line_spanning_multiple_lines() -> Result<()> { - run("TrailingTrivia", "multi_line_spanning_multiple_lines") -} - -#[test] -fn multi_line_without_newline() -> Result<()> { - run("TrailingTrivia", "multi_line_without_newline") -} - -#[test] -fn only_until_newline() -> Result<()> { - run("TrailingTrivia", "only_until_newline") -} diff --git a/crates/solidity/outputs/cargo/tests/src/doc_examples/using_the_parser.rs b/crates/solidity/outputs/cargo/tests/src/doc_examples/using_the_parser.rs index 627297d2af..3524b0c99c 100644 --- a/crates/solidity/outputs/cargo/tests/src/doc_examples/using_the_parser.rs +++ b/crates/solidity/outputs/cargo/tests/src/doc_examples/using_the_parser.rs @@ -43,9 +43,9 @@ fn using_the_parser() -> Result<()> { let children = &contract.children; assert!(matches!(&children[0].node, Node::Token(t) if t.kind == TokenKind::ContractKeyword)); - assert!(matches!(&children[1].node, Node::Rule(r) if r.kind == RuleKind::LeadingTrivia)); + assert!(matches!(&children[1].node, Node::Token(t) if t.kind == TokenKind::Whitespace)); assert!(matches!(&children[2].node, Node::Token(t) if t.kind == TokenKind::Identifier)); - assert!(matches!(&children[3].node, Node::Rule(r) if r.kind == RuleKind::LeadingTrivia)); + assert!(matches!(&children[3].node, Node::Token(t) if t.kind == TokenKind::Whitespace)); assert!(matches!(&children[4].node, Node::Token(t) if t.kind == TokenKind::OpenBrace)); assert!(matches!(&children[5].node, Node::Rule(r) if r.kind == RuleKind::ContractMembers)); assert!(matches!(&children[6].node, Node::Token(t) if t.kind == TokenKind::CloseBrace)); diff --git a/crates/solidity/outputs/npm/package/src/generated/index.d.ts b/crates/solidity/outputs/npm/package/src/generated/index.d.ts index 1f1c512bd6..7de064fefe 100644 --- a/crates/solidity/outputs/npm/package/src/generated/index.d.ts +++ b/crates/solidity/outputs/npm/package/src/generated/index.d.ts @@ -96,7 +96,6 @@ export namespace kinds { InheritanceTypes = "InheritanceTypes", InterfaceDefinition = "InterfaceDefinition", InterfaceMembers = "InterfaceMembers", - LeadingTrivia = "LeadingTrivia", LibraryDefinition = "LibraryDefinition", LibraryMembers = "LibraryMembers", MappingKey = "MappingKey", @@ -156,7 +155,6 @@ export namespace kinds { StructMember = "StructMember", StructMembers = "StructMembers", ThrowStatement = "ThrowStatement", - TrailingTrivia = "TrailingTrivia", TryStatement = "TryStatement", TupleDeconstructionElement = "TupleDeconstructionElement", TupleDeconstructionElements = "TupleDeconstructionElements", @@ -234,6 +232,8 @@ export namespace kinds { Operand = "Operand", LeftOperand = "LeftOperand", RightOperand = "RightOperand", + LeadingTrivia = "LeadingTrivia", + TrailingTrivia = "TrailingTrivia", AbicoderKeyword = "AbicoderKeyword", AbstractKeyword = "AbstractKeyword", AddressKeyword = "AddressKeyword", diff --git a/crates/solidity/outputs/npm/tests/src/doc-examples/using-the-parser.ts b/crates/solidity/outputs/npm/tests/src/doc-examples/using-the-parser.ts index d64b82c1e7..115511460a 100644 --- a/crates/solidity/outputs/npm/tests/src/doc-examples/using-the-parser.ts +++ b/crates/solidity/outputs/npm/tests/src/doc-examples/using-the-parser.ts @@ -39,9 +39,9 @@ test("using the parser", async () => { const [contractKeyword, firstSpace, contractName, secondSpace, openBrace, members, closeBrace] = contractChildren; assert.equal(contractKeyword?.kind, TokenKind.ContractKeyword); - assert.equal(firstSpace?.kind, RuleKind.LeadingTrivia); + assert.equal(firstSpace?.kind, TokenKind.Whitespace); assert.equal(contractName?.kind, TokenKind.Identifier); - assert.equal(secondSpace?.kind, RuleKind.LeadingTrivia); + assert.equal(secondSpace?.kind, TokenKind.Whitespace); assert.equal(openBrace?.kind, TokenKind.OpenBrace); assert.equal(members?.kind, RuleKind.ContractMembers); assert.equal(closeBrace?.kind, TokenKind.CloseBrace); diff --git a/crates/solidity/testing/snapshots/cst_output/AssemblyStatement/simple/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/AssemblyStatement/simple/generated/0.4.11-success.yml index 8fc4c577d2..dfe34bbef1 100644 --- a/crates/solidity/testing/snapshots/cst_output/AssemblyStatement/simple/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/AssemblyStatement/simple/generated/0.4.11-success.yml @@ -11,19 +11,19 @@ Tree: - (AssemblyStatement): # 'assembly "evmasm" ("memory-safe") {\n\n}\n' (0..39) - (assembly_keyword꞉ AssemblyKeyword): "assembly" # (0..8) - (label꞉ StringLiteral): # ' "evmasm"' (8..17) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ DoubleQuotedStringLiteral): '"evmasm"' # (9..17) - (flags꞉ AssemblyFlagsDeclaration): # ' ("memory-safe")' (17..33) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (open_paren꞉ OpenParen): "(" # (18..19) - (flags꞉ AssemblyFlags): # '"memory-safe"' (19..32) - (item꞉ StringLiteral) ► (variant꞉ DoubleQuotedStringLiteral): '"memory-safe"' # (19..32) - (close_paren꞉ CloseParen): ")" # (32..33) - (body꞉ YulBlock): # " {\n\n}\n" (33..39) - - (LeadingTrivia) ► (Whitespace): " " # (33..34) + - (leading_trivia꞉ Whitespace): " " # (33..34) - (open_brace꞉ OpenBrace): "{" # (34..35) - - (TrailingTrivia) ► (EndOfLine): "\n" # (35..36) + - (trailing_trivia꞉ EndOfLine): "\n" # (35..36) - (statements꞉ YulStatements): [] # (36..36) - - (LeadingTrivia) ► (EndOfLine): "\n" # (36..37) + - (leading_trivia꞉ EndOfLine): "\n" # (36..37) - (close_brace꞉ CloseBrace): "}" # (37..38) - - (TrailingTrivia) ► (EndOfLine): "\n" # (38..39) + - (trailing_trivia꞉ EndOfLine): "\n" # (38..39) diff --git a/crates/solidity/testing/snapshots/cst_output/Block/postfix_recovery_regression/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/Block/postfix_recovery_regression/generated/0.4.11-failure.yml index 1ac9e0dc5f..30af1b3171 100644 --- a/crates/solidity/testing/snapshots/cst_output/Block/postfix_recovery_regression/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Block/postfix_recovery_regression/generated/0.4.11-failure.yml @@ -21,21 +21,20 @@ Errors: # 1 total Tree: - (Block): # "// Make sure we don't panic when encountering an u..." (0..122) - - (LeadingTrivia): # "// Make sure we don't panic when encountering an u..." (0..95) - - (SingleLineComment): "// Make sure we don't panic when encountering an u..." # (0..93) - - (EndOfLine): "\n" # (93..94) - - (EndOfLine): "\n" # (94..95) + - (leading_trivia꞉ SingleLineComment): "// Make sure we don't panic when encountering an u..." # (0..93) + - (leading_trivia꞉ EndOfLine): "\n" # (93..94) + - (leading_trivia꞉ EndOfLine): "\n" # (94..95) - (open_brace꞉ OpenBrace): "{" # (95..96) - - (TrailingTrivia) ► (EndOfLine): "\n" # (96..97) + - (trailing_trivia꞉ EndOfLine): "\n" # (96..97) - (statements꞉ Statements): # " a.b('\n }');\n" (97..120) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " a.b('\n }');\n" (97..120) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ IdentifierPath): # " a.b" (97..104) - - (LeadingTrivia) ► (Whitespace): " " # (97..101) + - (leading_trivia꞉ Whitespace): " " # (97..101) - (item꞉ Identifier): "a" # (101..102) - (separator꞉ Period): "." # (102..103) - (item꞉ Identifier): "b" # (103..104) - (SKIPPED): "('\n }')" # (104..118) - (semicolon꞉ Semicolon): ";" # (118..119) - - (TrailingTrivia) ► (EndOfLine): "\n" # (119..120) + - (trailing_trivia꞉ EndOfLine): "\n" # (119..120) - (close_brace꞉ CloseBrace): "}" # (120..121) - - (TrailingTrivia) ► (EndOfLine): "\n" # (121..122) + - (trailing_trivia꞉ EndOfLine): "\n" # (121..122) diff --git a/crates/solidity/testing/snapshots/cst_output/Block/postfix_recovery_regression/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Block/postfix_recovery_regression/generated/0.5.0-failure.yml index ed782accde..307b8a34f3 100644 --- a/crates/solidity/testing/snapshots/cst_output/Block/postfix_recovery_regression/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Block/postfix_recovery_regression/generated/0.5.0-failure.yml @@ -21,21 +21,20 @@ Errors: # 1 total Tree: - (Block): # "// Make sure we don't panic when encountering an u..." (0..122) - - (LeadingTrivia): # "// Make sure we don't panic when encountering an u..." (0..95) - - (SingleLineComment): "// Make sure we don't panic when encountering an u..." # (0..93) - - (EndOfLine): "\n" # (93..94) - - (EndOfLine): "\n" # (94..95) + - (leading_trivia꞉ SingleLineComment): "// Make sure we don't panic when encountering an u..." # (0..93) + - (leading_trivia꞉ EndOfLine): "\n" # (93..94) + - (leading_trivia꞉ EndOfLine): "\n" # (94..95) - (open_brace꞉ OpenBrace): "{" # (95..96) - - (TrailingTrivia) ► (EndOfLine): "\n" # (96..97) + - (trailing_trivia꞉ EndOfLine): "\n" # (96..97) - (statements꞉ Statements): # " a.b('\n }');\n" (97..120) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " a.b('\n }');\n" (97..120) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ IdentifierPath): # " a.b" (97..104) - - (LeadingTrivia) ► (Whitespace): " " # (97..101) + - (leading_trivia꞉ Whitespace): " " # (97..101) - (item꞉ Identifier): "a" # (101..102) - (separator꞉ Period): "." # (102..103) - (item꞉ Identifier): "b" # (103..104) - (SKIPPED): "('\n }')" # (104..118) - (semicolon꞉ Semicolon): ";" # (118..119) - - (TrailingTrivia) ► (EndOfLine): "\n" # (119..120) + - (trailing_trivia꞉ EndOfLine): "\n" # (119..120) - (close_brace꞉ CloseBrace): "}" # (120..121) - - (TrailingTrivia) ► (EndOfLine): "\n" # (121..122) + - (trailing_trivia꞉ EndOfLine): "\n" # (121..122) diff --git a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.4.11-failure.yml index a216568efb..fe951e9e43 100644 --- a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.4.11-failure.yml @@ -19,8 +19,8 @@ Tree: - (statements꞉ Statements): # " unchecked " (1..12) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " unchecked " (1..12) - (expression꞉ Expression): # " unchecked" (1..11) - - (LeadingTrivia) ► (Whitespace): " " # (1..2) + - (leading_trivia꞉ Whitespace): " " # (1..2) - (variant꞉ Identifier): "unchecked" # (2..11) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (SKIPPED): "{ x = 1; } " # (12..23) - (close_brace꞉ CloseBrace): "}" # (23..24) diff --git a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.5.0-failure.yml index 85d92e31ea..fbaa7f50d8 100644 --- a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.5.0-failure.yml @@ -17,6 +17,6 @@ Tree: - (Block): # "{ unchecked { x = 1; } }" (0..24) - (open_brace꞉ OpenBrace): "{" # (0..1) - (statements꞉ Statements): [] # (1..1) - - (LeadingTrivia) ► (Whitespace): " " # (1..2) + - (leading_trivia꞉ Whitespace): " " # (1..2) - (SKIPPED): "unchecked { x = 1; } " # (2..23) - (close_brace꞉ CloseBrace): "}" # (23..24) diff --git a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.5.3-failure.yml b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.5.3-failure.yml index b9e676a5ff..577faeda83 100644 --- a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.5.3-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.5.3-failure.yml @@ -17,6 +17,6 @@ Tree: - (Block): # "{ unchecked { x = 1; } }" (0..24) - (open_brace꞉ OpenBrace): "{" # (0..1) - (statements꞉ Statements): [] # (1..1) - - (LeadingTrivia) ► (Whitespace): " " # (1..2) + - (leading_trivia꞉ Whitespace): " " # (1..2) - (SKIPPED): "unchecked { x = 1; } " # (2..23) - (close_brace꞉ CloseBrace): "}" # (23..24) diff --git a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.6.0-failure.yml index 3acb2fdc3a..3819069b53 100644 --- a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.6.0-failure.yml @@ -17,6 +17,6 @@ Tree: - (Block): # "{ unchecked { x = 1; } }" (0..24) - (open_brace꞉ OpenBrace): "{" # (0..1) - (statements꞉ Statements): [] # (1..1) - - (LeadingTrivia) ► (Whitespace): " " # (1..2) + - (leading_trivia꞉ Whitespace): " " # (1..2) - (SKIPPED): "unchecked { x = 1; } " # (2..23) - (close_brace꞉ CloseBrace): "}" # (23..24) diff --git a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.7.0-failure.yml index 65d5e9e1c9..a5fc01f74f 100644 --- a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.7.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.7.0-failure.yml @@ -17,6 +17,6 @@ Tree: - (Block): # "{ unchecked { x = 1; } }" (0..24) - (open_brace꞉ OpenBrace): "{" # (0..1) - (statements꞉ Statements): [] # (1..1) - - (LeadingTrivia) ► (Whitespace): " " # (1..2) + - (leading_trivia꞉ Whitespace): " " # (1..2) - (SKIPPED): "unchecked { x = 1; } " # (2..23) - (close_brace꞉ CloseBrace): "}" # (23..24) diff --git a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.8.0-success.yml b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.8.0-success.yml index 1369d88d39..a5e4e6a69e 100644 --- a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.8.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.8.0-success.yml @@ -10,24 +10,24 @@ Tree: - (open_brace꞉ OpenBrace): "{" # (0..1) - (statements꞉ Statements): # " unchecked { x = 1; }" (1..22) - (item꞉ Statement) ► (variant꞉ UncheckedBlock): # " unchecked { x = 1; }" (1..22) - - (LeadingTrivia) ► (Whitespace): " " # (1..2) + - (leading_trivia꞉ Whitespace): " " # (1..2) - (unchecked_keyword꞉ UncheckedKeyword): "unchecked" # (2..11) - (block꞉ Block): # " { x = 1; }" (11..22) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (open_brace꞉ OpenBrace): "{" # (12..13) - (statements꞉ Statements): # " x = 1;" (13..20) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " x = 1;" (13..20) - (expression꞉ Expression) ► (variant꞉ AssignmentExpression): # " x = 1" (13..19) - (left_operand꞉ Expression): # " x" (13..15) - - (LeadingTrivia) ► (Whitespace): " " # (13..14) + - (leading_trivia꞉ Whitespace): " " # (13..14) - (variant꞉ Identifier): "x" # (14..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (operator꞉ Equal): "=" # (16..17) - (right_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (17..19) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (literal꞉ DecimalLiteral): "1" # (18..19) - (semicolon꞉ Semicolon): ";" # (19..20) - - (LeadingTrivia) ► (Whitespace): " " # (20..21) + - (leading_trivia꞉ Whitespace): " " # (20..21) - (close_brace꞉ CloseBrace): "}" # (21..22) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (close_brace꞉ CloseBrace): "}" # (23..24) diff --git a/crates/solidity/testing/snapshots/cst_output/BreakStatement/error_recovery/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/BreakStatement/error_recovery/generated/0.4.11-failure.yml index 21416d14d9..5012a022cd 100644 --- a/crates/solidity/testing/snapshots/cst_output/BreakStatement/error_recovery/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/BreakStatement/error_recovery/generated/0.4.11-failure.yml @@ -16,7 +16,7 @@ Errors: # 1 total Tree: - (BreakStatement): # "break invalid ;\n" (0..16) - (break_keyword꞉ BreakKeyword): "break" # (0..5) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (SKIPPED): "invalid " # (6..14) - (semicolon꞉ Semicolon): ";" # (14..15) - - (TrailingTrivia) ► (EndOfLine): "\n" # (15..16) + - (trailing_trivia꞉ EndOfLine): "\n" # (15..16) diff --git a/crates/solidity/testing/snapshots/cst_output/BreakStatement/valid/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/BreakStatement/valid/generated/0.4.11-success.yml index 2c5f2eab35..2a3eb5f488 100644 --- a/crates/solidity/testing/snapshots/cst_output/BreakStatement/valid/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/BreakStatement/valid/generated/0.4.11-success.yml @@ -8,6 +8,6 @@ Errors: [] Tree: - (BreakStatement): # "break ;\n" (0..8) - (break_keyword꞉ BreakKeyword): "break" # (0..5) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (semicolon꞉ Semicolon): ";" # (6..7) - - (TrailingTrivia) ► (EndOfLine): "\n" # (7..8) + - (trailing_trivia꞉ EndOfLine): "\n" # (7..8) diff --git a/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/identifier_base/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/identifier_base/generated/0.4.11-success.yml index 92e33b85da..151df9e260 100644 --- a/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/identifier_base/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/identifier_base/generated/0.4.11-success.yml @@ -8,13 +8,13 @@ Errors: [] Tree: - (ConditionalExpression): # "foo ? true : false" (0..18) - (operand꞉ Expression) ► (variant꞉ Identifier): "foo" # (0..3) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (question_mark꞉ QuestionMark): "?" # (4..5) - (true_expression꞉ Expression): # " true" (5..10) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (variant꞉ TrueKeyword): "true" # (6..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (colon꞉ Colon): ":" # (11..12) - (false_expression꞉ Expression): # " false" (12..18) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (variant꞉ FalseKeyword): "false" # (13..18) diff --git a/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/nested_base/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/nested_base/generated/0.4.11-success.yml index 1bcbd2a0c5..a6b0286a4c 100644 --- a/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/nested_base/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/nested_base/generated/0.4.11-success.yml @@ -12,19 +12,19 @@ Tree: - (items꞉ TupleValues): # "foo == bar" (1..11) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ EqualityExpression): # "foo == bar" (1..11) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "foo" # (1..4) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (operator꞉ EqualEqual): "==" # (5..7) - (right_operand꞉ Expression): # " bar" (7..11) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (variant꞉ Identifier): "bar" # (8..11) - (close_paren꞉ CloseParen): ")" # (11..12) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (question_mark꞉ QuestionMark): "?" # (13..14) - (true_expression꞉ Expression): # " true" (14..19) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (variant꞉ TrueKeyword): "true" # (15..19) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (colon꞉ Colon): ":" # (20..21) - (false_expression꞉ Expression): # " false" (21..27) - - (LeadingTrivia) ► (Whitespace): " " # (21..22) + - (leading_trivia꞉ Whitespace): " " # (21..22) - (variant꞉ FalseKeyword): "false" # (22..27) diff --git a/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/nested_conditions/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/nested_conditions/generated/0.4.11-success.yml index 1868bc4230..d7a7e209df 100644 --- a/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/nested_conditions/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/nested_conditions/generated/0.4.11-success.yml @@ -8,31 +8,31 @@ Errors: [] Tree: - (ConditionalExpression): # "foo ? (a + b) : (c + d)" (0..23) - (operand꞉ Expression) ► (variant꞉ Identifier): "foo" # (0..3) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (question_mark꞉ QuestionMark): "?" # (4..5) - (true_expression꞉ Expression) ► (variant꞉ TupleExpression): # " (a + b)" (5..13) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (open_paren꞉ OpenParen): "(" # (6..7) - (items꞉ TupleValues): # "a + b" (7..12) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ AdditiveExpression): # "a + b" (7..12) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (7..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (operator꞉ Plus): "+" # (9..10) - (right_operand꞉ Expression): # " b" (10..12) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (variant꞉ Identifier): "b" # (11..12) - (close_paren꞉ CloseParen): ")" # (12..13) - - (LeadingTrivia) ► (Whitespace): " " # (13..14) + - (leading_trivia꞉ Whitespace): " " # (13..14) - (colon꞉ Colon): ":" # (14..15) - (false_expression꞉ Expression) ► (variant꞉ TupleExpression): # " (c + d)" (15..23) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_paren꞉ OpenParen): "(" # (16..17) - (items꞉ TupleValues): # "c + d" (17..22) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ AdditiveExpression): # "c + d" (17..22) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "c" # (17..18) - - (LeadingTrivia) ► (Whitespace): " " # (18..19) + - (leading_trivia꞉ Whitespace): " " # (18..19) - (operator꞉ Plus): "+" # (19..20) - (right_operand꞉ Expression): # " d" (20..22) - - (LeadingTrivia) ► (Whitespace): " " # (20..21) + - (leading_trivia꞉ Whitespace): " " # (20..21) - (variant꞉ Identifier): "d" # (21..22) - (close_paren꞉ CloseParen): ")" # (22..23) diff --git a/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/recursive/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/recursive/generated/0.4.11-success.yml index 91275c8432..4f1f3d03b4 100644 --- a/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/recursive/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ConditionalExpression/recursive/generated/0.4.11-success.yml @@ -8,84 +8,84 @@ Errors: [] Tree: - (ConditionalExpression): # "foo ? a == b ? a + b * c : a + b * c + d : !bar ? ..." (0..63) - (operand꞉ Expression) ► (variant꞉ Identifier): "foo" # (0..3) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (question_mark꞉ QuestionMark): "?" # (4..5) - (true_expression꞉ Expression) ► (variant꞉ ConditionalExpression): # " a == b ? a + b * c : a + b * c + d" (5..40) - (operand꞉ Expression) ► (variant꞉ EqualityExpression): # " a == b" (5..12) - (left_operand꞉ Expression): # " a" (5..7) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (variant꞉ Identifier): "a" # (6..7) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (operator꞉ EqualEqual): "==" # (8..10) - (right_operand꞉ Expression): # " b" (10..12) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (variant꞉ Identifier): "b" # (11..12) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (question_mark꞉ QuestionMark): "?" # (13..14) - (true_expression꞉ Expression) ► (variant꞉ AdditiveExpression): # " a + b * c" (14..24) - (left_operand꞉ Expression): # " a" (14..16) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (variant꞉ Identifier): "a" # (15..16) - - (LeadingTrivia) ► (Whitespace): " " # (16..17) + - (leading_trivia꞉ Whitespace): " " # (16..17) - (operator꞉ Plus): "+" # (17..18) - (right_operand꞉ Expression) ► (variant꞉ MultiplicativeExpression): # " b * c" (18..24) - (left_operand꞉ Expression): # " b" (18..20) - - (LeadingTrivia) ► (Whitespace): " " # (18..19) + - (leading_trivia꞉ Whitespace): " " # (18..19) - (variant꞉ Identifier): "b" # (19..20) - - (LeadingTrivia) ► (Whitespace): " " # (20..21) + - (leading_trivia꞉ Whitespace): " " # (20..21) - (operator꞉ Asterisk): "*" # (21..22) - (right_operand꞉ Expression): # " c" (22..24) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (variant꞉ Identifier): "c" # (23..24) - - (LeadingTrivia) ► (Whitespace): " " # (24..25) + - (leading_trivia꞉ Whitespace): " " # (24..25) - (colon꞉ Colon): ":" # (25..26) - (false_expression꞉ Expression) ► (variant꞉ AdditiveExpression): # " a + b * c + d" (26..40) - (left_operand꞉ Expression) ► (variant꞉ AdditiveExpression): # " a + b * c" (26..36) - (left_operand꞉ Expression): # " a" (26..28) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (variant꞉ Identifier): "a" # (27..28) - - (LeadingTrivia) ► (Whitespace): " " # (28..29) + - (leading_trivia꞉ Whitespace): " " # (28..29) - (operator꞉ Plus): "+" # (29..30) - (right_operand꞉ Expression) ► (variant꞉ MultiplicativeExpression): # " b * c" (30..36) - (left_operand꞉ Expression): # " b" (30..32) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (variant꞉ Identifier): "b" # (31..32) - - (LeadingTrivia) ► (Whitespace): " " # (32..33) + - (leading_trivia꞉ Whitespace): " " # (32..33) - (operator꞉ Asterisk): "*" # (33..34) - (right_operand꞉ Expression): # " c" (34..36) - - (LeadingTrivia) ► (Whitespace): " " # (34..35) + - (leading_trivia꞉ Whitespace): " " # (34..35) - (variant꞉ Identifier): "c" # (35..36) - - (LeadingTrivia) ► (Whitespace): " " # (36..37) + - (leading_trivia꞉ Whitespace): " " # (36..37) - (operator꞉ Plus): "+" # (37..38) - (right_operand꞉ Expression): # " d" (38..40) - - (LeadingTrivia) ► (Whitespace): " " # (38..39) + - (leading_trivia꞉ Whitespace): " " # (38..39) - (variant꞉ Identifier): "d" # (39..40) - - (LeadingTrivia) ► (Whitespace): " " # (40..41) + - (leading_trivia꞉ Whitespace): " " # (40..41) - (colon꞉ Colon): ":" # (41..42) - (false_expression꞉ Expression) ► (variant꞉ ConditionalExpression): # " !bar ? e + f : g + h" (42..63) - (operand꞉ Expression) ► (variant꞉ PrefixExpression): # " !bar" (42..47) - - (LeadingTrivia) ► (Whitespace): " " # (42..43) + - (leading_trivia꞉ Whitespace): " " # (42..43) - (operator꞉ Bang): "!" # (43..44) - (operand꞉ Expression) ► (variant꞉ Identifier): "bar" # (44..47) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (question_mark꞉ QuestionMark): "?" # (48..49) - (true_expression꞉ Expression) ► (variant꞉ AdditiveExpression): # " e + f" (49..55) - (left_operand꞉ Expression): # " e" (49..51) - - (LeadingTrivia) ► (Whitespace): " " # (49..50) + - (leading_trivia꞉ Whitespace): " " # (49..50) - (variant꞉ Identifier): "e" # (50..51) - - (LeadingTrivia) ► (Whitespace): " " # (51..52) + - (leading_trivia꞉ Whitespace): " " # (51..52) - (operator꞉ Plus): "+" # (52..53) - (right_operand꞉ Expression): # " f" (53..55) - - (LeadingTrivia) ► (Whitespace): " " # (53..54) + - (leading_trivia꞉ Whitespace): " " # (53..54) - (variant꞉ Identifier): "f" # (54..55) - - (LeadingTrivia) ► (Whitespace): " " # (55..56) + - (leading_trivia꞉ Whitespace): " " # (55..56) - (colon꞉ Colon): ":" # (56..57) - (false_expression꞉ Expression) ► (variant꞉ AdditiveExpression): # " g + h" (57..63) - (left_operand꞉ Expression): # " g" (57..59) - - (LeadingTrivia) ► (Whitespace): " " # (57..58) + - (leading_trivia꞉ Whitespace): " " # (57..58) - (variant꞉ Identifier): "g" # (58..59) - - (LeadingTrivia) ► (Whitespace): " " # (59..60) + - (leading_trivia꞉ Whitespace): " " # (59..60) - (operator꞉ Plus): "+" # (60..61) - (right_operand꞉ Expression): # " h" (61..63) - - (LeadingTrivia) ► (Whitespace): " " # (61..62) + - (leading_trivia꞉ Whitespace): " " # (61..62) - (variant꞉ Identifier): "h" # (62..63) diff --git a/crates/solidity/testing/snapshots/cst_output/ConstantDefinition/int/generated/0.7.4-success.yml b/crates/solidity/testing/snapshots/cst_output/ConstantDefinition/int/generated/0.7.4-success.yml index be03069f61..604ec751ab 100644 --- a/crates/solidity/testing/snapshots/cst_output/ConstantDefinition/int/generated/0.7.4-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ConstantDefinition/int/generated/0.7.4-success.yml @@ -8,13 +8,13 @@ Errors: [] Tree: - (ConstantDefinition): # "int constant foo = 0;" (0..21) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ IntKeyword): "int" # (0..3) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (constant_keyword꞉ ConstantKeyword): "constant" # (4..12) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (name꞉ Identifier): "foo" # (13..16) - - (LeadingTrivia) ► (Whitespace): " " # (16..17) + - (leading_trivia꞉ Whitespace): " " # (16..17) - (equal꞉ Equal): "=" # (17..18) - (value꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 0" (18..20) - - (LeadingTrivia) ► (Whitespace): " " # (18..19) + - (leading_trivia꞉ Whitespace): " " # (18..19) - (literal꞉ DecimalLiteral): "0" # (19..20) - (semicolon꞉ Semicolon): ";" # (20..21) diff --git a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.4.22-success.yml b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.4.22-success.yml index 62a7e6c93d..fbe2379038 100644 --- a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.4.22-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.4.22-success.yml @@ -9,17 +9,17 @@ Tree: - (ConstructorDefinition): # "constructor () override {}\n" (0..27) - (constructor_keyword꞉ ConstructorKeyword): "constructor" # (0..11) - (parameters꞉ ParametersDeclaration): # " ()" (11..14) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (open_paren꞉ OpenParen): "(" # (12..13) - (parameters꞉ Parameters): [] # (13..13) - (close_paren꞉ CloseParen): ")" # (13..14) - (attributes꞉ ConstructorAttributes): # " override" (14..23) - (item꞉ ConstructorAttribute) ► (variant꞉ ModifierInvocation) ► (name꞉ IdentifierPath): # " override" (14..23) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (item꞉ Identifier): "override" # (15..23) - (body꞉ Block): # " {}\n" (23..27) - - (LeadingTrivia) ► (Whitespace): " " # (23..24) + - (leading_trivia꞉ Whitespace): " " # (23..24) - (open_brace꞉ OpenBrace): "{" # (24..25) - (statements꞉ Statements): [] # (25..25) - (close_brace꞉ CloseBrace): "}" # (25..26) - - (TrailingTrivia) ► (EndOfLine): "\n" # (26..27) + - (trailing_trivia꞉ EndOfLine): "\n" # (26..27) diff --git a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.5.0-failure.yml index cba728d6fb..3e55fe7740 100644 --- a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.5.0-failure.yml @@ -17,7 +17,7 @@ Tree: - (ConstructorDefinition): # "constructor () override {}\n" (0..27) - (constructor_keyword꞉ ConstructorKeyword): "constructor" # (0..11) - (parameters꞉ ParametersDeclaration): # " ()" (11..14) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (open_paren꞉ OpenParen): "(" # (12..13) - (parameters꞉ Parameters): [] # (13..13) - (close_paren꞉ CloseParen): ")" # (13..14) diff --git a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.6.0-success.yml b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.6.0-success.yml index 8ce4170409..fa2abefe15 100644 --- a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.6.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.6.0-success.yml @@ -9,17 +9,17 @@ Tree: - (ConstructorDefinition): # "constructor () override {}\n" (0..27) - (constructor_keyword꞉ ConstructorKeyword): "constructor" # (0..11) - (parameters꞉ ParametersDeclaration): # " ()" (11..14) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (open_paren꞉ OpenParen): "(" # (12..13) - (parameters꞉ Parameters): [] # (13..13) - (close_paren꞉ CloseParen): ")" # (13..14) - (attributes꞉ ConstructorAttributes): # " override" (14..23) - (item꞉ ConstructorAttribute): # " override" (14..23) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (variant꞉ OverrideKeyword): "override" # (15..23) - (body꞉ Block): # " {}\n" (23..27) - - (LeadingTrivia) ► (Whitespace): " " # (23..24) + - (leading_trivia꞉ Whitespace): " " # (23..24) - (open_brace꞉ OpenBrace): "{" # (24..25) - (statements꞉ Statements): [] # (25..25) - (close_brace꞉ CloseBrace): "}" # (25..26) - - (TrailingTrivia) ► (EndOfLine): "\n" # (26..27) + - (trailing_trivia꞉ EndOfLine): "\n" # (26..27) diff --git a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.6.7-failure.yml b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.6.7-failure.yml index cba728d6fb..3e55fe7740 100644 --- a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.6.7-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/override_attribute/generated/0.6.7-failure.yml @@ -17,7 +17,7 @@ Tree: - (ConstructorDefinition): # "constructor () override {}\n" (0..27) - (constructor_keyword꞉ ConstructorKeyword): "constructor" # (0..11) - (parameters꞉ ParametersDeclaration): # " ()" (11..14) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (open_paren꞉ OpenParen): "(" # (12..13) - (parameters꞉ Parameters): [] # (13..13) - (close_paren꞉ CloseParen): ")" # (13..14) diff --git a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/simple/generated/0.4.22-success.yml b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/simple/generated/0.4.22-success.yml index 3ff6cb4220..a91e43cbf9 100644 --- a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/simple/generated/0.4.22-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/simple/generated/0.4.22-success.yml @@ -9,13 +9,13 @@ Tree: - (ConstructorDefinition): # "constructor () {}" (0..17) - (constructor_keyword꞉ ConstructorKeyword): "constructor" # (0..11) - (parameters꞉ ParametersDeclaration): # " ()" (11..14) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (open_paren꞉ OpenParen): "(" # (12..13) - (parameters꞉ Parameters): [] # (13..13) - (close_paren꞉ CloseParen): ")" # (13..14) - (attributes꞉ ConstructorAttributes): [] # (14..14) - (body꞉ Block): # " {}" (14..17) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (open_brace꞉ OpenBrace): "{" # (15..16) - (statements꞉ Statements): [] # (16..16) - (close_brace꞉ CloseBrace): "}" # (16..17) diff --git a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/virtual_attribute/generated/0.4.22-success.yml b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/virtual_attribute/generated/0.4.22-success.yml index 59a8c5ec03..54424fe0cc 100644 --- a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/virtual_attribute/generated/0.4.22-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/virtual_attribute/generated/0.4.22-success.yml @@ -9,17 +9,17 @@ Tree: - (ConstructorDefinition): # "constructor () virtual {}\n" (0..26) - (constructor_keyword꞉ ConstructorKeyword): "constructor" # (0..11) - (parameters꞉ ParametersDeclaration): # " ()" (11..14) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (open_paren꞉ OpenParen): "(" # (12..13) - (parameters꞉ Parameters): [] # (13..13) - (close_paren꞉ CloseParen): ")" # (13..14) - (attributes꞉ ConstructorAttributes): # " virtual" (14..22) - (item꞉ ConstructorAttribute) ► (variant꞉ ModifierInvocation) ► (name꞉ IdentifierPath): # " virtual" (14..22) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (item꞉ Identifier): "virtual" # (15..22) - (body꞉ Block): # " {}\n" (22..26) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (open_brace꞉ OpenBrace): "{" # (23..24) - (statements꞉ Statements): [] # (24..24) - (close_brace꞉ CloseBrace): "}" # (24..25) - - (TrailingTrivia) ► (EndOfLine): "\n" # (25..26) + - (trailing_trivia꞉ EndOfLine): "\n" # (25..26) diff --git a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/virtual_attribute/generated/0.6.0-success.yml b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/virtual_attribute/generated/0.6.0-success.yml index 387f888ac1..2836c10fcc 100644 --- a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/virtual_attribute/generated/0.6.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/virtual_attribute/generated/0.6.0-success.yml @@ -9,17 +9,17 @@ Tree: - (ConstructorDefinition): # "constructor () virtual {}\n" (0..26) - (constructor_keyword꞉ ConstructorKeyword): "constructor" # (0..11) - (parameters꞉ ParametersDeclaration): # " ()" (11..14) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (open_paren꞉ OpenParen): "(" # (12..13) - (parameters꞉ Parameters): [] # (13..13) - (close_paren꞉ CloseParen): ")" # (13..14) - (attributes꞉ ConstructorAttributes): # " virtual" (14..22) - (item꞉ ConstructorAttribute): # " virtual" (14..22) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (variant꞉ VirtualKeyword): "virtual" # (15..22) - (body꞉ Block): # " {}\n" (22..26) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (open_brace꞉ OpenBrace): "{" # (23..24) - (statements꞉ Statements): [] # (24..24) - (close_brace꞉ CloseBrace): "}" # (24..25) - - (TrailingTrivia) ► (EndOfLine): "\n" # (25..26) + - (trailing_trivia꞉ EndOfLine): "\n" # (25..26) diff --git a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/virtual_attribute/generated/0.6.7-failure.yml b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/virtual_attribute/generated/0.6.7-failure.yml index 8b42908947..c4f88e6345 100644 --- a/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/virtual_attribute/generated/0.6.7-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ConstructorDefinition/virtual_attribute/generated/0.6.7-failure.yml @@ -17,7 +17,7 @@ Tree: - (ConstructorDefinition): # "constructor () virtual {}\n" (0..26) - (constructor_keyword꞉ ConstructorKeyword): "constructor" # (0..11) - (parameters꞉ ParametersDeclaration): # " ()" (11..14) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (open_paren꞉ OpenParen): "(" # (12..13) - (parameters꞉ Parameters): [] # (13..13) - (close_paren꞉ CloseParen): ")" # (13..14) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/abstract_contract/generated/0.6.0-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/abstract_contract/generated/0.6.0-success.yml index 0a6e13a9f0..b41df8b4db 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/abstract_contract/generated/0.6.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/abstract_contract/generated/0.6.0-success.yml @@ -8,12 +8,12 @@ Errors: [] Tree: - (ContractDefinition): # "abstract contract Sample {}\n" (0..28) - (abstract_keyword꞉ AbstractKeyword): "abstract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (contract_keyword꞉ ContractKeyword): "contract" # (9..17) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (name꞉ Identifier): "Sample" # (18..24) - - (LeadingTrivia) ► (Whitespace): " " # (24..25) + - (leading_trivia꞉ Whitespace): " " # (24..25) - (open_brace꞉ OpenBrace): "{" # (25..26) - (members꞉ ContractMembers): [] # (26..26) - (close_brace꞉ CloseBrace): "}" # (26..27) - - (TrailingTrivia) ► (EndOfLine): "\n" # (27..28) + - (trailing_trivia꞉ EndOfLine): "\n" # (27..28) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/constructor_contextual/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/constructor_contextual/generated/0.4.11-failure.yml index be80c55229..ae09fb1ecc 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/constructor_contextual/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/constructor_contextual/generated/0.4.11-failure.yml @@ -24,22 +24,21 @@ Errors: # 1 total Tree: - (ContractDefinition): # "// Constructors introduced in 0.4.22 but `construc..." (0..191) - - (LeadingTrivia): # "// Constructors introduced in 0.4.22 but `construc..." (0..93) - - (SingleLineComment): "// Constructors introduced in 0.4.22 but `construc..." # (0..91) - - (EndOfLine): "\n" # (91..92) - - (EndOfLine): "\n" # (92..93) + - (leading_trivia꞉ SingleLineComment): "// Constructors introduced in 0.4.22 but `construc..." # (0..91) + - (leading_trivia꞉ EndOfLine): "\n" # (91..92) + - (leading_trivia꞉ EndOfLine): "\n" # (92..93) - (contract_keyword꞉ ContractKeyword): "contract" # (93..101) - - (LeadingTrivia) ► (Whitespace): " " # (101..102) + - (leading_trivia꞉ Whitespace): " " # (101..102) - (name꞉ Identifier): "Contract" # (102..110) - - (LeadingTrivia) ► (Whitespace): " " # (110..111) + - (leading_trivia꞉ Whitespace): " " # (110..111) - (open_brace꞉ OpenBrace): "{" # (111..112) - - (TrailingTrivia) ► (EndOfLine): "\n" # (112..113) + - (trailing_trivia꞉ EndOfLine): "\n" # (112..113) - (members꞉ ContractMembers): # "\tconstructor" (113..125) - (item꞉ ContractMember) ► (variant꞉ StateVariableDefinition): # "\tconstructor" (113..125) - (type_name꞉ TypeName) ► (variant꞉ IdentifierPath): # "\tconstructor" (113..125) - - (LeadingTrivia) ► (Whitespace): "\t" # (113..114) + - (leading_trivia꞉ Whitespace): "\t" # (113..114) - (item꞉ Identifier): "constructor" # (114..125) - (attributes꞉ StateVariableAttributes): [] # (125..125) - (SKIPPED): "() {}\n function func() public {\n\t\tuint256 const..." # (125..189) - (close_brace꞉ CloseBrace): "}" # (189..190) - - (TrailingTrivia) ► (EndOfLine): "\n" # (190..191) + - (trailing_trivia꞉ EndOfLine): "\n" # (190..191) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/constructor_contextual/generated/0.4.22-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/constructor_contextual/generated/0.4.22-success.yml index 3d2881edcf..c14257b18d 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/constructor_contextual/generated/0.4.22-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/constructor_contextual/generated/0.4.22-success.yml @@ -14,19 +14,18 @@ Errors: [] Tree: - (ContractDefinition): # "// Constructors introduced in 0.4.22 but `construc..." (0..191) - - (LeadingTrivia): # "// Constructors introduced in 0.4.22 but `construc..." (0..93) - - (SingleLineComment): "// Constructors introduced in 0.4.22 but `construc..." # (0..91) - - (EndOfLine): "\n" # (91..92) - - (EndOfLine): "\n" # (92..93) + - (leading_trivia꞉ SingleLineComment): "// Constructors introduced in 0.4.22 but `construc..." # (0..91) + - (leading_trivia꞉ EndOfLine): "\n" # (91..92) + - (leading_trivia꞉ EndOfLine): "\n" # (92..93) - (contract_keyword꞉ ContractKeyword): "contract" # (93..101) - - (LeadingTrivia) ► (Whitespace): " " # (101..102) + - (leading_trivia꞉ Whitespace): " " # (101..102) - (name꞉ Identifier): "Contract" # (102..110) - - (LeadingTrivia) ► (Whitespace): " " # (110..111) + - (leading_trivia꞉ Whitespace): " " # (110..111) - (open_brace꞉ OpenBrace): "{" # (111..112) - - (TrailingTrivia) ► (EndOfLine): "\n" # (112..113) + - (trailing_trivia꞉ EndOfLine): "\n" # (112..113) - (members꞉ ContractMembers): # "\tconstructor() {}\n function func() public {\n\t\tu..." (113..189) - (item꞉ ContractMember) ► (variant꞉ ConstructorDefinition): # "\tconstructor() {}\n" (113..131) - - (LeadingTrivia) ► (Whitespace): "\t" # (113..114) + - (leading_trivia꞉ Whitespace): "\t" # (113..114) - (constructor_keyword꞉ ConstructorKeyword): "constructor" # (114..125) - (parameters꞉ ParametersDeclaration): # "()" (125..127) - (open_paren꞉ OpenParen): "(" # (125..126) @@ -34,16 +33,16 @@ Tree: - (close_paren꞉ CloseParen): ")" # (126..127) - (attributes꞉ ConstructorAttributes): [] # (127..127) - (body꞉ Block): # " {}\n" (127..131) - - (LeadingTrivia) ► (Whitespace): " " # (127..128) + - (leading_trivia꞉ Whitespace): " " # (127..128) - (open_brace꞉ OpenBrace): "{" # (128..129) - (statements꞉ Statements): [] # (129..129) - (close_brace꞉ CloseBrace): "}" # (129..130) - - (TrailingTrivia) ► (EndOfLine): "\n" # (130..131) + - (trailing_trivia꞉ EndOfLine): "\n" # (130..131) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function func() public {\n\t\tuint256 constructor..." (131..189) - - (LeadingTrivia) ► (Whitespace): " " # (131..135) + - (leading_trivia꞉ Whitespace): " " # (131..135) - (function_keyword꞉ FunctionKeyword): "function" # (135..143) - (name꞉ FunctionName): # " func" (143..148) - - (LeadingTrivia) ► (Whitespace): " " # (143..144) + - (leading_trivia꞉ Whitespace): " " # (143..144) - (variant꞉ Identifier): "func" # (144..148) - (parameters꞉ ParametersDeclaration): # "()" (148..150) - (open_paren꞉ OpenParen): "(" # (148..149) @@ -51,23 +50,23 @@ Tree: - (close_paren꞉ CloseParen): ")" # (149..150) - (attributes꞉ FunctionAttributes): # " public" (150..157) - (item꞉ FunctionAttribute): # " public" (150..157) - - (LeadingTrivia) ► (Whitespace): " " # (150..151) + - (leading_trivia꞉ Whitespace): " " # (150..151) - (variant꞉ PublicKeyword): "public" # (151..157) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\t\tuint256 constructor;\n }\n" (157..189) - - (LeadingTrivia) ► (Whitespace): " " # (157..158) + - (leading_trivia꞉ Whitespace): " " # (157..158) - (open_brace꞉ OpenBrace): "{" # (158..159) - - (TrailingTrivia) ► (EndOfLine): "\n" # (159..160) + - (trailing_trivia꞉ EndOfLine): "\n" # (159..160) - (statements꞉ Statements): # "\t\tuint256 constructor;\n" (160..183) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "\t\tuint256 constructor;\n" (160..183) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "\t\tuint256" (160..169) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (160..162) + - (leading_trivia꞉ Whitespace): "\t\t" # (160..162) - (variant꞉ UintKeyword): "uint256" # (162..169) - - (LeadingTrivia) ► (Whitespace): " " # (169..170) + - (leading_trivia꞉ Whitespace): " " # (169..170) - (name꞉ Identifier): "constructor" # (170..181) - (semicolon꞉ Semicolon): ";" # (181..182) - - (TrailingTrivia) ► (EndOfLine): "\n" # (182..183) - - (LeadingTrivia) ► (Whitespace): " " # (183..187) + - (trailing_trivia꞉ EndOfLine): "\n" # (182..183) + - (leading_trivia꞉ Whitespace): " " # (183..187) - (close_brace꞉ CloseBrace): "}" # (187..188) - - (TrailingTrivia) ► (EndOfLine): "\n" # (188..189) + - (trailing_trivia꞉ EndOfLine): "\n" # (188..189) - (close_brace꞉ CloseBrace): "}" # (189..190) - - (TrailingTrivia) ► (EndOfLine): "\n" # (190..191) + - (trailing_trivia꞉ EndOfLine): "\n" # (190..191) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/constructor_contextual/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/constructor_contextual/generated/0.5.0-failure.yml index a1ec7b46c0..aac617f7de 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/constructor_contextual/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/constructor_contextual/generated/0.5.0-failure.yml @@ -22,19 +22,18 @@ Errors: # 1 total Tree: - (ContractDefinition): # "// Constructors introduced in 0.4.22 but `construc..." (0..191) - - (LeadingTrivia): # "// Constructors introduced in 0.4.22 but `construc..." (0..93) - - (SingleLineComment): "// Constructors introduced in 0.4.22 but `construc..." # (0..91) - - (EndOfLine): "\n" # (91..92) - - (EndOfLine): "\n" # (92..93) + - (leading_trivia꞉ SingleLineComment): "// Constructors introduced in 0.4.22 but `construc..." # (0..91) + - (leading_trivia꞉ EndOfLine): "\n" # (91..92) + - (leading_trivia꞉ EndOfLine): "\n" # (92..93) - (contract_keyword꞉ ContractKeyword): "contract" # (93..101) - - (LeadingTrivia) ► (Whitespace): " " # (101..102) + - (leading_trivia꞉ Whitespace): " " # (101..102) - (name꞉ Identifier): "Contract" # (102..110) - - (LeadingTrivia) ► (Whitespace): " " # (110..111) + - (leading_trivia꞉ Whitespace): " " # (110..111) - (open_brace꞉ OpenBrace): "{" # (111..112) - - (TrailingTrivia) ► (EndOfLine): "\n" # (112..113) + - (trailing_trivia꞉ EndOfLine): "\n" # (112..113) - (members꞉ ContractMembers): # "\tconstructor() {}\n function func() public {\n\t\tu..." (113..189) - (item꞉ ContractMember) ► (variant꞉ ConstructorDefinition): # "\tconstructor() {}\n" (113..131) - - (LeadingTrivia) ► (Whitespace): "\t" # (113..114) + - (leading_trivia꞉ Whitespace): "\t" # (113..114) - (constructor_keyword꞉ ConstructorKeyword): "constructor" # (114..125) - (parameters꞉ ParametersDeclaration): # "()" (125..127) - (open_paren꞉ OpenParen): "(" # (125..126) @@ -42,16 +41,16 @@ Tree: - (close_paren꞉ CloseParen): ")" # (126..127) - (attributes꞉ ConstructorAttributes): [] # (127..127) - (body꞉ Block): # " {}\n" (127..131) - - (LeadingTrivia) ► (Whitespace): " " # (127..128) + - (leading_trivia꞉ Whitespace): " " # (127..128) - (open_brace꞉ OpenBrace): "{" # (128..129) - (statements꞉ Statements): [] # (129..129) - (close_brace꞉ CloseBrace): "}" # (129..130) - - (TrailingTrivia) ► (EndOfLine): "\n" # (130..131) + - (trailing_trivia꞉ EndOfLine): "\n" # (130..131) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function func() public {\n\t\tuint256 constructor..." (131..189) - - (LeadingTrivia) ► (Whitespace): " " # (131..135) + - (leading_trivia꞉ Whitespace): " " # (131..135) - (function_keyword꞉ FunctionKeyword): "function" # (135..143) - (name꞉ FunctionName): # " func" (143..148) - - (LeadingTrivia) ► (Whitespace): " " # (143..144) + - (leading_trivia꞉ Whitespace): " " # (143..144) - (variant꞉ Identifier): "func" # (144..148) - (parameters꞉ ParametersDeclaration): # "()" (148..150) - (open_paren꞉ OpenParen): "(" # (148..149) @@ -59,23 +58,23 @@ Tree: - (close_paren꞉ CloseParen): ")" # (149..150) - (attributes꞉ FunctionAttributes): # " public" (150..157) - (item꞉ FunctionAttribute): # " public" (150..157) - - (LeadingTrivia) ► (Whitespace): " " # (150..151) + - (leading_trivia꞉ Whitespace): " " # (150..151) - (variant꞉ PublicKeyword): "public" # (151..157) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\t\tuint256 constructor;\n }\n" (157..189) - - (LeadingTrivia) ► (Whitespace): " " # (157..158) + - (leading_trivia꞉ Whitespace): " " # (157..158) - (open_brace꞉ OpenBrace): "{" # (158..159) - - (TrailingTrivia) ► (EndOfLine): "\n" # (159..160) + - (trailing_trivia꞉ EndOfLine): "\n" # (159..160) - (statements꞉ Statements): # "\t\tuint256 constructor;\n" (160..183) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # "\t\tuint256 constructor;\n" (160..183) - (expression꞉ Expression) ► (variant꞉ ElementaryType): # "\t\tuint256" (160..169) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (160..162) + - (leading_trivia꞉ Whitespace): "\t\t" # (160..162) - (variant꞉ UintKeyword): "uint256" # (162..169) - - (LeadingTrivia) ► (Whitespace): " " # (169..170) + - (leading_trivia꞉ Whitespace): " " # (169..170) - (SKIPPED): "constructor" # (170..181) - (semicolon꞉ Semicolon): ";" # (181..182) - - (TrailingTrivia) ► (EndOfLine): "\n" # (182..183) - - (LeadingTrivia) ► (Whitespace): " " # (183..187) + - (trailing_trivia꞉ EndOfLine): "\n" # (182..183) + - (leading_trivia꞉ Whitespace): " " # (183..187) - (close_brace꞉ CloseBrace): "}" # (187..188) - - (TrailingTrivia) ► (EndOfLine): "\n" # (188..189) + - (trailing_trivia꞉ EndOfLine): "\n" # (188..189) - (close_brace꞉ CloseBrace): "}" # (189..190) - - (TrailingTrivia) ► (EndOfLine): "\n" # (190..191) + - (trailing_trivia꞉ EndOfLine): "\n" # (190..191) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/emit_contextual/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/emit_contextual/generated/0.4.11-failure.yml index 7aa5794348..2122726017 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/emit_contextual/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/emit_contextual/generated/0.4.11-failure.yml @@ -23,33 +23,32 @@ Errors: # 1 total Tree: - (ContractDefinition): # "// Emitting events introduced syntactically in 0.4..." (0..243) - - (LeadingTrivia): # "// Emitting events introduced syntactically in 0.4..." (0..103) - - (SingleLineComment): "// Emitting events introduced syntactically in 0.4..." # (0..101) - - (EndOfLine): "\n" # (101..102) - - (EndOfLine): "\n" # (102..103) + - (leading_trivia꞉ SingleLineComment): "// Emitting events introduced syntactically in 0.4..." # (0..101) + - (leading_trivia꞉ EndOfLine): "\n" # (101..102) + - (leading_trivia꞉ EndOfLine): "\n" # (102..103) - (contract_keyword꞉ ContractKeyword): "contract" # (103..111) - - (LeadingTrivia) ► (Whitespace): " " # (111..112) + - (leading_trivia꞉ Whitespace): " " # (111..112) - (name꞉ Identifier): "ClientReceipt" # (112..125) - - (LeadingTrivia) ► (Whitespace): " " # (125..126) + - (leading_trivia꞉ Whitespace): " " # (125..126) - (open_brace꞉ OpenBrace): "{" # (126..127) - - (TrailingTrivia) ► (EndOfLine): "\n" # (127..128) + - (trailing_trivia꞉ EndOfLine): "\n" # (127..128) - (members꞉ ContractMembers): # " event Deposit();\n function deposit() public..." (128..241) - (item꞉ ContractMember) ► (variant꞉ EventDefinition): # " event Deposit();\n" (128..149) - - (LeadingTrivia) ► (Whitespace): " " # (128..132) + - (leading_trivia꞉ Whitespace): " " # (128..132) - (event_keyword꞉ EventKeyword): "event" # (132..137) - - (LeadingTrivia) ► (Whitespace): " " # (137..138) + - (leading_trivia꞉ Whitespace): " " # (137..138) - (name꞉ Identifier): "Deposit" # (138..145) - (parameters꞉ EventParametersDeclaration): # "()" (145..147) - (open_paren꞉ OpenParen): "(" # (145..146) - (parameters꞉ EventParameters): [] # (146..146) - (close_paren꞉ CloseParen): ")" # (146..147) - (semicolon꞉ Semicolon): ";" # (147..148) - - (TrailingTrivia) ► (EndOfLine): "\n" # (148..149) + - (trailing_trivia꞉ EndOfLine): "\n" # (148..149) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function deposit() public payable {\n ui..." (149..241) - - (LeadingTrivia) ► (Whitespace): " " # (149..153) + - (leading_trivia꞉ Whitespace): " " # (149..153) - (function_keyword꞉ FunctionKeyword): "function" # (153..161) - (name꞉ FunctionName): # " deposit" (161..169) - - (LeadingTrivia) ► (Whitespace): " " # (161..162) + - (leading_trivia꞉ Whitespace): " " # (161..162) - (variant꞉ Identifier): "deposit" # (162..169) - (parameters꞉ ParametersDeclaration): # "()" (169..171) - (open_paren꞉ OpenParen): "(" # (169..170) @@ -57,35 +56,35 @@ Tree: - (close_paren꞉ CloseParen): ")" # (170..171) - (attributes꞉ FunctionAttributes): # " public payable" (171..186) - (item꞉ FunctionAttribute): # " public" (171..178) - - (LeadingTrivia) ► (Whitespace): " " # (171..172) + - (leading_trivia꞉ Whitespace): " " # (171..172) - (variant꞉ PublicKeyword): "public" # (172..178) - (item꞉ FunctionAttribute): # " payable" (178..186) - - (LeadingTrivia) ► (Whitespace): " " # (178..179) + - (leading_trivia꞉ Whitespace): " " # (178..179) - (variant꞉ PayableKeyword): "payable" # (179..186) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n uint256 emit;\n emit Deposit();\n ..." (186..241) - - (LeadingTrivia) ► (Whitespace): " " # (186..187) + - (leading_trivia꞉ Whitespace): " " # (186..187) - (open_brace꞉ OpenBrace): "{" # (187..188) - - (TrailingTrivia) ► (EndOfLine): "\n" # (188..189) + - (trailing_trivia꞉ EndOfLine): "\n" # (188..189) - (statements꞉ Statements): # " uint256 emit;\n emit Deposit();\n" (189..235) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " uint256 emit;\n" (189..211) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (189..204) - - (LeadingTrivia) ► (Whitespace): " " # (189..197) + - (leading_trivia꞉ Whitespace): " " # (189..197) - (variant꞉ UintKeyword): "uint256" # (197..204) - - (LeadingTrivia) ► (Whitespace): " " # (204..205) + - (leading_trivia꞉ Whitespace): " " # (204..205) - (name꞉ Identifier): "emit" # (205..209) - (semicolon꞉ Semicolon): ";" # (209..210) - - (TrailingTrivia) ► (EndOfLine): "\n" # (210..211) + - (trailing_trivia꞉ EndOfLine): "\n" # (210..211) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " emit Deposit();\n" (211..235) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ IdentifierPath): # " emit" (211..223) - - (LeadingTrivia) ► (Whitespace): " " # (211..219) + - (leading_trivia꞉ Whitespace): " " # (211..219) - (item꞉ Identifier): "emit" # (219..223) - - (LeadingTrivia) ► (Whitespace): " " # (223..224) + - (leading_trivia꞉ Whitespace): " " # (223..224) - (name꞉ Identifier): "Deposit" # (224..231) - (SKIPPED): "()" # (231..233) - (semicolon꞉ Semicolon): ";" # (233..234) - - (TrailingTrivia) ► (EndOfLine): "\n" # (234..235) - - (LeadingTrivia) ► (Whitespace): " " # (235..239) + - (trailing_trivia꞉ EndOfLine): "\n" # (234..235) + - (leading_trivia꞉ Whitespace): " " # (235..239) - (close_brace꞉ CloseBrace): "}" # (239..240) - - (TrailingTrivia) ► (EndOfLine): "\n" # (240..241) + - (trailing_trivia꞉ EndOfLine): "\n" # (240..241) - (close_brace꞉ CloseBrace): "}" # (241..242) - - (TrailingTrivia) ► (EndOfLine): "\n" # (242..243) + - (trailing_trivia꞉ EndOfLine): "\n" # (242..243) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/emit_contextual/generated/0.4.21-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/emit_contextual/generated/0.4.21-success.yml index 28c6f7ba65..3443733479 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/emit_contextual/generated/0.4.21-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/emit_contextual/generated/0.4.21-success.yml @@ -15,33 +15,32 @@ Errors: [] Tree: - (ContractDefinition): # "// Emitting events introduced syntactically in 0.4..." (0..243) - - (LeadingTrivia): # "// Emitting events introduced syntactically in 0.4..." (0..103) - - (SingleLineComment): "// Emitting events introduced syntactically in 0.4..." # (0..101) - - (EndOfLine): "\n" # (101..102) - - (EndOfLine): "\n" # (102..103) + - (leading_trivia꞉ SingleLineComment): "// Emitting events introduced syntactically in 0.4..." # (0..101) + - (leading_trivia꞉ EndOfLine): "\n" # (101..102) + - (leading_trivia꞉ EndOfLine): "\n" # (102..103) - (contract_keyword꞉ ContractKeyword): "contract" # (103..111) - - (LeadingTrivia) ► (Whitespace): " " # (111..112) + - (leading_trivia꞉ Whitespace): " " # (111..112) - (name꞉ Identifier): "ClientReceipt" # (112..125) - - (LeadingTrivia) ► (Whitespace): " " # (125..126) + - (leading_trivia꞉ Whitespace): " " # (125..126) - (open_brace꞉ OpenBrace): "{" # (126..127) - - (TrailingTrivia) ► (EndOfLine): "\n" # (127..128) + - (trailing_trivia꞉ EndOfLine): "\n" # (127..128) - (members꞉ ContractMembers): # " event Deposit();\n function deposit() public..." (128..241) - (item꞉ ContractMember) ► (variant꞉ EventDefinition): # " event Deposit();\n" (128..149) - - (LeadingTrivia) ► (Whitespace): " " # (128..132) + - (leading_trivia꞉ Whitespace): " " # (128..132) - (event_keyword꞉ EventKeyword): "event" # (132..137) - - (LeadingTrivia) ► (Whitespace): " " # (137..138) + - (leading_trivia꞉ Whitespace): " " # (137..138) - (name꞉ Identifier): "Deposit" # (138..145) - (parameters꞉ EventParametersDeclaration): # "()" (145..147) - (open_paren꞉ OpenParen): "(" # (145..146) - (parameters꞉ EventParameters): [] # (146..146) - (close_paren꞉ CloseParen): ")" # (146..147) - (semicolon꞉ Semicolon): ";" # (147..148) - - (TrailingTrivia) ► (EndOfLine): "\n" # (148..149) + - (trailing_trivia꞉ EndOfLine): "\n" # (148..149) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function deposit() public payable {\n ui..." (149..241) - - (LeadingTrivia) ► (Whitespace): " " # (149..153) + - (leading_trivia꞉ Whitespace): " " # (149..153) - (function_keyword꞉ FunctionKeyword): "function" # (153..161) - (name꞉ FunctionName): # " deposit" (161..169) - - (LeadingTrivia) ► (Whitespace): " " # (161..162) + - (leading_trivia꞉ Whitespace): " " # (161..162) - (variant꞉ Identifier): "deposit" # (162..169) - (parameters꞉ ParametersDeclaration): # "()" (169..171) - (open_paren꞉ OpenParen): "(" # (169..170) @@ -49,38 +48,38 @@ Tree: - (close_paren꞉ CloseParen): ")" # (170..171) - (attributes꞉ FunctionAttributes): # " public payable" (171..186) - (item꞉ FunctionAttribute): # " public" (171..178) - - (LeadingTrivia) ► (Whitespace): " " # (171..172) + - (leading_trivia꞉ Whitespace): " " # (171..172) - (variant꞉ PublicKeyword): "public" # (172..178) - (item꞉ FunctionAttribute): # " payable" (178..186) - - (LeadingTrivia) ► (Whitespace): " " # (178..179) + - (leading_trivia꞉ Whitespace): " " # (178..179) - (variant꞉ PayableKeyword): "payable" # (179..186) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n uint256 emit;\n emit Deposit();\n ..." (186..241) - - (LeadingTrivia) ► (Whitespace): " " # (186..187) + - (leading_trivia꞉ Whitespace): " " # (186..187) - (open_brace꞉ OpenBrace): "{" # (187..188) - - (TrailingTrivia) ► (EndOfLine): "\n" # (188..189) + - (trailing_trivia꞉ EndOfLine): "\n" # (188..189) - (statements꞉ Statements): # " uint256 emit;\n emit Deposit();\n" (189..235) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " uint256 emit;\n" (189..211) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (189..204) - - (LeadingTrivia) ► (Whitespace): " " # (189..197) + - (leading_trivia꞉ Whitespace): " " # (189..197) - (variant꞉ UintKeyword): "uint256" # (197..204) - - (LeadingTrivia) ► (Whitespace): " " # (204..205) + - (leading_trivia꞉ Whitespace): " " # (204..205) - (name꞉ Identifier): "emit" # (205..209) - (semicolon꞉ Semicolon): ";" # (209..210) - - (TrailingTrivia) ► (EndOfLine): "\n" # (210..211) + - (trailing_trivia꞉ EndOfLine): "\n" # (210..211) - (item꞉ Statement) ► (variant꞉ EmitStatement): # " emit Deposit();\n" (211..235) - - (LeadingTrivia) ► (Whitespace): " " # (211..219) + - (leading_trivia꞉ Whitespace): " " # (211..219) - (emit_keyword꞉ EmitKeyword): "emit" # (219..223) - (event꞉ IdentifierPath): # " Deposit" (223..231) - - (LeadingTrivia) ► (Whitespace): " " # (223..224) + - (leading_trivia꞉ Whitespace): " " # (223..224) - (item꞉ Identifier): "Deposit" # (224..231) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # "()" (231..233) - (open_paren꞉ OpenParen): "(" # (231..232) - (arguments꞉ PositionalArguments): [] # (232..232) - (close_paren꞉ CloseParen): ")" # (232..233) - (semicolon꞉ Semicolon): ";" # (233..234) - - (TrailingTrivia) ► (EndOfLine): "\n" # (234..235) - - (LeadingTrivia) ► (Whitespace): " " # (235..239) + - (trailing_trivia꞉ EndOfLine): "\n" # (234..235) + - (leading_trivia꞉ Whitespace): " " # (235..239) - (close_brace꞉ CloseBrace): "}" # (239..240) - - (TrailingTrivia) ► (EndOfLine): "\n" # (240..241) + - (trailing_trivia꞉ EndOfLine): "\n" # (240..241) - (close_brace꞉ CloseBrace): "}" # (241..242) - - (TrailingTrivia) ► (EndOfLine): "\n" # (242..243) + - (trailing_trivia꞉ EndOfLine): "\n" # (242..243) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/emit_contextual/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/emit_contextual/generated/0.5.0-failure.yml index 5f0ed37887..0a867f5e6b 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/emit_contextual/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/emit_contextual/generated/0.5.0-failure.yml @@ -23,33 +23,32 @@ Errors: # 1 total Tree: - (ContractDefinition): # "// Emitting events introduced syntactically in 0.4..." (0..243) - - (LeadingTrivia): # "// Emitting events introduced syntactically in 0.4..." (0..103) - - (SingleLineComment): "// Emitting events introduced syntactically in 0.4..." # (0..101) - - (EndOfLine): "\n" # (101..102) - - (EndOfLine): "\n" # (102..103) + - (leading_trivia꞉ SingleLineComment): "// Emitting events introduced syntactically in 0.4..." # (0..101) + - (leading_trivia꞉ EndOfLine): "\n" # (101..102) + - (leading_trivia꞉ EndOfLine): "\n" # (102..103) - (contract_keyword꞉ ContractKeyword): "contract" # (103..111) - - (LeadingTrivia) ► (Whitespace): " " # (111..112) + - (leading_trivia꞉ Whitespace): " " # (111..112) - (name꞉ Identifier): "ClientReceipt" # (112..125) - - (LeadingTrivia) ► (Whitespace): " " # (125..126) + - (leading_trivia꞉ Whitespace): " " # (125..126) - (open_brace꞉ OpenBrace): "{" # (126..127) - - (TrailingTrivia) ► (EndOfLine): "\n" # (127..128) + - (trailing_trivia꞉ EndOfLine): "\n" # (127..128) - (members꞉ ContractMembers): # " event Deposit();\n function deposit() public..." (128..241) - (item꞉ ContractMember) ► (variant꞉ EventDefinition): # " event Deposit();\n" (128..149) - - (LeadingTrivia) ► (Whitespace): " " # (128..132) + - (leading_trivia꞉ Whitespace): " " # (128..132) - (event_keyword꞉ EventKeyword): "event" # (132..137) - - (LeadingTrivia) ► (Whitespace): " " # (137..138) + - (leading_trivia꞉ Whitespace): " " # (137..138) - (name꞉ Identifier): "Deposit" # (138..145) - (parameters꞉ EventParametersDeclaration): # "()" (145..147) - (open_paren꞉ OpenParen): "(" # (145..146) - (parameters꞉ EventParameters): [] # (146..146) - (close_paren꞉ CloseParen): ")" # (146..147) - (semicolon꞉ Semicolon): ";" # (147..148) - - (TrailingTrivia) ► (EndOfLine): "\n" # (148..149) + - (trailing_trivia꞉ EndOfLine): "\n" # (148..149) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function deposit() public payable {\n ui..." (149..241) - - (LeadingTrivia) ► (Whitespace): " " # (149..153) + - (leading_trivia꞉ Whitespace): " " # (149..153) - (function_keyword꞉ FunctionKeyword): "function" # (153..161) - (name꞉ FunctionName): # " deposit" (161..169) - - (LeadingTrivia) ► (Whitespace): " " # (161..162) + - (leading_trivia꞉ Whitespace): " " # (161..162) - (variant꞉ Identifier): "deposit" # (162..169) - (parameters꞉ ParametersDeclaration): # "()" (169..171) - (open_paren꞉ OpenParen): "(" # (169..170) @@ -57,38 +56,38 @@ Tree: - (close_paren꞉ CloseParen): ")" # (170..171) - (attributes꞉ FunctionAttributes): # " public payable" (171..186) - (item꞉ FunctionAttribute): # " public" (171..178) - - (LeadingTrivia) ► (Whitespace): " " # (171..172) + - (leading_trivia꞉ Whitespace): " " # (171..172) - (variant꞉ PublicKeyword): "public" # (172..178) - (item꞉ FunctionAttribute): # " payable" (178..186) - - (LeadingTrivia) ► (Whitespace): " " # (178..179) + - (leading_trivia꞉ Whitespace): " " # (178..179) - (variant꞉ PayableKeyword): "payable" # (179..186) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n uint256 emit;\n emit Deposit();\n ..." (186..241) - - (LeadingTrivia) ► (Whitespace): " " # (186..187) + - (leading_trivia꞉ Whitespace): " " # (186..187) - (open_brace꞉ OpenBrace): "{" # (187..188) - - (TrailingTrivia) ► (EndOfLine): "\n" # (188..189) + - (trailing_trivia꞉ EndOfLine): "\n" # (188..189) - (statements꞉ Statements): # " uint256 emit;\n emit Deposit();\n" (189..235) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " uint256 emit;\n" (189..211) - (expression꞉ Expression) ► (variant꞉ ElementaryType): # " uint256" (189..204) - - (LeadingTrivia) ► (Whitespace): " " # (189..197) + - (leading_trivia꞉ Whitespace): " " # (189..197) - (variant꞉ UintKeyword): "uint256" # (197..204) - - (LeadingTrivia) ► (Whitespace): " " # (204..205) + - (leading_trivia꞉ Whitespace): " " # (204..205) - (SKIPPED): "emit" # (205..209) - (semicolon꞉ Semicolon): ";" # (209..210) - - (TrailingTrivia) ► (EndOfLine): "\n" # (210..211) + - (trailing_trivia꞉ EndOfLine): "\n" # (210..211) - (item꞉ Statement) ► (variant꞉ EmitStatement): # " emit Deposit();\n" (211..235) - - (LeadingTrivia) ► (Whitespace): " " # (211..219) + - (leading_trivia꞉ Whitespace): " " # (211..219) - (emit_keyword꞉ EmitKeyword): "emit" # (219..223) - (event꞉ IdentifierPath): # " Deposit" (223..231) - - (LeadingTrivia) ► (Whitespace): " " # (223..224) + - (leading_trivia꞉ Whitespace): " " # (223..224) - (item꞉ Identifier): "Deposit" # (224..231) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # "()" (231..233) - (open_paren꞉ OpenParen): "(" # (231..232) - (arguments꞉ PositionalArguments): [] # (232..232) - (close_paren꞉ CloseParen): ")" # (232..233) - (semicolon꞉ Semicolon): ";" # (233..234) - - (TrailingTrivia) ► (EndOfLine): "\n" # (234..235) - - (LeadingTrivia) ► (Whitespace): " " # (235..239) + - (trailing_trivia꞉ EndOfLine): "\n" # (234..235) + - (leading_trivia꞉ Whitespace): " " # (235..239) - (close_brace꞉ CloseBrace): "}" # (239..240) - - (TrailingTrivia) ► (EndOfLine): "\n" # (240..241) + - (trailing_trivia꞉ EndOfLine): "\n" # (240..241) - (close_brace꞉ CloseBrace): "}" # (241..242) - - (TrailingTrivia) ► (EndOfLine): "\n" # (242..243) + - (trailing_trivia꞉ EndOfLine): "\n" # (242..243) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/empty_contract/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/empty_contract/generated/0.4.11-success.yml index 3b1d4131af..1f937d6811 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/empty_contract/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/empty_contract/generated/0.4.11-success.yml @@ -8,10 +8,10 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample {}\n" (0..19) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - (members꞉ ContractMembers): [] # (17..17) - (close_brace꞉ CloseBrace): "}" # (17..18) - - (TrailingTrivia) ► (EndOfLine): "\n" # (18..19) + - (trailing_trivia꞉ EndOfLine): "\n" # (18..19) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.4.11-failure.yml index fc2a3e0a0e..e268041065 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.4.11-failure.yml @@ -23,21 +23,20 @@ Errors: # 1 total Tree: - (ContractDefinition): # "// SPDX-License-Identifier: MIT\ncontract ABC {\n f..." (0..352) - - (LeadingTrivia): # "// SPDX-License-Identifier: MIT\n" (0..32) - - (SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) - - (EndOfLine): "\n" # (31..32) + - (leading_trivia꞉ SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) + - (leading_trivia꞉ EndOfLine): "\n" # (31..32) - (contract_keyword꞉ ContractKeyword): "contract" # (32..40) - - (LeadingTrivia) ► (Whitespace): " " # (40..41) + - (leading_trivia꞉ Whitespace): " " # (40..41) - (name꞉ Identifier): "ABC" # (41..44) - - (LeadingTrivia) ► (Whitespace): " " # (44..45) + - (leading_trivia꞉ Whitespace): " " # (44..45) - (open_brace꞉ OpenBrace): "{" # (45..46) - - (TrailingTrivia) ► (EndOfLine): "\n" # (46..47) + - (trailing_trivia꞉ EndOfLine): "\n" # (46..47) - (members꞉ ContractMembers): # " function sendValue(address payable recipient, ui..." (47..350) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function sendValue(address payable recipient, ui..." (47..350) - - (LeadingTrivia) ► (Whitespace): " " # (47..49) + - (leading_trivia꞉ Whitespace): " " # (47..49) - (function_keyword꞉ FunctionKeyword): "function" # (49..57) - (name꞉ FunctionName): # " sendValue" (57..67) - - (LeadingTrivia) ► (Whitespace): " " # (57..58) + - (leading_trivia꞉ Whitespace): " " # (57..58) - (variant꞉ Identifier): "sendValue" # (58..67) - (parameters꞉ ParametersDeclaration): # "(address payable recipient, uint256 amount)" (67..110) - (open_paren꞉ OpenParen): "(" # (67..68) @@ -45,31 +44,31 @@ Tree: - (item꞉ Parameter): # "address payable recipient" (68..93) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType): # "address payable" (68..83) - (address_keyword꞉ AddressKeyword): "address" # (68..75) - - (LeadingTrivia) ► (Whitespace): " " # (75..76) + - (leading_trivia꞉ Whitespace): " " # (75..76) - (payable_keyword꞉ PayableKeyword): "payable" # (76..83) - - (LeadingTrivia) ► (Whitespace): " " # (83..84) + - (leading_trivia꞉ Whitespace): " " # (83..84) - (name꞉ Identifier): "recipient" # (84..93) - (separator꞉ Comma): "," # (93..94) - (item꞉ Parameter): # " uint256 amount" (94..109) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (94..102) - - (LeadingTrivia) ► (Whitespace): " " # (94..95) + - (leading_trivia꞉ Whitespace): " " # (94..95) - (variant꞉ UintKeyword): "uint256" # (95..102) - - (LeadingTrivia) ► (Whitespace): " " # (102..103) + - (leading_trivia꞉ Whitespace): " " # (102..103) - (name꞉ Identifier): "amount" # (103..109) - (close_paren꞉ CloseParen): ")" # (109..110) - (attributes꞉ FunctionAttributes): # " internal" (110..119) - (item꞉ FunctionAttribute): # " internal" (110..119) - - (LeadingTrivia) ► (Whitespace): " " # (110..111) + - (leading_trivia꞉ Whitespace): " " # (110..111) - (variant꞉ InternalKeyword): "internal" # (111..119) - (body꞉ FunctionBody) ► (variant꞉ Block): # ' {\n require(address(this).balance >= amount, "A...' (119..350) - - (LeadingTrivia) ► (Whitespace): " " # (119..120) + - (leading_trivia꞉ Whitespace): " " # (119..120) - (open_brace꞉ OpenBrace): "{" # (120..121) - - (TrailingTrivia) ► (EndOfLine): "\n" # (121..122) + - (trailing_trivia꞉ EndOfLine): "\n" # (121..122) - (statements꞉ Statements): # ' require(address(this).balance >= amount, "Addr...' (122..346) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # ' require(address(this).balance >= amount, "Addr...' (122..201) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # ' require(address(this).balance >= amount, "Addr...' (122..199) - (operand꞉ Expression): # " require" (122..133) - - (LeadingTrivia) ► (Whitespace): " " # (122..126) + - (leading_trivia꞉ Whitespace): " " # (122..126) - (variant꞉ Identifier): "require" # (126..133) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # '(address(this).balance >= amount, "Address: insuff...' (133..199) - (open_paren꞉ OpenParen): "(" # (133..134) @@ -85,47 +84,46 @@ Tree: - (close_paren꞉ CloseParen): ")" # (146..147) - (period꞉ Period): "." # (147..148) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "balance" # (148..155) - - (LeadingTrivia) ► (Whitespace): " " # (155..156) + - (leading_trivia꞉ Whitespace): " " # (155..156) - (operator꞉ GreaterThanEqual): ">=" # (156..158) - (right_operand꞉ Expression): # " amount" (158..165) - - (LeadingTrivia) ► (Whitespace): " " # (158..159) + - (leading_trivia꞉ Whitespace): " " # (158..159) - (variant꞉ Identifier): "amount" # (159..165) - (separator꞉ Comma): "," # (165..166) - (item꞉ Expression) ► (variant꞉ StringExpression) ► (variant꞉ StringLiteral): # ' "Address: insufficient balance"' (166..198) - - (LeadingTrivia) ► (Whitespace): " " # (166..167) + - (leading_trivia꞉ Whitespace): " " # (166..167) - (variant꞉ DoubleQuotedStringLiteral): '"Address: insufficient balance"' # (167..198) - (close_paren꞉ CloseParen): ")" # (198..199) - (semicolon꞉ Semicolon): ";" # (199..200) - - (TrailingTrivia) ► (EndOfLine): "\n" # (200..201) + - (trailing_trivia꞉ EndOfLine): "\n" # (200..201) - (item꞉ Statement) ► (variant꞉ TupleDeconstructionStatement): # "\n (bool success, ) = recipient.call{ value: amo..." (201..262) - - (LeadingTrivia): # "\n " (201..206) - - (EndOfLine): "\n" # (201..202) - - (Whitespace): " " # (202..206) + - (leading_trivia꞉ EndOfLine): "\n" # (201..202) + - (leading_trivia꞉ Whitespace): " " # (202..206) - (open_paren꞉ OpenParen): "(" # (206..207) - (elements꞉ TupleDeconstructionElements): # "bool success," (207..220) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ TypedTupleMember): # "bool success" (207..219) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ BoolKeyword): "bool" # (207..211) - - (LeadingTrivia) ► (Whitespace): " " # (211..212) + - (leading_trivia꞉ Whitespace): " " # (211..212) - (name꞉ Identifier): "success" # (212..219) - (separator꞉ Comma): "," # (219..220) - (item꞉ TupleDeconstructionElement): [] # (220..220) - - (LeadingTrivia) ► (Whitespace): " " # (220..221) + - (leading_trivia꞉ Whitespace): " " # (220..221) - (close_paren꞉ CloseParen): ")" # (221..222) - - (LeadingTrivia) ► (Whitespace): " " # (222..223) + - (leading_trivia꞉ Whitespace): " " # (222..223) - (equal꞉ Equal): "=" # (223..224) - (expression꞉ Expression) ► (variant꞉ MemberAccessExpression): # " recipient.call" (224..239) - (operand꞉ Expression): # " recipient" (224..234) - - (LeadingTrivia) ► (Whitespace): " " # (224..225) + - (leading_trivia꞉ Whitespace): " " # (224..225) - (variant꞉ Identifier): "recipient" # (225..234) - (period꞉ Period): "." # (234..235) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "call" # (235..239) - (SKIPPED): '{ value: amount }("")' # (239..260) - (semicolon꞉ Semicolon): ";" # (260..261) - - (TrailingTrivia) ► (EndOfLine): "\n" # (261..262) + - (trailing_trivia꞉ EndOfLine): "\n" # (261..262) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # ' require(success, "Address: unable to send valu...' (262..346) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # ' require(success, "Address: unable to send valu...' (262..344) - (operand꞉ Expression): # " require" (262..273) - - (LeadingTrivia) ► (Whitespace): " " # (262..266) + - (leading_trivia꞉ Whitespace): " " # (262..266) - (variant꞉ Identifier): "require" # (266..273) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # '(success, "Address: unable to send value, recipien...' (273..344) - (open_paren꞉ OpenParen): "(" # (273..274) @@ -133,13 +131,13 @@ Tree: - (item꞉ Expression) ► (variant꞉ Identifier): "success" # (274..281) - (separator꞉ Comma): "," # (281..282) - (item꞉ Expression) ► (variant꞉ StringExpression) ► (variant꞉ StringLiteral): # ' "Address: unable to send value, recipient may hav...' (282..343) - - (LeadingTrivia) ► (Whitespace): " " # (282..283) + - (leading_trivia꞉ Whitespace): " " # (282..283) - (variant꞉ DoubleQuotedStringLiteral): '"Address: unable to send value, recipient may have...' # (283..343) - (close_paren꞉ CloseParen): ")" # (343..344) - (semicolon꞉ Semicolon): ";" # (344..345) - - (TrailingTrivia) ► (EndOfLine): "\n" # (345..346) - - (LeadingTrivia) ► (Whitespace): " " # (346..348) + - (trailing_trivia꞉ EndOfLine): "\n" # (345..346) + - (leading_trivia꞉ Whitespace): " " # (346..348) - (close_brace꞉ CloseBrace): "}" # (348..349) - - (TrailingTrivia) ► (EndOfLine): "\n" # (349..350) + - (trailing_trivia꞉ EndOfLine): "\n" # (349..350) - (close_brace꞉ CloseBrace): "}" # (350..351) - - (TrailingTrivia) ► (EndOfLine): "\n" # (351..352) + - (trailing_trivia꞉ EndOfLine): "\n" # (351..352) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.5.14-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.5.14-failure.yml index 6f91cc6953..55fdb88fca 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.5.14-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.5.14-failure.yml @@ -23,21 +23,20 @@ Errors: # 1 total Tree: - (ContractDefinition): # "// SPDX-License-Identifier: MIT\ncontract ABC {\n f..." (0..352) - - (LeadingTrivia): # "// SPDX-License-Identifier: MIT\n" (0..32) - - (SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) - - (EndOfLine): "\n" # (31..32) + - (leading_trivia꞉ SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) + - (leading_trivia꞉ EndOfLine): "\n" # (31..32) - (contract_keyword꞉ ContractKeyword): "contract" # (32..40) - - (LeadingTrivia) ► (Whitespace): " " # (40..41) + - (leading_trivia꞉ Whitespace): " " # (40..41) - (name꞉ Identifier): "ABC" # (41..44) - - (LeadingTrivia) ► (Whitespace): " " # (44..45) + - (leading_trivia꞉ Whitespace): " " # (44..45) - (open_brace꞉ OpenBrace): "{" # (45..46) - - (TrailingTrivia) ► (EndOfLine): "\n" # (46..47) + - (trailing_trivia꞉ EndOfLine): "\n" # (46..47) - (members꞉ ContractMembers): # " function sendValue(address payable recipient, ui..." (47..350) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function sendValue(address payable recipient, ui..." (47..350) - - (LeadingTrivia) ► (Whitespace): " " # (47..49) + - (leading_trivia꞉ Whitespace): " " # (47..49) - (function_keyword꞉ FunctionKeyword): "function" # (49..57) - (name꞉ FunctionName): # " sendValue" (57..67) - - (LeadingTrivia) ► (Whitespace): " " # (57..58) + - (leading_trivia꞉ Whitespace): " " # (57..58) - (variant꞉ Identifier): "sendValue" # (58..67) - (parameters꞉ ParametersDeclaration): # "(address payable recipient, uint256 amount)" (67..110) - (open_paren꞉ OpenParen): "(" # (67..68) @@ -45,31 +44,31 @@ Tree: - (item꞉ Parameter): # "address payable recipient" (68..93) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType): # "address payable" (68..83) - (address_keyword꞉ AddressKeyword): "address" # (68..75) - - (LeadingTrivia) ► (Whitespace): " " # (75..76) + - (leading_trivia꞉ Whitespace): " " # (75..76) - (payable_keyword꞉ PayableKeyword): "payable" # (76..83) - - (LeadingTrivia) ► (Whitespace): " " # (83..84) + - (leading_trivia꞉ Whitespace): " " # (83..84) - (name꞉ Identifier): "recipient" # (84..93) - (separator꞉ Comma): "," # (93..94) - (item꞉ Parameter): # " uint256 amount" (94..109) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (94..102) - - (LeadingTrivia) ► (Whitespace): " " # (94..95) + - (leading_trivia꞉ Whitespace): " " # (94..95) - (variant꞉ UintKeyword): "uint256" # (95..102) - - (LeadingTrivia) ► (Whitespace): " " # (102..103) + - (leading_trivia꞉ Whitespace): " " # (102..103) - (name꞉ Identifier): "amount" # (103..109) - (close_paren꞉ CloseParen): ")" # (109..110) - (attributes꞉ FunctionAttributes): # " internal" (110..119) - (item꞉ FunctionAttribute): # " internal" (110..119) - - (LeadingTrivia) ► (Whitespace): " " # (110..111) + - (leading_trivia꞉ Whitespace): " " # (110..111) - (variant꞉ InternalKeyword): "internal" # (111..119) - (body꞉ FunctionBody) ► (variant꞉ Block): # ' {\n require(address(this).balance >= amount, "A...' (119..350) - - (LeadingTrivia) ► (Whitespace): " " # (119..120) + - (leading_trivia꞉ Whitespace): " " # (119..120) - (open_brace꞉ OpenBrace): "{" # (120..121) - - (TrailingTrivia) ► (EndOfLine): "\n" # (121..122) + - (trailing_trivia꞉ EndOfLine): "\n" # (121..122) - (statements꞉ Statements): # ' require(address(this).balance >= amount, "Addr...' (122..346) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # ' require(address(this).balance >= amount, "Addr...' (122..201) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # ' require(address(this).balance >= amount, "Addr...' (122..199) - (operand꞉ Expression): # " require" (122..133) - - (LeadingTrivia) ► (Whitespace): " " # (122..126) + - (leading_trivia꞉ Whitespace): " " # (122..126) - (variant꞉ Identifier): "require" # (126..133) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # '(address(this).balance >= amount, "Address: insuff...' (133..199) - (open_paren꞉ OpenParen): "(" # (133..134) @@ -85,48 +84,47 @@ Tree: - (close_paren꞉ CloseParen): ")" # (146..147) - (period꞉ Period): "." # (147..148) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "balance" # (148..155) - - (LeadingTrivia) ► (Whitespace): " " # (155..156) + - (leading_trivia꞉ Whitespace): " " # (155..156) - (operator꞉ GreaterThanEqual): ">=" # (156..158) - (right_operand꞉ Expression): # " amount" (158..165) - - (LeadingTrivia) ► (Whitespace): " " # (158..159) + - (leading_trivia꞉ Whitespace): " " # (158..159) - (variant꞉ Identifier): "amount" # (159..165) - (separator꞉ Comma): "," # (165..166) - (item꞉ Expression) ► (variant꞉ StringExpression) ► (variant꞉ StringLiterals): # ' "Address: insufficient balance"' (166..198) - (item꞉ StringLiteral): # ' "Address: insufficient balance"' (166..198) - - (LeadingTrivia) ► (Whitespace): " " # (166..167) + - (leading_trivia꞉ Whitespace): " " # (166..167) - (variant꞉ DoubleQuotedStringLiteral): '"Address: insufficient balance"' # (167..198) - (close_paren꞉ CloseParen): ")" # (198..199) - (semicolon꞉ Semicolon): ";" # (199..200) - - (TrailingTrivia) ► (EndOfLine): "\n" # (200..201) + - (trailing_trivia꞉ EndOfLine): "\n" # (200..201) - (item꞉ Statement) ► (variant꞉ TupleDeconstructionStatement): # "\n (bool success, ) = recipient.call{ value: amo..." (201..262) - - (LeadingTrivia): # "\n " (201..206) - - (EndOfLine): "\n" # (201..202) - - (Whitespace): " " # (202..206) + - (leading_trivia꞉ EndOfLine): "\n" # (201..202) + - (leading_trivia꞉ Whitespace): " " # (202..206) - (open_paren꞉ OpenParen): "(" # (206..207) - (elements꞉ TupleDeconstructionElements): # "bool success," (207..220) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ TypedTupleMember): # "bool success" (207..219) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ BoolKeyword): "bool" # (207..211) - - (LeadingTrivia) ► (Whitespace): " " # (211..212) + - (leading_trivia꞉ Whitespace): " " # (211..212) - (name꞉ Identifier): "success" # (212..219) - (separator꞉ Comma): "," # (219..220) - (item꞉ TupleDeconstructionElement): [] # (220..220) - - (LeadingTrivia) ► (Whitespace): " " # (220..221) + - (leading_trivia꞉ Whitespace): " " # (220..221) - (close_paren꞉ CloseParen): ")" # (221..222) - - (LeadingTrivia) ► (Whitespace): " " # (222..223) + - (leading_trivia꞉ Whitespace): " " # (222..223) - (equal꞉ Equal): "=" # (223..224) - (expression꞉ Expression) ► (variant꞉ MemberAccessExpression): # " recipient.call" (224..239) - (operand꞉ Expression): # " recipient" (224..234) - - (LeadingTrivia) ► (Whitespace): " " # (224..225) + - (leading_trivia꞉ Whitespace): " " # (224..225) - (variant꞉ Identifier): "recipient" # (225..234) - (period꞉ Period): "." # (234..235) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "call" # (235..239) - (SKIPPED): '{ value: amount }("")' # (239..260) - (semicolon꞉ Semicolon): ";" # (260..261) - - (TrailingTrivia) ► (EndOfLine): "\n" # (261..262) + - (trailing_trivia꞉ EndOfLine): "\n" # (261..262) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # ' require(success, "Address: unable to send valu...' (262..346) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # ' require(success, "Address: unable to send valu...' (262..344) - (operand꞉ Expression): # " require" (262..273) - - (LeadingTrivia) ► (Whitespace): " " # (262..266) + - (leading_trivia꞉ Whitespace): " " # (262..266) - (variant꞉ Identifier): "require" # (266..273) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # '(success, "Address: unable to send value, recipien...' (273..344) - (open_paren꞉ OpenParen): "(" # (273..274) @@ -135,13 +133,13 @@ Tree: - (separator꞉ Comma): "," # (281..282) - (item꞉ Expression) ► (variant꞉ StringExpression) ► (variant꞉ StringLiterals): # ' "Address: unable to send value, recipient may hav...' (282..343) - (item꞉ StringLiteral): # ' "Address: unable to send value, recipient may hav...' (282..343) - - (LeadingTrivia) ► (Whitespace): " " # (282..283) + - (leading_trivia꞉ Whitespace): " " # (282..283) - (variant꞉ DoubleQuotedStringLiteral): '"Address: unable to send value, recipient may have...' # (283..343) - (close_paren꞉ CloseParen): ")" # (343..344) - (semicolon꞉ Semicolon): ";" # (344..345) - - (TrailingTrivia) ► (EndOfLine): "\n" # (345..346) - - (LeadingTrivia) ► (Whitespace): " " # (346..348) + - (trailing_trivia꞉ EndOfLine): "\n" # (345..346) + - (leading_trivia꞉ Whitespace): " " # (346..348) - (close_brace꞉ CloseBrace): "}" # (348..349) - - (TrailingTrivia) ► (EndOfLine): "\n" # (349..350) + - (trailing_trivia꞉ EndOfLine): "\n" # (349..350) - (close_brace꞉ CloseBrace): "}" # (350..351) - - (TrailingTrivia) ► (EndOfLine): "\n" # (351..352) + - (trailing_trivia꞉ EndOfLine): "\n" # (351..352) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.6.2-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.6.2-success.yml index 5d173558e3..1a1e50058d 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.6.2-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.6.2-success.yml @@ -15,21 +15,20 @@ Errors: [] Tree: - (ContractDefinition): # "// SPDX-License-Identifier: MIT\ncontract ABC {\n f..." (0..352) - - (LeadingTrivia): # "// SPDX-License-Identifier: MIT\n" (0..32) - - (SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) - - (EndOfLine): "\n" # (31..32) + - (leading_trivia꞉ SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) + - (leading_trivia꞉ EndOfLine): "\n" # (31..32) - (contract_keyword꞉ ContractKeyword): "contract" # (32..40) - - (LeadingTrivia) ► (Whitespace): " " # (40..41) + - (leading_trivia꞉ Whitespace): " " # (40..41) - (name꞉ Identifier): "ABC" # (41..44) - - (LeadingTrivia) ► (Whitespace): " " # (44..45) + - (leading_trivia꞉ Whitespace): " " # (44..45) - (open_brace꞉ OpenBrace): "{" # (45..46) - - (TrailingTrivia) ► (EndOfLine): "\n" # (46..47) + - (trailing_trivia꞉ EndOfLine): "\n" # (46..47) - (members꞉ ContractMembers): # " function sendValue(address payable recipient, ui..." (47..350) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function sendValue(address payable recipient, ui..." (47..350) - - (LeadingTrivia) ► (Whitespace): " " # (47..49) + - (leading_trivia꞉ Whitespace): " " # (47..49) - (function_keyword꞉ FunctionKeyword): "function" # (49..57) - (name꞉ FunctionName): # " sendValue" (57..67) - - (LeadingTrivia) ► (Whitespace): " " # (57..58) + - (leading_trivia꞉ Whitespace): " " # (57..58) - (variant꞉ Identifier): "sendValue" # (58..67) - (parameters꞉ ParametersDeclaration): # "(address payable recipient, uint256 amount)" (67..110) - (open_paren꞉ OpenParen): "(" # (67..68) @@ -37,31 +36,31 @@ Tree: - (item꞉ Parameter): # "address payable recipient" (68..93) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType): # "address payable" (68..83) - (address_keyword꞉ AddressKeyword): "address" # (68..75) - - (LeadingTrivia) ► (Whitespace): " " # (75..76) + - (leading_trivia꞉ Whitespace): " " # (75..76) - (payable_keyword꞉ PayableKeyword): "payable" # (76..83) - - (LeadingTrivia) ► (Whitespace): " " # (83..84) + - (leading_trivia꞉ Whitespace): " " # (83..84) - (name꞉ Identifier): "recipient" # (84..93) - (separator꞉ Comma): "," # (93..94) - (item꞉ Parameter): # " uint256 amount" (94..109) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (94..102) - - (LeadingTrivia) ► (Whitespace): " " # (94..95) + - (leading_trivia꞉ Whitespace): " " # (94..95) - (variant꞉ UintKeyword): "uint256" # (95..102) - - (LeadingTrivia) ► (Whitespace): " " # (102..103) + - (leading_trivia꞉ Whitespace): " " # (102..103) - (name꞉ Identifier): "amount" # (103..109) - (close_paren꞉ CloseParen): ")" # (109..110) - (attributes꞉ FunctionAttributes): # " internal" (110..119) - (item꞉ FunctionAttribute): # " internal" (110..119) - - (LeadingTrivia) ► (Whitespace): " " # (110..111) + - (leading_trivia꞉ Whitespace): " " # (110..111) - (variant꞉ InternalKeyword): "internal" # (111..119) - (body꞉ FunctionBody) ► (variant꞉ Block): # ' {\n require(address(this).balance >= amount, "A...' (119..350) - - (LeadingTrivia) ► (Whitespace): " " # (119..120) + - (leading_trivia꞉ Whitespace): " " # (119..120) - (open_brace꞉ OpenBrace): "{" # (120..121) - - (TrailingTrivia) ► (EndOfLine): "\n" # (121..122) + - (trailing_trivia꞉ EndOfLine): "\n" # (121..122) - (statements꞉ Statements): # ' require(address(this).balance >= amount, "Addr...' (122..346) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # ' require(address(this).balance >= amount, "Addr...' (122..201) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # ' require(address(this).balance >= amount, "Addr...' (122..199) - (operand꞉ Expression): # " require" (122..133) - - (LeadingTrivia) ► (Whitespace): " " # (122..126) + - (leading_trivia꞉ Whitespace): " " # (122..126) - (variant꞉ Identifier): "require" # (126..133) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # '(address(this).balance >= amount, "Address: insuff...' (133..199) - (open_paren꞉ OpenParen): "(" # (133..134) @@ -77,39 +76,38 @@ Tree: - (close_paren꞉ CloseParen): ")" # (146..147) - (period꞉ Period): "." # (147..148) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "balance" # (148..155) - - (LeadingTrivia) ► (Whitespace): " " # (155..156) + - (leading_trivia꞉ Whitespace): " " # (155..156) - (operator꞉ GreaterThanEqual): ">=" # (156..158) - (right_operand꞉ Expression): # " amount" (158..165) - - (LeadingTrivia) ► (Whitespace): " " # (158..159) + - (leading_trivia꞉ Whitespace): " " # (158..159) - (variant꞉ Identifier): "amount" # (159..165) - (separator꞉ Comma): "," # (165..166) - (item꞉ Expression) ► (variant꞉ StringExpression) ► (variant꞉ StringLiterals): # ' "Address: insufficient balance"' (166..198) - (item꞉ StringLiteral): # ' "Address: insufficient balance"' (166..198) - - (LeadingTrivia) ► (Whitespace): " " # (166..167) + - (leading_trivia꞉ Whitespace): " " # (166..167) - (variant꞉ DoubleQuotedStringLiteral): '"Address: insufficient balance"' # (167..198) - (close_paren꞉ CloseParen): ")" # (198..199) - (semicolon꞉ Semicolon): ";" # (199..200) - - (TrailingTrivia) ► (EndOfLine): "\n" # (200..201) + - (trailing_trivia꞉ EndOfLine): "\n" # (200..201) - (item꞉ Statement) ► (variant꞉ TupleDeconstructionStatement): # "\n (bool success, ) = recipient.call{ value: amo..." (201..262) - - (LeadingTrivia): # "\n " (201..206) - - (EndOfLine): "\n" # (201..202) - - (Whitespace): " " # (202..206) + - (leading_trivia꞉ EndOfLine): "\n" # (201..202) + - (leading_trivia꞉ Whitespace): " " # (202..206) - (open_paren꞉ OpenParen): "(" # (206..207) - (elements꞉ TupleDeconstructionElements): # "bool success," (207..220) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ TypedTupleMember): # "bool success" (207..219) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ BoolKeyword): "bool" # (207..211) - - (LeadingTrivia) ► (Whitespace): " " # (211..212) + - (leading_trivia꞉ Whitespace): " " # (211..212) - (name꞉ Identifier): "success" # (212..219) - (separator꞉ Comma): "," # (219..220) - (item꞉ TupleDeconstructionElement): [] # (220..220) - - (LeadingTrivia) ► (Whitespace): " " # (220..221) + - (leading_trivia꞉ Whitespace): " " # (220..221) - (close_paren꞉ CloseParen): ")" # (221..222) - - (LeadingTrivia) ► (Whitespace): " " # (222..223) + - (leading_trivia꞉ Whitespace): " " # (222..223) - (equal꞉ Equal): "=" # (223..224) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # ' recipient.call{ value: amount }("")' (224..260) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " recipient.call" (224..239) - (operand꞉ Expression): # " recipient" (224..234) - - (LeadingTrivia) ► (Whitespace): " " # (224..225) + - (leading_trivia꞉ Whitespace): " " # (224..225) - (variant꞉ Identifier): "recipient" # (225..234) - (period꞉ Period): "." # (234..235) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "call" # (235..239) @@ -118,13 +116,13 @@ Tree: - (open_brace꞉ OpenBrace): "{" # (239..240) - (arguments꞉ NamedArguments): # " value: amount" (240..254) - (item꞉ NamedArgument): # " value: amount" (240..254) - - (LeadingTrivia) ► (Whitespace): " " # (240..241) + - (leading_trivia꞉ Whitespace): " " # (240..241) - (name꞉ Identifier): "value" # (241..246) - (colon꞉ Colon): ":" # (246..247) - (value꞉ Expression): # " amount" (247..254) - - (LeadingTrivia) ► (Whitespace): " " # (247..248) + - (leading_trivia꞉ Whitespace): " " # (247..248) - (variant꞉ Identifier): "amount" # (248..254) - - (LeadingTrivia) ► (Whitespace): " " # (254..255) + - (leading_trivia꞉ Whitespace): " " # (254..255) - (close_brace꞉ CloseBrace): "}" # (255..256) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # '("")' (256..260) - (open_paren꞉ OpenParen): "(" # (256..257) @@ -133,11 +131,11 @@ Tree: - (item꞉ StringLiteral) ► (variant꞉ DoubleQuotedStringLiteral): '""' # (257..259) - (close_paren꞉ CloseParen): ")" # (259..260) - (semicolon꞉ Semicolon): ";" # (260..261) - - (TrailingTrivia) ► (EndOfLine): "\n" # (261..262) + - (trailing_trivia꞉ EndOfLine): "\n" # (261..262) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # ' require(success, "Address: unable to send valu...' (262..346) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # ' require(success, "Address: unable to send valu...' (262..344) - (operand꞉ Expression): # " require" (262..273) - - (LeadingTrivia) ► (Whitespace): " " # (262..266) + - (leading_trivia꞉ Whitespace): " " # (262..266) - (variant꞉ Identifier): "require" # (266..273) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # '(success, "Address: unable to send value, recipien...' (273..344) - (open_paren꞉ OpenParen): "(" # (273..274) @@ -146,13 +144,13 @@ Tree: - (separator꞉ Comma): "," # (281..282) - (item꞉ Expression) ► (variant꞉ StringExpression) ► (variant꞉ StringLiterals): # ' "Address: unable to send value, recipient may hav...' (282..343) - (item꞉ StringLiteral): # ' "Address: unable to send value, recipient may hav...' (282..343) - - (LeadingTrivia) ► (Whitespace): " " # (282..283) + - (leading_trivia꞉ Whitespace): " " # (282..283) - (variant꞉ DoubleQuotedStringLiteral): '"Address: unable to send value, recipient may have...' # (283..343) - (close_paren꞉ CloseParen): ")" # (343..344) - (semicolon꞉ Semicolon): ";" # (344..345) - - (TrailingTrivia) ► (EndOfLine): "\n" # (345..346) - - (LeadingTrivia) ► (Whitespace): " " # (346..348) + - (trailing_trivia꞉ EndOfLine): "\n" # (345..346) + - (leading_trivia꞉ Whitespace): " " # (346..348) - (close_brace꞉ CloseBrace): "}" # (348..349) - - (TrailingTrivia) ► (EndOfLine): "\n" # (349..350) + - (trailing_trivia꞉ EndOfLine): "\n" # (349..350) - (close_brace꞉ CloseBrace): "}" # (350..351) - - (TrailingTrivia) ► (EndOfLine): "\n" # (351..352) + - (trailing_trivia꞉ EndOfLine): "\n" # (351..352) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.8.0-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.8.0-success.yml index 1ea944c796..2cdfca46d0 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.8.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.8.0-success.yml @@ -15,21 +15,20 @@ Errors: [] Tree: - (ContractDefinition): # "// SPDX-License-Identifier: MIT\ncontract ABC {\n f..." (0..352) - - (LeadingTrivia): # "// SPDX-License-Identifier: MIT\n" (0..32) - - (SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) - - (EndOfLine): "\n" # (31..32) + - (leading_trivia꞉ SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) + - (leading_trivia꞉ EndOfLine): "\n" # (31..32) - (contract_keyword꞉ ContractKeyword): "contract" # (32..40) - - (LeadingTrivia) ► (Whitespace): " " # (40..41) + - (leading_trivia꞉ Whitespace): " " # (40..41) - (name꞉ Identifier): "ABC" # (41..44) - - (LeadingTrivia) ► (Whitespace): " " # (44..45) + - (leading_trivia꞉ Whitespace): " " # (44..45) - (open_brace꞉ OpenBrace): "{" # (45..46) - - (TrailingTrivia) ► (EndOfLine): "\n" # (46..47) + - (trailing_trivia꞉ EndOfLine): "\n" # (46..47) - (members꞉ ContractMembers): # " function sendValue(address payable recipient, ui..." (47..350) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function sendValue(address payable recipient, ui..." (47..350) - - (LeadingTrivia) ► (Whitespace): " " # (47..49) + - (leading_trivia꞉ Whitespace): " " # (47..49) - (function_keyword꞉ FunctionKeyword): "function" # (49..57) - (name꞉ FunctionName): # " sendValue" (57..67) - - (LeadingTrivia) ► (Whitespace): " " # (57..58) + - (leading_trivia꞉ Whitespace): " " # (57..58) - (variant꞉ Identifier): "sendValue" # (58..67) - (parameters꞉ ParametersDeclaration): # "(address payable recipient, uint256 amount)" (67..110) - (open_paren꞉ OpenParen): "(" # (67..68) @@ -37,31 +36,31 @@ Tree: - (item꞉ Parameter): # "address payable recipient" (68..93) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType): # "address payable" (68..83) - (address_keyword꞉ AddressKeyword): "address" # (68..75) - - (LeadingTrivia) ► (Whitespace): " " # (75..76) + - (leading_trivia꞉ Whitespace): " " # (75..76) - (payable_keyword꞉ PayableKeyword): "payable" # (76..83) - - (LeadingTrivia) ► (Whitespace): " " # (83..84) + - (leading_trivia꞉ Whitespace): " " # (83..84) - (name꞉ Identifier): "recipient" # (84..93) - (separator꞉ Comma): "," # (93..94) - (item꞉ Parameter): # " uint256 amount" (94..109) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (94..102) - - (LeadingTrivia) ► (Whitespace): " " # (94..95) + - (leading_trivia꞉ Whitespace): " " # (94..95) - (variant꞉ UintKeyword): "uint256" # (95..102) - - (LeadingTrivia) ► (Whitespace): " " # (102..103) + - (leading_trivia꞉ Whitespace): " " # (102..103) - (name꞉ Identifier): "amount" # (103..109) - (close_paren꞉ CloseParen): ")" # (109..110) - (attributes꞉ FunctionAttributes): # " internal" (110..119) - (item꞉ FunctionAttribute): # " internal" (110..119) - - (LeadingTrivia) ► (Whitespace): " " # (110..111) + - (leading_trivia꞉ Whitespace): " " # (110..111) - (variant꞉ InternalKeyword): "internal" # (111..119) - (body꞉ FunctionBody) ► (variant꞉ Block): # ' {\n require(address(this).balance >= amount, "A...' (119..350) - - (LeadingTrivia) ► (Whitespace): " " # (119..120) + - (leading_trivia꞉ Whitespace): " " # (119..120) - (open_brace꞉ OpenBrace): "{" # (120..121) - - (TrailingTrivia) ► (EndOfLine): "\n" # (121..122) + - (trailing_trivia꞉ EndOfLine): "\n" # (121..122) - (statements꞉ Statements): # ' require(address(this).balance >= amount, "Addr...' (122..346) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # ' require(address(this).balance >= amount, "Addr...' (122..201) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # ' require(address(this).balance >= amount, "Addr...' (122..199) - (operand꞉ Expression): # " require" (122..133) - - (LeadingTrivia) ► (Whitespace): " " # (122..126) + - (leading_trivia꞉ Whitespace): " " # (122..126) - (variant꞉ Identifier): "require" # (126..133) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # '(address(this).balance >= amount, "Address: insuff...' (133..199) - (open_paren꞉ OpenParen): "(" # (133..134) @@ -77,39 +76,38 @@ Tree: - (close_paren꞉ CloseParen): ")" # (146..147) - (period꞉ Period): "." # (147..148) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "balance" # (148..155) - - (LeadingTrivia) ► (Whitespace): " " # (155..156) + - (leading_trivia꞉ Whitespace): " " # (155..156) - (operator꞉ GreaterThanEqual): ">=" # (156..158) - (right_operand꞉ Expression): # " amount" (158..165) - - (LeadingTrivia) ► (Whitespace): " " # (158..159) + - (leading_trivia꞉ Whitespace): " " # (158..159) - (variant꞉ Identifier): "amount" # (159..165) - (separator꞉ Comma): "," # (165..166) - (item꞉ Expression) ► (variant꞉ StringExpression) ► (variant꞉ StringLiterals): # ' "Address: insufficient balance"' (166..198) - (item꞉ StringLiteral): # ' "Address: insufficient balance"' (166..198) - - (LeadingTrivia) ► (Whitespace): " " # (166..167) + - (leading_trivia꞉ Whitespace): " " # (166..167) - (variant꞉ DoubleQuotedStringLiteral): '"Address: insufficient balance"' # (167..198) - (close_paren꞉ CloseParen): ")" # (198..199) - (semicolon꞉ Semicolon): ";" # (199..200) - - (TrailingTrivia) ► (EndOfLine): "\n" # (200..201) + - (trailing_trivia꞉ EndOfLine): "\n" # (200..201) - (item꞉ Statement) ► (variant꞉ TupleDeconstructionStatement): # "\n (bool success, ) = recipient.call{ value: amo..." (201..262) - - (LeadingTrivia): # "\n " (201..206) - - (EndOfLine): "\n" # (201..202) - - (Whitespace): " " # (202..206) + - (leading_trivia꞉ EndOfLine): "\n" # (201..202) + - (leading_trivia꞉ Whitespace): " " # (202..206) - (open_paren꞉ OpenParen): "(" # (206..207) - (elements꞉ TupleDeconstructionElements): # "bool success," (207..220) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ TypedTupleMember): # "bool success" (207..219) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ BoolKeyword): "bool" # (207..211) - - (LeadingTrivia) ► (Whitespace): " " # (211..212) + - (leading_trivia꞉ Whitespace): " " # (211..212) - (name꞉ Identifier): "success" # (212..219) - (separator꞉ Comma): "," # (219..220) - (item꞉ TupleDeconstructionElement): [] # (220..220) - - (LeadingTrivia) ► (Whitespace): " " # (220..221) + - (leading_trivia꞉ Whitespace): " " # (220..221) - (close_paren꞉ CloseParen): ")" # (221..222) - - (LeadingTrivia) ► (Whitespace): " " # (222..223) + - (leading_trivia꞉ Whitespace): " " # (222..223) - (equal꞉ Equal): "=" # (223..224) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # ' recipient.call{ value: amount }("")' (224..260) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " recipient.call" (224..239) - (operand꞉ Expression): # " recipient" (224..234) - - (LeadingTrivia) ► (Whitespace): " " # (224..225) + - (leading_trivia꞉ Whitespace): " " # (224..225) - (variant꞉ Identifier): "recipient" # (225..234) - (period꞉ Period): "." # (234..235) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "call" # (235..239) @@ -117,13 +115,13 @@ Tree: - (open_brace꞉ OpenBrace): "{" # (239..240) - (arguments꞉ NamedArguments): # " value: amount" (240..254) - (item꞉ NamedArgument): # " value: amount" (240..254) - - (LeadingTrivia) ► (Whitespace): " " # (240..241) + - (leading_trivia꞉ Whitespace): " " # (240..241) - (name꞉ Identifier): "value" # (241..246) - (colon꞉ Colon): ":" # (246..247) - (value꞉ Expression): # " amount" (247..254) - - (LeadingTrivia) ► (Whitespace): " " # (247..248) + - (leading_trivia꞉ Whitespace): " " # (247..248) - (variant꞉ Identifier): "amount" # (248..254) - - (LeadingTrivia) ► (Whitespace): " " # (254..255) + - (leading_trivia꞉ Whitespace): " " # (254..255) - (close_brace꞉ CloseBrace): "}" # (255..256) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # '("")' (256..260) - (open_paren꞉ OpenParen): "(" # (256..257) @@ -132,11 +130,11 @@ Tree: - (item꞉ StringLiteral) ► (variant꞉ DoubleQuotedStringLiteral): '""' # (257..259) - (close_paren꞉ CloseParen): ")" # (259..260) - (semicolon꞉ Semicolon): ";" # (260..261) - - (TrailingTrivia) ► (EndOfLine): "\n" # (261..262) + - (trailing_trivia꞉ EndOfLine): "\n" # (261..262) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # ' require(success, "Address: unable to send valu...' (262..346) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # ' require(success, "Address: unable to send valu...' (262..344) - (operand꞉ Expression): # " require" (262..273) - - (LeadingTrivia) ► (Whitespace): " " # (262..266) + - (leading_trivia꞉ Whitespace): " " # (262..266) - (variant꞉ Identifier): "require" # (266..273) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # '(success, "Address: unable to send value, recipien...' (273..344) - (open_paren꞉ OpenParen): "(" # (273..274) @@ -145,13 +143,13 @@ Tree: - (separator꞉ Comma): "," # (281..282) - (item꞉ Expression) ► (variant꞉ StringExpression) ► (variant꞉ StringLiterals): # ' "Address: unable to send value, recipient may hav...' (282..343) - (item꞉ StringLiteral): # ' "Address: unable to send value, recipient may hav...' (282..343) - - (LeadingTrivia) ► (Whitespace): " " # (282..283) + - (leading_trivia꞉ Whitespace): " " # (282..283) - (variant꞉ DoubleQuotedStringLiteral): '"Address: unable to send value, recipient may have...' # (283..343) - (close_paren꞉ CloseParen): ")" # (343..344) - (semicolon꞉ Semicolon): ";" # (344..345) - - (TrailingTrivia) ► (EndOfLine): "\n" # (345..346) - - (LeadingTrivia) ► (Whitespace): " " # (346..348) + - (trailing_trivia꞉ EndOfLine): "\n" # (345..346) + - (leading_trivia꞉ Whitespace): " " # (346..348) - (close_brace꞉ CloseBrace): "}" # (348..349) - - (TrailingTrivia) ► (EndOfLine): "\n" # (349..350) + - (trailing_trivia꞉ EndOfLine): "\n" # (349..350) - (close_brace꞉ CloseBrace): "}" # (350..351) - - (TrailingTrivia) ► (EndOfLine): "\n" # (351..352) + - (trailing_trivia꞉ EndOfLine): "\n" # (351..352) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/header_comment/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/header_comment/generated/0.4.11-success.yml index 34048a6283..c3ed7ba9c3 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/header_comment/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/header_comment/generated/0.4.11-success.yml @@ -27,13 +27,12 @@ Errors: [] Tree: - (ContractDefinition): # "/*\n * Lorem ipsum dolor sit amet, consectetur adip..." (0..2001) - - (LeadingTrivia): # "/*\n * Lorem ipsum dolor sit amet, consectetur adip..." (0..1986) - - (MultiLineComment): "/*\n * Lorem ipsum dolor sit amet, consectetur adip..." # (0..1985) - - (EndOfLine): "\n" # (1985..1986) + - (leading_trivia꞉ MultiLineComment): "/*\n * Lorem ipsum dolor sit amet, consectetur adip..." # (0..1985) + - (leading_trivia꞉ EndOfLine): "\n" # (1985..1986) - (contract_keyword꞉ ContractKeyword): "contract" # (1986..1994) - - (LeadingTrivia) ► (Whitespace): " " # (1994..1995) + - (leading_trivia꞉ Whitespace): " " # (1994..1995) - (name꞉ Identifier): "Foo" # (1995..1998) - - (LeadingTrivia) ► (Whitespace): " " # (1998..1999) + - (leading_trivia꞉ Whitespace): " " # (1998..1999) - (open_brace꞉ OpenBrace): "{" # (1999..2000) - (members꞉ ContractMembers): [] # (2000..2000) - (close_brace꞉ CloseBrace): "}" # (2000..2001) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/inheritence_specifier/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/inheritence_specifier/generated/0.4.11-success.yml index 8055052592..163ef21349 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/inheritence_specifier/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/inheritence_specifier/generated/0.4.11-success.yml @@ -8,19 +8,19 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample is Foo, Bar(1, 2), Baz {}" (0..41) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - (inheritence꞉ InheritanceSpecifier): # " is Foo, Bar(1, 2), Baz" (15..38) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (is_keyword꞉ IsKeyword): "is" # (16..18) - (types꞉ InheritanceTypes): # " Foo, Bar(1, 2), Baz" (18..38) - (item꞉ InheritanceType) ► (type_name꞉ IdentifierPath): # " Foo" (18..22) - - (LeadingTrivia) ► (Whitespace): " " # (18..19) + - (leading_trivia꞉ Whitespace): " " # (18..19) - (item꞉ Identifier): "Foo" # (19..22) - (separator꞉ Comma): "," # (22..23) - (item꞉ InheritanceType): # " Bar(1, 2)" (23..33) - (type_name꞉ IdentifierPath): # " Bar" (23..27) - - (LeadingTrivia) ► (Whitespace): " " # (23..24) + - (leading_trivia꞉ Whitespace): " " # (23..24) - (item꞉ Identifier): "Bar" # (24..27) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # "(1, 2)" (27..33) - (open_paren꞉ OpenParen): "(" # (27..28) @@ -28,14 +28,14 @@ Tree: - (item꞉ Expression) ► (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "1" # (28..29) - (separator꞉ Comma): "," # (29..30) - (item꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 2" (30..32) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (literal꞉ DecimalLiteral): "2" # (31..32) - (close_paren꞉ CloseParen): ")" # (32..33) - (separator꞉ Comma): "," # (33..34) - (item꞉ InheritanceType) ► (type_name꞉ IdentifierPath): # " Baz" (34..38) - - (LeadingTrivia) ► (Whitespace): " " # (34..35) + - (leading_trivia꞉ Whitespace): " " # (34..35) - (item꞉ Identifier): "Baz" # (35..38) - - (LeadingTrivia) ► (Whitespace): " " # (38..39) + - (leading_trivia꞉ Whitespace): " " # (38..39) - (open_brace꞉ OpenBrace): "{" # (39..40) - (members꞉ ContractMembers): [] # (40..40) - (close_brace꞉ CloseBrace): "}" # (40..41) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.11-failure.yml index d98f752d73..573dc66915 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.11-failure.yml @@ -20,15 +20,15 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {\n constructor() public {\n }\n}" (0..48) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " constructor" (18..31) - (item꞉ ContractMember) ► (variant꞉ StateVariableDefinition): # " constructor" (18..31) - (type_name꞉ TypeName) ► (variant꞉ IdentifierPath): # " constructor" (18..31) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (item꞉ Identifier): "constructor" # (20..31) - (attributes꞉ StateVariableAttributes): [] # (31..31) - (SKIPPED): "() public {\n }\n" # (31..47) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.22-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.22-success.yml index e0155fea80..0e1aae4bdc 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.22-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.22-success.yml @@ -11,14 +11,14 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample {\n constructor() public {\n }\n}" (0..48) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " constructor() public {\n }\n" (18..47) - (item꞉ ContractMember) ► (variant꞉ ConstructorDefinition): # " constructor() public {\n }\n" (18..47) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (constructor_keyword꞉ ConstructorKeyword): "constructor" # (20..31) - (parameters꞉ ParametersDeclaration): # "()" (31..33) - (open_paren꞉ OpenParen): "(" # (31..32) @@ -26,14 +26,14 @@ Tree: - (close_paren꞉ CloseParen): ")" # (32..33) - (attributes꞉ ConstructorAttributes): # " public" (33..40) - (item꞉ ConstructorAttribute): # " public" (33..40) - - (LeadingTrivia) ► (Whitespace): " " # (33..34) + - (leading_trivia꞉ Whitespace): " " # (33..34) - (variant꞉ PublicKeyword): "public" # (34..40) - (body꞉ Block): # " {\n }\n" (40..47) - - (LeadingTrivia) ► (Whitespace): " " # (40..41) + - (leading_trivia꞉ Whitespace): " " # (40..41) - (open_brace꞉ OpenBrace): "{" # (41..42) - - (TrailingTrivia) ► (EndOfLine): "\n" # (42..43) + - (trailing_trivia꞉ EndOfLine): "\n" # (42..43) - (statements꞉ Statements): [] # (43..43) - - (LeadingTrivia) ► (Whitespace): " " # (43..45) + - (leading_trivia꞉ Whitespace): " " # (43..45) - (close_brace꞉ CloseBrace): "}" # (45..46) - - (TrailingTrivia) ► (EndOfLine): "\n" # (46..47) + - (trailing_trivia꞉ EndOfLine): "\n" # (46..47) - (close_brace꞉ CloseBrace): "}" # (47..48) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_enum_definition/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_enum_definition/generated/0.4.11-success.yml index 262b49e211..952766f2c0 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_enum_definition/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_enum_definition/generated/0.4.11-success.yml @@ -14,33 +14,33 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample {\n enum State {\n A,\n B,\n ..." (0..58) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " enum State {\n A,\n B,\n C\n }\n" (18..57) - (item꞉ ContractMember) ► (variant꞉ EnumDefinition): # " enum State {\n A,\n B,\n C\n }\n" (18..57) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (enum_keyword꞉ EnumKeyword): "enum" # (20..24) - - (LeadingTrivia) ► (Whitespace): " " # (24..25) + - (leading_trivia꞉ Whitespace): " " # (24..25) - (name꞉ Identifier): "State" # (25..30) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (open_brace꞉ OpenBrace): "{" # (31..32) - - (TrailingTrivia) ► (EndOfLine): "\n" # (32..33) + - (trailing_trivia꞉ EndOfLine): "\n" # (32..33) - (members꞉ EnumMembers): # " A,\n B,\n C\n" (33..53) - - (LeadingTrivia) ► (Whitespace): " " # (33..37) + - (leading_trivia꞉ Whitespace): " " # (33..37) - (item꞉ Identifier): "A" # (37..38) - (separator꞉ Comma): "," # (38..39) - - (TrailingTrivia) ► (EndOfLine): "\n" # (39..40) - - (LeadingTrivia) ► (Whitespace): " " # (40..44) + - (trailing_trivia꞉ EndOfLine): "\n" # (39..40) + - (leading_trivia꞉ Whitespace): " " # (40..44) - (item꞉ Identifier): "B" # (44..45) - (separator꞉ Comma): "," # (45..46) - - (TrailingTrivia) ► (EndOfLine): "\n" # (46..47) - - (LeadingTrivia) ► (Whitespace): " " # (47..51) + - (trailing_trivia꞉ EndOfLine): "\n" # (46..47) + - (leading_trivia꞉ Whitespace): " " # (47..51) - (item꞉ Identifier): "C" # (51..52) - - (TrailingTrivia) ► (EndOfLine): "\n" # (52..53) - - (LeadingTrivia) ► (Whitespace): " " # (53..55) + - (trailing_trivia꞉ EndOfLine): "\n" # (52..53) + - (leading_trivia꞉ Whitespace): " " # (53..55) - (close_brace꞉ CloseBrace): "}" # (55..56) - - (TrailingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (56..57) - (close_brace꞉ CloseBrace): "}" # (57..58) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.4.11-failure.yml index 360305e4dc..03004f2025 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.4.11-failure.yml @@ -18,20 +18,20 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {\n error Error1();\n}" (0..37) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " error Error1();\n" (18..36) - (item꞉ ContractMember) ► (variant꞉ StateVariableDefinition): # " error Error1();\n" (18..36) - (type_name꞉ TypeName) ► (variant꞉ IdentifierPath): # " error" (18..25) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (item꞉ Identifier): "error" # (20..25) - (attributes꞉ StateVariableAttributes): [] # (25..25) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (leading_trivia꞉ Whitespace): " " # (25..26) - (name꞉ Identifier): "Error1" # (26..32) - (SKIPPED): "()" # (32..34) - (semicolon꞉ Semicolon): ";" # (34..35) - - (TrailingTrivia) ► (EndOfLine): "\n" # (35..36) + - (trailing_trivia꞉ EndOfLine): "\n" # (35..36) - (close_brace꞉ CloseBrace): "}" # (36..37) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.8.4-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.8.4-success.yml index 2107f59b63..f0985006af 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.8.4-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.8.4-success.yml @@ -10,21 +10,21 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample {\n error Error1();\n}" (0..37) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " error Error1();\n" (18..36) - (item꞉ ContractMember) ► (variant꞉ ErrorDefinition): # " error Error1();\n" (18..36) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (error_keyword꞉ ErrorKeyword): "error" # (20..25) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (leading_trivia꞉ Whitespace): " " # (25..26) - (name꞉ Identifier): "Error1" # (26..32) - (members꞉ ErrorParametersDeclaration): # "()" (32..34) - (open_paren꞉ OpenParen): "(" # (32..33) - (parameters꞉ ErrorParameters): [] # (33..33) - (close_paren꞉ CloseParen): ")" # (33..34) - (semicolon꞉ Semicolon): ";" # (34..35) - - (TrailingTrivia) ► (EndOfLine): "\n" # (35..36) + - (trailing_trivia꞉ EndOfLine): "\n" # (35..36) - (close_brace꞉ CloseBrace): "}" # (36..37) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_event_definition/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_event_definition/generated/0.4.11-success.yml index 476edba0c6..f0a46daff2 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_event_definition/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_event_definition/generated/0.4.11-success.yml @@ -10,36 +10,36 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample {\n event Log(uint256 indexed a, u..." (0..70) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " event Log(uint256 indexed a, uint256 indexed b);..." (18..69) - (item꞉ ContractMember) ► (variant꞉ EventDefinition): # " event Log(uint256 indexed a, uint256 indexed b);..." (18..69) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (event_keyword꞉ EventKeyword): "event" # (20..25) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (leading_trivia꞉ Whitespace): " " # (25..26) - (name꞉ Identifier): "Log" # (26..29) - (parameters꞉ EventParametersDeclaration): # "(uint256 indexed a, uint256 indexed b)" (29..67) - (open_paren꞉ OpenParen): "(" # (29..30) - (parameters꞉ EventParameters): # "uint256 indexed a, uint256 indexed b" (30..66) - (item꞉ EventParameter): # "uint256 indexed a" (30..47) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (30..37) - - (LeadingTrivia) ► (Whitespace): " " # (37..38) + - (leading_trivia꞉ Whitespace): " " # (37..38) - (indexed_keyword꞉ IndexedKeyword): "indexed" # (38..45) - - (LeadingTrivia) ► (Whitespace): " " # (45..46) + - (leading_trivia꞉ Whitespace): " " # (45..46) - (name꞉ Identifier): "a" # (46..47) - (separator꞉ Comma): "," # (47..48) - (item꞉ EventParameter): # " uint256 indexed b" (48..66) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (48..56) - - (LeadingTrivia) ► (Whitespace): " " # (48..49) + - (leading_trivia꞉ Whitespace): " " # (48..49) - (variant꞉ UintKeyword): "uint256" # (49..56) - - (LeadingTrivia) ► (Whitespace): " " # (56..57) + - (leading_trivia꞉ Whitespace): " " # (56..57) - (indexed_keyword꞉ IndexedKeyword): "indexed" # (57..64) - - (LeadingTrivia) ► (Whitespace): " " # (64..65) + - (leading_trivia꞉ Whitespace): " " # (64..65) - (name꞉ Identifier): "b" # (65..66) - (close_paren꞉ CloseParen): ")" # (66..67) - (semicolon꞉ Semicolon): ";" # (67..68) - - (TrailingTrivia) ► (EndOfLine): "\n" # (68..69) + - (trailing_trivia꞉ EndOfLine): "\n" # (68..69) - (close_brace꞉ CloseBrace): "}" # (69..70) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.4.11-failure.yml index bf88f85164..2a5247bceb 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.4.11-failure.yml @@ -20,15 +20,15 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {\n fallback() {\n }\n}" (0..38) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " fallback" (18..28) - (item꞉ ContractMember) ► (variant꞉ StateVariableDefinition): # " fallback" (18..28) - (type_name꞉ TypeName) ► (variant꞉ IdentifierPath): # " fallback" (18..28) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (item꞉ Identifier): "fallback" # (20..28) - (attributes꞉ StateVariableAttributes): [] # (28..28) - (SKIPPED): "() {\n }\n" # (28..37) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.6.0-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.6.0-success.yml index 498b1c7d22..45df143bc5 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.6.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.6.0-success.yml @@ -11,14 +11,14 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample {\n fallback() {\n }\n}" (0..38) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " fallback() {\n }\n" (18..37) - (item꞉ ContractMember) ► (variant꞉ FallbackFunctionDefinition): # " fallback() {\n }\n" (18..37) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (fallback_keyword꞉ FallbackKeyword): "fallback" # (20..28) - (parameters꞉ ParametersDeclaration): # "()" (28..30) - (open_paren꞉ OpenParen): "(" # (28..29) @@ -26,11 +26,11 @@ Tree: - (close_paren꞉ CloseParen): ")" # (29..30) - (attributes꞉ FallbackFunctionAttributes): [] # (30..30) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n }\n" (30..37) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (open_brace꞉ OpenBrace): "{" # (31..32) - - (TrailingTrivia) ► (EndOfLine): "\n" # (32..33) + - (trailing_trivia꞉ EndOfLine): "\n" # (32..33) - (statements꞉ Statements): [] # (33..33) - - (LeadingTrivia) ► (Whitespace): " " # (33..35) + - (leading_trivia꞉ Whitespace): " " # (33..35) - (close_brace꞉ CloseBrace): "}" # (35..36) - - (TrailingTrivia) ► (EndOfLine): "\n" # (36..37) + - (trailing_trivia꞉ EndOfLine): "\n" # (36..37) - (close_brace꞉ CloseBrace): "}" # (37..38) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_function_definition/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_function_definition/generated/0.4.11-success.yml index c227738650..cdebd80a25 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_function_definition/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_function_definition/generated/0.4.11-success.yml @@ -12,17 +12,17 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample {\n function foo() returns (uint) ..." (0..71) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " function foo() returns (uint) {\n return 1;\n ..." (18..70) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function foo() returns (uint) {\n return 1;\n ..." (18..70) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (function_keyword꞉ FunctionKeyword): "function" # (20..28) - (name꞉ FunctionName): # " foo" (28..32) - - (LeadingTrivia) ► (Whitespace): " " # (28..29) + - (leading_trivia꞉ Whitespace): " " # (28..29) - (variant꞉ Identifier): "foo" # (29..32) - (parameters꞉ ParametersDeclaration): # "()" (32..34) - (open_paren꞉ OpenParen): "(" # (32..33) @@ -30,28 +30,28 @@ Tree: - (close_paren꞉ CloseParen): ")" # (33..34) - (attributes꞉ FunctionAttributes): [] # (34..34) - (returns꞉ ReturnsDeclaration): # " returns (uint)" (34..49) - - (LeadingTrivia) ► (Whitespace): " " # (34..35) + - (leading_trivia꞉ Whitespace): " " # (34..35) - (returns_keyword꞉ ReturnsKeyword): "returns" # (35..42) - (variables꞉ ParametersDeclaration): # " (uint)" (42..49) - - (LeadingTrivia) ► (Whitespace): " " # (42..43) + - (leading_trivia꞉ Whitespace): " " # (42..43) - (open_paren꞉ OpenParen): "(" # (43..44) - (parameters꞉ Parameters): # "uint" (44..48) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint" # (44..48) - (close_paren꞉ CloseParen): ")" # (48..49) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n return 1;\n }\n" (49..70) - - (LeadingTrivia) ► (Whitespace): " " # (49..50) + - (leading_trivia꞉ Whitespace): " " # (49..50) - (open_brace꞉ OpenBrace): "{" # (50..51) - - (TrailingTrivia) ► (EndOfLine): "\n" # (51..52) + - (trailing_trivia꞉ EndOfLine): "\n" # (51..52) - (statements꞉ Statements): # " return 1;\n" (52..66) - (item꞉ Statement) ► (variant꞉ ReturnStatement): # " return 1;\n" (52..66) - - (LeadingTrivia) ► (Whitespace): " " # (52..56) + - (leading_trivia꞉ Whitespace): " " # (52..56) - (return_keyword꞉ ReturnKeyword): "return" # (56..62) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (62..64) - - (LeadingTrivia) ► (Whitespace): " " # (62..63) + - (leading_trivia꞉ Whitespace): " " # (62..63) - (literal꞉ DecimalLiteral): "1" # (63..64) - (semicolon꞉ Semicolon): ";" # (64..65) - - (TrailingTrivia) ► (EndOfLine): "\n" # (65..66) - - (LeadingTrivia) ► (Whitespace): " " # (66..68) + - (trailing_trivia꞉ EndOfLine): "\n" # (65..66) + - (leading_trivia꞉ Whitespace): " " # (66..68) - (close_brace꞉ CloseBrace): "}" # (68..69) - - (TrailingTrivia) ► (EndOfLine): "\n" # (69..70) + - (trailing_trivia꞉ EndOfLine): "\n" # (69..70) - (close_brace꞉ CloseBrace): "}" # (70..71) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_modifier_definition/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_modifier_definition/generated/0.4.11-success.yml index b931ea003a..c580f390c8 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_modifier_definition/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_modifier_definition/generated/0.4.11-success.yml @@ -12,16 +12,16 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample {\n modifier foo() {\n _;\n }\n}" (0..49) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " modifier foo() {\n _;\n }\n" (18..48) - (item꞉ ContractMember) ► (variant꞉ ModifierDefinition): # " modifier foo() {\n _;\n }\n" (18..48) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (modifier_keyword꞉ ModifierKeyword): "modifier" # (20..28) - - (LeadingTrivia) ► (Whitespace): " " # (28..29) + - (leading_trivia꞉ Whitespace): " " # (28..29) - (name꞉ Identifier): "foo" # (29..32) - (parameters꞉ ParametersDeclaration): # "()" (32..34) - (open_paren꞉ OpenParen): "(" # (32..33) @@ -29,17 +29,17 @@ Tree: - (close_paren꞉ CloseParen): ")" # (33..34) - (attributes꞉ ModifierAttributes): [] # (34..34) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n _;\n }\n" (34..48) - - (LeadingTrivia) ► (Whitespace): " " # (34..35) + - (leading_trivia꞉ Whitespace): " " # (34..35) - (open_brace꞉ OpenBrace): "{" # (35..36) - - (TrailingTrivia) ► (EndOfLine): "\n" # (36..37) + - (trailing_trivia꞉ EndOfLine): "\n" # (36..37) - (statements꞉ Statements): # " _;\n" (37..44) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " _;\n" (37..44) - (expression꞉ Expression): # " _" (37..42) - - (LeadingTrivia) ► (Whitespace): " " # (37..41) + - (leading_trivia꞉ Whitespace): " " # (37..41) - (variant꞉ Identifier): "_" # (41..42) - (semicolon꞉ Semicolon): ";" # (42..43) - - (TrailingTrivia) ► (EndOfLine): "\n" # (43..44) - - (LeadingTrivia) ► (Whitespace): " " # (44..46) + - (trailing_trivia꞉ EndOfLine): "\n" # (43..44) + - (leading_trivia꞉ Whitespace): " " # (44..46) - (close_brace꞉ CloseBrace): "}" # (46..47) - - (TrailingTrivia) ► (EndOfLine): "\n" # (47..48) + - (trailing_trivia꞉ EndOfLine): "\n" # (47..48) - (close_brace꞉ CloseBrace): "}" # (48..49) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.4.11-failure.yml index d12c2045d5..e22e128a50 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.4.11-failure.yml @@ -20,15 +20,15 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {\n receive() {\n }\n}" (0..37) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " receive" (18..27) - (item꞉ ContractMember) ► (variant꞉ StateVariableDefinition): # " receive" (18..27) - (type_name꞉ TypeName) ► (variant꞉ IdentifierPath): # " receive" (18..27) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (item꞉ Identifier): "receive" # (20..27) - (attributes꞉ StateVariableAttributes): [] # (27..27) - (SKIPPED): "() {\n }\n" # (27..36) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.6.0-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.6.0-success.yml index fba3c6ace6..1e2747b800 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.6.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.6.0-success.yml @@ -11,14 +11,14 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample {\n receive() {\n }\n}" (0..37) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " receive() {\n }\n" (18..36) - (item꞉ ContractMember) ► (variant꞉ ReceiveFunctionDefinition): # " receive() {\n }\n" (18..36) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (receive_keyword꞉ ReceiveKeyword): "receive" # (20..27) - (parameters꞉ ParametersDeclaration): # "()" (27..29) - (open_paren꞉ OpenParen): "(" # (27..28) @@ -26,11 +26,11 @@ Tree: - (close_paren꞉ CloseParen): ")" # (28..29) - (attributes꞉ ReceiveFunctionAttributes): [] # (29..29) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n }\n" (29..36) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (open_brace꞉ OpenBrace): "{" # (30..31) - - (TrailingTrivia) ► (EndOfLine): "\n" # (31..32) + - (trailing_trivia꞉ EndOfLine): "\n" # (31..32) - (statements꞉ Statements): [] # (32..32) - - (LeadingTrivia) ► (Whitespace): " " # (32..34) + - (leading_trivia꞉ Whitespace): " " # (32..34) - (close_brace꞉ CloseBrace): "}" # (34..35) - - (TrailingTrivia) ► (EndOfLine): "\n" # (35..36) + - (trailing_trivia꞉ EndOfLine): "\n" # (35..36) - (close_brace꞉ CloseBrace): "}" # (36..37) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_state_variable_declaration/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_state_variable_declaration/generated/0.4.11-success.yml index 544eec1b7a..26073c8443 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_state_variable_declaration/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_state_variable_declaration/generated/0.4.11-success.yml @@ -10,22 +10,22 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample {\n uint public a;\n}" (0..36) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " uint public a;\n" (18..35) - (item꞉ ContractMember) ► (variant꞉ StateVariableDefinition): # " uint public a;\n" (18..35) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint" (18..24) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (variant꞉ UintKeyword): "uint" # (20..24) - (attributes꞉ StateVariableAttributes): # " public" (24..31) - (item꞉ StateVariableAttribute): # " public" (24..31) - - (LeadingTrivia) ► (Whitespace): " " # (24..25) + - (leading_trivia꞉ Whitespace): " " # (24..25) - (variant꞉ PublicKeyword): "public" # (25..31) - - (LeadingTrivia) ► (Whitespace): " " # (31..32) + - (leading_trivia꞉ Whitespace): " " # (31..32) - (name꞉ Identifier): "a" # (32..33) - (semicolon꞉ Semicolon): ";" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (close_brace꞉ CloseBrace): "}" # (35..36) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_struct_definition/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_struct_definition/generated/0.4.11-success.yml index 275f19ce67..0f33ffcf36 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_struct_definition/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_struct_definition/generated/0.4.11-success.yml @@ -13,38 +13,38 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample {\n struct S {\n uint a;\n uin..." (0..60) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " struct S {\n uint a;\n uint b;\n }\n" (18..59) - (item꞉ ContractMember) ► (variant꞉ StructDefinition): # " struct S {\n uint a;\n uint b;\n }\n" (18..59) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (struct_keyword꞉ StructKeyword): "struct" # (20..26) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (name꞉ Identifier): "S" # (27..28) - - (LeadingTrivia) ► (Whitespace): " " # (28..29) + - (leading_trivia꞉ Whitespace): " " # (28..29) - (open_brace꞉ OpenBrace): "{" # (29..30) - - (TrailingTrivia) ► (EndOfLine): "\n" # (30..31) + - (trailing_trivia꞉ EndOfLine): "\n" # (30..31) - (members꞉ StructMembers): # " uint a;\n uint b;\n" (31..55) - (item꞉ StructMember): # " uint a;\n" (31..43) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint" (31..39) - - (LeadingTrivia) ► (Whitespace): " " # (31..35) + - (leading_trivia꞉ Whitespace): " " # (31..35) - (variant꞉ UintKeyword): "uint" # (35..39) - - (LeadingTrivia) ► (Whitespace): " " # (39..40) + - (leading_trivia꞉ Whitespace): " " # (39..40) - (name꞉ Identifier): "a" # (40..41) - (semicolon꞉ Semicolon): ";" # (41..42) - - (TrailingTrivia) ► (EndOfLine): "\n" # (42..43) + - (trailing_trivia꞉ EndOfLine): "\n" # (42..43) - (item꞉ StructMember): # " uint b;\n" (43..55) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint" (43..51) - - (LeadingTrivia) ► (Whitespace): " " # (43..47) + - (leading_trivia꞉ Whitespace): " " # (43..47) - (variant꞉ UintKeyword): "uint" # (47..51) - - (LeadingTrivia) ► (Whitespace): " " # (51..52) + - (leading_trivia꞉ Whitespace): " " # (51..52) - (name꞉ Identifier): "b" # (52..53) - (semicolon꞉ Semicolon): ";" # (53..54) - - (TrailingTrivia) ► (EndOfLine): "\n" # (54..55) - - (LeadingTrivia) ► (Whitespace): " " # (55..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (54..55) + - (leading_trivia꞉ Whitespace): " " # (55..57) - (close_brace꞉ CloseBrace): "}" # (57..58) - - (TrailingTrivia) ► (EndOfLine): "\n" # (58..59) + - (trailing_trivia꞉ EndOfLine): "\n" # (58..59) - (close_brace꞉ CloseBrace): "}" # (59..60) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.4.11-success.yml index 5573b0a8be..d5d895907c 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.4.11-success.yml @@ -11,27 +11,27 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample {\n function () {\n }\n}" (0..39) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " function () {\n }\n" (18..38) - (item꞉ ContractMember) ► (variant꞉ UnnamedFunctionDefinition): # " function () {\n }\n" (18..38) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (function_keyword꞉ FunctionKeyword): "function" # (20..28) - (parameters꞉ ParametersDeclaration): # " ()" (28..31) - - (LeadingTrivia) ► (Whitespace): " " # (28..29) + - (leading_trivia꞉ Whitespace): " " # (28..29) - (open_paren꞉ OpenParen): "(" # (29..30) - (parameters꞉ Parameters): [] # (30..30) - (close_paren꞉ CloseParen): ")" # (30..31) - (attributes꞉ UnnamedFunctionAttributes): [] # (31..31) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n }\n" (31..38) - - (LeadingTrivia) ► (Whitespace): " " # (31..32) + - (leading_trivia꞉ Whitespace): " " # (31..32) - (open_brace꞉ OpenBrace): "{" # (32..33) - - (TrailingTrivia) ► (EndOfLine): "\n" # (33..34) + - (trailing_trivia꞉ EndOfLine): "\n" # (33..34) - (statements꞉ Statements): [] # (34..34) - - (LeadingTrivia) ► (Whitespace): " " # (34..36) + - (leading_trivia꞉ Whitespace): " " # (34..36) - (close_brace꞉ CloseBrace): "}" # (36..37) - - (TrailingTrivia) ► (EndOfLine): "\n" # (37..38) + - (trailing_trivia꞉ EndOfLine): "\n" # (37..38) - (close_brace꞉ CloseBrace): "}" # (38..39) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.0-failure.yml index c7ab0457b8..7f1acc035e 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.0-failure.yml @@ -20,23 +20,23 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {\n function () {\n }\n}" (0..39) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " function () " (18..32) - (item꞉ ContractMember) ► (variant꞉ StateVariableDefinition): # " function () " (18..32) - (type_name꞉ TypeName) ► (variant꞉ FunctionType): # " function ()" (18..31) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (function_keyword꞉ FunctionKeyword): "function" # (20..28) - (parameters꞉ ParametersDeclaration): # " ()" (28..31) - - (LeadingTrivia) ► (Whitespace): " " # (28..29) + - (leading_trivia꞉ Whitespace): " " # (28..29) - (open_paren꞉ OpenParen): "(" # (29..30) - (parameters꞉ Parameters): [] # (30..30) - (close_paren꞉ CloseParen): ")" # (30..31) - (attributes꞉ FunctionTypeAttributes): [] # (31..31) - (attributes꞉ StateVariableAttributes): [] # (31..31) - - (LeadingTrivia) ► (Whitespace): " " # (31..32) + - (leading_trivia꞉ Whitespace): " " # (31..32) - (SKIPPED): "{\n }\n" # (32..38) - (close_brace꞉ CloseBrace): "}" # (38..39) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.5-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.5-failure.yml index 10433116d4..cbc88ea255 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.5-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.5-failure.yml @@ -20,23 +20,23 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {\n function () {\n }\n}" (0..39) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " function () " (18..32) - (item꞉ ContractMember) ► (variant꞉ StateVariableDefinition): # " function () " (18..32) - (type_name꞉ TypeName) ► (variant꞉ FunctionType): # " function ()" (18..31) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (function_keyword꞉ FunctionKeyword): "function" # (20..28) - (parameters꞉ ParametersDeclaration): # " ()" (28..31) - - (LeadingTrivia) ► (Whitespace): " " # (28..29) + - (leading_trivia꞉ Whitespace): " " # (28..29) - (open_paren꞉ OpenParen): "(" # (29..30) - (parameters꞉ Parameters): [] # (30..30) - (close_paren꞉ CloseParen): ")" # (30..31) - (attributes꞉ FunctionTypeAttributes): [] # (31..31) - (attributes꞉ StateVariableAttributes): [] # (31..31) - - (LeadingTrivia) ► (Whitespace): " " # (31..32) + - (leading_trivia꞉ Whitespace): " " # (31..32) - (SKIPPED): "{\n }\n" # (32..38) - (close_brace꞉ CloseBrace): "}" # (38..39) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.4.11-success.yml index 6161eeea56..2033f92b17 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.4.11-success.yml @@ -10,14 +10,14 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample {\n function() external payable {}..." (0..53) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " function() external payable {}\n" (18..51) - (item꞉ ContractMember) ► (variant꞉ UnnamedFunctionDefinition): # " function() external payable {}\n" (18..51) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (function_keyword꞉ FunctionKeyword): "function" # (20..28) - (parameters꞉ ParametersDeclaration): # "()" (28..30) - (open_paren꞉ OpenParen): "(" # (28..29) @@ -25,16 +25,16 @@ Tree: - (close_paren꞉ CloseParen): ")" # (29..30) - (attributes꞉ UnnamedFunctionAttributes): # " external payable" (30..47) - (item꞉ UnnamedFunctionAttribute): # " external" (30..39) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (variant꞉ ExternalKeyword): "external" # (31..39) - (item꞉ UnnamedFunctionAttribute): # " payable" (39..47) - - (LeadingTrivia) ► (Whitespace): " " # (39..40) + - (leading_trivia꞉ Whitespace): " " # (39..40) - (variant꞉ PayableKeyword): "payable" # (40..47) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {}\n" (47..51) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (open_brace꞉ OpenBrace): "{" # (48..49) - (statements꞉ Statements): [] # (49..49) - (close_brace꞉ CloseBrace): "}" # (49..50) - - (TrailingTrivia) ► (EndOfLine): "\n" # (50..51) + - (trailing_trivia꞉ EndOfLine): "\n" # (50..51) - (close_brace꞉ CloseBrace): "}" # (51..52) - - (TrailingTrivia) ► (EndOfLine): "\n" # (52..53) + - (trailing_trivia꞉ EndOfLine): "\n" # (52..53) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.0-failure.yml index cfcf86794c..ed816f60fd 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.0-failure.yml @@ -18,15 +18,15 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {\n function() external payable {}..." (0..53) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " function() external payable " (18..48) - (item꞉ ContractMember) ► (variant꞉ StateVariableDefinition): # " function() external payable " (18..48) - (type_name꞉ TypeName) ► (variant꞉ FunctionType): # " function() external payable" (18..47) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (function_keyword꞉ FunctionKeyword): "function" # (20..28) - (parameters꞉ ParametersDeclaration): # "()" (28..30) - (open_paren꞉ OpenParen): "(" # (28..29) @@ -34,13 +34,13 @@ Tree: - (close_paren꞉ CloseParen): ")" # (29..30) - (attributes꞉ FunctionTypeAttributes): # " external payable" (30..47) - (item꞉ FunctionTypeAttribute): # " external" (30..39) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (variant꞉ ExternalKeyword): "external" # (31..39) - (item꞉ FunctionTypeAttribute): # " payable" (39..47) - - (LeadingTrivia) ► (Whitespace): " " # (39..40) + - (leading_trivia꞉ Whitespace): " " # (39..40) - (variant꞉ PayableKeyword): "payable" # (40..47) - (attributes꞉ StateVariableAttributes): [] # (47..47) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (SKIPPED): "{}\n" # (48..51) - (close_brace꞉ CloseBrace): "}" # (51..52) - - (TrailingTrivia) ► (EndOfLine): "\n" # (52..53) + - (trailing_trivia꞉ EndOfLine): "\n" # (52..53) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.5-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.5-failure.yml index 6e42e1167e..6dedc25e6e 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.5-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.5-failure.yml @@ -18,15 +18,15 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {\n function() external payable {}..." (0..53) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " function() external payable " (18..48) - (item꞉ ContractMember) ► (variant꞉ StateVariableDefinition): # " function() external payable " (18..48) - (type_name꞉ TypeName) ► (variant꞉ FunctionType): # " function() external payable" (18..47) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (function_keyword꞉ FunctionKeyword): "function" # (20..28) - (parameters꞉ ParametersDeclaration): # "()" (28..30) - (open_paren꞉ OpenParen): "(" # (28..29) @@ -34,13 +34,13 @@ Tree: - (close_paren꞉ CloseParen): ")" # (29..30) - (attributes꞉ FunctionTypeAttributes): # " external payable" (30..47) - (item꞉ FunctionTypeAttribute): # " external" (30..39) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (variant꞉ ExternalKeyword): "external" # (31..39) - (item꞉ FunctionTypeAttribute): # " payable" (39..47) - - (LeadingTrivia) ► (Whitespace): " " # (39..40) + - (leading_trivia꞉ Whitespace): " " # (39..40) - (variant꞉ PayableKeyword): "payable" # (40..47) - (attributes꞉ StateVariableAttributes): [] # (47..47) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (SKIPPED): "{}\n" # (48..51) - (close_brace꞉ CloseBrace): "}" # (51..52) - - (TrailingTrivia) ► (EndOfLine): "\n" # (52..53) + - (trailing_trivia꞉ EndOfLine): "\n" # (52..53) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.4.11-failure.yml index 32bc4abe4a..89eb7fda59 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.4.11-failure.yml @@ -18,12 +18,12 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {\n type Foo is bool;\n}" (0..39) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): [] # (18..18) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (SKIPPED): "type Foo is bool;\n" # (20..38) - (close_brace꞉ CloseBrace): "}" # (38..39) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.4.22-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.4.22-failure.yml index 5125b023c7..2a4605f781 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.4.22-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.4.22-failure.yml @@ -18,12 +18,12 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {\n type Foo is bool;\n}" (0..39) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): [] # (18..18) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (SKIPPED): "type Foo is bool;\n" # (20..38) - (close_brace꞉ CloseBrace): "}" # (38..39) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.6.0-failure.yml index aa537c1261..4c4527d1fd 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.6.0-failure.yml @@ -18,12 +18,12 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {\n type Foo is bool;\n}" (0..39) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): [] # (18..18) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (SKIPPED): "type Foo is bool;\n" # (20..38) - (close_brace꞉ CloseBrace): "}" # (38..39) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.0-failure.yml index 1c99458e53..5c5cf99df7 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.0-failure.yml @@ -18,12 +18,12 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {\n type Foo is bool;\n}" (0..39) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): [] # (18..18) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (SKIPPED): "type Foo is bool;\n" # (20..38) - (close_brace꞉ CloseBrace): "}" # (38..39) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.4-failure.yml index f1c82479fe..3522f31cc4 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.4-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.4-failure.yml @@ -18,12 +18,12 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {\n type Foo is bool;\n}" (0..39) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): [] # (18..18) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (SKIPPED): "type Foo is bool;\n" # (20..38) - (close_brace꞉ CloseBrace): "}" # (38..39) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.8-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.8-success.yml index c58af82406..585f103243 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.8-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.8-success.yml @@ -10,22 +10,22 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample {\n type Foo is bool;\n}" (0..39) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " type Foo is bool;\n" (18..38) - (item꞉ ContractMember) ► (variant꞉ UserDefinedValueTypeDefinition): # " type Foo is bool;\n" (18..38) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (type_keyword꞉ TypeKeyword): "type" # (20..24) - - (LeadingTrivia) ► (Whitespace): " " # (24..25) + - (leading_trivia꞉ Whitespace): " " # (24..25) - (name꞉ Identifier): "Foo" # (25..28) - - (LeadingTrivia) ► (Whitespace): " " # (28..29) + - (leading_trivia꞉ Whitespace): " " # (28..29) - (is_keyword꞉ IsKeyword): "is" # (29..31) - (value_type꞉ ElementaryType): # " bool" (31..36) - - (LeadingTrivia) ► (Whitespace): " " # (31..32) + - (leading_trivia꞉ Whitespace): " " # (31..32) - (variant꞉ BoolKeyword): "bool" # (32..36) - (semicolon꞉ Semicolon): ";" # (36..37) - - (TrailingTrivia) ► (EndOfLine): "\n" # (37..38) + - (trailing_trivia꞉ EndOfLine): "\n" # (37..38) - (close_brace꞉ CloseBrace): "}" # (38..39) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml index f7115f5a98..460d1bcce0 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml @@ -10,23 +10,23 @@ Errors: [] Tree: - (ContractDefinition): # "contract Sample {\n using x for *;\n}" (0..36) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " using x for *;\n" (18..35) - (item꞉ ContractMember) ► (variant꞉ UsingDirective): # " using x for *;\n" (18..35) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (using_keyword꞉ UsingKeyword): "using" # (20..25) - (clause꞉ UsingClause) ► (variant꞉ IdentifierPath): # " x" (25..27) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (leading_trivia꞉ Whitespace): " " # (25..26) - (item꞉ Identifier): "x" # (26..27) - - (LeadingTrivia) ► (Whitespace): " " # (27..28) + - (leading_trivia꞉ Whitespace): " " # (27..28) - (for_keyword꞉ ForKeyword): "for" # (28..31) - (target꞉ UsingTarget): # " *" (31..33) - - (LeadingTrivia) ► (Whitespace): " " # (31..32) + - (leading_trivia꞉ Whitespace): " " # (31..32) - (variant꞉ Asterisk): "*" # (32..33) - (semicolon꞉ Semicolon): ";" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (close_brace꞉ CloseBrace): "}" # (35..36) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.4.11-failure.yml index 7e0da4e07b..89c4fb1db7 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.4.11-failure.yml @@ -18,19 +18,19 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Test {\n field;\n}\n" (0..27) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Test" # (9..13) - - (LeadingTrivia) ► (Whitespace): " " # (13..14) + - (leading_trivia꞉ Whitespace): " " # (13..14) - (open_brace꞉ OpenBrace): "{" # (14..15) - - (TrailingTrivia) ► (EndOfLine): "\n" # (15..16) + - (trailing_trivia꞉ EndOfLine): "\n" # (15..16) - (members꞉ ContractMembers): # " field;\n" (16..25) - (item꞉ ContractMember) ► (variant꞉ StateVariableDefinition): # " field;\n" (16..25) - (type_name꞉ TypeName) ► (variant꞉ IdentifierPath): # " field" (16..23) - - (LeadingTrivia) ► (Whitespace): " " # (16..18) + - (leading_trivia꞉ Whitespace): " " # (16..18) - (item꞉ Identifier): "field" # (18..23) - (attributes꞉ StateVariableAttributes): [] # (23..23) - (SKIPPED): "" # (23..23) - (semicolon꞉ Semicolon): ";" # (23..24) - - (TrailingTrivia) ► (EndOfLine): "\n" # (24..25) + - (trailing_trivia꞉ EndOfLine): "\n" # (24..25) - (close_brace꞉ CloseBrace): "}" # (25..26) - - (TrailingTrivia) ► (EndOfLine): "\n" # (26..27) + - (trailing_trivia꞉ EndOfLine): "\n" # (26..27) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.6.5-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.6.5-failure.yml index c554f7b833..940d828d1b 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.6.5-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.6.5-failure.yml @@ -18,19 +18,19 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Test {\n field;\n}\n" (0..27) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Test" # (9..13) - - (LeadingTrivia) ► (Whitespace): " " # (13..14) + - (leading_trivia꞉ Whitespace): " " # (13..14) - (open_brace꞉ OpenBrace): "{" # (14..15) - - (TrailingTrivia) ► (EndOfLine): "\n" # (15..16) + - (trailing_trivia꞉ EndOfLine): "\n" # (15..16) - (members꞉ ContractMembers): # " field;\n" (16..25) - (item꞉ ContractMember) ► (variant꞉ StateVariableDefinition): # " field;\n" (16..25) - (type_name꞉ TypeName) ► (variant꞉ IdentifierPath): # " field" (16..23) - - (LeadingTrivia) ► (Whitespace): " " # (16..18) + - (leading_trivia꞉ Whitespace): " " # (16..18) - (item꞉ Identifier): "field" # (18..23) - (attributes꞉ StateVariableAttributes): [] # (23..23) - (SKIPPED): "" # (23..23) - (semicolon꞉ Semicolon): ";" # (23..24) - - (TrailingTrivia) ► (EndOfLine): "\n" # (24..25) + - (trailing_trivia꞉ EndOfLine): "\n" # (24..25) - (close_brace꞉ CloseBrace): "}" # (25..26) - - (TrailingTrivia) ► (EndOfLine): "\n" # (26..27) + - (trailing_trivia꞉ EndOfLine): "\n" # (26..27) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.4.11-failure.yml index ecfb02dfc4..1f597881bd 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.4.11-failure.yml @@ -44,71 +44,70 @@ Errors: # 3 total Tree: - (ContractDefinition): # "contract Contract {\n\tfunction _transfer(address wh..." (0..212) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Contract" # (9..17) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (open_brace꞉ OpenBrace): "{" # (18..19) - - (TrailingTrivia) ► (EndOfLine): "\n" # (19..20) + - (trailing_trivia꞉ EndOfLine): "\n" # (19..20) - (members꞉ ContractMembers): # "\tfunction _transfer(address while) private {\n\t\tif(..." (20..210) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\tfunction _transfer(address while) private {\n\t\tif(..." (20..138) - - (LeadingTrivia) ► (Whitespace): "\t" # (20..21) + - (leading_trivia꞉ Whitespace): "\t" # (20..21) - (function_keyword꞉ FunctionKeyword): "function" # (21..29) - (name꞉ FunctionName): # " _transfer" (29..39) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (variant꞉ Identifier): "_transfer" # (30..39) - (parameters꞉ ParametersDeclaration): # "(address while)" (39..54) - (open_paren꞉ OpenParen): "(" # (39..40) - (parameters꞉ Parameters): # "address" (40..47) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType) ► (address_keyword꞉ AddressKeyword): "address" # (40..47) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (SKIPPED): "while" # (48..53) - (close_paren꞉ CloseParen): ")" # (53..54) - (attributes꞉ FunctionAttributes): # " private" (54..62) - (item꞉ FunctionAttribute): # " private" (54..62) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (variant꞉ PrivateKeyword): "private" # (55..62) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\t\tif(while == pair && !_isExcludedFromFee[to]){..." (62..138) - - (LeadingTrivia) ► (Whitespace): " " # (62..63) + - (leading_trivia꞉ Whitespace): " " # (62..63) - (open_brace꞉ OpenBrace): "{" # (63..64) - - (TrailingTrivia) ► (EndOfLine): "\n" # (64..65) + - (trailing_trivia꞉ EndOfLine): "\n" # (64..65) - (statements꞉ Statements): # "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." (65..135) - (item꞉ Statement) ► (variant꞉ IfStatement): # "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." (65..135) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (65..67) + - (leading_trivia꞉ Whitespace): "\t\t" # (65..67) - (if_keyword꞉ IfKeyword): "if" # (67..69) - (open_paren꞉ OpenParen): "(" # (69..70) - (SKIPPED): "while == pair && !_isExcludedFromFee[to]" # (70..110) - (close_paren꞉ CloseParen): ")" # (110..111) - (body꞉ Statement) ► (variant꞉ Block): # "{\n\t\t\tuint256 a = 1;\n\t\t}\n" (111..135) - (open_brace꞉ OpenBrace): "{" # (111..112) - - (TrailingTrivia) ► (EndOfLine): "\n" # (112..113) + - (trailing_trivia꞉ EndOfLine): "\n" # (112..113) - (statements꞉ Statements): # "\t\t\tuint256 a = 1;\n" (113..131) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "\t\t\tuint256 a = 1;\n" (113..131) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "\t\t\tuint256" (113..123) - - (LeadingTrivia) ► (Whitespace): "\t\t\t" # (113..116) + - (leading_trivia꞉ Whitespace): "\t\t\t" # (113..116) - (variant꞉ UintKeyword): "uint256" # (116..123) - - (LeadingTrivia) ► (Whitespace): " " # (123..124) + - (leading_trivia꞉ Whitespace): " " # (123..124) - (name꞉ Identifier): "a" # (124..125) - (value꞉ VariableDeclarationValue): # " = 1" (125..129) - - (LeadingTrivia) ► (Whitespace): " " # (125..126) + - (leading_trivia꞉ Whitespace): " " # (125..126) - (equal꞉ Equal): "=" # (126..127) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (127..129) - - (LeadingTrivia) ► (Whitespace): " " # (127..128) + - (leading_trivia꞉ Whitespace): " " # (127..128) - (literal꞉ DecimalLiteral): "1" # (128..129) - (semicolon꞉ Semicolon): ";" # (129..130) - - (TrailingTrivia) ► (EndOfLine): "\n" # (130..131) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (131..133) + - (trailing_trivia꞉ EndOfLine): "\n" # (130..131) + - (leading_trivia꞉ Whitespace): "\t\t" # (131..133) - (close_brace꞉ CloseBrace): "}" # (133..134) - - (TrailingTrivia) ► (EndOfLine): "\n" # (134..135) - - (LeadingTrivia) ► (Whitespace): "\t" # (135..136) + - (trailing_trivia꞉ EndOfLine): "\n" # (134..135) + - (leading_trivia꞉ Whitespace): "\t" # (135..136) - (close_brace꞉ CloseBrace): "}" # (136..137) - - (TrailingTrivia) ► (EndOfLine): "\n" # (137..138) + - (trailing_trivia꞉ EndOfLine): "\n" # (137..138) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\n\tfunction abc() {\n\t\tuint256 x = 0;\n\t\tunchecked { ..." (138..210) - - (LeadingTrivia): # "\n\t" (138..140) - - (EndOfLine): "\n" # (138..139) - - (Whitespace): "\t" # (139..140) + - (leading_trivia꞉ EndOfLine): "\n" # (138..139) + - (leading_trivia꞉ Whitespace): "\t" # (139..140) - (function_keyword꞉ FunctionKeyword): "function" # (140..148) - (name꞉ FunctionName): # " abc" (148..152) - - (LeadingTrivia) ► (Whitespace): " " # (148..149) + - (leading_trivia꞉ Whitespace): " " # (148..149) - (variant꞉ Identifier): "abc" # (149..152) - (parameters꞉ ParametersDeclaration): # "()" (152..154) - (open_paren꞉ OpenParen): "(" # (152..153) @@ -116,31 +115,31 @@ Tree: - (close_paren꞉ CloseParen): ")" # (153..154) - (attributes꞉ FunctionAttributes): [] # (154..154) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\t\tuint256 x = 0;\n\t\tunchecked { invalid sequence..." (154..210) - - (LeadingTrivia) ► (Whitespace): " " # (154..155) + - (leading_trivia꞉ Whitespace): " " # (154..155) - (open_brace꞉ OpenBrace): "{" # (155..156) - - (TrailingTrivia) ► (EndOfLine): "\n" # (156..157) + - (trailing_trivia꞉ EndOfLine): "\n" # (156..157) - (statements꞉ Statements): # "\t\tuint256 x = 0;\n\t\tunchecked " (157..186) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "\t\tuint256 x = 0;\n" (157..174) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "\t\tuint256" (157..166) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (157..159) + - (leading_trivia꞉ Whitespace): "\t\t" # (157..159) - (variant꞉ UintKeyword): "uint256" # (159..166) - - (LeadingTrivia) ► (Whitespace): " " # (166..167) + - (leading_trivia꞉ Whitespace): " " # (166..167) - (name꞉ Identifier): "x" # (167..168) - (value꞉ VariableDeclarationValue): # " = 0" (168..172) - - (LeadingTrivia) ► (Whitespace): " " # (168..169) + - (leading_trivia꞉ Whitespace): " " # (168..169) - (equal꞉ Equal): "=" # (169..170) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 0" (170..172) - - (LeadingTrivia) ► (Whitespace): " " # (170..171) + - (leading_trivia꞉ Whitespace): " " # (170..171) - (literal꞉ DecimalLiteral): "0" # (171..172) - (semicolon꞉ Semicolon): ";" # (172..173) - - (TrailingTrivia) ► (EndOfLine): "\n" # (173..174) + - (trailing_trivia꞉ EndOfLine): "\n" # (173..174) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # "\t\tunchecked " (174..186) - (expression꞉ Expression): # "\t\tunchecked" (174..185) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (174..176) + - (leading_trivia꞉ Whitespace): "\t\t" # (174..176) - (variant꞉ Identifier): "unchecked" # (176..185) - - (LeadingTrivia) ► (Whitespace): " " # (185..186) + - (leading_trivia꞉ Whitespace): " " # (185..186) - (SKIPPED): "{ invalid sequence }\n\t" # (186..208) - (close_brace꞉ CloseBrace): "}" # (208..209) - - (TrailingTrivia) ► (EndOfLine): "\n" # (209..210) + - (trailing_trivia꞉ EndOfLine): "\n" # (209..210) - (close_brace꞉ CloseBrace): "}" # (210..211) - - (TrailingTrivia) ► (EndOfLine): "\n" # (211..212) + - (trailing_trivia꞉ EndOfLine): "\n" # (211..212) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.0-failure.yml index 0634b9d21a..9585fab1a8 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.0-failure.yml @@ -44,71 +44,70 @@ Errors: # 3 total Tree: - (ContractDefinition): # "contract Contract {\n\tfunction _transfer(address wh..." (0..212) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Contract" # (9..17) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (open_brace꞉ OpenBrace): "{" # (18..19) - - (TrailingTrivia) ► (EndOfLine): "\n" # (19..20) + - (trailing_trivia꞉ EndOfLine): "\n" # (19..20) - (members꞉ ContractMembers): # "\tfunction _transfer(address while) private {\n\t\tif(..." (20..210) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\tfunction _transfer(address while) private {\n\t\tif(..." (20..138) - - (LeadingTrivia) ► (Whitespace): "\t" # (20..21) + - (leading_trivia꞉ Whitespace): "\t" # (20..21) - (function_keyword꞉ FunctionKeyword): "function" # (21..29) - (name꞉ FunctionName): # " _transfer" (29..39) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (variant꞉ Identifier): "_transfer" # (30..39) - (parameters꞉ ParametersDeclaration): # "(address while)" (39..54) - (open_paren꞉ OpenParen): "(" # (39..40) - (parameters꞉ Parameters): # "address" (40..47) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType) ► (address_keyword꞉ AddressKeyword): "address" # (40..47) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (SKIPPED): "while" # (48..53) - (close_paren꞉ CloseParen): ")" # (53..54) - (attributes꞉ FunctionAttributes): # " private" (54..62) - (item꞉ FunctionAttribute): # " private" (54..62) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (variant꞉ PrivateKeyword): "private" # (55..62) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\t\tif(while == pair && !_isExcludedFromFee[to]){..." (62..138) - - (LeadingTrivia) ► (Whitespace): " " # (62..63) + - (leading_trivia꞉ Whitespace): " " # (62..63) - (open_brace꞉ OpenBrace): "{" # (63..64) - - (TrailingTrivia) ► (EndOfLine): "\n" # (64..65) + - (trailing_trivia꞉ EndOfLine): "\n" # (64..65) - (statements꞉ Statements): # "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." (65..135) - (item꞉ Statement) ► (variant꞉ IfStatement): # "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." (65..135) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (65..67) + - (leading_trivia꞉ Whitespace): "\t\t" # (65..67) - (if_keyword꞉ IfKeyword): "if" # (67..69) - (open_paren꞉ OpenParen): "(" # (69..70) - (SKIPPED): "while == pair && !_isExcludedFromFee[to]" # (70..110) - (close_paren꞉ CloseParen): ")" # (110..111) - (body꞉ Statement) ► (variant꞉ Block): # "{\n\t\t\tuint256 a = 1;\n\t\t}\n" (111..135) - (open_brace꞉ OpenBrace): "{" # (111..112) - - (TrailingTrivia) ► (EndOfLine): "\n" # (112..113) + - (trailing_trivia꞉ EndOfLine): "\n" # (112..113) - (statements꞉ Statements): # "\t\t\tuint256 a = 1;\n" (113..131) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "\t\t\tuint256 a = 1;\n" (113..131) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "\t\t\tuint256" (113..123) - - (LeadingTrivia) ► (Whitespace): "\t\t\t" # (113..116) + - (leading_trivia꞉ Whitespace): "\t\t\t" # (113..116) - (variant꞉ UintKeyword): "uint256" # (116..123) - - (LeadingTrivia) ► (Whitespace): " " # (123..124) + - (leading_trivia꞉ Whitespace): " " # (123..124) - (name꞉ Identifier): "a" # (124..125) - (value꞉ VariableDeclarationValue): # " = 1" (125..129) - - (LeadingTrivia) ► (Whitespace): " " # (125..126) + - (leading_trivia꞉ Whitespace): " " # (125..126) - (equal꞉ Equal): "=" # (126..127) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (127..129) - - (LeadingTrivia) ► (Whitespace): " " # (127..128) + - (leading_trivia꞉ Whitespace): " " # (127..128) - (literal꞉ DecimalLiteral): "1" # (128..129) - (semicolon꞉ Semicolon): ";" # (129..130) - - (TrailingTrivia) ► (EndOfLine): "\n" # (130..131) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (131..133) + - (trailing_trivia꞉ EndOfLine): "\n" # (130..131) + - (leading_trivia꞉ Whitespace): "\t\t" # (131..133) - (close_brace꞉ CloseBrace): "}" # (133..134) - - (TrailingTrivia) ► (EndOfLine): "\n" # (134..135) - - (LeadingTrivia) ► (Whitespace): "\t" # (135..136) + - (trailing_trivia꞉ EndOfLine): "\n" # (134..135) + - (leading_trivia꞉ Whitespace): "\t" # (135..136) - (close_brace꞉ CloseBrace): "}" # (136..137) - - (TrailingTrivia) ► (EndOfLine): "\n" # (137..138) + - (trailing_trivia꞉ EndOfLine): "\n" # (137..138) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\n\tfunction abc() {\n\t\tuint256 x = 0;\n\t\tunchecked { ..." (138..210) - - (LeadingTrivia): # "\n\t" (138..140) - - (EndOfLine): "\n" # (138..139) - - (Whitespace): "\t" # (139..140) + - (leading_trivia꞉ EndOfLine): "\n" # (138..139) + - (leading_trivia꞉ Whitespace): "\t" # (139..140) - (function_keyword꞉ FunctionKeyword): "function" # (140..148) - (name꞉ FunctionName): # " abc" (148..152) - - (LeadingTrivia) ► (Whitespace): " " # (148..149) + - (leading_trivia꞉ Whitespace): " " # (148..149) - (variant꞉ Identifier): "abc" # (149..152) - (parameters꞉ ParametersDeclaration): # "()" (152..154) - (open_paren꞉ OpenParen): "(" # (152..153) @@ -116,27 +115,27 @@ Tree: - (close_paren꞉ CloseParen): ")" # (153..154) - (attributes꞉ FunctionAttributes): [] # (154..154) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\t\tuint256 x = 0;\n\t\tunchecked { invalid sequence..." (154..210) - - (LeadingTrivia) ► (Whitespace): " " # (154..155) + - (leading_trivia꞉ Whitespace): " " # (154..155) - (open_brace꞉ OpenBrace): "{" # (155..156) - - (TrailingTrivia) ► (EndOfLine): "\n" # (156..157) + - (trailing_trivia꞉ EndOfLine): "\n" # (156..157) - (statements꞉ Statements): # "\t\tuint256 x = 0;\n" (157..174) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "\t\tuint256 x = 0;\n" (157..174) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "\t\tuint256" (157..166) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (157..159) + - (leading_trivia꞉ Whitespace): "\t\t" # (157..159) - (variant꞉ UintKeyword): "uint256" # (159..166) - - (LeadingTrivia) ► (Whitespace): " " # (166..167) + - (leading_trivia꞉ Whitespace): " " # (166..167) - (name꞉ Identifier): "x" # (167..168) - (value꞉ VariableDeclarationValue): # " = 0" (168..172) - - (LeadingTrivia) ► (Whitespace): " " # (168..169) + - (leading_trivia꞉ Whitespace): " " # (168..169) - (equal꞉ Equal): "=" # (169..170) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 0" (170..172) - - (LeadingTrivia) ► (Whitespace): " " # (170..171) + - (leading_trivia꞉ Whitespace): " " # (170..171) - (literal꞉ DecimalLiteral): "0" # (171..172) - (semicolon꞉ Semicolon): ";" # (172..173) - - (TrailingTrivia) ► (EndOfLine): "\n" # (173..174) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (174..176) + - (trailing_trivia꞉ EndOfLine): "\n" # (173..174) + - (leading_trivia꞉ Whitespace): "\t\t" # (174..176) - (SKIPPED): "unchecked { invalid sequence }\n\t" # (176..208) - (close_brace꞉ CloseBrace): "}" # (208..209) - - (TrailingTrivia) ► (EndOfLine): "\n" # (209..210) + - (trailing_trivia꞉ EndOfLine): "\n" # (209..210) - (close_brace꞉ CloseBrace): "}" # (210..211) - - (TrailingTrivia) ► (EndOfLine): "\n" # (211..212) + - (trailing_trivia꞉ EndOfLine): "\n" # (211..212) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.3-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.3-failure.yml index efebad8936..f30eeae838 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.3-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.3-failure.yml @@ -44,71 +44,70 @@ Errors: # 3 total Tree: - (ContractDefinition): # "contract Contract {\n\tfunction _transfer(address wh..." (0..212) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Contract" # (9..17) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (open_brace꞉ OpenBrace): "{" # (18..19) - - (TrailingTrivia) ► (EndOfLine): "\n" # (19..20) + - (trailing_trivia꞉ EndOfLine): "\n" # (19..20) - (members꞉ ContractMembers): # "\tfunction _transfer(address while) private {\n\t\tif(..." (20..210) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\tfunction _transfer(address while) private {\n\t\tif(..." (20..138) - - (LeadingTrivia) ► (Whitespace): "\t" # (20..21) + - (leading_trivia꞉ Whitespace): "\t" # (20..21) - (function_keyword꞉ FunctionKeyword): "function" # (21..29) - (name꞉ FunctionName): # " _transfer" (29..39) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (variant꞉ Identifier): "_transfer" # (30..39) - (parameters꞉ ParametersDeclaration): # "(address while)" (39..54) - (open_paren꞉ OpenParen): "(" # (39..40) - (parameters꞉ Parameters): # "address" (40..47) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType) ► (address_keyword꞉ AddressKeyword): "address" # (40..47) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (SKIPPED): "while" # (48..53) - (close_paren꞉ CloseParen): ")" # (53..54) - (attributes꞉ FunctionAttributes): # " private" (54..62) - (item꞉ FunctionAttribute): # " private" (54..62) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (variant꞉ PrivateKeyword): "private" # (55..62) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\t\tif(while == pair && !_isExcludedFromFee[to]){..." (62..138) - - (LeadingTrivia) ► (Whitespace): " " # (62..63) + - (leading_trivia꞉ Whitespace): " " # (62..63) - (open_brace꞉ OpenBrace): "{" # (63..64) - - (TrailingTrivia) ► (EndOfLine): "\n" # (64..65) + - (trailing_trivia꞉ EndOfLine): "\n" # (64..65) - (statements꞉ Statements): # "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." (65..135) - (item꞉ Statement) ► (variant꞉ IfStatement): # "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." (65..135) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (65..67) + - (leading_trivia꞉ Whitespace): "\t\t" # (65..67) - (if_keyword꞉ IfKeyword): "if" # (67..69) - (open_paren꞉ OpenParen): "(" # (69..70) - (SKIPPED): "while == pair && !_isExcludedFromFee[to]" # (70..110) - (close_paren꞉ CloseParen): ")" # (110..111) - (body꞉ Statement) ► (variant꞉ Block): # "{\n\t\t\tuint256 a = 1;\n\t\t}\n" (111..135) - (open_brace꞉ OpenBrace): "{" # (111..112) - - (TrailingTrivia) ► (EndOfLine): "\n" # (112..113) + - (trailing_trivia꞉ EndOfLine): "\n" # (112..113) - (statements꞉ Statements): # "\t\t\tuint256 a = 1;\n" (113..131) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "\t\t\tuint256 a = 1;\n" (113..131) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "\t\t\tuint256" (113..123) - - (LeadingTrivia) ► (Whitespace): "\t\t\t" # (113..116) + - (leading_trivia꞉ Whitespace): "\t\t\t" # (113..116) - (variant꞉ UintKeyword): "uint256" # (116..123) - - (LeadingTrivia) ► (Whitespace): " " # (123..124) + - (leading_trivia꞉ Whitespace): " " # (123..124) - (name꞉ Identifier): "a" # (124..125) - (value꞉ VariableDeclarationValue): # " = 1" (125..129) - - (LeadingTrivia) ► (Whitespace): " " # (125..126) + - (leading_trivia꞉ Whitespace): " " # (125..126) - (equal꞉ Equal): "=" # (126..127) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (127..129) - - (LeadingTrivia) ► (Whitespace): " " # (127..128) + - (leading_trivia꞉ Whitespace): " " # (127..128) - (literal꞉ DecimalLiteral): "1" # (128..129) - (semicolon꞉ Semicolon): ";" # (129..130) - - (TrailingTrivia) ► (EndOfLine): "\n" # (130..131) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (131..133) + - (trailing_trivia꞉ EndOfLine): "\n" # (130..131) + - (leading_trivia꞉ Whitespace): "\t\t" # (131..133) - (close_brace꞉ CloseBrace): "}" # (133..134) - - (TrailingTrivia) ► (EndOfLine): "\n" # (134..135) - - (LeadingTrivia) ► (Whitespace): "\t" # (135..136) + - (trailing_trivia꞉ EndOfLine): "\n" # (134..135) + - (leading_trivia꞉ Whitespace): "\t" # (135..136) - (close_brace꞉ CloseBrace): "}" # (136..137) - - (TrailingTrivia) ► (EndOfLine): "\n" # (137..138) + - (trailing_trivia꞉ EndOfLine): "\n" # (137..138) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\n\tfunction abc() {\n\t\tuint256 x = 0;\n\t\tunchecked { ..." (138..210) - - (LeadingTrivia): # "\n\t" (138..140) - - (EndOfLine): "\n" # (138..139) - - (Whitespace): "\t" # (139..140) + - (leading_trivia꞉ EndOfLine): "\n" # (138..139) + - (leading_trivia꞉ Whitespace): "\t" # (139..140) - (function_keyword꞉ FunctionKeyword): "function" # (140..148) - (name꞉ FunctionName): # " abc" (148..152) - - (LeadingTrivia) ► (Whitespace): " " # (148..149) + - (leading_trivia꞉ Whitespace): " " # (148..149) - (variant꞉ Identifier): "abc" # (149..152) - (parameters꞉ ParametersDeclaration): # "()" (152..154) - (open_paren꞉ OpenParen): "(" # (152..153) @@ -116,27 +115,27 @@ Tree: - (close_paren꞉ CloseParen): ")" # (153..154) - (attributes꞉ FunctionAttributes): [] # (154..154) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\t\tuint256 x = 0;\n\t\tunchecked { invalid sequence..." (154..210) - - (LeadingTrivia) ► (Whitespace): " " # (154..155) + - (leading_trivia꞉ Whitespace): " " # (154..155) - (open_brace꞉ OpenBrace): "{" # (155..156) - - (TrailingTrivia) ► (EndOfLine): "\n" # (156..157) + - (trailing_trivia꞉ EndOfLine): "\n" # (156..157) - (statements꞉ Statements): # "\t\tuint256 x = 0;\n" (157..174) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "\t\tuint256 x = 0;\n" (157..174) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "\t\tuint256" (157..166) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (157..159) + - (leading_trivia꞉ Whitespace): "\t\t" # (157..159) - (variant꞉ UintKeyword): "uint256" # (159..166) - - (LeadingTrivia) ► (Whitespace): " " # (166..167) + - (leading_trivia꞉ Whitespace): " " # (166..167) - (name꞉ Identifier): "x" # (167..168) - (value꞉ VariableDeclarationValue): # " = 0" (168..172) - - (LeadingTrivia) ► (Whitespace): " " # (168..169) + - (leading_trivia꞉ Whitespace): " " # (168..169) - (equal꞉ Equal): "=" # (169..170) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 0" (170..172) - - (LeadingTrivia) ► (Whitespace): " " # (170..171) + - (leading_trivia꞉ Whitespace): " " # (170..171) - (literal꞉ DecimalLiteral): "0" # (171..172) - (semicolon꞉ Semicolon): ";" # (172..173) - - (TrailingTrivia) ► (EndOfLine): "\n" # (173..174) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (174..176) + - (trailing_trivia꞉ EndOfLine): "\n" # (173..174) + - (leading_trivia꞉ Whitespace): "\t\t" # (174..176) - (SKIPPED): "unchecked { invalid sequence }\n\t" # (176..208) - (close_brace꞉ CloseBrace): "}" # (208..209) - - (TrailingTrivia) ► (EndOfLine): "\n" # (209..210) + - (trailing_trivia꞉ EndOfLine): "\n" # (209..210) - (close_brace꞉ CloseBrace): "}" # (210..211) - - (TrailingTrivia) ► (EndOfLine): "\n" # (211..212) + - (trailing_trivia꞉ EndOfLine): "\n" # (211..212) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.6.0-failure.yml index df12f0613e..96013f344a 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.6.0-failure.yml @@ -44,71 +44,70 @@ Errors: # 3 total Tree: - (ContractDefinition): # "contract Contract {\n\tfunction _transfer(address wh..." (0..212) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Contract" # (9..17) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (open_brace꞉ OpenBrace): "{" # (18..19) - - (TrailingTrivia) ► (EndOfLine): "\n" # (19..20) + - (trailing_trivia꞉ EndOfLine): "\n" # (19..20) - (members꞉ ContractMembers): # "\tfunction _transfer(address while) private {\n\t\tif(..." (20..210) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\tfunction _transfer(address while) private {\n\t\tif(..." (20..138) - - (LeadingTrivia) ► (Whitespace): "\t" # (20..21) + - (leading_trivia꞉ Whitespace): "\t" # (20..21) - (function_keyword꞉ FunctionKeyword): "function" # (21..29) - (name꞉ FunctionName): # " _transfer" (29..39) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (variant꞉ Identifier): "_transfer" # (30..39) - (parameters꞉ ParametersDeclaration): # "(address while)" (39..54) - (open_paren꞉ OpenParen): "(" # (39..40) - (parameters꞉ Parameters): # "address" (40..47) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType) ► (address_keyword꞉ AddressKeyword): "address" # (40..47) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (SKIPPED): "while" # (48..53) - (close_paren꞉ CloseParen): ")" # (53..54) - (attributes꞉ FunctionAttributes): # " private" (54..62) - (item꞉ FunctionAttribute): # " private" (54..62) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (variant꞉ PrivateKeyword): "private" # (55..62) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\t\tif(while == pair && !_isExcludedFromFee[to]){..." (62..138) - - (LeadingTrivia) ► (Whitespace): " " # (62..63) + - (leading_trivia꞉ Whitespace): " " # (62..63) - (open_brace꞉ OpenBrace): "{" # (63..64) - - (TrailingTrivia) ► (EndOfLine): "\n" # (64..65) + - (trailing_trivia꞉ EndOfLine): "\n" # (64..65) - (statements꞉ Statements): # "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." (65..135) - (item꞉ Statement) ► (variant꞉ IfStatement): # "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." (65..135) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (65..67) + - (leading_trivia꞉ Whitespace): "\t\t" # (65..67) - (if_keyword꞉ IfKeyword): "if" # (67..69) - (open_paren꞉ OpenParen): "(" # (69..70) - (SKIPPED): "while == pair && !_isExcludedFromFee[to]" # (70..110) - (close_paren꞉ CloseParen): ")" # (110..111) - (body꞉ Statement) ► (variant꞉ Block): # "{\n\t\t\tuint256 a = 1;\n\t\t}\n" (111..135) - (open_brace꞉ OpenBrace): "{" # (111..112) - - (TrailingTrivia) ► (EndOfLine): "\n" # (112..113) + - (trailing_trivia꞉ EndOfLine): "\n" # (112..113) - (statements꞉ Statements): # "\t\t\tuint256 a = 1;\n" (113..131) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "\t\t\tuint256 a = 1;\n" (113..131) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "\t\t\tuint256" (113..123) - - (LeadingTrivia) ► (Whitespace): "\t\t\t" # (113..116) + - (leading_trivia꞉ Whitespace): "\t\t\t" # (113..116) - (variant꞉ UintKeyword): "uint256" # (116..123) - - (LeadingTrivia) ► (Whitespace): " " # (123..124) + - (leading_trivia꞉ Whitespace): " " # (123..124) - (name꞉ Identifier): "a" # (124..125) - (value꞉ VariableDeclarationValue): # " = 1" (125..129) - - (LeadingTrivia) ► (Whitespace): " " # (125..126) + - (leading_trivia꞉ Whitespace): " " # (125..126) - (equal꞉ Equal): "=" # (126..127) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (127..129) - - (LeadingTrivia) ► (Whitespace): " " # (127..128) + - (leading_trivia꞉ Whitespace): " " # (127..128) - (literal꞉ DecimalLiteral): "1" # (128..129) - (semicolon꞉ Semicolon): ";" # (129..130) - - (TrailingTrivia) ► (EndOfLine): "\n" # (130..131) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (131..133) + - (trailing_trivia꞉ EndOfLine): "\n" # (130..131) + - (leading_trivia꞉ Whitespace): "\t\t" # (131..133) - (close_brace꞉ CloseBrace): "}" # (133..134) - - (TrailingTrivia) ► (EndOfLine): "\n" # (134..135) - - (LeadingTrivia) ► (Whitespace): "\t" # (135..136) + - (trailing_trivia꞉ EndOfLine): "\n" # (134..135) + - (leading_trivia꞉ Whitespace): "\t" # (135..136) - (close_brace꞉ CloseBrace): "}" # (136..137) - - (TrailingTrivia) ► (EndOfLine): "\n" # (137..138) + - (trailing_trivia꞉ EndOfLine): "\n" # (137..138) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\n\tfunction abc() {\n\t\tuint256 x = 0;\n\t\tunchecked { ..." (138..210) - - (LeadingTrivia): # "\n\t" (138..140) - - (EndOfLine): "\n" # (138..139) - - (Whitespace): "\t" # (139..140) + - (leading_trivia꞉ EndOfLine): "\n" # (138..139) + - (leading_trivia꞉ Whitespace): "\t" # (139..140) - (function_keyword꞉ FunctionKeyword): "function" # (140..148) - (name꞉ FunctionName): # " abc" (148..152) - - (LeadingTrivia) ► (Whitespace): " " # (148..149) + - (leading_trivia꞉ Whitespace): " " # (148..149) - (variant꞉ Identifier): "abc" # (149..152) - (parameters꞉ ParametersDeclaration): # "()" (152..154) - (open_paren꞉ OpenParen): "(" # (152..153) @@ -116,27 +115,27 @@ Tree: - (close_paren꞉ CloseParen): ")" # (153..154) - (attributes꞉ FunctionAttributes): [] # (154..154) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\t\tuint256 x = 0;\n\t\tunchecked { invalid sequence..." (154..210) - - (LeadingTrivia) ► (Whitespace): " " # (154..155) + - (leading_trivia꞉ Whitespace): " " # (154..155) - (open_brace꞉ OpenBrace): "{" # (155..156) - - (TrailingTrivia) ► (EndOfLine): "\n" # (156..157) + - (trailing_trivia꞉ EndOfLine): "\n" # (156..157) - (statements꞉ Statements): # "\t\tuint256 x = 0;\n" (157..174) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "\t\tuint256 x = 0;\n" (157..174) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "\t\tuint256" (157..166) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (157..159) + - (leading_trivia꞉ Whitespace): "\t\t" # (157..159) - (variant꞉ UintKeyword): "uint256" # (159..166) - - (LeadingTrivia) ► (Whitespace): " " # (166..167) + - (leading_trivia꞉ Whitespace): " " # (166..167) - (name꞉ Identifier): "x" # (167..168) - (value꞉ VariableDeclarationValue): # " = 0" (168..172) - - (LeadingTrivia) ► (Whitespace): " " # (168..169) + - (leading_trivia꞉ Whitespace): " " # (168..169) - (equal꞉ Equal): "=" # (169..170) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 0" (170..172) - - (LeadingTrivia) ► (Whitespace): " " # (170..171) + - (leading_trivia꞉ Whitespace): " " # (170..171) - (literal꞉ DecimalLiteral): "0" # (171..172) - (semicolon꞉ Semicolon): ";" # (172..173) - - (TrailingTrivia) ► (EndOfLine): "\n" # (173..174) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (174..176) + - (trailing_trivia꞉ EndOfLine): "\n" # (173..174) + - (leading_trivia꞉ Whitespace): "\t\t" # (174..176) - (SKIPPED): "unchecked { invalid sequence }\n\t" # (176..208) - (close_brace꞉ CloseBrace): "}" # (208..209) - - (TrailingTrivia) ► (EndOfLine): "\n" # (209..210) + - (trailing_trivia꞉ EndOfLine): "\n" # (209..210) - (close_brace꞉ CloseBrace): "}" # (210..211) - - (TrailingTrivia) ► (EndOfLine): "\n" # (211..212) + - (trailing_trivia꞉ EndOfLine): "\n" # (211..212) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.7.0-failure.yml index a2e4be7d24..933a87a497 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.7.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.7.0-failure.yml @@ -44,71 +44,70 @@ Errors: # 3 total Tree: - (ContractDefinition): # "contract Contract {\n\tfunction _transfer(address wh..." (0..212) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Contract" # (9..17) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (open_brace꞉ OpenBrace): "{" # (18..19) - - (TrailingTrivia) ► (EndOfLine): "\n" # (19..20) + - (trailing_trivia꞉ EndOfLine): "\n" # (19..20) - (members꞉ ContractMembers): # "\tfunction _transfer(address while) private {\n\t\tif(..." (20..210) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\tfunction _transfer(address while) private {\n\t\tif(..." (20..138) - - (LeadingTrivia) ► (Whitespace): "\t" # (20..21) + - (leading_trivia꞉ Whitespace): "\t" # (20..21) - (function_keyword꞉ FunctionKeyword): "function" # (21..29) - (name꞉ FunctionName): # " _transfer" (29..39) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (variant꞉ Identifier): "_transfer" # (30..39) - (parameters꞉ ParametersDeclaration): # "(address while)" (39..54) - (open_paren꞉ OpenParen): "(" # (39..40) - (parameters꞉ Parameters): # "address" (40..47) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType) ► (address_keyword꞉ AddressKeyword): "address" # (40..47) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (SKIPPED): "while" # (48..53) - (close_paren꞉ CloseParen): ")" # (53..54) - (attributes꞉ FunctionAttributes): # " private" (54..62) - (item꞉ FunctionAttribute): # " private" (54..62) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (variant꞉ PrivateKeyword): "private" # (55..62) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\t\tif(while == pair && !_isExcludedFromFee[to]){..." (62..138) - - (LeadingTrivia) ► (Whitespace): " " # (62..63) + - (leading_trivia꞉ Whitespace): " " # (62..63) - (open_brace꞉ OpenBrace): "{" # (63..64) - - (TrailingTrivia) ► (EndOfLine): "\n" # (64..65) + - (trailing_trivia꞉ EndOfLine): "\n" # (64..65) - (statements꞉ Statements): # "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." (65..135) - (item꞉ Statement) ► (variant꞉ IfStatement): # "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." (65..135) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (65..67) + - (leading_trivia꞉ Whitespace): "\t\t" # (65..67) - (if_keyword꞉ IfKeyword): "if" # (67..69) - (open_paren꞉ OpenParen): "(" # (69..70) - (SKIPPED): "while == pair && !_isExcludedFromFee[to]" # (70..110) - (close_paren꞉ CloseParen): ")" # (110..111) - (body꞉ Statement) ► (variant꞉ Block): # "{\n\t\t\tuint256 a = 1;\n\t\t}\n" (111..135) - (open_brace꞉ OpenBrace): "{" # (111..112) - - (TrailingTrivia) ► (EndOfLine): "\n" # (112..113) + - (trailing_trivia꞉ EndOfLine): "\n" # (112..113) - (statements꞉ Statements): # "\t\t\tuint256 a = 1;\n" (113..131) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "\t\t\tuint256 a = 1;\n" (113..131) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "\t\t\tuint256" (113..123) - - (LeadingTrivia) ► (Whitespace): "\t\t\t" # (113..116) + - (leading_trivia꞉ Whitespace): "\t\t\t" # (113..116) - (variant꞉ UintKeyword): "uint256" # (116..123) - - (LeadingTrivia) ► (Whitespace): " " # (123..124) + - (leading_trivia꞉ Whitespace): " " # (123..124) - (name꞉ Identifier): "a" # (124..125) - (value꞉ VariableDeclarationValue): # " = 1" (125..129) - - (LeadingTrivia) ► (Whitespace): " " # (125..126) + - (leading_trivia꞉ Whitespace): " " # (125..126) - (equal꞉ Equal): "=" # (126..127) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (127..129) - - (LeadingTrivia) ► (Whitespace): " " # (127..128) + - (leading_trivia꞉ Whitespace): " " # (127..128) - (literal꞉ DecimalLiteral): "1" # (128..129) - (semicolon꞉ Semicolon): ";" # (129..130) - - (TrailingTrivia) ► (EndOfLine): "\n" # (130..131) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (131..133) + - (trailing_trivia꞉ EndOfLine): "\n" # (130..131) + - (leading_trivia꞉ Whitespace): "\t\t" # (131..133) - (close_brace꞉ CloseBrace): "}" # (133..134) - - (TrailingTrivia) ► (EndOfLine): "\n" # (134..135) - - (LeadingTrivia) ► (Whitespace): "\t" # (135..136) + - (trailing_trivia꞉ EndOfLine): "\n" # (134..135) + - (leading_trivia꞉ Whitespace): "\t" # (135..136) - (close_brace꞉ CloseBrace): "}" # (136..137) - - (TrailingTrivia) ► (EndOfLine): "\n" # (137..138) + - (trailing_trivia꞉ EndOfLine): "\n" # (137..138) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\n\tfunction abc() {\n\t\tuint256 x = 0;\n\t\tunchecked { ..." (138..210) - - (LeadingTrivia): # "\n\t" (138..140) - - (EndOfLine): "\n" # (138..139) - - (Whitespace): "\t" # (139..140) + - (leading_trivia꞉ EndOfLine): "\n" # (138..139) + - (leading_trivia꞉ Whitespace): "\t" # (139..140) - (function_keyword꞉ FunctionKeyword): "function" # (140..148) - (name꞉ FunctionName): # " abc" (148..152) - - (LeadingTrivia) ► (Whitespace): " " # (148..149) + - (leading_trivia꞉ Whitespace): " " # (148..149) - (variant꞉ Identifier): "abc" # (149..152) - (parameters꞉ ParametersDeclaration): # "()" (152..154) - (open_paren꞉ OpenParen): "(" # (152..153) @@ -116,27 +115,27 @@ Tree: - (close_paren꞉ CloseParen): ")" # (153..154) - (attributes꞉ FunctionAttributes): [] # (154..154) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\t\tuint256 x = 0;\n\t\tunchecked { invalid sequence..." (154..210) - - (LeadingTrivia) ► (Whitespace): " " # (154..155) + - (leading_trivia꞉ Whitespace): " " # (154..155) - (open_brace꞉ OpenBrace): "{" # (155..156) - - (TrailingTrivia) ► (EndOfLine): "\n" # (156..157) + - (trailing_trivia꞉ EndOfLine): "\n" # (156..157) - (statements꞉ Statements): # "\t\tuint256 x = 0;\n" (157..174) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "\t\tuint256 x = 0;\n" (157..174) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "\t\tuint256" (157..166) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (157..159) + - (leading_trivia꞉ Whitespace): "\t\t" # (157..159) - (variant꞉ UintKeyword): "uint256" # (159..166) - - (LeadingTrivia) ► (Whitespace): " " # (166..167) + - (leading_trivia꞉ Whitespace): " " # (166..167) - (name꞉ Identifier): "x" # (167..168) - (value꞉ VariableDeclarationValue): # " = 0" (168..172) - - (LeadingTrivia) ► (Whitespace): " " # (168..169) + - (leading_trivia꞉ Whitespace): " " # (168..169) - (equal꞉ Equal): "=" # (169..170) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 0" (170..172) - - (LeadingTrivia) ► (Whitespace): " " # (170..171) + - (leading_trivia꞉ Whitespace): " " # (170..171) - (literal꞉ DecimalLiteral): "0" # (171..172) - (semicolon꞉ Semicolon): ";" # (172..173) - - (TrailingTrivia) ► (EndOfLine): "\n" # (173..174) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (174..176) + - (trailing_trivia꞉ EndOfLine): "\n" # (173..174) + - (leading_trivia꞉ Whitespace): "\t\t" # (174..176) - (SKIPPED): "unchecked { invalid sequence }\n\t" # (176..208) - (close_brace꞉ CloseBrace): "}" # (208..209) - - (TrailingTrivia) ► (EndOfLine): "\n" # (209..210) + - (trailing_trivia꞉ EndOfLine): "\n" # (209..210) - (close_brace꞉ CloseBrace): "}" # (210..211) - - (TrailingTrivia) ► (EndOfLine): "\n" # (211..212) + - (trailing_trivia꞉ EndOfLine): "\n" # (211..212) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.8.0-failure.yml index cbbae05442..0d744cab74 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.8.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.8.0-failure.yml @@ -43,71 +43,70 @@ Errors: # 3 total Tree: - (ContractDefinition): # "contract Contract {\n\tfunction _transfer(address wh..." (0..212) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Contract" # (9..17) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (open_brace꞉ OpenBrace): "{" # (18..19) - - (TrailingTrivia) ► (EndOfLine): "\n" # (19..20) + - (trailing_trivia꞉ EndOfLine): "\n" # (19..20) - (members꞉ ContractMembers): # "\tfunction _transfer(address while) private {\n\t\tif(..." (20..210) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\tfunction _transfer(address while) private {\n\t\tif(..." (20..138) - - (LeadingTrivia) ► (Whitespace): "\t" # (20..21) + - (leading_trivia꞉ Whitespace): "\t" # (20..21) - (function_keyword꞉ FunctionKeyword): "function" # (21..29) - (name꞉ FunctionName): # " _transfer" (29..39) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (variant꞉ Identifier): "_transfer" # (30..39) - (parameters꞉ ParametersDeclaration): # "(address while)" (39..54) - (open_paren꞉ OpenParen): "(" # (39..40) - (parameters꞉ Parameters): # "address" (40..47) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType) ► (address_keyword꞉ AddressKeyword): "address" # (40..47) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (SKIPPED): "while" # (48..53) - (close_paren꞉ CloseParen): ")" # (53..54) - (attributes꞉ FunctionAttributes): # " private" (54..62) - (item꞉ FunctionAttribute): # " private" (54..62) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (variant꞉ PrivateKeyword): "private" # (55..62) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\t\tif(while == pair && !_isExcludedFromFee[to]){..." (62..138) - - (LeadingTrivia) ► (Whitespace): " " # (62..63) + - (leading_trivia꞉ Whitespace): " " # (62..63) - (open_brace꞉ OpenBrace): "{" # (63..64) - - (TrailingTrivia) ► (EndOfLine): "\n" # (64..65) + - (trailing_trivia꞉ EndOfLine): "\n" # (64..65) - (statements꞉ Statements): # "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." (65..135) - (item꞉ Statement) ► (variant꞉ IfStatement): # "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." (65..135) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (65..67) + - (leading_trivia꞉ Whitespace): "\t\t" # (65..67) - (if_keyword꞉ IfKeyword): "if" # (67..69) - (open_paren꞉ OpenParen): "(" # (69..70) - (SKIPPED): "while == pair && !_isExcludedFromFee[to]" # (70..110) - (close_paren꞉ CloseParen): ")" # (110..111) - (body꞉ Statement) ► (variant꞉ Block): # "{\n\t\t\tuint256 a = 1;\n\t\t}\n" (111..135) - (open_brace꞉ OpenBrace): "{" # (111..112) - - (TrailingTrivia) ► (EndOfLine): "\n" # (112..113) + - (trailing_trivia꞉ EndOfLine): "\n" # (112..113) - (statements꞉ Statements): # "\t\t\tuint256 a = 1;\n" (113..131) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "\t\t\tuint256 a = 1;\n" (113..131) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "\t\t\tuint256" (113..123) - - (LeadingTrivia) ► (Whitespace): "\t\t\t" # (113..116) + - (leading_trivia꞉ Whitespace): "\t\t\t" # (113..116) - (variant꞉ UintKeyword): "uint256" # (116..123) - - (LeadingTrivia) ► (Whitespace): " " # (123..124) + - (leading_trivia꞉ Whitespace): " " # (123..124) - (name꞉ Identifier): "a" # (124..125) - (value꞉ VariableDeclarationValue): # " = 1" (125..129) - - (LeadingTrivia) ► (Whitespace): " " # (125..126) + - (leading_trivia꞉ Whitespace): " " # (125..126) - (equal꞉ Equal): "=" # (126..127) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (127..129) - - (LeadingTrivia) ► (Whitespace): " " # (127..128) + - (leading_trivia꞉ Whitespace): " " # (127..128) - (literal꞉ DecimalLiteral): "1" # (128..129) - (semicolon꞉ Semicolon): ";" # (129..130) - - (TrailingTrivia) ► (EndOfLine): "\n" # (130..131) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (131..133) + - (trailing_trivia꞉ EndOfLine): "\n" # (130..131) + - (leading_trivia꞉ Whitespace): "\t\t" # (131..133) - (close_brace꞉ CloseBrace): "}" # (133..134) - - (TrailingTrivia) ► (EndOfLine): "\n" # (134..135) - - (LeadingTrivia) ► (Whitespace): "\t" # (135..136) + - (trailing_trivia꞉ EndOfLine): "\n" # (134..135) + - (leading_trivia꞉ Whitespace): "\t" # (135..136) - (close_brace꞉ CloseBrace): "}" # (136..137) - - (TrailingTrivia) ► (EndOfLine): "\n" # (137..138) + - (trailing_trivia꞉ EndOfLine): "\n" # (137..138) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\n\tfunction abc() {\n\t\tuint256 x = 0;\n\t\tunchecked { ..." (138..210) - - (LeadingTrivia): # "\n\t" (138..140) - - (EndOfLine): "\n" # (138..139) - - (Whitespace): "\t" # (139..140) + - (leading_trivia꞉ EndOfLine): "\n" # (138..139) + - (leading_trivia꞉ Whitespace): "\t" # (139..140) - (function_keyword꞉ FunctionKeyword): "function" # (140..148) - (name꞉ FunctionName): # " abc" (148..152) - - (LeadingTrivia) ► (Whitespace): " " # (148..149) + - (leading_trivia꞉ Whitespace): " " # (148..149) - (variant꞉ Identifier): "abc" # (149..152) - (parameters꞉ ParametersDeclaration): # "()" (152..154) - (open_paren꞉ OpenParen): "(" # (152..153) @@ -115,43 +114,43 @@ Tree: - (close_paren꞉ CloseParen): ")" # (153..154) - (attributes꞉ FunctionAttributes): [] # (154..154) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\t\tuint256 x = 0;\n\t\tunchecked { invalid sequence..." (154..210) - - (LeadingTrivia) ► (Whitespace): " " # (154..155) + - (leading_trivia꞉ Whitespace): " " # (154..155) - (open_brace꞉ OpenBrace): "{" # (155..156) - - (TrailingTrivia) ► (EndOfLine): "\n" # (156..157) + - (trailing_trivia꞉ EndOfLine): "\n" # (156..157) - (statements꞉ Statements): # "\t\tuint256 x = 0;\n\t\tunchecked { invalid sequence }\n" (157..207) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "\t\tuint256 x = 0;\n" (157..174) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "\t\tuint256" (157..166) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (157..159) + - (leading_trivia꞉ Whitespace): "\t\t" # (157..159) - (variant꞉ UintKeyword): "uint256" # (159..166) - - (LeadingTrivia) ► (Whitespace): " " # (166..167) + - (leading_trivia꞉ Whitespace): " " # (166..167) - (name꞉ Identifier): "x" # (167..168) - (value꞉ VariableDeclarationValue): # " = 0" (168..172) - - (LeadingTrivia) ► (Whitespace): " " # (168..169) + - (leading_trivia꞉ Whitespace): " " # (168..169) - (equal꞉ Equal): "=" # (169..170) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 0" (170..172) - - (LeadingTrivia) ► (Whitespace): " " # (170..171) + - (leading_trivia꞉ Whitespace): " " # (170..171) - (literal꞉ DecimalLiteral): "0" # (171..172) - (semicolon꞉ Semicolon): ";" # (172..173) - - (TrailingTrivia) ► (EndOfLine): "\n" # (173..174) + - (trailing_trivia꞉ EndOfLine): "\n" # (173..174) - (item꞉ Statement) ► (variant꞉ UncheckedBlock): # "\t\tunchecked { invalid sequence }\n" (174..207) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (174..176) + - (leading_trivia꞉ Whitespace): "\t\t" # (174..176) - (unchecked_keyword꞉ UncheckedKeyword): "unchecked" # (176..185) - (block꞉ Block): # " { invalid sequence }\n" (185..207) - - (LeadingTrivia) ► (Whitespace): " " # (185..186) + - (leading_trivia꞉ Whitespace): " " # (185..186) - (open_brace꞉ OpenBrace): "{" # (186..187) - (statements꞉ Statements): # " invalid sequence " (187..205) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " invalid sequence " (187..205) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ IdentifierPath): # " invalid" (187..195) - - (LeadingTrivia) ► (Whitespace): " " # (187..188) + - (leading_trivia꞉ Whitespace): " " # (187..188) - (item꞉ Identifier): "invalid" # (188..195) - - (LeadingTrivia) ► (Whitespace): " " # (195..196) + - (leading_trivia꞉ Whitespace): " " # (195..196) - (name꞉ Identifier): "sequence" # (196..204) - - (LeadingTrivia) ► (Whitespace): " " # (204..205) + - (leading_trivia꞉ Whitespace): " " # (204..205) - (SKIPPED): "" # (205..205) - (close_brace꞉ CloseBrace): "}" # (205..206) - - (TrailingTrivia) ► (EndOfLine): "\n" # (206..207) - - (LeadingTrivia) ► (Whitespace): "\t" # (207..208) + - (trailing_trivia꞉ EndOfLine): "\n" # (206..207) + - (leading_trivia꞉ Whitespace): "\t" # (207..208) - (close_brace꞉ CloseBrace): "}" # (208..209) - - (TrailingTrivia) ► (EndOfLine): "\n" # (209..210) + - (trailing_trivia꞉ EndOfLine): "\n" # (209..210) - (close_brace꞉ CloseBrace): "}" # (210..211) - - (TrailingTrivia) ► (EndOfLine): "\n" # (211..212) + - (trailing_trivia꞉ EndOfLine): "\n" # (211..212) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.4.11-failure.yml index 282b9e4c70..5683a3bc68 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.4.11-failure.yml @@ -16,9 +16,9 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {" (0..17) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - (members꞉ ContractMembers): [] # (17..17) - (SKIPPED): "" # (17..17) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.4.22-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.4.22-failure.yml index ef60946eca..db523e5c4a 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.4.22-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.4.22-failure.yml @@ -16,9 +16,9 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {" (0..17) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - (members꞉ ContractMembers): [] # (17..17) - (SKIPPED): "" # (17..17) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.6.0-failure.yml index b590bfea2a..04f4f9dbf8 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.6.0-failure.yml @@ -16,9 +16,9 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {" (0..17) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - (members꞉ ContractMembers): [] # (17..17) - (SKIPPED): "" # (17..17) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.0-failure.yml index 11534b9caf..8fa256bfb9 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.0-failure.yml @@ -16,9 +16,9 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {" (0..17) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - (members꞉ ContractMembers): [] # (17..17) - (SKIPPED): "" # (17..17) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.4-failure.yml index dabd3fdb58..b578d841c2 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.4-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.4-failure.yml @@ -16,9 +16,9 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {" (0..17) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - (members꞉ ContractMembers): [] # (17..17) - (SKIPPED): "" # (17..17) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.8-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.8-failure.yml index f1a226ade2..773acdacb3 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.8-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.8-failure.yml @@ -16,9 +16,9 @@ Errors: # 1 total Tree: - (ContractDefinition): # "contract Sample {" (0..17) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - (members꞉ ContractMembers): [] # (17..17) - (SKIPPED): "" # (17..17) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembers/constructor/generated/0.4.22-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/constructor/generated/0.4.22-success.yml index a517bd7406..328dc590f2 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembers/constructor/generated/0.4.22-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/constructor/generated/0.4.22-success.yml @@ -15,11 +15,11 @@ Tree: - (close_paren꞉ CloseParen): ")" # (12..13) - (attributes꞉ ConstructorAttributes): # " public" (13..20) - (item꞉ ConstructorAttribute): # " public" (13..20) - - (LeadingTrivia) ► (Whitespace): " " # (13..14) + - (leading_trivia꞉ Whitespace): " " # (13..14) - (variant꞉ PublicKeyword): "public" # (14..20) - (body꞉ Block): # " {}\n" (20..24) - - (LeadingTrivia) ► (Whitespace): " " # (20..21) + - (leading_trivia꞉ Whitespace): " " # (20..21) - (open_brace꞉ OpenBrace): "{" # (21..22) - (statements꞉ Statements): [] # (22..22) - (close_brace꞉ CloseBrace): "}" # (22..23) - - (TrailingTrivia) ► (EndOfLine): "\n" # (23..24) + - (trailing_trivia꞉ EndOfLine): "\n" # (23..24) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembers/local_expression/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/local_expression/generated/0.4.11-success.yml index 3b7b91bdbf..538c396415 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembers/local_expression/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/local_expression/generated/0.4.11-success.yml @@ -12,7 +12,7 @@ Tree: - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function func() {\n uint a = 1 + 2 * 3;\n}\n" (0..42) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " func" (8..13) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "func" # (9..13) - (parameters꞉ ParametersDeclaration): # "()" (13..15) - (open_paren꞉ OpenParen): "(" # (13..14) @@ -20,35 +20,35 @@ Tree: - (close_paren꞉ CloseParen): ")" # (14..15) - (attributes꞉ FunctionAttributes): [] # (15..15) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n uint a = 1 + 2 * 3;\n}\n" (15..42) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (statements꞉ Statements): # " uint a = 1 + 2 * 3;\n" (18..40) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " uint a = 1 + 2 * 3;\n" (18..40) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # " uint" (18..24) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (variant꞉ UintKeyword): "uint" # (20..24) - - (LeadingTrivia) ► (Whitespace): " " # (24..25) + - (leading_trivia꞉ Whitespace): " " # (24..25) - (name꞉ Identifier): "a" # (25..26) - (value꞉ VariableDeclarationValue): # " = 1 + 2 * 3" (26..38) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (equal꞉ Equal): "=" # (27..28) - (expression꞉ Expression) ► (variant꞉ AdditiveExpression): # " 1 + 2 * 3" (28..38) - (left_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (28..30) - - (LeadingTrivia) ► (Whitespace): " " # (28..29) + - (leading_trivia꞉ Whitespace): " " # (28..29) - (literal꞉ DecimalLiteral): "1" # (29..30) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (operator꞉ Plus): "+" # (31..32) - (right_operand꞉ Expression) ► (variant꞉ MultiplicativeExpression): # " 2 * 3" (32..38) - (left_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 2" (32..34) - - (LeadingTrivia) ► (Whitespace): " " # (32..33) + - (leading_trivia꞉ Whitespace): " " # (32..33) - (literal꞉ DecimalLiteral): "2" # (33..34) - - (LeadingTrivia) ► (Whitespace): " " # (34..35) + - (leading_trivia꞉ Whitespace): " " # (34..35) - (operator꞉ Asterisk): "*" # (35..36) - (right_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 3" (36..38) - - (LeadingTrivia) ► (Whitespace): " " # (36..37) + - (leading_trivia꞉ Whitespace): " " # (36..37) - (literal꞉ DecimalLiteral): "3" # (37..38) - (semicolon꞉ Semicolon): ";" # (38..39) - - (TrailingTrivia) ► (EndOfLine): "\n" # (39..40) + - (trailing_trivia꞉ EndOfLine): "\n" # (39..40) - (close_brace꞉ CloseBrace): "}" # (40..41) - - (TrailingTrivia) ► (EndOfLine): "\n" # (41..42) + - (trailing_trivia꞉ EndOfLine): "\n" # (41..42) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.4.11-failure.yml index 398d81870d..32eee9b707 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.4.11-failure.yml @@ -31,7 +31,7 @@ Tree: - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function someFunc() public {\n {\n uint256..." (0..74) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " someFunc" (8..17) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "someFunc" # (9..17) - (parameters꞉ ParametersDeclaration): # "()" (17..19) - (open_paren꞉ OpenParen): "(" # (17..18) @@ -39,40 +39,40 @@ Tree: - (close_paren꞉ CloseParen): ")" # (18..19) - (attributes꞉ FunctionAttributes): # " public" (19..26) - (item꞉ FunctionAttribute): # " public" (19..26) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (variant꞉ PublicKeyword): "public" # (20..26) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" (26..74) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (open_brace꞉ OpenBrace): "{" # (27..28) - - (TrailingTrivia) ► (EndOfLine): "\n" # (28..29) + - (trailing_trivia꞉ EndOfLine): "\n" # (28..29) - (statements꞉ Statements): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - (item꞉ Statement) ► (variant꞉ Block): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - - (LeadingTrivia) ► (Whitespace): " " # (29..33) + - (leading_trivia꞉ Whitespace): " " # (29..33) - (open_brace꞉ OpenBrace): "{" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ Statements): # " uint256 arg = (1 + 2" (35..63) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " uint256 arg = (1 + 2" (35..63) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (35..50) - - (LeadingTrivia) ► (Whitespace): " " # (35..43) + - (leading_trivia꞉ Whitespace): " " # (35..43) - (variant꞉ UintKeyword): "uint256" # (43..50) - - (LeadingTrivia) ► (Whitespace): " " # (50..51) + - (leading_trivia꞉ Whitespace): " " # (50..51) - (name꞉ Identifier): "arg" # (51..54) - (value꞉ VariableDeclarationValue): # " = (1 + 2" (54..63) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (equal꞉ Equal): "=" # (55..56) - (expression꞉ Expression) ► (variant꞉ TupleExpression): # " (1 + 2" (56..63) - - (LeadingTrivia) ► (Whitespace): " " # (56..57) + - (leading_trivia꞉ Whitespace): " " # (56..57) - (open_paren꞉ OpenParen): "(" # (57..58) - (items꞉ TupleValues): # "1 + 2" (58..63) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ AdditiveExpression): # "1 + 2" (58..63) - (left_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "1" # (58..59) - - (LeadingTrivia) ► (Whitespace): " " # (59..60) + - (leading_trivia꞉ Whitespace): " " # (59..60) - (operator꞉ Plus): "+" # (60..61) - (right_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 2" (61..63) - - (LeadingTrivia) ► (Whitespace): " " # (61..62) + - (leading_trivia꞉ Whitespace): " " # (61..62) - (literal꞉ DecimalLiteral): "2" # (62..63) - (SKIPPED): ";\n " # (63..69) - (close_brace꞉ CloseBrace): "}" # (69..70) - (SKIPPED): ")\n" # (70..72) - (close_brace꞉ CloseBrace): "}" # (72..73) - - (TrailingTrivia) ► (EndOfLine): "\n" # (73..74) + - (trailing_trivia꞉ EndOfLine): "\n" # (73..74) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.4.21-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.4.21-failure.yml index 41207024b9..f07433785b 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.4.21-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.4.21-failure.yml @@ -31,7 +31,7 @@ Tree: - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function someFunc() public {\n {\n uint256..." (0..74) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " someFunc" (8..17) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "someFunc" # (9..17) - (parameters꞉ ParametersDeclaration): # "()" (17..19) - (open_paren꞉ OpenParen): "(" # (17..18) @@ -39,40 +39,40 @@ Tree: - (close_paren꞉ CloseParen): ")" # (18..19) - (attributes꞉ FunctionAttributes): # " public" (19..26) - (item꞉ FunctionAttribute): # " public" (19..26) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (variant꞉ PublicKeyword): "public" # (20..26) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" (26..74) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (open_brace꞉ OpenBrace): "{" # (27..28) - - (TrailingTrivia) ► (EndOfLine): "\n" # (28..29) + - (trailing_trivia꞉ EndOfLine): "\n" # (28..29) - (statements꞉ Statements): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - (item꞉ Statement) ► (variant꞉ Block): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - - (LeadingTrivia) ► (Whitespace): " " # (29..33) + - (leading_trivia꞉ Whitespace): " " # (29..33) - (open_brace꞉ OpenBrace): "{" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ Statements): # " uint256 arg = (1 + 2" (35..63) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " uint256 arg = (1 + 2" (35..63) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (35..50) - - (LeadingTrivia) ► (Whitespace): " " # (35..43) + - (leading_trivia꞉ Whitespace): " " # (35..43) - (variant꞉ UintKeyword): "uint256" # (43..50) - - (LeadingTrivia) ► (Whitespace): " " # (50..51) + - (leading_trivia꞉ Whitespace): " " # (50..51) - (name꞉ Identifier): "arg" # (51..54) - (value꞉ VariableDeclarationValue): # " = (1 + 2" (54..63) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (equal꞉ Equal): "=" # (55..56) - (expression꞉ Expression) ► (variant꞉ TupleExpression): # " (1 + 2" (56..63) - - (LeadingTrivia) ► (Whitespace): " " # (56..57) + - (leading_trivia꞉ Whitespace): " " # (56..57) - (open_paren꞉ OpenParen): "(" # (57..58) - (items꞉ TupleValues): # "1 + 2" (58..63) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ AdditiveExpression): # "1 + 2" (58..63) - (left_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "1" # (58..59) - - (LeadingTrivia) ► (Whitespace): " " # (59..60) + - (leading_trivia꞉ Whitespace): " " # (59..60) - (operator꞉ Plus): "+" # (60..61) - (right_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 2" (61..63) - - (LeadingTrivia) ► (Whitespace): " " # (61..62) + - (leading_trivia꞉ Whitespace): " " # (61..62) - (literal꞉ DecimalLiteral): "2" # (62..63) - (SKIPPED): ";\n " # (63..69) - (close_brace꞉ CloseBrace): "}" # (69..70) - (SKIPPED): ")\n" # (70..72) - (close_brace꞉ CloseBrace): "}" # (72..73) - - (TrailingTrivia) ► (EndOfLine): "\n" # (73..74) + - (trailing_trivia꞉ EndOfLine): "\n" # (73..74) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.5.0-failure.yml index 47aa0f6998..52d499974b 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.5.0-failure.yml @@ -31,7 +31,7 @@ Tree: - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function someFunc() public {\n {\n uint256..." (0..74) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " someFunc" (8..17) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "someFunc" # (9..17) - (parameters꞉ ParametersDeclaration): # "()" (17..19) - (open_paren꞉ OpenParen): "(" # (17..18) @@ -39,40 +39,40 @@ Tree: - (close_paren꞉ CloseParen): ")" # (18..19) - (attributes꞉ FunctionAttributes): # " public" (19..26) - (item꞉ FunctionAttribute): # " public" (19..26) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (variant꞉ PublicKeyword): "public" # (20..26) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" (26..74) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (open_brace꞉ OpenBrace): "{" # (27..28) - - (TrailingTrivia) ► (EndOfLine): "\n" # (28..29) + - (trailing_trivia꞉ EndOfLine): "\n" # (28..29) - (statements꞉ Statements): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - (item꞉ Statement) ► (variant꞉ Block): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - - (LeadingTrivia) ► (Whitespace): " " # (29..33) + - (leading_trivia꞉ Whitespace): " " # (29..33) - (open_brace꞉ OpenBrace): "{" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ Statements): # " uint256 arg = (1 + 2" (35..63) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " uint256 arg = (1 + 2" (35..63) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (35..50) - - (LeadingTrivia) ► (Whitespace): " " # (35..43) + - (leading_trivia꞉ Whitespace): " " # (35..43) - (variant꞉ UintKeyword): "uint256" # (43..50) - - (LeadingTrivia) ► (Whitespace): " " # (50..51) + - (leading_trivia꞉ Whitespace): " " # (50..51) - (name꞉ Identifier): "arg" # (51..54) - (value꞉ VariableDeclarationValue): # " = (1 + 2" (54..63) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (equal꞉ Equal): "=" # (55..56) - (expression꞉ Expression) ► (variant꞉ TupleExpression): # " (1 + 2" (56..63) - - (LeadingTrivia) ► (Whitespace): " " # (56..57) + - (leading_trivia꞉ Whitespace): " " # (56..57) - (open_paren꞉ OpenParen): "(" # (57..58) - (items꞉ TupleValues): # "1 + 2" (58..63) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ AdditiveExpression): # "1 + 2" (58..63) - (left_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "1" # (58..59) - - (LeadingTrivia) ► (Whitespace): " " # (59..60) + - (leading_trivia꞉ Whitespace): " " # (59..60) - (operator꞉ Plus): "+" # (60..61) - (right_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 2" (61..63) - - (LeadingTrivia) ► (Whitespace): " " # (61..62) + - (leading_trivia꞉ Whitespace): " " # (61..62) - (literal꞉ DecimalLiteral): "2" # (62..63) - (SKIPPED): ";\n " # (63..69) - (close_brace꞉ CloseBrace): "}" # (69..70) - (SKIPPED): ")\n" # (70..72) - (close_brace꞉ CloseBrace): "}" # (72..73) - - (TrailingTrivia) ► (EndOfLine): "\n" # (73..74) + - (trailing_trivia꞉ EndOfLine): "\n" # (73..74) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.5.3-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.5.3-failure.yml index 5d2058f20f..637302c618 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.5.3-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.5.3-failure.yml @@ -31,7 +31,7 @@ Tree: - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function someFunc() public {\n {\n uint256..." (0..74) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " someFunc" (8..17) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "someFunc" # (9..17) - (parameters꞉ ParametersDeclaration): # "()" (17..19) - (open_paren꞉ OpenParen): "(" # (17..18) @@ -39,40 +39,40 @@ Tree: - (close_paren꞉ CloseParen): ")" # (18..19) - (attributes꞉ FunctionAttributes): # " public" (19..26) - (item꞉ FunctionAttribute): # " public" (19..26) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (variant꞉ PublicKeyword): "public" # (20..26) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" (26..74) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (open_brace꞉ OpenBrace): "{" # (27..28) - - (TrailingTrivia) ► (EndOfLine): "\n" # (28..29) + - (trailing_trivia꞉ EndOfLine): "\n" # (28..29) - (statements꞉ Statements): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - (item꞉ Statement) ► (variant꞉ Block): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - - (LeadingTrivia) ► (Whitespace): " " # (29..33) + - (leading_trivia꞉ Whitespace): " " # (29..33) - (open_brace꞉ OpenBrace): "{" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ Statements): # " uint256 arg = (1 + 2" (35..63) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " uint256 arg = (1 + 2" (35..63) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (35..50) - - (LeadingTrivia) ► (Whitespace): " " # (35..43) + - (leading_trivia꞉ Whitespace): " " # (35..43) - (variant꞉ UintKeyword): "uint256" # (43..50) - - (LeadingTrivia) ► (Whitespace): " " # (50..51) + - (leading_trivia꞉ Whitespace): " " # (50..51) - (name꞉ Identifier): "arg" # (51..54) - (value꞉ VariableDeclarationValue): # " = (1 + 2" (54..63) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (equal꞉ Equal): "=" # (55..56) - (expression꞉ Expression) ► (variant꞉ TupleExpression): # " (1 + 2" (56..63) - - (LeadingTrivia) ► (Whitespace): " " # (56..57) + - (leading_trivia꞉ Whitespace): " " # (56..57) - (open_paren꞉ OpenParen): "(" # (57..58) - (items꞉ TupleValues): # "1 + 2" (58..63) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ AdditiveExpression): # "1 + 2" (58..63) - (left_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "1" # (58..59) - - (LeadingTrivia) ► (Whitespace): " " # (59..60) + - (leading_trivia꞉ Whitespace): " " # (59..60) - (operator꞉ Plus): "+" # (60..61) - (right_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 2" (61..63) - - (LeadingTrivia) ► (Whitespace): " " # (61..62) + - (leading_trivia꞉ Whitespace): " " # (61..62) - (literal꞉ DecimalLiteral): "2" # (62..63) - (SKIPPED): ";\n " # (63..69) - (close_brace꞉ CloseBrace): "}" # (69..70) - (SKIPPED): ")\n" # (70..72) - (close_brace꞉ CloseBrace): "}" # (72..73) - - (TrailingTrivia) ► (EndOfLine): "\n" # (73..74) + - (trailing_trivia꞉ EndOfLine): "\n" # (73..74) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.6.0-failure.yml index 8800f47370..c397dc5619 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.6.0-failure.yml @@ -31,7 +31,7 @@ Tree: - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function someFunc() public {\n {\n uint256..." (0..74) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " someFunc" (8..17) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "someFunc" # (9..17) - (parameters꞉ ParametersDeclaration): # "()" (17..19) - (open_paren꞉ OpenParen): "(" # (17..18) @@ -39,40 +39,40 @@ Tree: - (close_paren꞉ CloseParen): ")" # (18..19) - (attributes꞉ FunctionAttributes): # " public" (19..26) - (item꞉ FunctionAttribute): # " public" (19..26) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (variant꞉ PublicKeyword): "public" # (20..26) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" (26..74) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (open_brace꞉ OpenBrace): "{" # (27..28) - - (TrailingTrivia) ► (EndOfLine): "\n" # (28..29) + - (trailing_trivia꞉ EndOfLine): "\n" # (28..29) - (statements꞉ Statements): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - (item꞉ Statement) ► (variant꞉ Block): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - - (LeadingTrivia) ► (Whitespace): " " # (29..33) + - (leading_trivia꞉ Whitespace): " " # (29..33) - (open_brace꞉ OpenBrace): "{" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ Statements): # " uint256 arg = (1 + 2" (35..63) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " uint256 arg = (1 + 2" (35..63) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (35..50) - - (LeadingTrivia) ► (Whitespace): " " # (35..43) + - (leading_trivia꞉ Whitespace): " " # (35..43) - (variant꞉ UintKeyword): "uint256" # (43..50) - - (LeadingTrivia) ► (Whitespace): " " # (50..51) + - (leading_trivia꞉ Whitespace): " " # (50..51) - (name꞉ Identifier): "arg" # (51..54) - (value꞉ VariableDeclarationValue): # " = (1 + 2" (54..63) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (equal꞉ Equal): "=" # (55..56) - (expression꞉ Expression) ► (variant꞉ TupleExpression): # " (1 + 2" (56..63) - - (LeadingTrivia) ► (Whitespace): " " # (56..57) + - (leading_trivia꞉ Whitespace): " " # (56..57) - (open_paren꞉ OpenParen): "(" # (57..58) - (items꞉ TupleValues): # "1 + 2" (58..63) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ AdditiveExpression): # "1 + 2" (58..63) - (left_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "1" # (58..59) - - (LeadingTrivia) ► (Whitespace): " " # (59..60) + - (leading_trivia꞉ Whitespace): " " # (59..60) - (operator꞉ Plus): "+" # (60..61) - (right_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 2" (61..63) - - (LeadingTrivia) ► (Whitespace): " " # (61..62) + - (leading_trivia꞉ Whitespace): " " # (61..62) - (literal꞉ DecimalLiteral): "2" # (62..63) - (SKIPPED): ";\n " # (63..69) - (close_brace꞉ CloseBrace): "}" # (69..70) - (SKIPPED): ")\n" # (70..72) - (close_brace꞉ CloseBrace): "}" # (72..73) - - (TrailingTrivia) ► (EndOfLine): "\n" # (73..74) + - (trailing_trivia꞉ EndOfLine): "\n" # (73..74) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.7.0-failure.yml index ad82e6b5fc..f4833b187e 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.7.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.7.0-failure.yml @@ -31,7 +31,7 @@ Tree: - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function someFunc() public {\n {\n uint256..." (0..74) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " someFunc" (8..17) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "someFunc" # (9..17) - (parameters꞉ ParametersDeclaration): # "()" (17..19) - (open_paren꞉ OpenParen): "(" # (17..18) @@ -39,40 +39,40 @@ Tree: - (close_paren꞉ CloseParen): ")" # (18..19) - (attributes꞉ FunctionAttributes): # " public" (19..26) - (item꞉ FunctionAttribute): # " public" (19..26) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (variant꞉ PublicKeyword): "public" # (20..26) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" (26..74) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (open_brace꞉ OpenBrace): "{" # (27..28) - - (TrailingTrivia) ► (EndOfLine): "\n" # (28..29) + - (trailing_trivia꞉ EndOfLine): "\n" # (28..29) - (statements꞉ Statements): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - (item꞉ Statement) ► (variant꞉ Block): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - - (LeadingTrivia) ► (Whitespace): " " # (29..33) + - (leading_trivia꞉ Whitespace): " " # (29..33) - (open_brace꞉ OpenBrace): "{" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ Statements): # " uint256 arg = (1 + 2" (35..63) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " uint256 arg = (1 + 2" (35..63) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (35..50) - - (LeadingTrivia) ► (Whitespace): " " # (35..43) + - (leading_trivia꞉ Whitespace): " " # (35..43) - (variant꞉ UintKeyword): "uint256" # (43..50) - - (LeadingTrivia) ► (Whitespace): " " # (50..51) + - (leading_trivia꞉ Whitespace): " " # (50..51) - (name꞉ Identifier): "arg" # (51..54) - (value꞉ VariableDeclarationValue): # " = (1 + 2" (54..63) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (equal꞉ Equal): "=" # (55..56) - (expression꞉ Expression) ► (variant꞉ TupleExpression): # " (1 + 2" (56..63) - - (LeadingTrivia) ► (Whitespace): " " # (56..57) + - (leading_trivia꞉ Whitespace): " " # (56..57) - (open_paren꞉ OpenParen): "(" # (57..58) - (items꞉ TupleValues): # "1 + 2" (58..63) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ AdditiveExpression): # "1 + 2" (58..63) - (left_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "1" # (58..59) - - (LeadingTrivia) ► (Whitespace): " " # (59..60) + - (leading_trivia꞉ Whitespace): " " # (59..60) - (operator꞉ Plus): "+" # (60..61) - (right_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 2" (61..63) - - (LeadingTrivia) ► (Whitespace): " " # (61..62) + - (leading_trivia꞉ Whitespace): " " # (61..62) - (literal꞉ DecimalLiteral): "2" # (62..63) - (SKIPPED): ";\n " # (63..69) - (close_brace꞉ CloseBrace): "}" # (69..70) - (SKIPPED): ")\n" # (70..72) - (close_brace꞉ CloseBrace): "}" # (72..73) - - (TrailingTrivia) ► (EndOfLine): "\n" # (73..74) + - (trailing_trivia꞉ EndOfLine): "\n" # (73..74) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.8.0-failure.yml index 72d2884169..20493dec77 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.8.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.8.0-failure.yml @@ -31,7 +31,7 @@ Tree: - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function someFunc() public {\n {\n uint256..." (0..74) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " someFunc" (8..17) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "someFunc" # (9..17) - (parameters꞉ ParametersDeclaration): # "()" (17..19) - (open_paren꞉ OpenParen): "(" # (17..18) @@ -39,40 +39,40 @@ Tree: - (close_paren꞉ CloseParen): ")" # (18..19) - (attributes꞉ FunctionAttributes): # " public" (19..26) - (item꞉ FunctionAttribute): # " public" (19..26) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (variant꞉ PublicKeyword): "public" # (20..26) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" (26..74) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (open_brace꞉ OpenBrace): "{" # (27..28) - - (TrailingTrivia) ► (EndOfLine): "\n" # (28..29) + - (trailing_trivia꞉ EndOfLine): "\n" # (28..29) - (statements꞉ Statements): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - (item꞉ Statement) ► (variant꞉ Block): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - - (LeadingTrivia) ► (Whitespace): " " # (29..33) + - (leading_trivia꞉ Whitespace): " " # (29..33) - (open_brace꞉ OpenBrace): "{" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ Statements): # " uint256 arg = (1 + 2" (35..63) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " uint256 arg = (1 + 2" (35..63) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (35..50) - - (LeadingTrivia) ► (Whitespace): " " # (35..43) + - (leading_trivia꞉ Whitespace): " " # (35..43) - (variant꞉ UintKeyword): "uint256" # (43..50) - - (LeadingTrivia) ► (Whitespace): " " # (50..51) + - (leading_trivia꞉ Whitespace): " " # (50..51) - (name꞉ Identifier): "arg" # (51..54) - (value꞉ VariableDeclarationValue): # " = (1 + 2" (54..63) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (equal꞉ Equal): "=" # (55..56) - (expression꞉ Expression) ► (variant꞉ TupleExpression): # " (1 + 2" (56..63) - - (LeadingTrivia) ► (Whitespace): " " # (56..57) + - (leading_trivia꞉ Whitespace): " " # (56..57) - (open_paren꞉ OpenParen): "(" # (57..58) - (items꞉ TupleValues): # "1 + 2" (58..63) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ AdditiveExpression): # "1 + 2" (58..63) - (left_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "1" # (58..59) - - (LeadingTrivia) ► (Whitespace): " " # (59..60) + - (leading_trivia꞉ Whitespace): " " # (59..60) - (operator꞉ Plus): "+" # (60..61) - (right_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 2" (61..63) - - (LeadingTrivia) ► (Whitespace): " " # (61..62) + - (leading_trivia꞉ Whitespace): " " # (61..62) - (literal꞉ DecimalLiteral): "2" # (62..63) - (SKIPPED): ";\n " # (63..69) - (close_brace꞉ CloseBrace): "}" # (69..70) - (SKIPPED): ")\n" # (70..72) - (close_brace꞉ CloseBrace): "}" # (72..73) - - (TrailingTrivia) ► (EndOfLine): "\n" # (73..74) + - (trailing_trivia꞉ EndOfLine): "\n" # (73..74) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.8.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.8.4-failure.yml index 562bcdf08a..e6f4c90557 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.8.4-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.8.4-failure.yml @@ -31,7 +31,7 @@ Tree: - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function someFunc() public {\n {\n uint256..." (0..74) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " someFunc" (8..17) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "someFunc" # (9..17) - (parameters꞉ ParametersDeclaration): # "()" (17..19) - (open_paren꞉ OpenParen): "(" # (17..18) @@ -39,40 +39,40 @@ Tree: - (close_paren꞉ CloseParen): ")" # (18..19) - (attributes꞉ FunctionAttributes): # " public" (19..26) - (item꞉ FunctionAttribute): # " public" (19..26) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (variant꞉ PublicKeyword): "public" # (20..26) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" (26..74) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (open_brace꞉ OpenBrace): "{" # (27..28) - - (TrailingTrivia) ► (EndOfLine): "\n" # (28..29) + - (trailing_trivia꞉ EndOfLine): "\n" # (28..29) - (statements꞉ Statements): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - (item꞉ Statement) ► (variant꞉ Block): # " {\n uint256 arg = (1 + 2;\n }" (29..70) - - (LeadingTrivia) ► (Whitespace): " " # (29..33) + - (leading_trivia꞉ Whitespace): " " # (29..33) - (open_brace꞉ OpenBrace): "{" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ Statements): # " uint256 arg = (1 + 2" (35..63) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " uint256 arg = (1 + 2" (35..63) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (35..50) - - (LeadingTrivia) ► (Whitespace): " " # (35..43) + - (leading_trivia꞉ Whitespace): " " # (35..43) - (variant꞉ UintKeyword): "uint256" # (43..50) - - (LeadingTrivia) ► (Whitespace): " " # (50..51) + - (leading_trivia꞉ Whitespace): " " # (50..51) - (name꞉ Identifier): "arg" # (51..54) - (value꞉ VariableDeclarationValue): # " = (1 + 2" (54..63) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (equal꞉ Equal): "=" # (55..56) - (expression꞉ Expression) ► (variant꞉ TupleExpression): # " (1 + 2" (56..63) - - (LeadingTrivia) ► (Whitespace): " " # (56..57) + - (leading_trivia꞉ Whitespace): " " # (56..57) - (open_paren꞉ OpenParen): "(" # (57..58) - (items꞉ TupleValues): # "1 + 2" (58..63) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ AdditiveExpression): # "1 + 2" (58..63) - (left_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "1" # (58..59) - - (LeadingTrivia) ► (Whitespace): " " # (59..60) + - (leading_trivia꞉ Whitespace): " " # (59..60) - (operator꞉ Plus): "+" # (60..61) - (right_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 2" (61..63) - - (LeadingTrivia) ► (Whitespace): " " # (61..62) + - (leading_trivia꞉ Whitespace): " " # (61..62) - (literal꞉ DecimalLiteral): "2" # (62..63) - (SKIPPED): ";\n " # (63..69) - (close_brace꞉ CloseBrace): "}" # (69..70) - (SKIPPED): ")\n" # (70..72) - (close_brace꞉ CloseBrace): "}" # (72..73) - - (TrailingTrivia) ► (EndOfLine): "\n" # (73..74) + - (trailing_trivia꞉ EndOfLine): "\n" # (73..74) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.4.11-failure.yml index 4692e9322c..429751fdc6 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.4.11-failure.yml @@ -101,7 +101,7 @@ Tree: - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function all() override(some.ident unexpected toke..." (0..309) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " all" (8..12) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "all" # (9..12) - (parameters꞉ ParametersDeclaration): # "()" (12..14) - (open_paren꞉ OpenParen): "(" # (12..13) @@ -110,7 +110,7 @@ Tree: - (attributes꞉ FunctionAttributes): # " override(some.ident unexpected tokens, ISomeInter..." (14..83) - (item꞉ FunctionAttribute) ► (variant꞉ ModifierInvocation): # " override(some.ident unexpected tokens, ISomeInter..." (14..76) - (name꞉ IdentifierPath): # " override" (14..23) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (item꞉ Identifier): "override" # (15..23) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # "(some.ident unexpected tokens, ISomeInterface, Oth..." (23..76) - (open_paren꞉ OpenParen): "(" # (23..24) @@ -119,22 +119,22 @@ Tree: - (operand꞉ Expression) ► (variant꞉ Identifier): "some" # (24..28) - (period꞉ Period): "." # (28..29) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "ident" # (29..34) - - (LeadingTrivia) ► (Whitespace): " " # (34..35) + - (leading_trivia꞉ Whitespace): " " # (34..35) - (SKIPPED): "unexpected tokens, ISomeInterface, Other" # (35..75) - (close_paren꞉ CloseParen): ")" # (75..76) - (item꞉ FunctionAttribute): # " public" (76..83) - - (LeadingTrivia) ► (Whitespace): " " # (76..77) + - (leading_trivia꞉ Whitespace): " " # (76..77) - (variant꞉ PublicKeyword): "public" # (77..83) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n msg.sender.call{do: 1, arg: 1 }();\n msg.send..." (83..309) - - (LeadingTrivia) ► (Whitespace): " " # (83..84) + - (leading_trivia꞉ Whitespace): " " # (83..84) - (open_brace꞉ OpenBrace): "{" # (84..85) - - (TrailingTrivia) ► (EndOfLine): "\n" # (85..86) + - (trailing_trivia꞉ EndOfLine): "\n" # (85..86) - (statements꞉ Statements): # " msg.sender.call{do: 1, arg: 1 }();\n msg.sender...." (86..306) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{do: 1, arg: 1 }();\n" (86..123) - (expression꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (86..103) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (86..98) - (operand꞉ Expression): # " msg" (86..91) - - (LeadingTrivia) ► (Whitespace): " " # (86..88) + - (leading_trivia꞉ Whitespace): " " # (86..88) - (variant꞉ Identifier): "msg" # (88..91) - (period꞉ Period): "." # (91..92) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (92..98) @@ -142,12 +142,12 @@ Tree: - (member꞉ MemberAccess) ► (variant꞉ Identifier): "call" # (99..103) - (SKIPPED): "{do: 1, arg: 1 }()" # (103..121) - (semicolon꞉ Semicolon): ";" # (121..122) - - (TrailingTrivia) ► (EndOfLine): "\n" # (122..123) + - (trailing_trivia꞉ EndOfLine): "\n" # (122..123) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{, empty: 1, parse: 2 }();\n" (123..167) - (expression꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (123..140) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (123..135) - (operand꞉ Expression): # " msg" (123..128) - - (LeadingTrivia) ► (Whitespace): " " # (123..125) + - (leading_trivia꞉ Whitespace): " " # (123..125) - (variant꞉ Identifier): "msg" # (125..128) - (period꞉ Period): "." # (128..129) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (129..135) @@ -155,12 +155,12 @@ Tree: - (member꞉ MemberAccess) ► (variant꞉ Identifier): "call" # (136..140) - (SKIPPED): "{, empty: 1, parse: 2 }()" # (140..165) - (semicolon꞉ Semicolon): ";" # (165..166) - - (TrailingTrivia) ► (EndOfLine): "\n" # (166..167) + - (trailing_trivia꞉ EndOfLine): "\n" # (166..167) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{arg: 1, missing_expr: , no_semic..." (167..230) - (expression꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (167..184) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (167..179) - (operand꞉ Expression): # " msg" (167..172) - - (LeadingTrivia) ► (Whitespace): " " # (167..169) + - (leading_trivia꞉ Whitespace): " " # (167..169) - (variant꞉ Identifier): "msg" # (169..172) - (period꞉ Period): "." # (172..173) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (173..179) @@ -168,12 +168,12 @@ Tree: - (member꞉ MemberAccess) ► (variant꞉ Identifier): "call" # (180..184) - (SKIPPED): "{arg: 1, missing_expr: , no_semicolon, , }()" # (184..228) - (semicolon꞉ Semicolon): ";" # (228..229) - - (TrailingTrivia) ► (EndOfLine): "\n" # (229..230) + - (trailing_trivia꞉ EndOfLine): "\n" # (229..230) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{arg: 1 unexpected tokens, not: 2..." (230..306) - (expression꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (230..247) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (230..242) - (operand꞉ Expression): # " msg" (230..235) - - (LeadingTrivia) ► (Whitespace): " " # (230..232) + - (leading_trivia꞉ Whitespace): " " # (230..232) - (variant꞉ Identifier): "msg" # (232..235) - (period꞉ Period): "." # (235..236) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (236..242) @@ -181,15 +181,15 @@ Tree: - (member꞉ MemberAccess) ► (variant꞉ Identifier): "call" # (243..247) - (SKIPPED): "{arg: 1 unexpected tokens, not: 2, recovered, yet:..." # (247..304) - (semicolon꞉ Semicolon): ";" # (304..305) - - (TrailingTrivia) ► (EndOfLine): "\n" # (305..306) - - (LeadingTrivia) ► (EndOfLine): "\n" # (306..307) + - (trailing_trivia꞉ EndOfLine): "\n" # (305..306) + - (leading_trivia꞉ EndOfLine): "\n" # (306..307) - (close_brace꞉ CloseBrace): "}" # (307..308) - - (TrailingTrivia) ► (EndOfLine): "\n" # (308..309) + - (trailing_trivia꞉ EndOfLine): "\n" # (308..309) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\nfunction empty() override(some.ident, /* empty */..." (309..388) - - (LeadingTrivia) ► (EndOfLine): "\n" # (309..310) + - (leading_trivia꞉ EndOfLine): "\n" # (309..310) - (function_keyword꞉ FunctionKeyword): "function" # (310..318) - (name꞉ FunctionName): # " empty" (318..324) - - (LeadingTrivia) ► (Whitespace): " " # (318..319) + - (leading_trivia꞉ Whitespace): " " # (318..319) - (variant꞉ Identifier): "empty" # (319..324) - (parameters꞉ ParametersDeclaration): # "()" (324..326) - (open_paren꞉ OpenParen): "(" # (324..325) @@ -198,7 +198,7 @@ Tree: - (attributes꞉ FunctionAttributes): # " override(some.ident, /* empty */, other.arg.here,..." (326..386) - (item꞉ FunctionAttribute) ► (variant꞉ ModifierInvocation): # " override(some.ident, /* empty */, other.arg.here,..." (326..386) - (name꞉ IdentifierPath): # " override" (326..335) - - (LeadingTrivia) ► (Whitespace): " " # (326..327) + - (leading_trivia꞉ Whitespace): " " # (326..327) - (item꞉ Identifier): "override" # (327..335) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # "(some.ident, /* empty */, other.arg.here, and.here..." (335..386) - (open_paren꞉ OpenParen): "(" # (335..336) @@ -208,19 +208,18 @@ Tree: - (period꞉ Period): "." # (340..341) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "ident" # (341..346) - (separator꞉ Comma): "," # (346..347) - - (LeadingTrivia): # " /* empty */" (347..359) - - (Whitespace): " " # (347..348) - - (MultiLineComment): "/* empty */" # (348..359) + - (leading_trivia꞉ Whitespace): " " # (347..348) + - (leading_trivia꞉ MultiLineComment): "/* empty */" # (348..359) - (SKIPPED): ", other.arg.here, and.here" # (359..385) - (close_paren꞉ CloseParen): ")" # (385..386) - (body꞉ FunctionBody): # ";\n" (386..388) - (variant꞉ Semicolon): ";" # (386..387) - - (TrailingTrivia) ► (EndOfLine): "\n" # (387..388) + - (trailing_trivia꞉ EndOfLine): "\n" # (387..388) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\nfunction nested_lists() override(some.ident, next..." (388..489) - - (LeadingTrivia) ► (EndOfLine): "\n" # (388..389) + - (leading_trivia꞉ EndOfLine): "\n" # (388..389) - (function_keyword꞉ FunctionKeyword): "function" # (389..397) - (name꞉ FunctionName): # " nested_lists" (397..410) - - (LeadingTrivia) ► (Whitespace): " " # (397..398) + - (leading_trivia꞉ Whitespace): " " # (397..398) - (variant꞉ Identifier): "nested_lists" # (398..410) - (parameters꞉ ParametersDeclaration): # "()" (410..412) - (open_paren꞉ OpenParen): "(" # (410..411) @@ -229,7 +228,7 @@ Tree: - (attributes꞉ FunctionAttributes): # " override(some.ident, next.do.that, other.while, n..." (412..487) - (item꞉ FunctionAttribute) ► (variant꞉ ModifierInvocation): # " override(some.ident, next.do.that, other.while, n..." (412..487) - (name꞉ IdentifierPath): # " override" (412..421) - - (LeadingTrivia) ► (Whitespace): " " # (412..413) + - (leading_trivia꞉ Whitespace): " " # (412..413) - (item꞉ Identifier): "override" # (413..421) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # "(some.ident, next.do.that, other.while, next.one, ..." (421..487) - (open_paren꞉ OpenParen): "(" # (421..422) @@ -240,34 +239,34 @@ Tree: - (member꞉ MemberAccess) ► (variant꞉ Identifier): "ident" # (427..432) - (separator꞉ Comma): "," # (432..433) - (item꞉ Expression): # " next." (433..439) - - (LeadingTrivia) ► (Whitespace): " " # (433..434) + - (leading_trivia꞉ Whitespace): " " # (433..434) - (variant꞉ Identifier): "next" # (434..438) - (period꞉ Period): "." # (438..439) - (SKIPPED): "do.that" # (439..446) - (Comma): "," # (446..447) - (item꞉ Expression): # " other." (447..454) - - (LeadingTrivia) ► (Whitespace): " " # (447..448) + - (leading_trivia꞉ Whitespace): " " # (447..448) - (variant꞉ Identifier): "other" # (448..453) - (period꞉ Period): "." # (453..454) - (SKIPPED): "while" # (454..459) - (Comma): "," # (459..460) - (item꞉ Expression) ► (variant꞉ MemberAccessExpression): # " next.one" (460..469) - (operand꞉ Expression): # " next" (460..465) - - (LeadingTrivia) ► (Whitespace): " " # (460..461) + - (leading_trivia꞉ Whitespace): " " # (460..461) - (variant꞉ Identifier): "next" # (461..465) - (period꞉ Period): "." # (465..466) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "one" # (466..469) - (separator꞉ Comma): "," # (469..470) - - (LeadingTrivia) ► (Whitespace): " " # (470..471) + - (leading_trivia꞉ Whitespace): " " # (470..471) - (SKIPPED): "final, ultimate" # (471..486) - (close_paren꞉ CloseParen): ")" # (486..487) - (body꞉ FunctionBody): # ";\n" (487..489) - (variant꞉ Semicolon): ";" # (487..488) - - (TrailingTrivia) ► (EndOfLine): "\n" # (488..489) + - (trailing_trivia꞉ EndOfLine): "\n" # (488..489) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function nested_lists() override(some., next.arg, ..." (489..560) - (function_keyword꞉ FunctionKeyword): "function" # (489..497) - (name꞉ FunctionName): # " nested_lists" (497..510) - - (LeadingTrivia) ► (Whitespace): " " # (497..498) + - (leading_trivia꞉ Whitespace): " " # (497..498) - (variant꞉ Identifier): "nested_lists" # (498..510) - (parameters꞉ ParametersDeclaration): # "()" (510..512) - (open_paren꞉ OpenParen): "(" # (510..511) @@ -276,7 +275,7 @@ Tree: - (attributes꞉ FunctionAttributes): # " override(some., next.arg, next.one, ultimate)" (512..558) - (item꞉ FunctionAttribute) ► (variant꞉ ModifierInvocation): # " override(some., next.arg, next.one, ultimate)" (512..558) - (name꞉ IdentifierPath): # " override" (512..521) - - (LeadingTrivia) ► (Whitespace): " " # (512..513) + - (leading_trivia꞉ Whitespace): " " # (512..513) - (item꞉ Identifier): "override" # (513..521) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # "(some., next.arg, next.one, ultimate)" (521..558) - (open_paren꞉ OpenParen): "(" # (521..522) @@ -288,22 +287,22 @@ Tree: - (Comma): "," # (527..528) - (item꞉ Expression) ► (variant꞉ MemberAccessExpression): # " next.arg" (528..537) - (operand꞉ Expression): # " next" (528..533) - - (LeadingTrivia) ► (Whitespace): " " # (528..529) + - (leading_trivia꞉ Whitespace): " " # (528..529) - (variant꞉ Identifier): "next" # (529..533) - (period꞉ Period): "." # (533..534) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "arg" # (534..537) - (separator꞉ Comma): "," # (537..538) - (item꞉ Expression) ► (variant꞉ MemberAccessExpression): # " next.one" (538..547) - (operand꞉ Expression): # " next" (538..543) - - (LeadingTrivia) ► (Whitespace): " " # (538..539) + - (leading_trivia꞉ Whitespace): " " # (538..539) - (variant꞉ Identifier): "next" # (539..543) - (period꞉ Period): "." # (543..544) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "one" # (544..547) - (separator꞉ Comma): "," # (547..548) - (item꞉ Expression): # " ultimate" (548..557) - - (LeadingTrivia) ► (Whitespace): " " # (548..549) + - (leading_trivia꞉ Whitespace): " " # (548..549) - (variant꞉ Identifier): "ultimate" # (549..557) - (close_paren꞉ CloseParen): ")" # (557..558) - (body꞉ FunctionBody): # ";\n" (558..560) - (variant꞉ Semicolon): ";" # (558..559) - - (TrailingTrivia) ► (EndOfLine): "\n" # (559..560) + - (trailing_trivia꞉ EndOfLine): "\n" # (559..560) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.5.0-failure.yml index 4a6e1017df..8cd98404b2 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.5.0-failure.yml @@ -101,7 +101,7 @@ Tree: - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function all() override(some.ident unexpected toke..." (0..309) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " all" (8..12) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "all" # (9..12) - (parameters꞉ ParametersDeclaration): # "()" (12..14) - (open_paren꞉ OpenParen): "(" # (12..13) @@ -109,7 +109,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (13..14) - (attributes꞉ FunctionAttributes): # " override(some.ident unexpected tokens, ISomeInter..." (14..83) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some.ident unexpected tokens, ISomeInter..." (14..76) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (override_keyword꞉ OverrideKeyword): "override" # (15..23) - (overridden꞉ OverridePathsDeclaration): # "(some.ident unexpected tokens, ISomeInterface, Oth..." (23..76) - (open_paren꞉ OpenParen): "(" # (23..24) @@ -118,22 +118,22 @@ Tree: - (item꞉ Identifier): "some" # (24..28) - (separator꞉ Period): "." # (28..29) - (item꞉ Identifier): "ident" # (29..34) - - (LeadingTrivia) ► (Whitespace): " " # (34..35) + - (leading_trivia꞉ Whitespace): " " # (34..35) - (SKIPPED): "unexpected tokens, ISomeInterface, Other" # (35..75) - (close_paren꞉ CloseParen): ")" # (75..76) - (item꞉ FunctionAttribute): # " public" (76..83) - - (LeadingTrivia) ► (Whitespace): " " # (76..77) + - (leading_trivia꞉ Whitespace): " " # (76..77) - (variant꞉ PublicKeyword): "public" # (77..83) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n msg.sender.call{do: 1, arg: 1 }();\n msg.send..." (83..309) - - (LeadingTrivia) ► (Whitespace): " " # (83..84) + - (leading_trivia꞉ Whitespace): " " # (83..84) - (open_brace꞉ OpenBrace): "{" # (84..85) - - (TrailingTrivia) ► (EndOfLine): "\n" # (85..86) + - (trailing_trivia꞉ EndOfLine): "\n" # (85..86) - (statements꞉ Statements): # " msg.sender.call{do: 1, arg: 1 }();\n msg.sender...." (86..306) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{do: 1, arg: 1 }();\n" (86..123) - (expression꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (86..103) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (86..98) - (operand꞉ Expression): # " msg" (86..91) - - (LeadingTrivia) ► (Whitespace): " " # (86..88) + - (leading_trivia꞉ Whitespace): " " # (86..88) - (variant꞉ Identifier): "msg" # (88..91) - (period꞉ Period): "." # (91..92) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (92..98) @@ -141,12 +141,12 @@ Tree: - (member꞉ MemberAccess) ► (variant꞉ Identifier): "call" # (99..103) - (SKIPPED): "{do: 1, arg: 1 }()" # (103..121) - (semicolon꞉ Semicolon): ";" # (121..122) - - (TrailingTrivia) ► (EndOfLine): "\n" # (122..123) + - (trailing_trivia꞉ EndOfLine): "\n" # (122..123) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{, empty: 1, parse: 2 }();\n" (123..167) - (expression꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (123..140) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (123..135) - (operand꞉ Expression): # " msg" (123..128) - - (LeadingTrivia) ► (Whitespace): " " # (123..125) + - (leading_trivia꞉ Whitespace): " " # (123..125) - (variant꞉ Identifier): "msg" # (125..128) - (period꞉ Period): "." # (128..129) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (129..135) @@ -154,12 +154,12 @@ Tree: - (member꞉ MemberAccess) ► (variant꞉ Identifier): "call" # (136..140) - (SKIPPED): "{, empty: 1, parse: 2 }()" # (140..165) - (semicolon꞉ Semicolon): ";" # (165..166) - - (TrailingTrivia) ► (EndOfLine): "\n" # (166..167) + - (trailing_trivia꞉ EndOfLine): "\n" # (166..167) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{arg: 1, missing_expr: , no_semic..." (167..230) - (expression꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (167..184) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (167..179) - (operand꞉ Expression): # " msg" (167..172) - - (LeadingTrivia) ► (Whitespace): " " # (167..169) + - (leading_trivia꞉ Whitespace): " " # (167..169) - (variant꞉ Identifier): "msg" # (169..172) - (period꞉ Period): "." # (172..173) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (173..179) @@ -167,12 +167,12 @@ Tree: - (member꞉ MemberAccess) ► (variant꞉ Identifier): "call" # (180..184) - (SKIPPED): "{arg: 1, missing_expr: , no_semicolon, , }()" # (184..228) - (semicolon꞉ Semicolon): ";" # (228..229) - - (TrailingTrivia) ► (EndOfLine): "\n" # (229..230) + - (trailing_trivia꞉ EndOfLine): "\n" # (229..230) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{arg: 1 unexpected tokens, not: 2..." (230..306) - (expression꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (230..247) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (230..242) - (operand꞉ Expression): # " msg" (230..235) - - (LeadingTrivia) ► (Whitespace): " " # (230..232) + - (leading_trivia꞉ Whitespace): " " # (230..232) - (variant꞉ Identifier): "msg" # (232..235) - (period꞉ Period): "." # (235..236) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (236..242) @@ -180,15 +180,15 @@ Tree: - (member꞉ MemberAccess) ► (variant꞉ Identifier): "call" # (243..247) - (SKIPPED): "{arg: 1 unexpected tokens, not: 2, recovered, yet:..." # (247..304) - (semicolon꞉ Semicolon): ";" # (304..305) - - (TrailingTrivia) ► (EndOfLine): "\n" # (305..306) - - (LeadingTrivia) ► (EndOfLine): "\n" # (306..307) + - (trailing_trivia꞉ EndOfLine): "\n" # (305..306) + - (leading_trivia꞉ EndOfLine): "\n" # (306..307) - (close_brace꞉ CloseBrace): "}" # (307..308) - - (TrailingTrivia) ► (EndOfLine): "\n" # (308..309) + - (trailing_trivia꞉ EndOfLine): "\n" # (308..309) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\nfunction empty() override(some.ident, /* empty */..." (309..388) - - (LeadingTrivia) ► (EndOfLine): "\n" # (309..310) + - (leading_trivia꞉ EndOfLine): "\n" # (309..310) - (function_keyword꞉ FunctionKeyword): "function" # (310..318) - (name꞉ FunctionName): # " empty" (318..324) - - (LeadingTrivia) ► (Whitespace): " " # (318..319) + - (leading_trivia꞉ Whitespace): " " # (318..319) - (variant꞉ Identifier): "empty" # (319..324) - (parameters꞉ ParametersDeclaration): # "()" (324..326) - (open_paren꞉ OpenParen): "(" # (324..325) @@ -196,7 +196,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (325..326) - (attributes꞉ FunctionAttributes): # " override(some.ident, /* empty */, other.arg.here,..." (326..386) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some.ident, /* empty */, other.arg.here,..." (326..386) - - (LeadingTrivia) ► (Whitespace): " " # (326..327) + - (leading_trivia꞉ Whitespace): " " # (326..327) - (override_keyword꞉ OverrideKeyword): "override" # (327..335) - (overridden꞉ OverridePathsDeclaration): # "(some.ident, /* empty */, other.arg.here, and.here..." (335..386) - (open_paren꞉ OpenParen): "(" # (335..336) @@ -206,19 +206,18 @@ Tree: - (separator꞉ Period): "." # (340..341) - (item꞉ Identifier): "ident" # (341..346) - (separator꞉ Comma): "," # (346..347) - - (LeadingTrivia): # " /* empty */" (347..359) - - (Whitespace): " " # (347..348) - - (MultiLineComment): "/* empty */" # (348..359) + - (leading_trivia꞉ Whitespace): " " # (347..348) + - (leading_trivia꞉ MultiLineComment): "/* empty */" # (348..359) - (SKIPPED): ", other.arg.here, and.here" # (359..385) - (close_paren꞉ CloseParen): ")" # (385..386) - (body꞉ FunctionBody): # ";\n" (386..388) - (variant꞉ Semicolon): ";" # (386..387) - - (TrailingTrivia) ► (EndOfLine): "\n" # (387..388) + - (trailing_trivia꞉ EndOfLine): "\n" # (387..388) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\nfunction nested_lists() override(some.ident, next..." (388..489) - - (LeadingTrivia) ► (EndOfLine): "\n" # (388..389) + - (leading_trivia꞉ EndOfLine): "\n" # (388..389) - (function_keyword꞉ FunctionKeyword): "function" # (389..397) - (name꞉ FunctionName): # " nested_lists" (397..410) - - (LeadingTrivia) ► (Whitespace): " " # (397..398) + - (leading_trivia꞉ Whitespace): " " # (397..398) - (variant꞉ Identifier): "nested_lists" # (398..410) - (parameters꞉ ParametersDeclaration): # "()" (410..412) - (open_paren꞉ OpenParen): "(" # (410..411) @@ -226,7 +225,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (411..412) - (attributes꞉ FunctionAttributes): # " override(some.ident, next.do.that, other.while, n..." (412..487) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some.ident, next.do.that, other.while, n..." (412..487) - - (LeadingTrivia) ► (Whitespace): " " # (412..413) + - (leading_trivia꞉ Whitespace): " " # (412..413) - (override_keyword꞉ OverrideKeyword): "override" # (413..421) - (overridden꞉ OverridePathsDeclaration): # "(some.ident, next.do.that, other.while, next.one, ..." (421..487) - (open_paren꞉ OpenParen): "(" # (421..422) @@ -237,33 +236,33 @@ Tree: - (item꞉ Identifier): "ident" # (427..432) - (separator꞉ Comma): "," # (432..433) - (item꞉ IdentifierPath): # " next." (433..439) - - (LeadingTrivia) ► (Whitespace): " " # (433..434) + - (leading_trivia꞉ Whitespace): " " # (433..434) - (item꞉ Identifier): "next" # (434..438) - (separator꞉ Period): "." # (438..439) - (SKIPPED): "do.that" # (439..446) - (Comma): "," # (446..447) - (item꞉ IdentifierPath): # " other." (447..454) - - (LeadingTrivia) ► (Whitespace): " " # (447..448) + - (leading_trivia꞉ Whitespace): " " # (447..448) - (item꞉ Identifier): "other" # (448..453) - (separator꞉ Period): "." # (453..454) - (SKIPPED): "while" # (454..459) - (Comma): "," # (459..460) - (item꞉ IdentifierPath): # " next.one" (460..469) - - (LeadingTrivia) ► (Whitespace): " " # (460..461) + - (leading_trivia꞉ Whitespace): " " # (460..461) - (item꞉ Identifier): "next" # (461..465) - (separator꞉ Period): "." # (465..466) - (item꞉ Identifier): "one" # (466..469) - (separator꞉ Comma): "," # (469..470) - - (LeadingTrivia) ► (Whitespace): " " # (470..471) + - (leading_trivia꞉ Whitespace): " " # (470..471) - (SKIPPED): "final, ultimate" # (471..486) - (close_paren꞉ CloseParen): ")" # (486..487) - (body꞉ FunctionBody): # ";\n" (487..489) - (variant꞉ Semicolon): ";" # (487..488) - - (TrailingTrivia) ► (EndOfLine): "\n" # (488..489) + - (trailing_trivia꞉ EndOfLine): "\n" # (488..489) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function nested_lists() override(some., next.arg, ..." (489..560) - (function_keyword꞉ FunctionKeyword): "function" # (489..497) - (name꞉ FunctionName): # " nested_lists" (497..510) - - (LeadingTrivia) ► (Whitespace): " " # (497..498) + - (leading_trivia꞉ Whitespace): " " # (497..498) - (variant꞉ Identifier): "nested_lists" # (498..510) - (parameters꞉ ParametersDeclaration): # "()" (510..512) - (open_paren꞉ OpenParen): "(" # (510..511) @@ -271,7 +270,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (511..512) - (attributes꞉ FunctionAttributes): # " override(some., next.arg, next.one, ultimate)" (512..558) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some., next.arg, next.one, ultimate)" (512..558) - - (LeadingTrivia) ► (Whitespace): " " # (512..513) + - (leading_trivia꞉ Whitespace): " " # (512..513) - (override_keyword꞉ OverrideKeyword): "override" # (513..521) - (overridden꞉ OverridePathsDeclaration): # "(some., next.arg, next.one, ultimate)" (521..558) - (open_paren꞉ OpenParen): "(" # (521..522) @@ -282,21 +281,21 @@ Tree: - (SKIPPED): "" # (527..527) - (Comma): "," # (527..528) - (item꞉ IdentifierPath): # " next.arg" (528..537) - - (LeadingTrivia) ► (Whitespace): " " # (528..529) + - (leading_trivia꞉ Whitespace): " " # (528..529) - (item꞉ Identifier): "next" # (529..533) - (separator꞉ Period): "." # (533..534) - (item꞉ Identifier): "arg" # (534..537) - (separator꞉ Comma): "," # (537..538) - (item꞉ IdentifierPath): # " next.one" (538..547) - - (LeadingTrivia) ► (Whitespace): " " # (538..539) + - (leading_trivia꞉ Whitespace): " " # (538..539) - (item꞉ Identifier): "next" # (539..543) - (separator꞉ Period): "." # (543..544) - (item꞉ Identifier): "one" # (544..547) - (separator꞉ Comma): "," # (547..548) - (item꞉ IdentifierPath): # " ultimate" (548..557) - - (LeadingTrivia) ► (Whitespace): " " # (548..549) + - (leading_trivia꞉ Whitespace): " " # (548..549) - (item꞉ Identifier): "ultimate" # (549..557) - (close_paren꞉ CloseParen): ")" # (557..558) - (body꞉ FunctionBody): # ";\n" (558..560) - (variant꞉ Semicolon): ";" # (558..559) - - (TrailingTrivia) ► (EndOfLine): "\n" # (559..560) + - (trailing_trivia꞉ EndOfLine): "\n" # (559..560) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.6.2-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.6.2-failure.yml index 93c8f3c94f..d1fa18b8e7 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.6.2-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.6.2-failure.yml @@ -117,7 +117,7 @@ Tree: - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function all() override(some.ident unexpected toke..." (0..309) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " all" (8..12) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "all" # (9..12) - (parameters꞉ ParametersDeclaration): # "()" (12..14) - (open_paren꞉ OpenParen): "(" # (12..13) @@ -125,7 +125,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (13..14) - (attributes꞉ FunctionAttributes): # " override(some.ident unexpected tokens, ISomeInter..." (14..83) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some.ident unexpected tokens, ISomeInter..." (14..76) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (override_keyword꞉ OverrideKeyword): "override" # (15..23) - (overridden꞉ OverridePathsDeclaration): # "(some.ident unexpected tokens, ISomeInterface, Oth..." (23..76) - (open_paren꞉ OpenParen): "(" # (23..24) @@ -134,23 +134,23 @@ Tree: - (item꞉ Identifier): "some" # (24..28) - (separator꞉ Period): "." # (28..29) - (item꞉ Identifier): "ident" # (29..34) - - (LeadingTrivia) ► (Whitespace): " " # (34..35) + - (leading_trivia꞉ Whitespace): " " # (34..35) - (SKIPPED): "unexpected tokens, ISomeInterface, Other" # (35..75) - (close_paren꞉ CloseParen): ")" # (75..76) - (item꞉ FunctionAttribute): # " public" (76..83) - - (LeadingTrivia) ► (Whitespace): " " # (76..77) + - (leading_trivia꞉ Whitespace): " " # (76..77) - (variant꞉ PublicKeyword): "public" # (77..83) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n msg.sender.call{do: 1, arg: 1 }();\n msg.send..." (83..309) - - (LeadingTrivia) ► (Whitespace): " " # (83..84) + - (leading_trivia꞉ Whitespace): " " # (83..84) - (open_brace꞉ OpenBrace): "{" # (84..85) - - (TrailingTrivia) ► (EndOfLine): "\n" # (85..86) + - (trailing_trivia꞉ EndOfLine): "\n" # (85..86) - (statements꞉ Statements): # " msg.sender.call{do: 1, arg: 1 }();\n msg.sender...." (86..306) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{do: 1, arg: 1 }();\n" (86..123) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # " msg.sender.call{do: 1, arg: 1 }()" (86..121) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (86..103) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (86..98) - (operand꞉ Expression): # " msg" (86..91) - - (LeadingTrivia) ► (Whitespace): " " # (86..88) + - (leading_trivia꞉ Whitespace): " " # (86..88) - (variant꞉ Identifier): "msg" # (88..91) - (period꞉ Period): "." # (91..92) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (92..98) @@ -167,13 +167,13 @@ Tree: - (arguments꞉ PositionalArguments): [] # (120..120) - (close_paren꞉ CloseParen): ")" # (120..121) - (semicolon꞉ Semicolon): ";" # (121..122) - - (TrailingTrivia) ► (EndOfLine): "\n" # (122..123) + - (trailing_trivia꞉ EndOfLine): "\n" # (122..123) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{, empty: 1, parse: 2 }();\n" (123..167) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # " msg.sender.call{, empty: 1, parse: 2 }()" (123..165) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (123..140) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (123..135) - (operand꞉ Expression): # " msg" (123..128) - - (LeadingTrivia) ► (Whitespace): " " # (123..125) + - (leading_trivia꞉ Whitespace): " " # (123..125) - (variant꞉ Identifier): "msg" # (125..128) - (period꞉ Period): "." # (128..129) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (129..135) @@ -190,13 +190,13 @@ Tree: - (arguments꞉ PositionalArguments): [] # (164..164) - (close_paren꞉ CloseParen): ")" # (164..165) - (semicolon꞉ Semicolon): ";" # (165..166) - - (TrailingTrivia) ► (EndOfLine): "\n" # (166..167) + - (trailing_trivia꞉ EndOfLine): "\n" # (166..167) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{arg: 1, missing_expr: , no_semic..." (167..230) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # " msg.sender.call{arg: 1, missing_expr: , no_semic..." (167..228) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (167..184) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (167..179) - (operand꞉ Expression): # " msg" (167..172) - - (LeadingTrivia) ► (Whitespace): " " # (167..169) + - (leading_trivia꞉ Whitespace): " " # (167..169) - (variant꞉ Identifier): "msg" # (169..172) - (period꞉ Period): "." # (172..173) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (173..179) @@ -210,21 +210,21 @@ Tree: - (name꞉ Identifier): "arg" # (185..188) - (colon꞉ Colon): ":" # (188..189) - (value꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (189..191) - - (LeadingTrivia) ► (Whitespace): " " # (189..190) + - (leading_trivia꞉ Whitespace): " " # (189..190) - (literal꞉ DecimalLiteral): "1" # (190..191) - (separator꞉ Comma): "," # (191..192) - (item꞉ NamedArgument): # " missing_expr:" (192..206) - - (LeadingTrivia) ► (Whitespace): " " # (192..193) + - (leading_trivia꞉ Whitespace): " " # (192..193) - (name꞉ Identifier): "missing_expr" # (193..205) - (colon꞉ Colon): ":" # (205..206) - (SKIPPED): " " # (206..207) - (Comma): "," # (207..208) - (item꞉ NamedArgument): # " no_semicolon" (208..221) - - (LeadingTrivia) ► (Whitespace): " " # (208..209) + - (leading_trivia꞉ Whitespace): " " # (208..209) - (name꞉ Identifier): "no_semicolon" # (209..221) - (SKIPPED): "" # (221..221) - (Comma): "," # (221..222) - - (LeadingTrivia) ► (Whitespace): " " # (222..223) + - (leading_trivia꞉ Whitespace): " " # (222..223) - (SKIPPED): ", " # (223..225) - (close_brace꞉ CloseBrace): "}" # (225..226) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # "()" (226..228) @@ -232,13 +232,13 @@ Tree: - (arguments꞉ PositionalArguments): [] # (227..227) - (close_paren꞉ CloseParen): ")" # (227..228) - (semicolon꞉ Semicolon): ";" # (228..229) - - (TrailingTrivia) ► (EndOfLine): "\n" # (229..230) + - (trailing_trivia꞉ EndOfLine): "\n" # (229..230) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{arg: 1 unexpected tokens, not: 2..." (230..306) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # " msg.sender.call{arg: 1 unexpected tokens, not: 2..." (230..304) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (230..247) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (230..242) - (operand꞉ Expression): # " msg" (230..235) - - (LeadingTrivia) ► (Whitespace): " " # (230..232) + - (leading_trivia꞉ Whitespace): " " # (230..232) - (variant꞉ Identifier): "msg" # (232..235) - (period꞉ Period): "." # (235..236) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (236..242) @@ -252,9 +252,9 @@ Tree: - (name꞉ Identifier): "arg" # (248..251) - (colon꞉ Colon): ":" # (251..252) - (value꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (252..254) - - (LeadingTrivia) ► (Whitespace): " " # (252..253) + - (leading_trivia꞉ Whitespace): " " # (252..253) - (literal꞉ DecimalLiteral): "1" # (253..254) - - (LeadingTrivia) ► (Whitespace): " " # (254..255) + - (leading_trivia꞉ Whitespace): " " # (254..255) - (SKIPPED): "unexpected tokens, not: 2, recovered, yet: 3, " # (255..301) - (close_brace꞉ CloseBrace): "}" # (301..302) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # "()" (302..304) @@ -262,15 +262,15 @@ Tree: - (arguments꞉ PositionalArguments): [] # (303..303) - (close_paren꞉ CloseParen): ")" # (303..304) - (semicolon꞉ Semicolon): ";" # (304..305) - - (TrailingTrivia) ► (EndOfLine): "\n" # (305..306) - - (LeadingTrivia) ► (EndOfLine): "\n" # (306..307) + - (trailing_trivia꞉ EndOfLine): "\n" # (305..306) + - (leading_trivia꞉ EndOfLine): "\n" # (306..307) - (close_brace꞉ CloseBrace): "}" # (307..308) - - (TrailingTrivia) ► (EndOfLine): "\n" # (308..309) + - (trailing_trivia꞉ EndOfLine): "\n" # (308..309) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\nfunction empty() override(some.ident, /* empty */..." (309..388) - - (LeadingTrivia) ► (EndOfLine): "\n" # (309..310) + - (leading_trivia꞉ EndOfLine): "\n" # (309..310) - (function_keyword꞉ FunctionKeyword): "function" # (310..318) - (name꞉ FunctionName): # " empty" (318..324) - - (LeadingTrivia) ► (Whitespace): " " # (318..319) + - (leading_trivia꞉ Whitespace): " " # (318..319) - (variant꞉ Identifier): "empty" # (319..324) - (parameters꞉ ParametersDeclaration): # "()" (324..326) - (open_paren꞉ OpenParen): "(" # (324..325) @@ -278,7 +278,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (325..326) - (attributes꞉ FunctionAttributes): # " override(some.ident, /* empty */, other.arg.here,..." (326..386) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some.ident, /* empty */, other.arg.here,..." (326..386) - - (LeadingTrivia) ► (Whitespace): " " # (326..327) + - (leading_trivia꞉ Whitespace): " " # (326..327) - (override_keyword꞉ OverrideKeyword): "override" # (327..335) - (overridden꞉ OverridePathsDeclaration): # "(some.ident, /* empty */, other.arg.here, and.here..." (335..386) - (open_paren꞉ OpenParen): "(" # (335..336) @@ -288,19 +288,18 @@ Tree: - (separator꞉ Period): "." # (340..341) - (item꞉ Identifier): "ident" # (341..346) - (separator꞉ Comma): "," # (346..347) - - (LeadingTrivia): # " /* empty */" (347..359) - - (Whitespace): " " # (347..348) - - (MultiLineComment): "/* empty */" # (348..359) + - (leading_trivia꞉ Whitespace): " " # (347..348) + - (leading_trivia꞉ MultiLineComment): "/* empty */" # (348..359) - (SKIPPED): ", other.arg.here, and.here" # (359..385) - (close_paren꞉ CloseParen): ")" # (385..386) - (body꞉ FunctionBody): # ";\n" (386..388) - (variant꞉ Semicolon): ";" # (386..387) - - (TrailingTrivia) ► (EndOfLine): "\n" # (387..388) + - (trailing_trivia꞉ EndOfLine): "\n" # (387..388) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\nfunction nested_lists() override(some.ident, next..." (388..489) - - (LeadingTrivia) ► (EndOfLine): "\n" # (388..389) + - (leading_trivia꞉ EndOfLine): "\n" # (388..389) - (function_keyword꞉ FunctionKeyword): "function" # (389..397) - (name꞉ FunctionName): # " nested_lists" (397..410) - - (LeadingTrivia) ► (Whitespace): " " # (397..398) + - (leading_trivia꞉ Whitespace): " " # (397..398) - (variant꞉ Identifier): "nested_lists" # (398..410) - (parameters꞉ ParametersDeclaration): # "()" (410..412) - (open_paren꞉ OpenParen): "(" # (410..411) @@ -308,7 +307,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (411..412) - (attributes꞉ FunctionAttributes): # " override(some.ident, next.do.that, other.while, n..." (412..487) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some.ident, next.do.that, other.while, n..." (412..487) - - (LeadingTrivia) ► (Whitespace): " " # (412..413) + - (leading_trivia꞉ Whitespace): " " # (412..413) - (override_keyword꞉ OverrideKeyword): "override" # (413..421) - (overridden꞉ OverridePathsDeclaration): # "(some.ident, next.do.that, other.while, next.one, ..." (421..487) - (open_paren꞉ OpenParen): "(" # (421..422) @@ -319,33 +318,33 @@ Tree: - (item꞉ Identifier): "ident" # (427..432) - (separator꞉ Comma): "," # (432..433) - (item꞉ IdentifierPath): # " next." (433..439) - - (LeadingTrivia) ► (Whitespace): " " # (433..434) + - (leading_trivia꞉ Whitespace): " " # (433..434) - (item꞉ Identifier): "next" # (434..438) - (separator꞉ Period): "." # (438..439) - (SKIPPED): "do.that" # (439..446) - (Comma): "," # (446..447) - (item꞉ IdentifierPath): # " other." (447..454) - - (LeadingTrivia) ► (Whitespace): " " # (447..448) + - (leading_trivia꞉ Whitespace): " " # (447..448) - (item꞉ Identifier): "other" # (448..453) - (separator꞉ Period): "." # (453..454) - (SKIPPED): "while" # (454..459) - (Comma): "," # (459..460) - (item꞉ IdentifierPath): # " next.one" (460..469) - - (LeadingTrivia) ► (Whitespace): " " # (460..461) + - (leading_trivia꞉ Whitespace): " " # (460..461) - (item꞉ Identifier): "next" # (461..465) - (separator꞉ Period): "." # (465..466) - (item꞉ Identifier): "one" # (466..469) - (separator꞉ Comma): "," # (469..470) - - (LeadingTrivia) ► (Whitespace): " " # (470..471) + - (leading_trivia꞉ Whitespace): " " # (470..471) - (SKIPPED): "final, ultimate" # (471..486) - (close_paren꞉ CloseParen): ")" # (486..487) - (body꞉ FunctionBody): # ";\n" (487..489) - (variant꞉ Semicolon): ";" # (487..488) - - (TrailingTrivia) ► (EndOfLine): "\n" # (488..489) + - (trailing_trivia꞉ EndOfLine): "\n" # (488..489) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function nested_lists() override(some., next.arg, ..." (489..560) - (function_keyword꞉ FunctionKeyword): "function" # (489..497) - (name꞉ FunctionName): # " nested_lists" (497..510) - - (LeadingTrivia) ► (Whitespace): " " # (497..498) + - (leading_trivia꞉ Whitespace): " " # (497..498) - (variant꞉ Identifier): "nested_lists" # (498..510) - (parameters꞉ ParametersDeclaration): # "()" (510..512) - (open_paren꞉ OpenParen): "(" # (510..511) @@ -353,7 +352,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (511..512) - (attributes꞉ FunctionAttributes): # " override(some., next.arg, next.one, ultimate)" (512..558) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some., next.arg, next.one, ultimate)" (512..558) - - (LeadingTrivia) ► (Whitespace): " " # (512..513) + - (leading_trivia꞉ Whitespace): " " # (512..513) - (override_keyword꞉ OverrideKeyword): "override" # (513..521) - (overridden꞉ OverridePathsDeclaration): # "(some., next.arg, next.one, ultimate)" (521..558) - (open_paren꞉ OpenParen): "(" # (521..522) @@ -364,21 +363,21 @@ Tree: - (SKIPPED): "" # (527..527) - (Comma): "," # (527..528) - (item꞉ IdentifierPath): # " next.arg" (528..537) - - (LeadingTrivia) ► (Whitespace): " " # (528..529) + - (leading_trivia꞉ Whitespace): " " # (528..529) - (item꞉ Identifier): "next" # (529..533) - (separator꞉ Period): "." # (533..534) - (item꞉ Identifier): "arg" # (534..537) - (separator꞉ Comma): "," # (537..538) - (item꞉ IdentifierPath): # " next.one" (538..547) - - (LeadingTrivia) ► (Whitespace): " " # (538..539) + - (leading_trivia꞉ Whitespace): " " # (538..539) - (item꞉ Identifier): "next" # (539..543) - (separator꞉ Period): "." # (543..544) - (item꞉ Identifier): "one" # (544..547) - (separator꞉ Comma): "," # (547..548) - (item꞉ IdentifierPath): # " ultimate" (548..557) - - (LeadingTrivia) ► (Whitespace): " " # (548..549) + - (leading_trivia꞉ Whitespace): " " # (548..549) - (item꞉ Identifier): "ultimate" # (549..557) - (close_paren꞉ CloseParen): ")" # (557..558) - (body꞉ FunctionBody): # ";\n" (558..560) - (variant꞉ Semicolon): ";" # (558..559) - - (TrailingTrivia) ► (EndOfLine): "\n" # (559..560) + - (trailing_trivia꞉ EndOfLine): "\n" # (559..560) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.7.0-failure.yml index db96584472..4db10b2404 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.7.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.7.0-failure.yml @@ -117,7 +117,7 @@ Tree: - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function all() override(some.ident unexpected toke..." (0..309) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " all" (8..12) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "all" # (9..12) - (parameters꞉ ParametersDeclaration): # "()" (12..14) - (open_paren꞉ OpenParen): "(" # (12..13) @@ -125,7 +125,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (13..14) - (attributes꞉ FunctionAttributes): # " override(some.ident unexpected tokens, ISomeInter..." (14..83) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some.ident unexpected tokens, ISomeInter..." (14..76) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (override_keyword꞉ OverrideKeyword): "override" # (15..23) - (overridden꞉ OverridePathsDeclaration): # "(some.ident unexpected tokens, ISomeInterface, Oth..." (23..76) - (open_paren꞉ OpenParen): "(" # (23..24) @@ -134,23 +134,23 @@ Tree: - (item꞉ Identifier): "some" # (24..28) - (separator꞉ Period): "." # (28..29) - (item꞉ Identifier): "ident" # (29..34) - - (LeadingTrivia) ► (Whitespace): " " # (34..35) + - (leading_trivia꞉ Whitespace): " " # (34..35) - (SKIPPED): "unexpected tokens, ISomeInterface, Other" # (35..75) - (close_paren꞉ CloseParen): ")" # (75..76) - (item꞉ FunctionAttribute): # " public" (76..83) - - (LeadingTrivia) ► (Whitespace): " " # (76..77) + - (leading_trivia꞉ Whitespace): " " # (76..77) - (variant꞉ PublicKeyword): "public" # (77..83) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n msg.sender.call{do: 1, arg: 1 }();\n msg.send..." (83..309) - - (LeadingTrivia) ► (Whitespace): " " # (83..84) + - (leading_trivia꞉ Whitespace): " " # (83..84) - (open_brace꞉ OpenBrace): "{" # (84..85) - - (TrailingTrivia) ► (EndOfLine): "\n" # (85..86) + - (trailing_trivia꞉ EndOfLine): "\n" # (85..86) - (statements꞉ Statements): # " msg.sender.call{do: 1, arg: 1 }();\n msg.sender...." (86..306) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{do: 1, arg: 1 }();\n" (86..123) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # " msg.sender.call{do: 1, arg: 1 }()" (86..121) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (86..103) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (86..98) - (operand꞉ Expression): # " msg" (86..91) - - (LeadingTrivia) ► (Whitespace): " " # (86..88) + - (leading_trivia꞉ Whitespace): " " # (86..88) - (variant꞉ Identifier): "msg" # (88..91) - (period꞉ Period): "." # (91..92) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (92..98) @@ -167,13 +167,13 @@ Tree: - (arguments꞉ PositionalArguments): [] # (120..120) - (close_paren꞉ CloseParen): ")" # (120..121) - (semicolon꞉ Semicolon): ";" # (121..122) - - (TrailingTrivia) ► (EndOfLine): "\n" # (122..123) + - (trailing_trivia꞉ EndOfLine): "\n" # (122..123) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{, empty: 1, parse: 2 }();\n" (123..167) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # " msg.sender.call{, empty: 1, parse: 2 }()" (123..165) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (123..140) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (123..135) - (operand꞉ Expression): # " msg" (123..128) - - (LeadingTrivia) ► (Whitespace): " " # (123..125) + - (leading_trivia꞉ Whitespace): " " # (123..125) - (variant꞉ Identifier): "msg" # (125..128) - (period꞉ Period): "." # (128..129) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (129..135) @@ -190,13 +190,13 @@ Tree: - (arguments꞉ PositionalArguments): [] # (164..164) - (close_paren꞉ CloseParen): ")" # (164..165) - (semicolon꞉ Semicolon): ";" # (165..166) - - (TrailingTrivia) ► (EndOfLine): "\n" # (166..167) + - (trailing_trivia꞉ EndOfLine): "\n" # (166..167) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{arg: 1, missing_expr: , no_semic..." (167..230) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # " msg.sender.call{arg: 1, missing_expr: , no_semic..." (167..228) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (167..184) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (167..179) - (operand꞉ Expression): # " msg" (167..172) - - (LeadingTrivia) ► (Whitespace): " " # (167..169) + - (leading_trivia꞉ Whitespace): " " # (167..169) - (variant꞉ Identifier): "msg" # (169..172) - (period꞉ Period): "." # (172..173) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (173..179) @@ -210,21 +210,21 @@ Tree: - (name꞉ Identifier): "arg" # (185..188) - (colon꞉ Colon): ":" # (188..189) - (value꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (189..191) - - (LeadingTrivia) ► (Whitespace): " " # (189..190) + - (leading_trivia꞉ Whitespace): " " # (189..190) - (literal꞉ DecimalLiteral): "1" # (190..191) - (separator꞉ Comma): "," # (191..192) - (item꞉ NamedArgument): # " missing_expr:" (192..206) - - (LeadingTrivia) ► (Whitespace): " " # (192..193) + - (leading_trivia꞉ Whitespace): " " # (192..193) - (name꞉ Identifier): "missing_expr" # (193..205) - (colon꞉ Colon): ":" # (205..206) - (SKIPPED): " " # (206..207) - (Comma): "," # (207..208) - (item꞉ NamedArgument): # " no_semicolon" (208..221) - - (LeadingTrivia) ► (Whitespace): " " # (208..209) + - (leading_trivia꞉ Whitespace): " " # (208..209) - (name꞉ Identifier): "no_semicolon" # (209..221) - (SKIPPED): "" # (221..221) - (Comma): "," # (221..222) - - (LeadingTrivia) ► (Whitespace): " " # (222..223) + - (leading_trivia꞉ Whitespace): " " # (222..223) - (SKIPPED): ", " # (223..225) - (close_brace꞉ CloseBrace): "}" # (225..226) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # "()" (226..228) @@ -232,13 +232,13 @@ Tree: - (arguments꞉ PositionalArguments): [] # (227..227) - (close_paren꞉ CloseParen): ")" # (227..228) - (semicolon꞉ Semicolon): ";" # (228..229) - - (TrailingTrivia) ► (EndOfLine): "\n" # (229..230) + - (trailing_trivia꞉ EndOfLine): "\n" # (229..230) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{arg: 1 unexpected tokens, not: 2..." (230..306) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # " msg.sender.call{arg: 1 unexpected tokens, not: 2..." (230..304) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (230..247) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (230..242) - (operand꞉ Expression): # " msg" (230..235) - - (LeadingTrivia) ► (Whitespace): " " # (230..232) + - (leading_trivia꞉ Whitespace): " " # (230..232) - (variant꞉ Identifier): "msg" # (232..235) - (period꞉ Period): "." # (235..236) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (236..242) @@ -252,9 +252,9 @@ Tree: - (name꞉ Identifier): "arg" # (248..251) - (colon꞉ Colon): ":" # (251..252) - (value꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (252..254) - - (LeadingTrivia) ► (Whitespace): " " # (252..253) + - (leading_trivia꞉ Whitespace): " " # (252..253) - (literal꞉ DecimalLiteral): "1" # (253..254) - - (LeadingTrivia) ► (Whitespace): " " # (254..255) + - (leading_trivia꞉ Whitespace): " " # (254..255) - (SKIPPED): "unexpected tokens, not: 2, recovered, yet: 3, " # (255..301) - (close_brace꞉ CloseBrace): "}" # (301..302) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # "()" (302..304) @@ -262,15 +262,15 @@ Tree: - (arguments꞉ PositionalArguments): [] # (303..303) - (close_paren꞉ CloseParen): ")" # (303..304) - (semicolon꞉ Semicolon): ";" # (304..305) - - (TrailingTrivia) ► (EndOfLine): "\n" # (305..306) - - (LeadingTrivia) ► (EndOfLine): "\n" # (306..307) + - (trailing_trivia꞉ EndOfLine): "\n" # (305..306) + - (leading_trivia꞉ EndOfLine): "\n" # (306..307) - (close_brace꞉ CloseBrace): "}" # (307..308) - - (TrailingTrivia) ► (EndOfLine): "\n" # (308..309) + - (trailing_trivia꞉ EndOfLine): "\n" # (308..309) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\nfunction empty() override(some.ident, /* empty */..." (309..388) - - (LeadingTrivia) ► (EndOfLine): "\n" # (309..310) + - (leading_trivia꞉ EndOfLine): "\n" # (309..310) - (function_keyword꞉ FunctionKeyword): "function" # (310..318) - (name꞉ FunctionName): # " empty" (318..324) - - (LeadingTrivia) ► (Whitespace): " " # (318..319) + - (leading_trivia꞉ Whitespace): " " # (318..319) - (variant꞉ Identifier): "empty" # (319..324) - (parameters꞉ ParametersDeclaration): # "()" (324..326) - (open_paren꞉ OpenParen): "(" # (324..325) @@ -278,7 +278,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (325..326) - (attributes꞉ FunctionAttributes): # " override(some.ident, /* empty */, other.arg.here,..." (326..386) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some.ident, /* empty */, other.arg.here,..." (326..386) - - (LeadingTrivia) ► (Whitespace): " " # (326..327) + - (leading_trivia꞉ Whitespace): " " # (326..327) - (override_keyword꞉ OverrideKeyword): "override" # (327..335) - (overridden꞉ OverridePathsDeclaration): # "(some.ident, /* empty */, other.arg.here, and.here..." (335..386) - (open_paren꞉ OpenParen): "(" # (335..336) @@ -288,19 +288,18 @@ Tree: - (separator꞉ Period): "." # (340..341) - (item꞉ Identifier): "ident" # (341..346) - (separator꞉ Comma): "," # (346..347) - - (LeadingTrivia): # " /* empty */" (347..359) - - (Whitespace): " " # (347..348) - - (MultiLineComment): "/* empty */" # (348..359) + - (leading_trivia꞉ Whitespace): " " # (347..348) + - (leading_trivia꞉ MultiLineComment): "/* empty */" # (348..359) - (SKIPPED): ", other.arg.here, and.here" # (359..385) - (close_paren꞉ CloseParen): ")" # (385..386) - (body꞉ FunctionBody): # ";\n" (386..388) - (variant꞉ Semicolon): ";" # (386..387) - - (TrailingTrivia) ► (EndOfLine): "\n" # (387..388) + - (trailing_trivia꞉ EndOfLine): "\n" # (387..388) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\nfunction nested_lists() override(some.ident, next..." (388..489) - - (LeadingTrivia) ► (EndOfLine): "\n" # (388..389) + - (leading_trivia꞉ EndOfLine): "\n" # (388..389) - (function_keyword꞉ FunctionKeyword): "function" # (389..397) - (name꞉ FunctionName): # " nested_lists" (397..410) - - (LeadingTrivia) ► (Whitespace): " " # (397..398) + - (leading_trivia꞉ Whitespace): " " # (397..398) - (variant꞉ Identifier): "nested_lists" # (398..410) - (parameters꞉ ParametersDeclaration): # "()" (410..412) - (open_paren꞉ OpenParen): "(" # (410..411) @@ -308,7 +307,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (411..412) - (attributes꞉ FunctionAttributes): # " override(some.ident, next.do.that, other.while, n..." (412..487) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some.ident, next.do.that, other.while, n..." (412..487) - - (LeadingTrivia) ► (Whitespace): " " # (412..413) + - (leading_trivia꞉ Whitespace): " " # (412..413) - (override_keyword꞉ OverrideKeyword): "override" # (413..421) - (overridden꞉ OverridePathsDeclaration): # "(some.ident, next.do.that, other.while, next.one, ..." (421..487) - (open_paren꞉ OpenParen): "(" # (421..422) @@ -319,33 +318,33 @@ Tree: - (item꞉ Identifier): "ident" # (427..432) - (separator꞉ Comma): "," # (432..433) - (item꞉ IdentifierPath): # " next." (433..439) - - (LeadingTrivia) ► (Whitespace): " " # (433..434) + - (leading_trivia꞉ Whitespace): " " # (433..434) - (item꞉ Identifier): "next" # (434..438) - (separator꞉ Period): "." # (438..439) - (SKIPPED): "do.that" # (439..446) - (Comma): "," # (446..447) - (item꞉ IdentifierPath): # " other." (447..454) - - (LeadingTrivia) ► (Whitespace): " " # (447..448) + - (leading_trivia꞉ Whitespace): " " # (447..448) - (item꞉ Identifier): "other" # (448..453) - (separator꞉ Period): "." # (453..454) - (SKIPPED): "while" # (454..459) - (Comma): "," # (459..460) - (item꞉ IdentifierPath): # " next.one" (460..469) - - (LeadingTrivia) ► (Whitespace): " " # (460..461) + - (leading_trivia꞉ Whitespace): " " # (460..461) - (item꞉ Identifier): "next" # (461..465) - (separator꞉ Period): "." # (465..466) - (item꞉ Identifier): "one" # (466..469) - (separator꞉ Comma): "," # (469..470) - - (LeadingTrivia) ► (Whitespace): " " # (470..471) + - (leading_trivia꞉ Whitespace): " " # (470..471) - (SKIPPED): "final, ultimate" # (471..486) - (close_paren꞉ CloseParen): ")" # (486..487) - (body꞉ FunctionBody): # ";\n" (487..489) - (variant꞉ Semicolon): ";" # (487..488) - - (TrailingTrivia) ► (EndOfLine): "\n" # (488..489) + - (trailing_trivia꞉ EndOfLine): "\n" # (488..489) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function nested_lists() override(some., next.arg, ..." (489..560) - (function_keyword꞉ FunctionKeyword): "function" # (489..497) - (name꞉ FunctionName): # " nested_lists" (497..510) - - (LeadingTrivia) ► (Whitespace): " " # (497..498) + - (leading_trivia꞉ Whitespace): " " # (497..498) - (variant꞉ Identifier): "nested_lists" # (498..510) - (parameters꞉ ParametersDeclaration): # "()" (510..512) - (open_paren꞉ OpenParen): "(" # (510..511) @@ -353,7 +352,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (511..512) - (attributes꞉ FunctionAttributes): # " override(some., next.arg, next.one, ultimate)" (512..558) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some., next.arg, next.one, ultimate)" (512..558) - - (LeadingTrivia) ► (Whitespace): " " # (512..513) + - (leading_trivia꞉ Whitespace): " " # (512..513) - (override_keyword꞉ OverrideKeyword): "override" # (513..521) - (overridden꞉ OverridePathsDeclaration): # "(some., next.arg, next.one, ultimate)" (521..558) - (open_paren꞉ OpenParen): "(" # (521..522) @@ -364,21 +363,21 @@ Tree: - (SKIPPED): "" # (527..527) - (Comma): "," # (527..528) - (item꞉ IdentifierPath): # " next.arg" (528..537) - - (LeadingTrivia) ► (Whitespace): " " # (528..529) + - (leading_trivia꞉ Whitespace): " " # (528..529) - (item꞉ Identifier): "next" # (529..533) - (separator꞉ Period): "." # (533..534) - (item꞉ Identifier): "arg" # (534..537) - (separator꞉ Comma): "," # (537..538) - (item꞉ IdentifierPath): # " next.one" (538..547) - - (LeadingTrivia) ► (Whitespace): " " # (538..539) + - (leading_trivia꞉ Whitespace): " " # (538..539) - (item꞉ Identifier): "next" # (539..543) - (separator꞉ Period): "." # (543..544) - (item꞉ Identifier): "one" # (544..547) - (separator꞉ Comma): "," # (547..548) - (item꞉ IdentifierPath): # " ultimate" (548..557) - - (LeadingTrivia) ► (Whitespace): " " # (548..549) + - (leading_trivia꞉ Whitespace): " " # (548..549) - (item꞉ Identifier): "ultimate" # (549..557) - (close_paren꞉ CloseParen): ")" # (557..558) - (body꞉ FunctionBody): # ";\n" (558..560) - (variant꞉ Semicolon): ";" # (558..559) - - (TrailingTrivia) ► (EndOfLine): "\n" # (559..560) + - (trailing_trivia꞉ EndOfLine): "\n" # (559..560) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.8.0-failure.yml index 4989fc507c..c7d724ec07 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.8.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.8.0-failure.yml @@ -117,7 +117,7 @@ Tree: - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function all() override(some.ident unexpected toke..." (0..309) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " all" (8..12) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "all" # (9..12) - (parameters꞉ ParametersDeclaration): # "()" (12..14) - (open_paren꞉ OpenParen): "(" # (12..13) @@ -125,7 +125,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (13..14) - (attributes꞉ FunctionAttributes): # " override(some.ident unexpected tokens, ISomeInter..." (14..83) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some.ident unexpected tokens, ISomeInter..." (14..76) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (override_keyword꞉ OverrideKeyword): "override" # (15..23) - (overridden꞉ OverridePathsDeclaration): # "(some.ident unexpected tokens, ISomeInterface, Oth..." (23..76) - (open_paren꞉ OpenParen): "(" # (23..24) @@ -134,23 +134,23 @@ Tree: - (item꞉ Identifier): "some" # (24..28) - (separator꞉ Period): "." # (28..29) - (item꞉ Identifier): "ident" # (29..34) - - (LeadingTrivia) ► (Whitespace): " " # (34..35) + - (leading_trivia꞉ Whitespace): " " # (34..35) - (SKIPPED): "unexpected tokens, ISomeInterface, Other" # (35..75) - (close_paren꞉ CloseParen): ")" # (75..76) - (item꞉ FunctionAttribute): # " public" (76..83) - - (LeadingTrivia) ► (Whitespace): " " # (76..77) + - (leading_trivia꞉ Whitespace): " " # (76..77) - (variant꞉ PublicKeyword): "public" # (77..83) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n msg.sender.call{do: 1, arg: 1 }();\n msg.send..." (83..309) - - (LeadingTrivia) ► (Whitespace): " " # (83..84) + - (leading_trivia꞉ Whitespace): " " # (83..84) - (open_brace꞉ OpenBrace): "{" # (84..85) - - (TrailingTrivia) ► (EndOfLine): "\n" # (85..86) + - (trailing_trivia꞉ EndOfLine): "\n" # (85..86) - (statements꞉ Statements): # " msg.sender.call{do: 1, arg: 1 }();\n msg.sender...." (86..306) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{do: 1, arg: 1 }();\n" (86..123) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # " msg.sender.call{do: 1, arg: 1 }()" (86..121) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (86..103) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (86..98) - (operand꞉ Expression): # " msg" (86..91) - - (LeadingTrivia) ► (Whitespace): " " # (86..88) + - (leading_trivia꞉ Whitespace): " " # (86..88) - (variant꞉ Identifier): "msg" # (88..91) - (period꞉ Period): "." # (91..92) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (92..98) @@ -166,13 +166,13 @@ Tree: - (arguments꞉ PositionalArguments): [] # (120..120) - (close_paren꞉ CloseParen): ")" # (120..121) - (semicolon꞉ Semicolon): ";" # (121..122) - - (TrailingTrivia) ► (EndOfLine): "\n" # (122..123) + - (trailing_trivia꞉ EndOfLine): "\n" # (122..123) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{, empty: 1, parse: 2 }();\n" (123..167) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # " msg.sender.call{, empty: 1, parse: 2 }()" (123..165) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (123..140) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (123..135) - (operand꞉ Expression): # " msg" (123..128) - - (LeadingTrivia) ► (Whitespace): " " # (123..125) + - (leading_trivia꞉ Whitespace): " " # (123..125) - (variant꞉ Identifier): "msg" # (125..128) - (period꞉ Period): "." # (128..129) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (129..135) @@ -188,13 +188,13 @@ Tree: - (arguments꞉ PositionalArguments): [] # (164..164) - (close_paren꞉ CloseParen): ")" # (164..165) - (semicolon꞉ Semicolon): ";" # (165..166) - - (TrailingTrivia) ► (EndOfLine): "\n" # (166..167) + - (trailing_trivia꞉ EndOfLine): "\n" # (166..167) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{arg: 1, missing_expr: , no_semic..." (167..230) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # " msg.sender.call{arg: 1, missing_expr: , no_semic..." (167..228) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (167..184) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (167..179) - (operand꞉ Expression): # " msg" (167..172) - - (LeadingTrivia) ► (Whitespace): " " # (167..169) + - (leading_trivia꞉ Whitespace): " " # (167..169) - (variant꞉ Identifier): "msg" # (169..172) - (period꞉ Period): "." # (172..173) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (173..179) @@ -207,21 +207,21 @@ Tree: - (name꞉ Identifier): "arg" # (185..188) - (colon꞉ Colon): ":" # (188..189) - (value꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (189..191) - - (LeadingTrivia) ► (Whitespace): " " # (189..190) + - (leading_trivia꞉ Whitespace): " " # (189..190) - (literal꞉ DecimalLiteral): "1" # (190..191) - (separator꞉ Comma): "," # (191..192) - (item꞉ NamedArgument): # " missing_expr:" (192..206) - - (LeadingTrivia) ► (Whitespace): " " # (192..193) + - (leading_trivia꞉ Whitespace): " " # (192..193) - (name꞉ Identifier): "missing_expr" # (193..205) - (colon꞉ Colon): ":" # (205..206) - (SKIPPED): " " # (206..207) - (Comma): "," # (207..208) - (item꞉ NamedArgument): # " no_semicolon" (208..221) - - (LeadingTrivia) ► (Whitespace): " " # (208..209) + - (leading_trivia꞉ Whitespace): " " # (208..209) - (name꞉ Identifier): "no_semicolon" # (209..221) - (SKIPPED): "" # (221..221) - (Comma): "," # (221..222) - - (LeadingTrivia) ► (Whitespace): " " # (222..223) + - (leading_trivia꞉ Whitespace): " " # (222..223) - (SKIPPED): ", " # (223..225) - (close_brace꞉ CloseBrace): "}" # (225..226) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # "()" (226..228) @@ -229,13 +229,13 @@ Tree: - (arguments꞉ PositionalArguments): [] # (227..227) - (close_paren꞉ CloseParen): ")" # (227..228) - (semicolon꞉ Semicolon): ";" # (228..229) - - (TrailingTrivia) ► (EndOfLine): "\n" # (229..230) + - (trailing_trivia꞉ EndOfLine): "\n" # (229..230) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " msg.sender.call{arg: 1 unexpected tokens, not: 2..." (230..306) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # " msg.sender.call{arg: 1 unexpected tokens, not: 2..." (230..304) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender.call" (230..247) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " msg.sender" (230..242) - (operand꞉ Expression): # " msg" (230..235) - - (LeadingTrivia) ► (Whitespace): " " # (230..232) + - (leading_trivia꞉ Whitespace): " " # (230..232) - (variant꞉ Identifier): "msg" # (232..235) - (period꞉ Period): "." # (235..236) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (236..242) @@ -248,9 +248,9 @@ Tree: - (name꞉ Identifier): "arg" # (248..251) - (colon꞉ Colon): ":" # (251..252) - (value꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (252..254) - - (LeadingTrivia) ► (Whitespace): " " # (252..253) + - (leading_trivia꞉ Whitespace): " " # (252..253) - (literal꞉ DecimalLiteral): "1" # (253..254) - - (LeadingTrivia) ► (Whitespace): " " # (254..255) + - (leading_trivia꞉ Whitespace): " " # (254..255) - (SKIPPED): "unexpected tokens, not: 2, recovered, yet: 3, " # (255..301) - (close_brace꞉ CloseBrace): "}" # (301..302) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # "()" (302..304) @@ -258,15 +258,15 @@ Tree: - (arguments꞉ PositionalArguments): [] # (303..303) - (close_paren꞉ CloseParen): ")" # (303..304) - (semicolon꞉ Semicolon): ";" # (304..305) - - (TrailingTrivia) ► (EndOfLine): "\n" # (305..306) - - (LeadingTrivia) ► (EndOfLine): "\n" # (306..307) + - (trailing_trivia꞉ EndOfLine): "\n" # (305..306) + - (leading_trivia꞉ EndOfLine): "\n" # (306..307) - (close_brace꞉ CloseBrace): "}" # (307..308) - - (TrailingTrivia) ► (EndOfLine): "\n" # (308..309) + - (trailing_trivia꞉ EndOfLine): "\n" # (308..309) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\nfunction empty() override(some.ident, /* empty */..." (309..388) - - (LeadingTrivia) ► (EndOfLine): "\n" # (309..310) + - (leading_trivia꞉ EndOfLine): "\n" # (309..310) - (function_keyword꞉ FunctionKeyword): "function" # (310..318) - (name꞉ FunctionName): # " empty" (318..324) - - (LeadingTrivia) ► (Whitespace): " " # (318..319) + - (leading_trivia꞉ Whitespace): " " # (318..319) - (variant꞉ Identifier): "empty" # (319..324) - (parameters꞉ ParametersDeclaration): # "()" (324..326) - (open_paren꞉ OpenParen): "(" # (324..325) @@ -274,7 +274,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (325..326) - (attributes꞉ FunctionAttributes): # " override(some.ident, /* empty */, other.arg.here,..." (326..386) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some.ident, /* empty */, other.arg.here,..." (326..386) - - (LeadingTrivia) ► (Whitespace): " " # (326..327) + - (leading_trivia꞉ Whitespace): " " # (326..327) - (override_keyword꞉ OverrideKeyword): "override" # (327..335) - (overridden꞉ OverridePathsDeclaration): # "(some.ident, /* empty */, other.arg.here, and.here..." (335..386) - (open_paren꞉ OpenParen): "(" # (335..336) @@ -284,19 +284,18 @@ Tree: - (separator꞉ Period): "." # (340..341) - (item꞉ Identifier): "ident" # (341..346) - (separator꞉ Comma): "," # (346..347) - - (LeadingTrivia): # " /* empty */" (347..359) - - (Whitespace): " " # (347..348) - - (MultiLineComment): "/* empty */" # (348..359) + - (leading_trivia꞉ Whitespace): " " # (347..348) + - (leading_trivia꞉ MultiLineComment): "/* empty */" # (348..359) - (SKIPPED): ", other.arg.here, and.here" # (359..385) - (close_paren꞉ CloseParen): ")" # (385..386) - (body꞉ FunctionBody): # ";\n" (386..388) - (variant꞉ Semicolon): ";" # (386..387) - - (TrailingTrivia) ► (EndOfLine): "\n" # (387..388) + - (trailing_trivia꞉ EndOfLine): "\n" # (387..388) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\nfunction nested_lists() override(some.ident, next..." (388..489) - - (LeadingTrivia) ► (EndOfLine): "\n" # (388..389) + - (leading_trivia꞉ EndOfLine): "\n" # (388..389) - (function_keyword꞉ FunctionKeyword): "function" # (389..397) - (name꞉ FunctionName): # " nested_lists" (397..410) - - (LeadingTrivia) ► (Whitespace): " " # (397..398) + - (leading_trivia꞉ Whitespace): " " # (397..398) - (variant꞉ Identifier): "nested_lists" # (398..410) - (parameters꞉ ParametersDeclaration): # "()" (410..412) - (open_paren꞉ OpenParen): "(" # (410..411) @@ -304,7 +303,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (411..412) - (attributes꞉ FunctionAttributes): # " override(some.ident, next.do.that, other.while, n..." (412..487) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some.ident, next.do.that, other.while, n..." (412..487) - - (LeadingTrivia) ► (Whitespace): " " # (412..413) + - (leading_trivia꞉ Whitespace): " " # (412..413) - (override_keyword꞉ OverrideKeyword): "override" # (413..421) - (overridden꞉ OverridePathsDeclaration): # "(some.ident, next.do.that, other.while, next.one, ..." (421..487) - (open_paren꞉ OpenParen): "(" # (421..422) @@ -315,33 +314,33 @@ Tree: - (item꞉ Identifier): "ident" # (427..432) - (separator꞉ Comma): "," # (432..433) - (item꞉ IdentifierPath): # " next." (433..439) - - (LeadingTrivia) ► (Whitespace): " " # (433..434) + - (leading_trivia꞉ Whitespace): " " # (433..434) - (item꞉ Identifier): "next" # (434..438) - (separator꞉ Period): "." # (438..439) - (SKIPPED): "do.that" # (439..446) - (Comma): "," # (446..447) - (item꞉ IdentifierPath): # " other." (447..454) - - (LeadingTrivia) ► (Whitespace): " " # (447..448) + - (leading_trivia꞉ Whitespace): " " # (447..448) - (item꞉ Identifier): "other" # (448..453) - (separator꞉ Period): "." # (453..454) - (SKIPPED): "while" # (454..459) - (Comma): "," # (459..460) - (item꞉ IdentifierPath): # " next.one" (460..469) - - (LeadingTrivia) ► (Whitespace): " " # (460..461) + - (leading_trivia꞉ Whitespace): " " # (460..461) - (item꞉ Identifier): "next" # (461..465) - (separator꞉ Period): "." # (465..466) - (item꞉ Identifier): "one" # (466..469) - (separator꞉ Comma): "," # (469..470) - - (LeadingTrivia) ► (Whitespace): " " # (470..471) + - (leading_trivia꞉ Whitespace): " " # (470..471) - (SKIPPED): "final, ultimate" # (471..486) - (close_paren꞉ CloseParen): ")" # (486..487) - (body꞉ FunctionBody): # ";\n" (487..489) - (variant꞉ Semicolon): ";" # (487..488) - - (TrailingTrivia) ► (EndOfLine): "\n" # (488..489) + - (trailing_trivia꞉ EndOfLine): "\n" # (488..489) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "function nested_lists() override(some., next.arg, ..." (489..560) - (function_keyword꞉ FunctionKeyword): "function" # (489..497) - (name꞉ FunctionName): # " nested_lists" (497..510) - - (LeadingTrivia) ► (Whitespace): " " # (497..498) + - (leading_trivia꞉ Whitespace): " " # (497..498) - (variant꞉ Identifier): "nested_lists" # (498..510) - (parameters꞉ ParametersDeclaration): # "()" (510..512) - (open_paren꞉ OpenParen): "(" # (510..511) @@ -349,7 +348,7 @@ Tree: - (close_paren꞉ CloseParen): ")" # (511..512) - (attributes꞉ FunctionAttributes): # " override(some., next.arg, next.one, ultimate)" (512..558) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override(some., next.arg, next.one, ultimate)" (512..558) - - (LeadingTrivia) ► (Whitespace): " " # (512..513) + - (leading_trivia꞉ Whitespace): " " # (512..513) - (override_keyword꞉ OverrideKeyword): "override" # (513..521) - (overridden꞉ OverridePathsDeclaration): # "(some., next.arg, next.one, ultimate)" (521..558) - (open_paren꞉ OpenParen): "(" # (521..522) @@ -360,21 +359,21 @@ Tree: - (SKIPPED): "" # (527..527) - (Comma): "," # (527..528) - (item꞉ IdentifierPath): # " next.arg" (528..537) - - (LeadingTrivia) ► (Whitespace): " " # (528..529) + - (leading_trivia꞉ Whitespace): " " # (528..529) - (item꞉ Identifier): "next" # (529..533) - (separator꞉ Period): "." # (533..534) - (item꞉ Identifier): "arg" # (534..537) - (separator꞉ Comma): "," # (537..538) - (item꞉ IdentifierPath): # " next.one" (538..547) - - (LeadingTrivia) ► (Whitespace): " " # (538..539) + - (leading_trivia꞉ Whitespace): " " # (538..539) - (item꞉ Identifier): "next" # (539..543) - (separator꞉ Period): "." # (543..544) - (item꞉ Identifier): "one" # (544..547) - (separator꞉ Comma): "," # (547..548) - (item꞉ IdentifierPath): # " ultimate" (548..557) - - (LeadingTrivia) ► (Whitespace): " " # (548..549) + - (leading_trivia꞉ Whitespace): " " # (548..549) - (item꞉ Identifier): "ultimate" # (549..557) - (close_paren꞉ CloseParen): ")" # (557..558) - (body꞉ FunctionBody): # ";\n" (558..560) - (variant꞉ Semicolon): ";" # (558..559) - - (TrailingTrivia) ► (EndOfLine): "\n" # (559..560) + - (trailing_trivia꞉ EndOfLine): "\n" # (559..560) diff --git a/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/days_unit/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/days_unit/generated/0.4.11-success.yml index ea26796f6e..1463306c47 100644 --- a/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/days_unit/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/days_unit/generated/0.4.11-success.yml @@ -9,5 +9,5 @@ Tree: - (DecimalNumberExpression): # "10 days" (0..7) - (literal꞉ DecimalLiteral): "10" # (0..2) - (unit꞉ NumberUnit): # " days" (2..7) - - (LeadingTrivia) ► (Whitespace): " " # (2..3) + - (leading_trivia꞉ Whitespace): " " # (2..3) - (variant꞉ DaysKeyword): "days" # (3..7) diff --git a/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/ether_unit/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/ether_unit/generated/0.4.11-success.yml index 37780c3b82..3c604bd9e1 100644 --- a/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/ether_unit/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/ether_unit/generated/0.4.11-success.yml @@ -9,5 +9,5 @@ Tree: - (DecimalNumberExpression): # "10 ether" (0..8) - (literal꞉ DecimalLiteral): "10" # (0..2) - (unit꞉ NumberUnit): # " ether" (2..8) - - (LeadingTrivia) ► (Whitespace): " " # (2..3) + - (leading_trivia꞉ Whitespace): " " # (2..3) - (variant꞉ EtherKeyword): "ether" # (3..8) diff --git a/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.4.11-success.yml index 52ae494dce..c7f321658e 100644 --- a/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.4.11-success.yml @@ -9,6 +9,6 @@ Tree: - (DecimalNumberExpression): # "10 years\n" (0..9) - (literal꞉ DecimalLiteral): "10" # (0..2) - (unit꞉ NumberUnit): # " years\n" (2..9) - - (LeadingTrivia) ► (Whitespace): " " # (2..3) + - (leading_trivia꞉ Whitespace): " " # (2..3) - (variant꞉ YearsKeyword): "years" # (3..8) - - (TrailingTrivia) ► (EndOfLine): "\n" # (8..9) + - (trailing_trivia꞉ EndOfLine): "\n" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.5.0-failure.yml index 1ff3262656..b6548236cc 100644 --- a/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.5.0-failure.yml @@ -16,5 +16,5 @@ Errors: # 1 total Tree: - (DecimalNumberExpression): # "10 years\n" (0..9) - (literal꞉ DecimalLiteral): "10" # (0..2) - - (LeadingTrivia) ► (Whitespace): " " # (2..3) + - (leading_trivia꞉ Whitespace): " " # (2..3) - (SKIPPED): "years\n" # (3..9) diff --git a/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.6.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.6.11-failure.yml index f8effa0ef6..16b1a3449a 100644 --- a/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.6.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.6.11-failure.yml @@ -16,5 +16,5 @@ Errors: # 1 total Tree: - (DecimalNumberExpression): # "10 years\n" (0..9) - (literal꞉ DecimalLiteral): "10" # (0..2) - - (LeadingTrivia) ► (Whitespace): " " # (2..3) + - (leading_trivia꞉ Whitespace): " " # (2..3) - (SKIPPED): "years\n" # (3..9) diff --git a/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.7.0-failure.yml index 0f326bde47..d310ea15c4 100644 --- a/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.7.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/DecimalNumberExpression/years_unit/generated/0.7.0-failure.yml @@ -16,5 +16,5 @@ Errors: # 1 total Tree: - (DecimalNumberExpression): # "10 years\n" (0..9) - (literal꞉ DecimalLiteral): "10" # (0..2) - - (LeadingTrivia) ► (Whitespace): " " # (2..3) + - (leading_trivia꞉ Whitespace): " " # (2..3) - (SKIPPED): "years\n" # (3..9) diff --git a/crates/solidity/testing/snapshots/cst_output/DeleteStatement/delete_identifier/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/DeleteStatement/delete_identifier/generated/0.4.11-success.yml index 32db654452..5439ea02d6 100644 --- a/crates/solidity/testing/snapshots/cst_output/DeleteStatement/delete_identifier/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/DeleteStatement/delete_identifier/generated/0.4.11-success.yml @@ -9,6 +9,6 @@ Tree: - (DeleteStatement): # "delete foo;" (0..11) - (delete_keyword꞉ DeleteKeyword): "delete" # (0..6) - (expression꞉ Expression): # " foo" (6..10) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (variant꞉ Identifier): "foo" # (7..10) - (semicolon꞉ Semicolon): ";" # (10..11) diff --git a/crates/solidity/testing/snapshots/cst_output/DeleteStatement/delete_index/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/DeleteStatement/delete_index/generated/0.4.11-success.yml index 78bdd8b7fb..1349c257f4 100644 --- a/crates/solidity/testing/snapshots/cst_output/DeleteStatement/delete_index/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/DeleteStatement/delete_index/generated/0.4.11-success.yml @@ -10,7 +10,7 @@ Tree: - (delete_keyword꞉ DeleteKeyword): "delete" # (0..6) - (expression꞉ Expression) ► (variant꞉ IndexAccessExpression): # " foo[bar]" (6..15) - (operand꞉ Expression): # " foo" (6..10) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (variant꞉ Identifier): "foo" # (7..10) - (open_bracket꞉ OpenBracket): "[" # (10..11) - (start꞉ Expression) ► (variant꞉ Identifier): "bar" # (11..14) diff --git a/crates/solidity/testing/snapshots/cst_output/EnumDefinition/multiple_members/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/EnumDefinition/multiple_members/generated/0.4.11-success.yml index 3cac0932eb..7e8105045c 100644 --- a/crates/solidity/testing/snapshots/cst_output/EnumDefinition/multiple_members/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/EnumDefinition/multiple_members/generated/0.4.11-success.yml @@ -12,21 +12,21 @@ Errors: [] Tree: - (EnumDefinition): # "enum Foo {\n Bar1,\n Bar2,\n Bar3\n}" (0..41) - (enum_keyword꞉ EnumKeyword): "enum" # (0..4) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (name꞉ Identifier): "Foo" # (5..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (open_brace꞉ OpenBrace): "{" # (9..10) - - (TrailingTrivia) ► (EndOfLine): "\n" # (10..11) + - (trailing_trivia꞉ EndOfLine): "\n" # (10..11) - (members꞉ EnumMembers): # " Bar1,\n Bar2,\n Bar3\n" (11..40) - - (LeadingTrivia) ► (Whitespace): " " # (11..15) + - (leading_trivia꞉ Whitespace): " " # (11..15) - (item꞉ Identifier): "Bar1" # (15..19) - (separator꞉ Comma): "," # (19..20) - - (TrailingTrivia) ► (EndOfLine): "\n" # (20..21) - - (LeadingTrivia) ► (Whitespace): " " # (21..25) + - (trailing_trivia꞉ EndOfLine): "\n" # (20..21) + - (leading_trivia꞉ Whitespace): " " # (21..25) - (item꞉ Identifier): "Bar2" # (25..29) - (separator꞉ Comma): "," # (29..30) - - (TrailingTrivia) ► (EndOfLine): "\n" # (30..31) - - (LeadingTrivia) ► (Whitespace): " " # (31..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (30..31) + - (leading_trivia꞉ Whitespace): " " # (31..35) - (item꞉ Identifier): "Bar3" # (35..39) - - (TrailingTrivia) ► (EndOfLine): "\n" # (39..40) + - (trailing_trivia꞉ EndOfLine): "\n" # (39..40) - (close_brace꞉ CloseBrace): "}" # (40..41) diff --git a/crates/solidity/testing/snapshots/cst_output/EnumDefinition/no_members/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/EnumDefinition/no_members/generated/0.4.11-success.yml index 3afb569b51..ed1bac1b7e 100644 --- a/crates/solidity/testing/snapshots/cst_output/EnumDefinition/no_members/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/EnumDefinition/no_members/generated/0.4.11-success.yml @@ -8,10 +8,10 @@ Errors: [] Tree: - (EnumDefinition): # "enum Foo { }" (0..12) - (enum_keyword꞉ EnumKeyword): "enum" # (0..4) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (name꞉ Identifier): "Foo" # (5..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (open_brace꞉ OpenBrace): "{" # (9..10) - (members꞉ EnumMembers): [] # (10..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (close_brace꞉ CloseBrace): "}" # (11..12) diff --git a/crates/solidity/testing/snapshots/cst_output/ErrorDefinition/top_level/generated/0.8.4-success.yml b/crates/solidity/testing/snapshots/cst_output/ErrorDefinition/top_level/generated/0.8.4-success.yml index 9d1dcbc6ed..ac0993fcb2 100644 --- a/crates/solidity/testing/snapshots/cst_output/ErrorDefinition/top_level/generated/0.8.4-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ErrorDefinition/top_level/generated/0.8.4-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - (ErrorDefinition): # "error MyError();" (0..16) - (error_keyword꞉ ErrorKeyword): "error" # (0..5) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (name꞉ Identifier): "MyError" # (6..13) - (members꞉ ErrorParametersDeclaration): # "()" (13..15) - (open_paren꞉ OpenParen): "(" # (13..14) diff --git a/crates/solidity/testing/snapshots/cst_output/EventDefinition/no_parens/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/EventDefinition/no_parens/generated/0.4.11-failure.yml index 8125e9bd60..a15a73ac27 100644 --- a/crates/solidity/testing/snapshots/cst_output/EventDefinition/no_parens/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/EventDefinition/no_parens/generated/0.4.11-failure.yml @@ -16,8 +16,8 @@ Errors: # 1 total Tree: - (EventDefinition): # "event MyEvent;\n" (0..15) - (event_keyword꞉ EventKeyword): "event" # (0..5) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (name꞉ Identifier): "MyEvent" # (6..13) - (SKIPPED): "" # (13..13) - (semicolon꞉ Semicolon): ";" # (13..14) - - (TrailingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (14..15) diff --git a/crates/solidity/testing/snapshots/cst_output/EventDefinition/transfer/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/EventDefinition/transfer/generated/0.4.11-success.yml index 0e1aaebcb3..1987ea059c 100644 --- a/crates/solidity/testing/snapshots/cst_output/EventDefinition/transfer/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/EventDefinition/transfer/generated/0.4.11-success.yml @@ -8,33 +8,33 @@ Errors: [] Tree: - (EventDefinition): # "event Transfer(address indexed from, address index..." (0..73) - (event_keyword꞉ EventKeyword): "event" # (0..5) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (name꞉ Identifier): "Transfer" # (6..14) - (parameters꞉ EventParametersDeclaration): # "(address indexed from, address indexed to, uint256..." (14..71) - (open_paren꞉ OpenParen): "(" # (14..15) - (parameters꞉ EventParameters): # "address indexed from, address indexed to, uint256 ..." (15..70) - (item꞉ EventParameter): # "address indexed from" (15..35) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType) ► (address_keyword꞉ AddressKeyword): "address" # (15..22) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (indexed_keyword꞉ IndexedKeyword): "indexed" # (23..30) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (name꞉ Identifier): "from" # (31..35) - (separator꞉ Comma): "," # (35..36) - (item꞉ EventParameter): # " address indexed to" (36..55) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType): # " address" (36..44) - - (LeadingTrivia) ► (Whitespace): " " # (36..37) + - (leading_trivia꞉ Whitespace): " " # (36..37) - (address_keyword꞉ AddressKeyword): "address" # (37..44) - - (LeadingTrivia) ► (Whitespace): " " # (44..45) + - (leading_trivia꞉ Whitespace): " " # (44..45) - (indexed_keyword꞉ IndexedKeyword): "indexed" # (45..52) - - (LeadingTrivia) ► (Whitespace): " " # (52..53) + - (leading_trivia꞉ Whitespace): " " # (52..53) - (name꞉ Identifier): "to" # (53..55) - (separator꞉ Comma): "," # (55..56) - (item꞉ EventParameter): # " uint256 value" (56..70) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (56..64) - - (LeadingTrivia) ► (Whitespace): " " # (56..57) + - (leading_trivia꞉ Whitespace): " " # (56..57) - (variant꞉ UintKeyword): "uint256" # (57..64) - - (LeadingTrivia) ► (Whitespace): " " # (64..65) + - (leading_trivia꞉ Whitespace): " " # (64..65) - (name꞉ Identifier): "value" # (65..70) - (close_paren꞉ CloseParen): ")" # (70..71) - (semicolon꞉ Semicolon): ";" # (71..72) - - (TrailingTrivia) ► (EndOfLine): "\n" # (72..73) + - (trailing_trivia꞉ EndOfLine): "\n" # (72..73) diff --git a/crates/solidity/testing/snapshots/cst_output/ExponentiationExpression/associativity/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ExponentiationExpression/associativity/generated/0.4.11-success.yml index e4fddc606f..5cfe06f0c8 100644 --- a/crates/solidity/testing/snapshots/cst_output/ExponentiationExpression/associativity/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ExponentiationExpression/associativity/generated/0.4.11-success.yml @@ -9,14 +9,14 @@ Tree: - (ExponentiationExpression): # "x ** y ** z\n" (0..12) - (left_operand꞉ Expression) ► (variant꞉ ExponentiationExpression): # "x ** y" (0..6) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "x" # (0..1) - - (LeadingTrivia) ► (Whitespace): " " # (1..2) + - (leading_trivia꞉ Whitespace): " " # (1..2) - (operator꞉ AsteriskAsterisk): "**" # (2..4) - (right_operand꞉ Expression): # " y" (4..6) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (variant꞉ Identifier): "y" # (5..6) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (operator꞉ AsteriskAsterisk): "**" # (7..9) - (right_operand꞉ Expression): # " z\n" (9..12) - - (LeadingTrivia) ► (Whitespace): " " # (9..10) + - (leading_trivia꞉ Whitespace): " " # (9..10) - (variant꞉ Identifier): "z" # (10..11) - - (TrailingTrivia) ► (EndOfLine): "\n" # (11..12) + - (trailing_trivia꞉ EndOfLine): "\n" # (11..12) diff --git a/crates/solidity/testing/snapshots/cst_output/ExponentiationExpression/associativity/generated/0.6.0-success.yml b/crates/solidity/testing/snapshots/cst_output/ExponentiationExpression/associativity/generated/0.6.0-success.yml index 1f77cc3a18..c40f47f80e 100644 --- a/crates/solidity/testing/snapshots/cst_output/ExponentiationExpression/associativity/generated/0.6.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ExponentiationExpression/associativity/generated/0.6.0-success.yml @@ -8,15 +8,15 @@ Errors: [] Tree: - (ExponentiationExpression): # "x ** y ** z\n" (0..12) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "x" # (0..1) - - (LeadingTrivia) ► (Whitespace): " " # (1..2) + - (leading_trivia꞉ Whitespace): " " # (1..2) - (operator꞉ AsteriskAsterisk): "**" # (2..4) - (right_operand꞉ Expression) ► (variant꞉ ExponentiationExpression): # " y ** z\n" (4..12) - (left_operand꞉ Expression): # " y" (4..6) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (variant꞉ Identifier): "y" # (5..6) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (operator꞉ AsteriskAsterisk): "**" # (7..9) - (right_operand꞉ Expression): # " z\n" (9..12) - - (LeadingTrivia) ► (Whitespace): " " # (9..10) + - (leading_trivia꞉ Whitespace): " " # (9..10) - (variant꞉ Identifier): "z" # (10..11) - - (TrailingTrivia) ► (EndOfLine): "\n" # (11..12) + - (trailing_trivia꞉ EndOfLine): "\n" # (11..12) diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/add_mul/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/add_mul/generated/0.4.11-success.yml index 69c8c4c736..c0a81cb569 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/add_mul/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/add_mul/generated/0.4.11-success.yml @@ -9,19 +9,19 @@ Tree: - (Expression) ► (variant꞉ AdditiveExpression): # "a * b + c * d" (0..13) - (left_operand꞉ Expression) ► (variant꞉ MultiplicativeExpression): # "a * b" (0..5) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (0..1) - - (LeadingTrivia) ► (Whitespace): " " # (1..2) + - (leading_trivia꞉ Whitespace): " " # (1..2) - (operator꞉ Asterisk): "*" # (2..3) - (right_operand꞉ Expression): # " b" (3..5) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (variant꞉ Identifier): "b" # (4..5) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (operator꞉ Plus): "+" # (6..7) - (right_operand꞉ Expression) ► (variant꞉ MultiplicativeExpression): # " c * d" (7..13) - (left_operand꞉ Expression): # " c" (7..9) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (variant꞉ Identifier): "c" # (8..9) - - (LeadingTrivia) ► (Whitespace): " " # (9..10) + - (leading_trivia꞉ Whitespace): " " # (9..10) - (operator꞉ Asterisk): "*" # (10..11) - (right_operand꞉ Expression): # " d" (11..13) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (variant꞉ Identifier): "d" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/address_payable_call/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/address_payable_call/generated/0.4.11-success.yml index 0f624e89f4..e3314c43a6 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/address_payable_call/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/address_payable_call/generated/0.4.11-success.yml @@ -9,7 +9,7 @@ Tree: - (Expression) ► (variant꞉ FunctionCallExpression): # "address payable(value)" (0..22) - (operand꞉ Expression) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType): # "address payable" (0..15) - (address_keyword꞉ AddressKeyword): "address" # (0..7) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (payable_keyword꞉ PayableKeyword): "payable" # (8..15) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # "(value)" (15..22) - (open_paren꞉ OpenParen): "(" # (15..16) diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/function_call/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/function_call/generated/0.4.11-success.yml index c47af1700a..a086b6e141 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/function_call/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/function_call/generated/0.4.11-success.yml @@ -14,6 +14,6 @@ Tree: - (item꞉ Expression) ► (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "1" # (2..3) - (separator꞉ Comma): "," # (3..4) - (item꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 2" (4..6) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (literal꞉ DecimalLiteral): "2" # (5..6) - (close_paren꞉ CloseParen): ")" # (6..7) diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options/generated/0.6.2-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options/generated/0.6.2-success.yml index b872a7cfa0..295fc1d89e 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options/generated/0.6.2-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options/generated/0.6.2-success.yml @@ -19,15 +19,15 @@ Tree: - (name꞉ Identifier): "value" # (4..9) - (colon꞉ Colon): ":" # (9..10) - (value꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 0" (10..12) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (literal꞉ DecimalLiteral): "0" # (11..12) - (separator꞉ Comma): "," # (12..13) - (item꞉ NamedArgument): # " gas: 1" (13..20) - - (LeadingTrivia) ► (Whitespace): " " # (13..14) + - (leading_trivia꞉ Whitespace): " " # (13..14) - (name꞉ Identifier): "gas" # (14..17) - (colon꞉ Colon): ":" # (17..18) - (value꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (18..20) - - (LeadingTrivia) ► (Whitespace): " " # (18..19) + - (leading_trivia꞉ Whitespace): " " # (18..19) - (literal꞉ DecimalLiteral): "1" # (19..20) - (close_brace꞉ CloseBrace): "}" # (20..21) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # '("")' (21..25) diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options/generated/0.8.0-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options/generated/0.8.0-success.yml index aa57dc53fa..2d91599569 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options/generated/0.8.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options/generated/0.8.0-success.yml @@ -18,15 +18,15 @@ Tree: - (name꞉ Identifier): "value" # (4..9) - (colon꞉ Colon): ":" # (9..10) - (value꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 0" (10..12) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (literal꞉ DecimalLiteral): "0" # (11..12) - (separator꞉ Comma): "," # (12..13) - (item꞉ NamedArgument): # " gas: 1" (13..20) - - (LeadingTrivia) ► (Whitespace): " " # (13..14) + - (leading_trivia꞉ Whitespace): " " # (13..14) - (name꞉ Identifier): "gas" # (14..17) - (colon꞉ Colon): ":" # (17..18) - (value꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (18..20) - - (LeadingTrivia) ► (Whitespace): " " # (18..19) + - (leading_trivia꞉ Whitespace): " " # (18..19) - (literal꞉ DecimalLiteral): "1" # (19..20) - (close_brace꞉ CloseBrace): "}" # (20..21) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # '("")' (21..25) diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options_split/generated/0.6.2-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options_split/generated/0.6.2-success.yml index d6541eadff..bc187d23fd 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options_split/generated/0.6.2-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options_split/generated/0.6.2-success.yml @@ -19,7 +19,7 @@ Tree: - (name꞉ Identifier): "value" # (4..9) - (colon꞉ Colon): ":" # (9..10) - (value꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 0" (10..12) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (literal꞉ DecimalLiteral): "0" # (11..12) - (close_brace꞉ CloseBrace): "}" # (12..13) - (item꞉ NamedArgumentGroup): # "{gas: 1}" (13..21) @@ -29,7 +29,7 @@ Tree: - (name꞉ Identifier): "gas" # (14..17) - (colon꞉ Colon): ":" # (17..18) - (value꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (18..20) - - (LeadingTrivia) ► (Whitespace): " " # (18..19) + - (leading_trivia꞉ Whitespace): " " # (18..19) - (literal꞉ DecimalLiteral): "1" # (19..20) - (close_brace꞉ CloseBrace): "}" # (20..21) - (arguments꞉ ArgumentsDeclaration) ► (variant꞉ PositionalArgumentsDeclaration): # '("")' (21..25) diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/incomplete_operand/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/Expression/incomplete_operand/generated/0.4.11-failure.yml index 27fc7f2722..2355163dfa 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/incomplete_operand/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/incomplete_operand/generated/0.4.11-failure.yml @@ -17,10 +17,10 @@ Tree: - (Expression): # "2 * new\n" (0..8) - (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "2" # (0..1) - (MultiplicativeExpression): # " *" (1..3) - - (LeadingTrivia) ► (Whitespace): " " # (1..2) + - (leading_trivia꞉ Whitespace): " " # (1..2) - (operator꞉ Asterisk): "*" # (2..3) - (variant꞉ NewExpression): # " new\n" (3..8) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (new_keyword꞉ NewKeyword): "new" # (4..7) - - (TrailingTrivia) ► (EndOfLine): "\n" # (7..8) + - (trailing_trivia꞉ EndOfLine): "\n" # (7..8) - (SKIPPED): "" # (8..8) diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/incomplete_operand/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Expression/incomplete_operand/generated/0.8.0-failure.yml index 3caa4d43b8..99ad9d3fe0 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/incomplete_operand/generated/0.8.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/incomplete_operand/generated/0.8.0-failure.yml @@ -17,10 +17,10 @@ Tree: - (Expression): # "2 * new\n" (0..8) - (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "2" # (0..1) - (MultiplicativeExpression): # " *" (1..3) - - (LeadingTrivia) ► (Whitespace): " " # (1..2) + - (leading_trivia꞉ Whitespace): " " # (1..2) - (operator꞉ Asterisk): "*" # (2..3) - (variant꞉ NewExpression): # " new\n" (3..8) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (new_keyword꞉ NewKeyword): "new" # (4..7) - - (TrailingTrivia) ► (EndOfLine): "\n" # (7..8) + - (trailing_trivia꞉ EndOfLine): "\n" # (7..8) - (SKIPPED): "" # (8..8) diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/keyword_ufixed/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/keyword_ufixed/generated/0.4.11-success.yml index 97022a8e1e..9bed1ca21d 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/keyword_ufixed/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/keyword_ufixed/generated/0.4.11-success.yml @@ -8,4 +8,4 @@ Errors: [] Tree: - (Expression) ► (variant꞉ ElementaryType): # "ufixed\n" (0..7) - (variant꞉ UfixedKeyword): "ufixed" # (0..6) - - (TrailingTrivia) ► (EndOfLine): "\n" # (6..7) + - (trailing_trivia꞉ EndOfLine): "\n" # (6..7) diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/overlapping_operators/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/overlapping_operators/generated/0.4.11-success.yml index 5c3505b3a3..7921ac4e69 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/overlapping_operators/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/overlapping_operators/generated/0.4.11-success.yml @@ -9,13 +9,13 @@ Tree: - (Expression) ► (variant꞉ AndExpression): # "a & b && c" (0..10) - (left_operand꞉ Expression) ► (variant꞉ BitwiseAndExpression): # "a & b" (0..5) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (0..1) - - (LeadingTrivia) ► (Whitespace): " " # (1..2) + - (leading_trivia꞉ Whitespace): " " # (1..2) - (operator꞉ Ampersand): "&" # (2..3) - (right_operand꞉ Expression): # " b" (3..5) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (variant꞉ Identifier): "b" # (4..5) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (operator꞉ AmpersandAmpersand): "&&" # (6..8) - (right_operand꞉ Expression): # " c" (8..10) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "c" # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/FallbackFunctionDefinition/simple/generated/0.6.0-success.yml b/crates/solidity/testing/snapshots/cst_output/FallbackFunctionDefinition/simple/generated/0.6.0-success.yml index 18eea34f3a..e55bad74c8 100644 --- a/crates/solidity/testing/snapshots/cst_output/FallbackFunctionDefinition/simple/generated/0.6.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/FallbackFunctionDefinition/simple/generated/0.6.0-success.yml @@ -9,13 +9,13 @@ Tree: - (FallbackFunctionDefinition): # "fallback () {}" (0..14) - (fallback_keyword꞉ FallbackKeyword): "fallback" # (0..8) - (parameters꞉ ParametersDeclaration): # " ()" (8..11) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (open_paren꞉ OpenParen): "(" # (9..10) - (parameters꞉ Parameters): [] # (10..10) - (close_paren꞉ CloseParen): ")" # (10..11) - (attributes꞉ FallbackFunctionAttributes): [] # (11..11) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {}" (11..14) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (open_brace꞉ OpenBrace): "{" # (12..13) - (statements꞉ Statements): [] # (13..13) - (close_brace꞉ CloseBrace): "}" # (13..14) diff --git a/crates/solidity/testing/snapshots/cst_output/FunctionCallExpression/payable_conversion/generated/0.6.0-success.yml b/crates/solidity/testing/snapshots/cst_output/FunctionCallExpression/payable_conversion/generated/0.6.0-success.yml index 8e42eb9c2c..358ca0c6bb 100644 --- a/crates/solidity/testing/snapshots/cst_output/FunctionCallExpression/payable_conversion/generated/0.6.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/FunctionCallExpression/payable_conversion/generated/0.6.0-success.yml @@ -16,4 +16,4 @@ Tree: - (period꞉ Period): "." # (11..12) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "sender" # (12..18) - (close_paren꞉ CloseParen): ")" # (18..19) - - (TrailingTrivia) ► (EndOfLine): "\n" # (19..20) + - (trailing_trivia꞉ EndOfLine): "\n" # (19..20) diff --git a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/constant_state_mutability/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/constant_state_mutability/generated/0.4.11-success.yml index 0f7d5a8a58..66fde141c4 100644 --- a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/constant_state_mutability/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/constant_state_mutability/generated/0.4.11-success.yml @@ -9,7 +9,7 @@ Tree: - (FunctionDefinition): # "function a() constant {}" (0..24) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " a" (8..10) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "a" # (9..10) - (parameters꞉ ParametersDeclaration): # "()" (10..12) - (open_paren꞉ OpenParen): "(" # (10..11) @@ -17,10 +17,10 @@ Tree: - (close_paren꞉ CloseParen): ")" # (11..12) - (attributes꞉ FunctionAttributes): # " constant" (12..21) - (item꞉ FunctionAttribute): # " constant" (12..21) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (variant꞉ ConstantKeyword): "constant" # (13..21) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {}" (21..24) - - (LeadingTrivia) ► (Whitespace): " " # (21..22) + - (leading_trivia꞉ Whitespace): " " # (21..22) - (open_brace꞉ OpenBrace): "{" # (22..23) - (statements꞉ Statements): [] # (23..23) - (close_brace꞉ CloseBrace): "}" # (23..24) diff --git a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/constant_state_mutability/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/constant_state_mutability/generated/0.5.0-failure.yml index 38a699fef6..55b4c4e83b 100644 --- a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/constant_state_mutability/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/constant_state_mutability/generated/0.5.0-failure.yml @@ -17,7 +17,7 @@ Tree: - (FunctionDefinition): # "function a() constant {}" (0..24) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " a" (8..10) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "a" # (9..10) - (parameters꞉ ParametersDeclaration): # "()" (10..12) - (open_paren꞉ OpenParen): "(" # (10..11) diff --git a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/from_contextual_keyword/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/from_contextual_keyword/generated/0.4.11-success.yml index d9b7f3e70f..1b417ca11c 100644 --- a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/from_contextual_keyword/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/from_contextual_keyword/generated/0.4.11-success.yml @@ -9,43 +9,43 @@ Tree: - (FunctionDefinition): # "function transferFrom(address from, address to, ui..." (0..89) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " transferFrom" (8..21) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "transferFrom" # (9..21) - (parameters꞉ ParametersDeclaration): # "(address from, address to, uint256 amount)" (21..63) - (open_paren꞉ OpenParen): "(" # (21..22) - (parameters꞉ Parameters): # "address from, address to, uint256 amount" (22..62) - (item꞉ Parameter): # "address from" (22..34) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType) ► (address_keyword꞉ AddressKeyword): "address" # (22..29) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (name꞉ Identifier): "from" # (30..34) - (separator꞉ Comma): "," # (34..35) - (item꞉ Parameter): # " address to" (35..46) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType): # " address" (35..43) - - (LeadingTrivia) ► (Whitespace): " " # (35..36) + - (leading_trivia꞉ Whitespace): " " # (35..36) - (address_keyword꞉ AddressKeyword): "address" # (36..43) - - (LeadingTrivia) ► (Whitespace): " " # (43..44) + - (leading_trivia꞉ Whitespace): " " # (43..44) - (name꞉ Identifier): "to" # (44..46) - (separator꞉ Comma): "," # (46..47) - (item꞉ Parameter): # " uint256 amount" (47..62) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (47..55) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (variant꞉ UintKeyword): "uint256" # (48..55) - - (LeadingTrivia) ► (Whitespace): " " # (55..56) + - (leading_trivia꞉ Whitespace): " " # (55..56) - (name꞉ Identifier): "amount" # (56..62) - (close_paren꞉ CloseParen): ")" # (62..63) - (attributes꞉ FunctionAttributes): # " external" (63..72) - (item꞉ FunctionAttribute): # " external" (63..72) - - (LeadingTrivia) ► (Whitespace): " " # (63..64) + - (leading_trivia꞉ Whitespace): " " # (63..64) - (variant꞉ ExternalKeyword): "external" # (64..72) - (returns꞉ ReturnsDeclaration): # " returns (bool)" (72..87) - - (LeadingTrivia) ► (Whitespace): " " # (72..73) + - (leading_trivia꞉ Whitespace): " " # (72..73) - (returns_keyword꞉ ReturnsKeyword): "returns" # (73..80) - (variables꞉ ParametersDeclaration): # " (bool)" (80..87) - - (LeadingTrivia) ► (Whitespace): " " # (80..81) + - (leading_trivia꞉ Whitespace): " " # (80..81) - (open_paren꞉ OpenParen): "(" # (81..82) - (parameters꞉ Parameters): # "bool" (82..86) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ BoolKeyword): "bool" # (82..86) - (close_paren꞉ CloseParen): ")" # (86..87) - (body꞉ FunctionBody): # ";\n" (87..89) - (variant꞉ Semicolon): ";" # (87..88) - - (TrailingTrivia) ► (EndOfLine): "\n" # (88..89) + - (trailing_trivia꞉ EndOfLine): "\n" # (88..89) diff --git a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/overridden/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/overridden/generated/0.4.11-success.yml index 647f77f0e3..119e87a7ea 100644 --- a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/overridden/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/overridden/generated/0.4.11-success.yml @@ -11,7 +11,7 @@ Tree: - (FunctionDefinition): # "function some() public virtual override returns (u..." (0..73) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " some" (8..13) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "some" # (9..13) - (parameters꞉ ParametersDeclaration): # "()" (13..15) - (open_paren꞉ OpenParen): "(" # (13..14) @@ -19,35 +19,35 @@ Tree: - (close_paren꞉ CloseParen): ")" # (14..15) - (attributes꞉ FunctionAttributes): # " public virtual override" (15..39) - (item꞉ FunctionAttribute): # " public" (15..22) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (variant꞉ PublicKeyword): "public" # (16..22) - (item꞉ FunctionAttribute) ► (variant꞉ ModifierInvocation) ► (name꞉ IdentifierPath): # " virtual" (22..30) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (item꞉ Identifier): "virtual" # (23..30) - (item꞉ FunctionAttribute) ► (variant꞉ ModifierInvocation) ► (name꞉ IdentifierPath): # " override" (30..39) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (item꞉ Identifier): "override" # (31..39) - (returns꞉ ReturnsDeclaration): # " returns (uint256)" (39..57) - - (LeadingTrivia) ► (Whitespace): " " # (39..40) + - (leading_trivia꞉ Whitespace): " " # (39..40) - (returns_keyword꞉ ReturnsKeyword): "returns" # (40..47) - (variables꞉ ParametersDeclaration): # " (uint256)" (47..57) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (open_paren꞉ OpenParen): "(" # (48..49) - (parameters꞉ Parameters): # "uint256" (49..56) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (49..56) - (close_paren꞉ CloseParen): ")" # (56..57) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\treturn 1;\n}\n" (57..73) - - (LeadingTrivia) ► (Whitespace): " " # (57..58) + - (leading_trivia꞉ Whitespace): " " # (57..58) - (open_brace꞉ OpenBrace): "{" # (58..59) - - (TrailingTrivia) ► (EndOfLine): "\n" # (59..60) + - (trailing_trivia꞉ EndOfLine): "\n" # (59..60) - (statements꞉ Statements): # "\treturn 1;\n" (60..71) - (item꞉ Statement) ► (variant꞉ ReturnStatement): # "\treturn 1;\n" (60..71) - - (LeadingTrivia) ► (Whitespace): "\t" # (60..61) + - (leading_trivia꞉ Whitespace): "\t" # (60..61) - (return_keyword꞉ ReturnKeyword): "return" # (61..67) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (67..69) - - (LeadingTrivia) ► (Whitespace): " " # (67..68) + - (leading_trivia꞉ Whitespace): " " # (67..68) - (literal꞉ DecimalLiteral): "1" # (68..69) - (semicolon꞉ Semicolon): ";" # (69..70) - - (TrailingTrivia) ► (EndOfLine): "\n" # (70..71) + - (trailing_trivia꞉ EndOfLine): "\n" # (70..71) - (close_brace꞉ CloseBrace): "}" # (71..72) - - (TrailingTrivia) ► (EndOfLine): "\n" # (72..73) + - (trailing_trivia꞉ EndOfLine): "\n" # (72..73) diff --git a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/overridden/generated/0.5.0-success.yml b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/overridden/generated/0.5.0-success.yml index 5e7ea142ab..9d69d12a84 100644 --- a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/overridden/generated/0.5.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/overridden/generated/0.5.0-success.yml @@ -11,7 +11,7 @@ Tree: - (FunctionDefinition): # "function some() public virtual override returns (u..." (0..73) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " some" (8..13) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "some" # (9..13) - (parameters꞉ ParametersDeclaration): # "()" (13..15) - (open_paren꞉ OpenParen): "(" # (13..14) @@ -19,35 +19,35 @@ Tree: - (close_paren꞉ CloseParen): ")" # (14..15) - (attributes꞉ FunctionAttributes): # " public virtual override" (15..39) - (item꞉ FunctionAttribute): # " public" (15..22) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (variant꞉ PublicKeyword): "public" # (16..22) - (item꞉ FunctionAttribute) ► (variant꞉ ModifierInvocation) ► (name꞉ IdentifierPath): # " virtual" (22..30) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (item꞉ Identifier): "virtual" # (23..30) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override" (30..39) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (override_keyword꞉ OverrideKeyword): "override" # (31..39) - (returns꞉ ReturnsDeclaration): # " returns (uint256)" (39..57) - - (LeadingTrivia) ► (Whitespace): " " # (39..40) + - (leading_trivia꞉ Whitespace): " " # (39..40) - (returns_keyword꞉ ReturnsKeyword): "returns" # (40..47) - (variables꞉ ParametersDeclaration): # " (uint256)" (47..57) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (open_paren꞉ OpenParen): "(" # (48..49) - (parameters꞉ Parameters): # "uint256" (49..56) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (49..56) - (close_paren꞉ CloseParen): ")" # (56..57) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\treturn 1;\n}\n" (57..73) - - (LeadingTrivia) ► (Whitespace): " " # (57..58) + - (leading_trivia꞉ Whitespace): " " # (57..58) - (open_brace꞉ OpenBrace): "{" # (58..59) - - (TrailingTrivia) ► (EndOfLine): "\n" # (59..60) + - (trailing_trivia꞉ EndOfLine): "\n" # (59..60) - (statements꞉ Statements): # "\treturn 1;\n" (60..71) - (item꞉ Statement) ► (variant꞉ ReturnStatement): # "\treturn 1;\n" (60..71) - - (LeadingTrivia) ► (Whitespace): "\t" # (60..61) + - (leading_trivia꞉ Whitespace): "\t" # (60..61) - (return_keyword꞉ ReturnKeyword): "return" # (61..67) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (67..69) - - (LeadingTrivia) ► (Whitespace): " " # (67..68) + - (leading_trivia꞉ Whitespace): " " # (67..68) - (literal꞉ DecimalLiteral): "1" # (68..69) - (semicolon꞉ Semicolon): ";" # (69..70) - - (TrailingTrivia) ► (EndOfLine): "\n" # (70..71) + - (trailing_trivia꞉ EndOfLine): "\n" # (70..71) - (close_brace꞉ CloseBrace): "}" # (71..72) - - (TrailingTrivia) ► (EndOfLine): "\n" # (72..73) + - (trailing_trivia꞉ EndOfLine): "\n" # (72..73) diff --git a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/overridden/generated/0.6.0-success.yml b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/overridden/generated/0.6.0-success.yml index 1f8527236c..16dbf8e185 100644 --- a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/overridden/generated/0.6.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/overridden/generated/0.6.0-success.yml @@ -11,7 +11,7 @@ Tree: - (FunctionDefinition): # "function some() public virtual override returns (u..." (0..73) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " some" (8..13) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "some" # (9..13) - (parameters꞉ ParametersDeclaration): # "()" (13..15) - (open_paren꞉ OpenParen): "(" # (13..14) @@ -19,35 +19,35 @@ Tree: - (close_paren꞉ CloseParen): ")" # (14..15) - (attributes꞉ FunctionAttributes): # " public virtual override" (15..39) - (item꞉ FunctionAttribute): # " public" (15..22) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (variant꞉ PublicKeyword): "public" # (16..22) - (item꞉ FunctionAttribute): # " virtual" (22..30) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (variant꞉ VirtualKeyword): "virtual" # (23..30) - (item꞉ FunctionAttribute) ► (variant꞉ OverrideSpecifier): # " override" (30..39) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (override_keyword꞉ OverrideKeyword): "override" # (31..39) - (returns꞉ ReturnsDeclaration): # " returns (uint256)" (39..57) - - (LeadingTrivia) ► (Whitespace): " " # (39..40) + - (leading_trivia꞉ Whitespace): " " # (39..40) - (returns_keyword꞉ ReturnsKeyword): "returns" # (40..47) - (variables꞉ ParametersDeclaration): # " (uint256)" (47..57) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (open_paren꞉ OpenParen): "(" # (48..49) - (parameters꞉ Parameters): # "uint256" (49..56) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (49..56) - (close_paren꞉ CloseParen): ")" # (56..57) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n\treturn 1;\n}\n" (57..73) - - (LeadingTrivia) ► (Whitespace): " " # (57..58) + - (leading_trivia꞉ Whitespace): " " # (57..58) - (open_brace꞉ OpenBrace): "{" # (58..59) - - (TrailingTrivia) ► (EndOfLine): "\n" # (59..60) + - (trailing_trivia꞉ EndOfLine): "\n" # (59..60) - (statements꞉ Statements): # "\treturn 1;\n" (60..71) - (item꞉ Statement) ► (variant꞉ ReturnStatement): # "\treturn 1;\n" (60..71) - - (LeadingTrivia) ► (Whitespace): "\t" # (60..61) + - (leading_trivia꞉ Whitespace): "\t" # (60..61) - (return_keyword꞉ ReturnKeyword): "return" # (61..67) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (67..69) - - (LeadingTrivia) ► (Whitespace): " " # (67..68) + - (leading_trivia꞉ Whitespace): " " # (67..68) - (literal꞉ DecimalLiteral): "1" # (68..69) - (semicolon꞉ Semicolon): ";" # (69..70) - - (TrailingTrivia) ► (EndOfLine): "\n" # (70..71) + - (trailing_trivia꞉ EndOfLine): "\n" # (70..71) - (close_brace꞉ CloseBrace): "}" # (71..72) - - (TrailingTrivia) ► (EndOfLine): "\n" # (72..73) + - (trailing_trivia꞉ EndOfLine): "\n" # (72..73) diff --git a/crates/solidity/testing/snapshots/cst_output/HexNumberExpression/hex_unit/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/HexNumberExpression/hex_unit/generated/0.4.11-success.yml index 9ec9df916c..587eb7df5f 100644 --- a/crates/solidity/testing/snapshots/cst_output/HexNumberExpression/hex_unit/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/HexNumberExpression/hex_unit/generated/0.4.11-success.yml @@ -9,5 +9,5 @@ Tree: - (HexNumberExpression): # "0x1 wei" (0..7) - (literal꞉ HexLiteral): "0x1" # (0..3) - (unit꞉ NumberUnit): # " wei" (3..7) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (variant꞉ WeiKeyword): "wei" # (4..7) diff --git a/crates/solidity/testing/snapshots/cst_output/HexNumberExpression/hex_unit/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/HexNumberExpression/hex_unit/generated/0.5.0-failure.yml index 5cbe381530..4f2c2daa70 100644 --- a/crates/solidity/testing/snapshots/cst_output/HexNumberExpression/hex_unit/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/HexNumberExpression/hex_unit/generated/0.5.0-failure.yml @@ -16,5 +16,5 @@ Errors: # 1 total Tree: - (HexNumberExpression): # "0x1 wei" (0..7) - (literal꞉ HexLiteral): "0x1" # (0..3) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (SKIPPED): "wei" # (4..7) diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/multiple/generated/0.5.14-success.yml b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/multiple/generated/0.5.14-success.yml index bb6b026940..d629b0f71a 100644 --- a/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/multiple/generated/0.5.14-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/multiple/generated/0.5.14-success.yml @@ -9,5 +9,5 @@ Tree: - (HexStringLiterals): # 'hex"ab" hex''cd''' (0..15) - (item꞉ HexStringLiteral) ► (variant꞉ DoubleQuotedHexStringLiteral): 'hex"ab"' # (0..7) - (item꞉ HexStringLiteral): # " hex'cd'" (7..15) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (variant꞉ SingleQuotedHexStringLiteral): "hex'cd'" # (8..15) diff --git a/crates/solidity/testing/snapshots/cst_output/ImportDirective/destructure_import_empty/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ImportDirective/destructure_import_empty/generated/0.4.11-failure.yml index db66763657..bf310fcbf7 100644 --- a/crates/solidity/testing/snapshots/cst_output/ImportDirective/destructure_import_empty/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ImportDirective/destructure_import_empty/generated/0.4.11-failure.yml @@ -16,19 +16,18 @@ Errors: # 1 total Tree: - (ImportDirective): # '// Empty imports are not valid\nimport {} from "foo...' (0..53) - - (LeadingTrivia): # "// Empty imports are not valid\n" (0..31) - - (SingleLineComment): "// Empty imports are not valid" # (0..30) - - (EndOfLine): "\n" # (30..31) + - (leading_trivia꞉ SingleLineComment): "// Empty imports are not valid" # (0..30) + - (leading_trivia꞉ EndOfLine): "\n" # (30..31) - (import_keyword꞉ ImportKeyword): "import" # (31..37) - (clause꞉ ImportClause) ► (variant꞉ ImportDeconstruction): # ' {} from "foo"' (37..51) - - (LeadingTrivia) ► (Whitespace): " " # (37..38) + - (leading_trivia꞉ Whitespace): " " # (37..38) - (open_brace꞉ OpenBrace): "{" # (38..39) - (SKIPPED): "" # (39..39) - (close_brace꞉ CloseBrace): "}" # (39..40) - - (LeadingTrivia) ► (Whitespace): " " # (40..41) + - (leading_trivia꞉ Whitespace): " " # (40..41) - (from_keyword꞉ FromKeyword): "from" # (41..45) - (path꞉ StringLiteral): # ' "foo"' (45..51) - - (LeadingTrivia) ► (Whitespace): " " # (45..46) + - (leading_trivia꞉ Whitespace): " " # (45..46) - (variant꞉ DoubleQuotedStringLiteral): '"foo"' # (46..51) - (semicolon꞉ Semicolon): ";" # (51..52) - - (TrailingTrivia) ► (EndOfLine): "\n" # (52..53) + - (trailing_trivia꞉ EndOfLine): "\n" # (52..53) diff --git a/crates/solidity/testing/snapshots/cst_output/ImportDirective/destructure_import_multiple/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ImportDirective/destructure_import_multiple/generated/0.4.11-success.yml index c575041b5d..f3fe31fc8c 100644 --- a/crates/solidity/testing/snapshots/cst_output/ImportDirective/destructure_import_multiple/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ImportDirective/destructure_import_multiple/generated/0.4.11-success.yml @@ -9,35 +9,35 @@ Tree: - (ImportDirective): # 'import { A1 as A2, B1, C1 as C2 } from "foo";' (0..45) - (import_keyword꞉ ImportKeyword): "import" # (0..6) - (clause꞉ ImportClause) ► (variant꞉ ImportDeconstruction): # ' { A1 as A2, B1, C1 as C2 } from "foo"' (6..44) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (open_brace꞉ OpenBrace): "{" # (7..8) - (symbols꞉ ImportDeconstructionSymbols): # " A1 as A2, B1, C1 as C2" (8..31) - (item꞉ ImportDeconstructionSymbol): # " A1 as A2" (8..17) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "A1" # (9..11) - (alias꞉ ImportAlias): # " as A2" (11..17) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (as_keyword꞉ AsKeyword): "as" # (12..14) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (identifier꞉ Identifier): "A2" # (15..17) - (separator꞉ Comma): "," # (17..18) - (item꞉ ImportDeconstructionSymbol): # " B1" (18..21) - - (LeadingTrivia) ► (Whitespace): " " # (18..19) + - (leading_trivia꞉ Whitespace): " " # (18..19) - (name꞉ Identifier): "B1" # (19..21) - (separator꞉ Comma): "," # (21..22) - (item꞉ ImportDeconstructionSymbol): # " C1 as C2" (22..31) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (name꞉ Identifier): "C1" # (23..25) - (alias꞉ ImportAlias): # " as C2" (25..31) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (leading_trivia꞉ Whitespace): " " # (25..26) - (as_keyword꞉ AsKeyword): "as" # (26..28) - - (LeadingTrivia) ► (Whitespace): " " # (28..29) + - (leading_trivia꞉ Whitespace): " " # (28..29) - (identifier꞉ Identifier): "C2" # (29..31) - - (LeadingTrivia) ► (Whitespace): " " # (31..32) + - (leading_trivia꞉ Whitespace): " " # (31..32) - (close_brace꞉ CloseBrace): "}" # (32..33) - - (LeadingTrivia) ► (Whitespace): " " # (33..34) + - (leading_trivia꞉ Whitespace): " " # (33..34) - (from_keyword꞉ FromKeyword): "from" # (34..38) - (path꞉ StringLiteral): # ' "foo"' (38..44) - - (LeadingTrivia) ► (Whitespace): " " # (38..39) + - (leading_trivia꞉ Whitespace): " " # (38..39) - (variant꞉ DoubleQuotedStringLiteral): '"foo"' # (39..44) - (semicolon꞉ Semicolon): ";" # (44..45) diff --git a/crates/solidity/testing/snapshots/cst_output/ImportDirective/destructure_import_single/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ImportDirective/destructure_import_single/generated/0.4.11-success.yml index 1da661a10a..348de65672 100644 --- a/crates/solidity/testing/snapshots/cst_output/ImportDirective/destructure_import_single/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ImportDirective/destructure_import_single/generated/0.4.11-success.yml @@ -9,22 +9,22 @@ Tree: - (ImportDirective): # 'import { x as y } from "foo";' (0..29) - (import_keyword꞉ ImportKeyword): "import" # (0..6) - (clause꞉ ImportClause) ► (variant꞉ ImportDeconstruction): # ' { x as y } from "foo"' (6..28) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (open_brace꞉ OpenBrace): "{" # (7..8) - (symbols꞉ ImportDeconstructionSymbols): # " x as y" (8..15) - (item꞉ ImportDeconstructionSymbol): # " x as y" (8..15) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "x" # (9..10) - (alias꞉ ImportAlias): # " as y" (10..15) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (as_keyword꞉ AsKeyword): "as" # (11..13) - - (LeadingTrivia) ► (Whitespace): " " # (13..14) + - (leading_trivia꞉ Whitespace): " " # (13..14) - (identifier꞉ Identifier): "y" # (14..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (close_brace꞉ CloseBrace): "}" # (16..17) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (from_keyword꞉ FromKeyword): "from" # (18..22) - (path꞉ StringLiteral): # ' "foo"' (22..28) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (variant꞉ DoubleQuotedStringLiteral): '"foo"' # (23..28) - (semicolon꞉ Semicolon): ";" # (28..29) diff --git a/crates/solidity/testing/snapshots/cst_output/ImportDirective/named_import/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ImportDirective/named_import/generated/0.4.11-success.yml index e0f2b8bce3..e6b52e95a6 100644 --- a/crates/solidity/testing/snapshots/cst_output/ImportDirective/named_import/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ImportDirective/named_import/generated/0.4.11-success.yml @@ -9,16 +9,16 @@ Tree: - (ImportDirective): # 'import * as foo from "bar";' (0..27) - (import_keyword꞉ ImportKeyword): "import" # (0..6) - (clause꞉ ImportClause) ► (variant꞉ NamedImport): # ' * as foo from "bar"' (6..26) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (asterisk꞉ Asterisk): "*" # (7..8) - (alias꞉ ImportAlias): # " as foo" (8..15) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (as_keyword꞉ AsKeyword): "as" # (9..11) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (identifier꞉ Identifier): "foo" # (12..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (from_keyword꞉ FromKeyword): "from" # (16..20) - (path꞉ StringLiteral): # ' "bar"' (20..26) - - (LeadingTrivia) ► (Whitespace): " " # (20..21) + - (leading_trivia꞉ Whitespace): " " # (20..21) - (variant꞉ DoubleQuotedStringLiteral): '"bar"' # (21..26) - (semicolon꞉ Semicolon): ";" # (26..27) diff --git a/crates/solidity/testing/snapshots/cst_output/ImportDirective/path_import/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ImportDirective/path_import/generated/0.4.11-success.yml index 059aa6f9b1..49297f51bd 100644 --- a/crates/solidity/testing/snapshots/cst_output/ImportDirective/path_import/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ImportDirective/path_import/generated/0.4.11-success.yml @@ -9,6 +9,6 @@ Tree: - (ImportDirective): # 'import "foo";' (0..13) - (import_keyword꞉ ImportKeyword): "import" # (0..6) - (clause꞉ ImportClause) ► (variant꞉ PathImport) ► (path꞉ StringLiteral): # ' "foo"' (6..12) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (variant꞉ DoubleQuotedStringLiteral): '"foo"' # (7..12) - (semicolon꞉ Semicolon): ";" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/ImportDirective/path_import_with_alias/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ImportDirective/path_import_with_alias/generated/0.4.11-success.yml index db9a5f5473..c9dfe33104 100644 --- a/crates/solidity/testing/snapshots/cst_output/ImportDirective/path_import_with_alias/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ImportDirective/path_import_with_alias/generated/0.4.11-success.yml @@ -10,11 +10,11 @@ Tree: - (import_keyword꞉ ImportKeyword): "import" # (0..6) - (clause꞉ ImportClause) ► (variant꞉ PathImport): # ' "foo" as bar' (6..19) - (path꞉ StringLiteral): # ' "foo"' (6..12) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (variant꞉ DoubleQuotedStringLiteral): '"foo"' # (7..12) - (alias꞉ ImportAlias): # " as bar" (12..19) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (as_keyword꞉ AsKeyword): "as" # (13..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (identifier꞉ Identifier): "bar" # (16..19) - (semicolon꞉ Semicolon): ";" # (19..20) diff --git a/crates/solidity/testing/snapshots/cst_output/InterfaceDefinition/sample_counter/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/InterfaceDefinition/sample_counter/generated/0.4.11-success.yml index 2681acaf1e..0acaa76050 100644 --- a/crates/solidity/testing/snapshots/cst_output/InterfaceDefinition/sample_counter/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/InterfaceDefinition/sample_counter/generated/0.4.11-success.yml @@ -14,21 +14,20 @@ Errors: [] Tree: - (InterfaceDefinition): # "interface ICounter {\n // returns the current co..." (0..172) - (interface_keyword꞉ InterfaceKeyword): "interface" # (0..9) - - (LeadingTrivia) ► (Whitespace): " " # (9..10) + - (leading_trivia꞉ Whitespace): " " # (9..10) - (name꞉ Identifier): "ICounter" # (10..18) - - (LeadingTrivia) ► (Whitespace): " " # (18..19) + - (leading_trivia꞉ Whitespace): " " # (18..19) - (open_brace꞉ OpenBrace): "{" # (19..20) - - (TrailingTrivia) ► (EndOfLine): "\n" # (20..21) + - (trailing_trivia꞉ EndOfLine): "\n" # (20..21) - (members꞉ InterfaceMembers): # " // returns the current count\n function coun..." (21..171) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " // returns the current count\n function coun..." (21..105) - - (LeadingTrivia): # " // returns the current count\n " (21..58) - - (Whitespace): " " # (21..25) - - (SingleLineComment): "// returns the current count" # (25..53) - - (EndOfLine): "\n" # (53..54) - - (Whitespace): " " # (54..58) + - (leading_trivia꞉ Whitespace): " " # (21..25) + - (leading_trivia꞉ SingleLineComment): "// returns the current count" # (25..53) + - (leading_trivia꞉ EndOfLine): "\n" # (53..54) + - (leading_trivia꞉ Whitespace): " " # (54..58) - (function_keyword꞉ FunctionKeyword): "function" # (58..66) - (name꞉ FunctionName): # " count" (66..72) - - (LeadingTrivia) ► (Whitespace): " " # (66..67) + - (leading_trivia꞉ Whitespace): " " # (66..67) - (variant꞉ Identifier): "count" # (67..72) - (parameters꞉ ParametersDeclaration): # "()" (72..74) - (open_paren꞉ OpenParen): "(" # (72..73) @@ -36,33 +35,32 @@ Tree: - (close_paren꞉ CloseParen): ")" # (73..74) - (attributes꞉ FunctionAttributes): # " external view" (74..88) - (item꞉ FunctionAttribute): # " external" (74..83) - - (LeadingTrivia) ► (Whitespace): " " # (74..75) + - (leading_trivia꞉ Whitespace): " " # (74..75) - (variant꞉ ExternalKeyword): "external" # (75..83) - (item꞉ FunctionAttribute): # " view" (83..88) - - (LeadingTrivia) ► (Whitespace): " " # (83..84) + - (leading_trivia꞉ Whitespace): " " # (83..84) - (variant꞉ ViewKeyword): "view" # (84..88) - (returns꞉ ReturnsDeclaration): # " returns (uint)" (88..103) - - (LeadingTrivia) ► (Whitespace): " " # (88..89) + - (leading_trivia꞉ Whitespace): " " # (88..89) - (returns_keyword꞉ ReturnsKeyword): "returns" # (89..96) - (variables꞉ ParametersDeclaration): # " (uint)" (96..103) - - (LeadingTrivia) ► (Whitespace): " " # (96..97) + - (leading_trivia꞉ Whitespace): " " # (96..97) - (open_paren꞉ OpenParen): "(" # (97..98) - (parameters꞉ Parameters): # "uint" (98..102) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint" # (98..102) - (close_paren꞉ CloseParen): ")" # (102..103) - (body꞉ FunctionBody): # ";\n" (103..105) - (variant꞉ Semicolon): ";" # (103..104) - - (TrailingTrivia) ► (EndOfLine): "\n" # (104..105) + - (trailing_trivia꞉ EndOfLine): "\n" # (104..105) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # "\n // increments the counter\n function increm..." (105..171) - - (LeadingTrivia): # "\n // increments the counter\n " (105..140) - - (EndOfLine): "\n" # (105..106) - - (Whitespace): " " # (106..110) - - (SingleLineComment): "// increments the counter" # (110..135) - - (EndOfLine): "\n" # (135..136) - - (Whitespace): " " # (136..140) + - (leading_trivia꞉ EndOfLine): "\n" # (105..106) + - (leading_trivia꞉ Whitespace): " " # (106..110) + - (leading_trivia꞉ SingleLineComment): "// increments the counter" # (110..135) + - (leading_trivia꞉ EndOfLine): "\n" # (135..136) + - (leading_trivia꞉ Whitespace): " " # (136..140) - (function_keyword꞉ FunctionKeyword): "function" # (140..148) - (name꞉ FunctionName): # " increment" (148..158) - - (LeadingTrivia) ► (Whitespace): " " # (148..149) + - (leading_trivia꞉ Whitespace): " " # (148..149) - (variant꞉ Identifier): "increment" # (149..158) - (parameters꞉ ParametersDeclaration): # "()" (158..160) - (open_paren꞉ OpenParen): "(" # (158..159) @@ -70,9 +68,9 @@ Tree: - (close_paren꞉ CloseParen): ")" # (159..160) - (attributes꞉ FunctionAttributes): # " external" (160..169) - (item꞉ FunctionAttribute): # " external" (160..169) - - (LeadingTrivia) ► (Whitespace): " " # (160..161) + - (leading_trivia꞉ Whitespace): " " # (160..161) - (variant꞉ ExternalKeyword): "external" # (161..169) - (body꞉ FunctionBody): # ";\n" (169..171) - (variant꞉ Semicolon): ";" # (169..170) - - (TrailingTrivia) ► (EndOfLine): "\n" # (170..171) + - (trailing_trivia꞉ EndOfLine): "\n" # (170..171) - (close_brace꞉ CloseBrace): "}" # (171..172) diff --git a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/multi_line_trailing_double_star/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/multi_line_trailing_double_star/generated/0.4.11-success.yml deleted file mode 100644 index 7ffbd19b25..0000000000 --- a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/multi_line_trailing_double_star/generated/0.4.11-success.yml +++ /dev/null @@ -1,11 +0,0 @@ -# This file is generated automatically by infrastructure scripts. Please don't edit by hand. - -Source: > - 1 │ /* multi-line comment **/ │ 0..25 - -Errors: [] - -Tree: - - (LeadingTrivia): # "/* multi-line comment **/\n" (0..26) - - (MultiLineComment): "/* multi-line comment **/" # (0..25) - - (EndOfLine): "\n" # (25..26) diff --git a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/single_line_comment/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/single_line_comment/generated/0.4.11-success.yml deleted file mode 100644 index 5b832c1afc..0000000000 --- a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/single_line_comment/generated/0.4.11-success.yml +++ /dev/null @@ -1,11 +0,0 @@ -# This file is generated automatically by infrastructure scripts. Please don't edit by hand. - -Source: > - 1 │ // single line │ 0..14 - -Errors: [] - -Tree: - - (LeadingTrivia): # "// single line\n" (0..15) - - (SingleLineComment): "// single line" # (0..14) - - (EndOfLine): "\n" # (14..15) diff --git a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/single_line_natspec_comment/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/single_line_natspec_comment/generated/0.4.11-success.yml deleted file mode 100644 index e26976b176..0000000000 --- a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/single_line_natspec_comment/generated/0.4.11-success.yml +++ /dev/null @@ -1,11 +0,0 @@ -# This file is generated automatically by infrastructure scripts. Please don't edit by hand. - -Source: > - 1 │ /// foo bar │ 0..11 - -Errors: [] - -Tree: - - (LeadingTrivia): # "/// foo bar\n" (0..12) - - (SingleLineNatSpecComment): "/// foo bar" # (0..11) - - (EndOfLine): "\n" # (11..12) diff --git a/crates/solidity/testing/snapshots/cst_output/MappingType/named_both/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/MappingType/named_both/generated/0.4.11-failure.yml index ce6740a12a..90eca26912 100644 --- a/crates/solidity/testing/snapshots/cst_output/MappingType/named_both/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/MappingType/named_both/generated/0.4.11-failure.yml @@ -18,6 +18,6 @@ Tree: - (mapping_keyword꞉ MappingKeyword): "mapping" # (0..7) - (open_paren꞉ OpenParen): "(" # (7..8) - (key_type꞉ MappingKey) ► (key_type꞉ MappingKeyType) ► (variant꞉ ElementaryType) ► (variant꞉ StringKeyword): "string" # (8..14) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (SKIPPED): "Foo => bytes32 Bar" # (15..33) - (close_paren꞉ CloseParen): ")" # (33..34) diff --git a/crates/solidity/testing/snapshots/cst_output/MappingType/named_both/generated/0.8.18-success.yml b/crates/solidity/testing/snapshots/cst_output/MappingType/named_both/generated/0.8.18-success.yml index c95dd6018c..2c7a2d03d2 100644 --- a/crates/solidity/testing/snapshots/cst_output/MappingType/named_both/generated/0.8.18-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/MappingType/named_both/generated/0.8.18-success.yml @@ -11,14 +11,14 @@ Tree: - (open_paren꞉ OpenParen): "(" # (7..8) - (key_type꞉ MappingKey): # "string Foo" (8..18) - (key_type꞉ MappingKeyType) ► (variant꞉ ElementaryType) ► (variant꞉ StringKeyword): "string" # (8..14) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (name꞉ Identifier): "Foo" # (15..18) - - (LeadingTrivia) ► (Whitespace): " " # (18..19) + - (leading_trivia꞉ Whitespace): " " # (18..19) - (equal_greater_than꞉ EqualGreaterThan): "=>" # (19..21) - (value_type꞉ MappingValue): # " bytes32 Bar" (21..33) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " bytes32" (21..29) - - (LeadingTrivia) ► (Whitespace): " " # (21..22) + - (leading_trivia꞉ Whitespace): " " # (21..22) - (variant꞉ BytesKeyword): "bytes32" # (22..29) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (name꞉ Identifier): "Bar" # (30..33) - (close_paren꞉ CloseParen): ")" # (33..34) diff --git a/crates/solidity/testing/snapshots/cst_output/MappingType/named_key/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/MappingType/named_key/generated/0.4.11-failure.yml index 5bdf542b5e..b674498636 100644 --- a/crates/solidity/testing/snapshots/cst_output/MappingType/named_key/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/MappingType/named_key/generated/0.4.11-failure.yml @@ -18,6 +18,6 @@ Tree: - (mapping_keyword꞉ MappingKeyword): "mapping" # (0..7) - (open_paren꞉ OpenParen): "(" # (7..8) - (key_type꞉ MappingKey) ► (key_type꞉ MappingKeyType) ► (variant꞉ ElementaryType) ► (variant꞉ StringKeyword): "string" # (8..14) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (SKIPPED): "Foo => bytes32" # (15..29) - (close_paren꞉ CloseParen): ")" # (29..30) diff --git a/crates/solidity/testing/snapshots/cst_output/MappingType/named_key/generated/0.8.18-success.yml b/crates/solidity/testing/snapshots/cst_output/MappingType/named_key/generated/0.8.18-success.yml index ea64d0ee71..844aa3698a 100644 --- a/crates/solidity/testing/snapshots/cst_output/MappingType/named_key/generated/0.8.18-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/MappingType/named_key/generated/0.8.18-success.yml @@ -11,11 +11,11 @@ Tree: - (open_paren꞉ OpenParen): "(" # (7..8) - (key_type꞉ MappingKey): # "string Foo" (8..18) - (key_type꞉ MappingKeyType) ► (variant꞉ ElementaryType) ► (variant꞉ StringKeyword): "string" # (8..14) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (name꞉ Identifier): "Foo" # (15..18) - - (LeadingTrivia) ► (Whitespace): " " # (18..19) + - (leading_trivia꞉ Whitespace): " " # (18..19) - (equal_greater_than꞉ EqualGreaterThan): "=>" # (19..21) - (value_type꞉ MappingValue) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " bytes32" (21..29) - - (LeadingTrivia) ► (Whitespace): " " # (21..22) + - (leading_trivia꞉ Whitespace): " " # (21..22) - (variant꞉ BytesKeyword): "bytes32" # (22..29) - (close_paren꞉ CloseParen): ")" # (29..30) diff --git a/crates/solidity/testing/snapshots/cst_output/MappingType/named_value/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/MappingType/named_value/generated/0.4.11-failure.yml index 97ea377762..beec83696a 100644 --- a/crates/solidity/testing/snapshots/cst_output/MappingType/named_value/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/MappingType/named_value/generated/0.4.11-failure.yml @@ -18,11 +18,11 @@ Tree: - (mapping_keyword꞉ MappingKeyword): "mapping" # (0..7) - (open_paren꞉ OpenParen): "(" # (7..8) - (key_type꞉ MappingKey) ► (key_type꞉ MappingKeyType) ► (variant꞉ ElementaryType) ► (variant꞉ StringKeyword): "string" # (8..14) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (equal_greater_than꞉ EqualGreaterThan): "=>" # (15..17) - (value_type꞉ MappingValue) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " bytes32" (17..25) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (variant꞉ BytesKeyword): "bytes32" # (18..25) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (leading_trivia꞉ Whitespace): " " # (25..26) - (SKIPPED): "Bar" # (26..29) - (close_paren꞉ CloseParen): ")" # (29..30) diff --git a/crates/solidity/testing/snapshots/cst_output/MappingType/named_value/generated/0.8.18-success.yml b/crates/solidity/testing/snapshots/cst_output/MappingType/named_value/generated/0.8.18-success.yml index 368f60c521..f59c0db07b 100644 --- a/crates/solidity/testing/snapshots/cst_output/MappingType/named_value/generated/0.8.18-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/MappingType/named_value/generated/0.8.18-success.yml @@ -10,12 +10,12 @@ Tree: - (mapping_keyword꞉ MappingKeyword): "mapping" # (0..7) - (open_paren꞉ OpenParen): "(" # (7..8) - (key_type꞉ MappingKey) ► (key_type꞉ MappingKeyType) ► (variant꞉ ElementaryType) ► (variant꞉ StringKeyword): "string" # (8..14) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (equal_greater_than꞉ EqualGreaterThan): "=>" # (15..17) - (value_type꞉ MappingValue): # " bytes32 Bar" (17..29) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " bytes32" (17..25) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (variant꞉ BytesKeyword): "bytes32" # (18..25) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (leading_trivia꞉ Whitespace): " " # (25..26) - (name꞉ Identifier): "Bar" # (26..29) - (close_paren꞉ CloseParen): ")" # (29..30) diff --git a/crates/solidity/testing/snapshots/cst_output/MappingType/stray_delimiter/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/MappingType/stray_delimiter/generated/0.4.11-failure.yml index 132ff4a350..c000000868 100644 --- a/crates/solidity/testing/snapshots/cst_output/MappingType/stray_delimiter/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/MappingType/stray_delimiter/generated/0.4.11-failure.yml @@ -18,11 +18,11 @@ Tree: - (mapping_keyword꞉ MappingKeyword): "mapping" # (0..7) - (open_paren꞉ OpenParen): "(" # (7..8) - (key_type꞉ MappingKey) ► (key_type꞉ MappingKeyType) ► (variant꞉ ElementaryType) ► (variant꞉ StringKeyword): "string" # (8..14) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (equal_greater_than꞉ EqualGreaterThan): "=>" # (15..17) - (value_type꞉ MappingValue) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " bytes32" (17..25) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (variant꞉ BytesKeyword): "bytes32" # (18..25) - (SKIPPED): "] arg" # (25..30) - (close_paren꞉ CloseParen): ")" # (30..31) - - (TrailingTrivia) ► (EndOfLine): "\n" # (31..32) + - (trailing_trivia꞉ EndOfLine): "\n" # (31..32) diff --git a/crates/solidity/testing/snapshots/cst_output/MappingType/stray_delimiter/generated/0.8.18-failure.yml b/crates/solidity/testing/snapshots/cst_output/MappingType/stray_delimiter/generated/0.8.18-failure.yml index 31161186eb..c9de0f6d05 100644 --- a/crates/solidity/testing/snapshots/cst_output/MappingType/stray_delimiter/generated/0.8.18-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/MappingType/stray_delimiter/generated/0.8.18-failure.yml @@ -18,11 +18,11 @@ Tree: - (mapping_keyword꞉ MappingKeyword): "mapping" # (0..7) - (open_paren꞉ OpenParen): "(" # (7..8) - (key_type꞉ MappingKey) ► (key_type꞉ MappingKeyType) ► (variant꞉ ElementaryType) ► (variant꞉ StringKeyword): "string" # (8..14) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (equal_greater_than꞉ EqualGreaterThan): "=>" # (15..17) - (value_type꞉ MappingValue) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " bytes32" (17..25) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (variant꞉ BytesKeyword): "bytes32" # (18..25) - (SKIPPED): "] arg" # (25..30) - (close_paren꞉ CloseParen): ")" # (30..31) - - (TrailingTrivia) ► (EndOfLine): "\n" # (31..32) + - (trailing_trivia꞉ EndOfLine): "\n" # (31..32) diff --git a/crates/solidity/testing/snapshots/cst_output/MappingType/unnamed/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/MappingType/unnamed/generated/0.4.11-success.yml index c9180766a8..fe1f5b9dae 100644 --- a/crates/solidity/testing/snapshots/cst_output/MappingType/unnamed/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/MappingType/unnamed/generated/0.4.11-success.yml @@ -10,9 +10,9 @@ Tree: - (mapping_keyword꞉ MappingKeyword): "mapping" # (0..7) - (open_paren꞉ OpenParen): "(" # (7..8) - (key_type꞉ MappingKey) ► (key_type꞉ MappingKeyType) ► (variant꞉ ElementaryType) ► (variant꞉ StringKeyword): "string" # (8..14) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (equal_greater_than꞉ EqualGreaterThan): "=>" # (15..17) - (value_type꞉ MappingValue) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " bytes32" (17..25) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (variant꞉ BytesKeyword): "bytes32" # (18..25) - (close_paren꞉ CloseParen): ")" # (25..26) diff --git a/crates/solidity/testing/snapshots/cst_output/NewExpression/array_1d/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/NewExpression/array_1d/generated/0.4.11-success.yml index 77237a162d..2e61142f63 100644 --- a/crates/solidity/testing/snapshots/cst_output/NewExpression/array_1d/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/NewExpression/array_1d/generated/0.4.11-success.yml @@ -10,7 +10,7 @@ Tree: - (new_keyword꞉ NewKeyword): "new" # (0..3) - (type_name꞉ TypeName) ► (variant꞉ ArrayTypeName): # " Foo[]" (3..9) - (operand꞉ TypeName) ► (variant꞉ IdentifierPath): # " Foo" (3..7) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (item꞉ Identifier): "Foo" # (4..7) - (open_bracket꞉ OpenBracket): "[" # (7..8) - (close_bracket꞉ CloseBracket): "]" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/NewExpression/array_1d_expression/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/NewExpression/array_1d_expression/generated/0.4.11-success.yml index 684034527f..07a1560307 100644 --- a/crates/solidity/testing/snapshots/cst_output/NewExpression/array_1d_expression/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/NewExpression/array_1d_expression/generated/0.4.11-success.yml @@ -10,7 +10,7 @@ Tree: - (new_keyword꞉ NewKeyword): "new" # (0..3) - (type_name꞉ TypeName) ► (variant꞉ ArrayTypeName): # " Foo[10]" (3..11) - (operand꞉ TypeName) ► (variant꞉ IdentifierPath): # " Foo" (3..7) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (item꞉ Identifier): "Foo" # (4..7) - (open_bracket꞉ OpenBracket): "[" # (7..8) - (index꞉ Expression) ► (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "10" # (8..10) diff --git a/crates/solidity/testing/snapshots/cst_output/NewExpression/array_2d/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/NewExpression/array_2d/generated/0.4.11-success.yml index 1449594885..982d4d53b7 100644 --- a/crates/solidity/testing/snapshots/cst_output/NewExpression/array_2d/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/NewExpression/array_2d/generated/0.4.11-success.yml @@ -11,7 +11,7 @@ Tree: - (type_name꞉ TypeName) ► (variant꞉ ArrayTypeName): # " Foo[][]" (3..11) - (operand꞉ TypeName) ► (variant꞉ ArrayTypeName): # " Foo[]" (3..9) - (operand꞉ TypeName) ► (variant꞉ IdentifierPath): # " Foo" (3..7) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (item꞉ Identifier): "Foo" # (4..7) - (open_bracket꞉ OpenBracket): "[" # (7..8) - (close_bracket꞉ CloseBracket): "]" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/NewExpression/identifier_path/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/NewExpression/identifier_path/generated/0.4.11-success.yml index 466ba7a51d..6758042cb1 100644 --- a/crates/solidity/testing/snapshots/cst_output/NewExpression/identifier_path/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/NewExpression/identifier_path/generated/0.4.11-success.yml @@ -9,7 +9,7 @@ Tree: - (NewExpression): # "new Foo.Bar.Baz" (0..15) - (new_keyword꞉ NewKeyword): "new" # (0..3) - (type_name꞉ TypeName) ► (variant꞉ IdentifierPath): # " Foo.Bar.Baz" (3..15) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (item꞉ Identifier): "Foo" # (4..7) - (separator꞉ Period): "." # (7..8) - (item꞉ Identifier): "Bar" # (8..11) diff --git a/crates/solidity/testing/snapshots/cst_output/PragmaDirective/abi_coder/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/PragmaDirective/abi_coder/generated/0.4.11-success.yml index 6811770483..b8b86b92d6 100644 --- a/crates/solidity/testing/snapshots/cst_output/PragmaDirective/abi_coder/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/PragmaDirective/abi_coder/generated/0.4.11-success.yml @@ -9,8 +9,8 @@ Tree: - (PragmaDirective): # "pragma abicoder foo;" (0..20) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (0..6) - (pragma꞉ Pragma) ► (variant꞉ ABICoderPragma): # " abicoder foo" (6..19) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (abicoder_keyword꞉ AbicoderKeyword): "abicoder" # (7..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (version꞉ Identifier): "foo" # (16..19) - (semicolon꞉ Semicolon): ";" # (19..20) diff --git a/crates/solidity/testing/snapshots/cst_output/PragmaDirective/experimental/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/PragmaDirective/experimental/generated/0.4.11-success.yml index a1a736279e..279c9cc9a6 100644 --- a/crates/solidity/testing/snapshots/cst_output/PragmaDirective/experimental/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/PragmaDirective/experimental/generated/0.4.11-success.yml @@ -9,9 +9,9 @@ Tree: - (PragmaDirective): # "pragma experimental foo;" (0..24) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (0..6) - (pragma꞉ Pragma) ► (variant꞉ ExperimentalPragma): # " experimental foo" (6..23) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (experimental_keyword꞉ ExperimentalKeyword): "experimental" # (7..19) - (feature꞉ ExperimentalFeature): # " foo" (19..23) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (variant꞉ Identifier): "foo" # (20..23) - (semicolon꞉ Semicolon): ";" # (23..24) diff --git a/crates/solidity/testing/snapshots/cst_output/PragmaDirective/experimental_string/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/PragmaDirective/experimental_string/generated/0.4.11-success.yml index 7beb937c86..9fd5e1bb5f 100644 --- a/crates/solidity/testing/snapshots/cst_output/PragmaDirective/experimental_string/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/PragmaDirective/experimental_string/generated/0.4.11-success.yml @@ -9,10 +9,10 @@ Tree: - (PragmaDirective): # 'pragma experimental "ABIEncoderV2";\n' (0..36) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (0..6) - (pragma꞉ Pragma) ► (variant꞉ ExperimentalPragma): # ' experimental "ABIEncoderV2"' (6..34) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (experimental_keyword꞉ ExperimentalKeyword): "experimental" # (7..19) - (feature꞉ ExperimentalFeature) ► (variant꞉ StringLiteral): # ' "ABIEncoderV2"' (19..34) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (variant꞉ DoubleQuotedStringLiteral): '"ABIEncoderV2"' # (20..34) - (semicolon꞉ Semicolon): ";" # (34..35) - - (TrailingTrivia) ► (EndOfLine): "\n" # (35..36) + - (trailing_trivia꞉ EndOfLine): "\n" # (35..36) diff --git a/crates/solidity/testing/snapshots/cst_output/PragmaDirective/version/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/PragmaDirective/version/generated/0.4.11-success.yml index 533753dd7b..d9b7520ae0 100644 --- a/crates/solidity/testing/snapshots/cst_output/PragmaDirective/version/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/PragmaDirective/version/generated/0.4.11-success.yml @@ -9,11 +9,11 @@ Tree: - (PragmaDirective): # "pragma solidity 1.0.0;" (0..22) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (0..6) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity 1.0.0" (6..21) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (7..15) - (expressions꞉ VersionPragmaExpressions): # " 1.0.0" (15..21) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 1.0.0" (15..21) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (item꞉ VersionPragmaValue): "1" # (16..17) - (separator꞉ Period): "." # (17..18) - (item꞉ VersionPragmaValue): "0" # (18..19) diff --git a/crates/solidity/testing/snapshots/cst_output/ReceiveFunctionDefinition/simple/generated/0.6.0-success.yml b/crates/solidity/testing/snapshots/cst_output/ReceiveFunctionDefinition/simple/generated/0.6.0-success.yml index e7622f6e87..8be811c7f3 100644 --- a/crates/solidity/testing/snapshots/cst_output/ReceiveFunctionDefinition/simple/generated/0.6.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ReceiveFunctionDefinition/simple/generated/0.6.0-success.yml @@ -9,13 +9,13 @@ Tree: - (ReceiveFunctionDefinition): # "receive () {}" (0..13) - (receive_keyword꞉ ReceiveKeyword): "receive" # (0..7) - (parameters꞉ ParametersDeclaration): # " ()" (7..10) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (open_paren꞉ OpenParen): "(" # (8..9) - (parameters꞉ Parameters): [] # (9..9) - (close_paren꞉ CloseParen): ")" # (9..10) - (attributes꞉ ReceiveFunctionAttributes): [] # (10..10) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {}" (10..13) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (open_brace꞉ OpenBrace): "{" # (11..12) - (statements꞉ Statements): [] # (12..12) - (close_brace꞉ CloseBrace): "}" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/ReturnStatement/invalid_terminator/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ReturnStatement/invalid_terminator/generated/0.4.11-failure.yml index c57ae949f0..7c4357568d 100644 --- a/crates/solidity/testing/snapshots/cst_output/ReturnStatement/invalid_terminator/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ReturnStatement/invalid_terminator/generated/0.4.11-failure.yml @@ -21,20 +21,20 @@ Tree: - (return_keyword꞉ ReturnKeyword): "return" # (0..6) - (expression꞉ Expression) ► (variant꞉ AdditiveExpression): # " a + 2 * some" (6..19) - (left_operand꞉ Expression): # " a" (6..8) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (variant꞉ Identifier): "a" # (7..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (operator꞉ Plus): "+" # (9..10) - (right_operand꞉ Expression) ► (variant꞉ MultiplicativeExpression): # " 2 * some" (10..19) - (left_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 2" (10..12) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (literal꞉ DecimalLiteral): "2" # (11..12) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (operator꞉ Asterisk): "*" # (13..14) - (right_operand꞉ Expression): # " some" (14..19) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (variant꞉ Identifier): "some" # (15..19) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (SKIPPED): "invalid tokens\n\n" # (20..36) - (semicolon꞉ Semicolon): ";" # (36..37) - - (TrailingTrivia) ► (EndOfLine): "\n" # (37..38) + - (trailing_trivia꞉ EndOfLine): "\n" # (37..38) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_1_asterisk/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_1_asterisk/generated/0.4.11-success.yml index 68f439172e..7299f43f6f 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_1_asterisk/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_1_asterisk/generated/0.4.11-success.yml @@ -8,6 +8,5 @@ Errors: [] Tree: - (SourceUnit): # "/*/ needs another one to terminate: /*/\n" (0..40) - (members꞉ SourceUnitMembers): [] # (0..0) - - (LeadingTrivia): # "/*/ needs another one to terminate: /*/\n" (0..40) - - (MultiLineComment): "/*/ needs another one to terminate: /*/" # (0..39) - - (EndOfLine): "\n" # (39..40) + - (leading_trivia꞉ MultiLineComment): "/*/ needs another one to terminate: /*/" # (0..39) + - (leading_trivia꞉ EndOfLine): "\n" # (39..40) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_2_asterisks/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_2_asterisks/generated/0.4.11-success.yml index f988663efa..ace54a88f1 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_2_asterisks/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_2_asterisks/generated/0.4.11-success.yml @@ -8,6 +8,5 @@ Errors: [] Tree: - (SourceUnit): # "/**/\n" (0..5) - (members꞉ SourceUnitMembers): [] # (0..0) - - (LeadingTrivia): # "/**/\n" (0..5) - - (MultiLineComment): "/**/" # (0..4) - - (EndOfLine): "\n" # (4..5) + - (leading_trivia꞉ MultiLineComment): "/**/" # (0..4) + - (leading_trivia꞉ EndOfLine): "\n" # (4..5) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_3_asterisks/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_3_asterisks/generated/0.4.11-success.yml index ac6ee968b8..c3316acb4a 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_3_asterisks/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_3_asterisks/generated/0.4.11-success.yml @@ -8,6 +8,5 @@ Errors: [] Tree: - (SourceUnit): # "/***/\n" (0..6) - (members꞉ SourceUnitMembers): [] # (0..0) - - (LeadingTrivia): # "/***/\n" (0..6) - - (MultiLineNatSpecComment): "/***/" # (0..5) - - (EndOfLine): "\n" # (5..6) + - (leading_trivia꞉ MultiLineNatSpecComment): "/***/" # (0..5) + - (leading_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_4_asterisks/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_4_asterisks/generated/0.4.11-success.yml index 2c88bb9999..f39c81e1d9 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_4_asterisks/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_comment_4_asterisks/generated/0.4.11-success.yml @@ -8,6 +8,5 @@ Errors: [] Tree: - (SourceUnit): # "/****/\n" (0..7) - (members꞉ SourceUnitMembers): [] # (0..0) - - (LeadingTrivia): # "/****/\n" (0..7) - - (MultiLineNatSpecComment): "/****/" # (0..6) - - (EndOfLine): "\n" # (6..7) + - (leading_trivia꞉ MultiLineNatSpecComment): "/****/" # (0..6) + - (leading_trivia꞉ EndOfLine): "\n" # (6..7) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_over_natspec/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_over_natspec/generated/0.4.11-success.yml index f2f4f73b5f..0007d1d7a8 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_over_natspec/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/empty_multiline_over_natspec/generated/0.4.11-success.yml @@ -14,23 +14,20 @@ Tree: - (SourceUnit): # "// The below comments should be parsed into two se..." (0..127) - (members꞉ SourceUnitMembers): # "// The below comments should be parsed into two se..." (0..122) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "// The below comments should be parsed into two se..." (0..122) - - (LeadingTrivia): # "// The below comments should be parsed into two se..." (0..98) - - (SingleLineComment): "// The below comments should be parsed into two se..." # (0..96) - - (EndOfLine): "\n" # (96..97) - - (EndOfLine): "\n" # (97..98) + - (leading_trivia꞉ SingleLineComment): "// The below comments should be parsed into two se..." # (0..96) + - (leading_trivia꞉ EndOfLine): "\n" # (96..97) + - (leading_trivia꞉ EndOfLine): "\n" # (97..98) - (contract_keyword꞉ ContractKeyword): "contract" # (98..106) - - (LeadingTrivia) ► (Whitespace): " " # (106..107) + - (leading_trivia꞉ Whitespace): " " # (106..107) - (name꞉ Identifier): "Foo" # (107..110) - - (LeadingTrivia) ► (Whitespace): " " # (110..111) + - (leading_trivia꞉ Whitespace): " " # (110..111) - (open_brace꞉ OpenBrace): "{" # (111..112) - - (TrailingTrivia) ► (EndOfLine): "\n" # (112..113) + - (trailing_trivia꞉ EndOfLine): "\n" # (112..113) - (members꞉ ContractMembers): [] # (113..113) - - (LeadingTrivia): # " /**/\n" (113..120) - - (Whitespace): " " # (113..115) - - (MultiLineComment): "/**/" # (115..119) - - (EndOfLine): "\n" # (119..120) + - (leading_trivia꞉ Whitespace): " " # (113..115) + - (leading_trivia꞉ MultiLineComment): "/**/" # (115..119) + - (leading_trivia꞉ EndOfLine): "\n" # (119..120) - (close_brace꞉ CloseBrace): "}" # (120..121) - - (TrailingTrivia) ► (EndOfLine): "\n" # (121..122) - - (LeadingTrivia): # "/**/\n" (122..127) - - (MultiLineComment): "/**/" # (122..126) - - (EndOfLine): "\n" # (126..127) + - (trailing_trivia꞉ EndOfLine): "\n" # (121..122) + - (leading_trivia꞉ MultiLineComment): "/**/" # (122..126) + - (leading_trivia꞉ EndOfLine): "\n" # (126..127) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia/generated/0.4.11-success.yml index 73bf8402a0..3a6f221369 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia/generated/0.4.11-success.yml @@ -15,20 +15,19 @@ Tree: - (members꞉ SourceUnitMembers): # "contract X { }\n" (0..15) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract X { }\n" (0..15) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "X" # (9..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (open_brace꞉ OpenBrace): "{" # (11..12) - (members꞉ ContractMembers): [] # (12..12) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (close_brace꞉ CloseBrace): "}" # (13..14) - - (TrailingTrivia) ► (EndOfLine): "\n" # (14..15) - - (LeadingTrivia): # " \n// spaces before this\n\n/* new lines after thi..." (15..71) - - (Whitespace): " " # (15..19) - - (EndOfLine): "\n" # (19..20) - - (SingleLineComment): "// spaces before this" # (20..41) - - (EndOfLine): "\n" # (41..42) - - (EndOfLine): "\n" # (42..43) - - (MultiLineComment): "/* new lines after this */" # (43..69) - - (EndOfLine): "\n" # (69..70) - - (EndOfLine): "\n" # (70..71) + - (trailing_trivia꞉ EndOfLine): "\n" # (14..15) + - (leading_trivia꞉ Whitespace): " " # (15..19) + - (leading_trivia꞉ EndOfLine): "\n" # (19..20) + - (leading_trivia꞉ SingleLineComment): "// spaces before this" # (20..41) + - (leading_trivia꞉ EndOfLine): "\n" # (41..42) + - (leading_trivia꞉ EndOfLine): "\n" # (42..43) + - (leading_trivia꞉ MultiLineComment): "/* new lines after this */" # (43..69) + - (leading_trivia꞉ EndOfLine): "\n" # (69..70) + - (leading_trivia꞉ EndOfLine): "\n" # (70..71) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.4.11-failure.yml index a73a1310eb..173b39e652 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.4.11-failure.yml @@ -20,12 +20,12 @@ Tree: - (members꞉ SourceUnitMembers): # "contract X {}\n" (0..14) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract X {}\n" (0..14) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "X" # (9..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (open_brace꞉ OpenBrace): "{" # (11..12) - (members꞉ ContractMembers): [] # (12..12) - (close_brace꞉ CloseBrace): "}" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) - - (LeadingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) + - (leading_trivia꞉ EndOfLine): "\n" # (14..15) - (SKIPPED): "/* unterminated comment\n" # (15..39) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.6.0-failure.yml index 2940a0f3e2..9c2dc9c117 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.6.0-failure.yml @@ -20,12 +20,12 @@ Tree: - (members꞉ SourceUnitMembers): # "contract X {}\n" (0..14) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract X {}\n" (0..14) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "X" # (9..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (open_brace꞉ OpenBrace): "{" # (11..12) - (members꞉ ContractMembers): [] # (12..12) - (close_brace꞉ CloseBrace): "}" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) - - (LeadingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) + - (leading_trivia꞉ EndOfLine): "\n" # (14..15) - (SKIPPED): "/* unterminated comment\n" # (15..39) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.7.1-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.7.1-failure.yml index 687638e80b..33f52e15d9 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.7.1-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.7.1-failure.yml @@ -20,12 +20,12 @@ Tree: - (members꞉ SourceUnitMembers): # "contract X {}\n" (0..14) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract X {}\n" (0..14) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "X" # (9..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (open_brace꞉ OpenBrace): "{" # (11..12) - (members꞉ ContractMembers): [] # (12..12) - (close_brace꞉ CloseBrace): "}" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) - - (LeadingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) + - (leading_trivia꞉ EndOfLine): "\n" # (14..15) - (SKIPPED): "/* unterminated comment\n" # (15..39) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.7.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.7.4-failure.yml index a182987172..a26b08244a 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.7.4-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.7.4-failure.yml @@ -20,12 +20,12 @@ Tree: - (members꞉ SourceUnitMembers): # "contract X {}\n" (0..14) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract X {}\n" (0..14) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "X" # (9..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (open_brace꞉ OpenBrace): "{" # (11..12) - (members꞉ ContractMembers): [] # (12..12) - (close_brace꞉ CloseBrace): "}" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) - - (LeadingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) + - (leading_trivia꞉ EndOfLine): "\n" # (14..15) - (SKIPPED): "/* unterminated comment\n" # (15..39) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.0-failure.yml index 82d8e4ff2c..8b7f8c47b1 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.0-failure.yml @@ -20,12 +20,12 @@ Tree: - (members꞉ SourceUnitMembers): # "contract X {}\n" (0..14) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract X {}\n" (0..14) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "X" # (9..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (open_brace꞉ OpenBrace): "{" # (11..12) - (members꞉ ContractMembers): [] # (12..12) - (close_brace꞉ CloseBrace): "}" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) - - (LeadingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) + - (leading_trivia꞉ EndOfLine): "\n" # (14..15) - (SKIPPED): "/* unterminated comment\n" # (15..39) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.13-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.13-failure.yml index 7d9e0f1ff7..18febdeef3 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.13-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.13-failure.yml @@ -20,12 +20,12 @@ Tree: - (members꞉ SourceUnitMembers): # "contract X {}\n" (0..14) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract X {}\n" (0..14) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "X" # (9..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (open_brace꞉ OpenBrace): "{" # (11..12) - (members꞉ ContractMembers): [] # (12..12) - (close_brace꞉ CloseBrace): "}" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) - - (LeadingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) + - (leading_trivia꞉ EndOfLine): "\n" # (14..15) - (SKIPPED): "/* unterminated comment\n" # (15..39) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.22-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.22-failure.yml index b27b50d64b..6c3df8a941 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.22-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.22-failure.yml @@ -20,12 +20,12 @@ Tree: - (members꞉ SourceUnitMembers): # "contract X {}\n" (0..14) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract X {}\n" (0..14) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "X" # (9..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (open_brace꞉ OpenBrace): "{" # (11..12) - (members꞉ ContractMembers): [] # (12..12) - (close_brace꞉ CloseBrace): "}" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) - - (LeadingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) + - (leading_trivia꞉ EndOfLine): "\n" # (14..15) - (SKIPPED): "/* unterminated comment\n" # (15..39) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.4-failure.yml index b8e1d37acc..f8c1203352 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.4-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.4-failure.yml @@ -20,12 +20,12 @@ Tree: - (members꞉ SourceUnitMembers): # "contract X {}\n" (0..14) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract X {}\n" (0..14) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "X" # (9..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (open_brace꞉ OpenBrace): "{" # (11..12) - (members꞉ ContractMembers): [] # (12..12) - (close_brace꞉ CloseBrace): "}" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) - - (LeadingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) + - (leading_trivia꞉ EndOfLine): "\n" # (14..15) - (SKIPPED): "/* unterminated comment\n" # (15..39) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.8-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.8-failure.yml index ec91dd46f7..0484e8746b 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.8-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_incomplete/generated/0.8.8-failure.yml @@ -20,12 +20,12 @@ Tree: - (members꞉ SourceUnitMembers): # "contract X {}\n" (0..14) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract X {}\n" (0..14) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "X" # (9..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (open_brace꞉ OpenBrace): "{" # (11..12) - (members꞉ ContractMembers): [] # (12..12) - (close_brace꞉ CloseBrace): "}" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) - - (LeadingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) + - (leading_trivia꞉ EndOfLine): "\n" # (14..15) - (SKIPPED): "/* unterminated comment\n" # (15..39) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.4.11-failure.yml index a2901248cb..33e21c731a 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.4.11-failure.yml @@ -22,18 +22,17 @@ Tree: - (members꞉ SourceUnitMembers): # "contract X { }\n" (0..15) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract X { }\n" (0..15) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "X" # (9..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (open_brace꞉ OpenBrace): "{" # (11..12) - (members꞉ ContractMembers): [] # (12..12) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (close_brace꞉ CloseBrace): "}" # (13..14) - - (TrailingTrivia) ► (EndOfLine): "\n" # (14..15) - - (LeadingTrivia): # " \n/* new lines after this */\n\n" (15..48) - - (Whitespace): " " # (15..19) - - (EndOfLine): "\n" # (19..20) - - (MultiLineComment): "/* new lines after this */" # (20..46) - - (EndOfLine): "\n" # (46..47) - - (EndOfLine): "\n" # (47..48) + - (trailing_trivia꞉ EndOfLine): "\n" # (14..15) + - (leading_trivia꞉ Whitespace): " " # (15..19) + - (leading_trivia꞉ EndOfLine): "\n" # (19..20) + - (leading_trivia꞉ MultiLineComment): "/* new lines after this */" # (20..46) + - (leading_trivia꞉ EndOfLine): "\n" # (46..47) + - (leading_trivia꞉ EndOfLine): "\n" # (47..48) - (SKIPPED): "unexpectedchars\n" # (48..64) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.6.0-failure.yml index 7151ec4d84..3a520180e7 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.6.0-failure.yml @@ -22,18 +22,17 @@ Tree: - (members꞉ SourceUnitMembers): # "contract X { }\n" (0..15) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract X { }\n" (0..15) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "X" # (9..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (open_brace꞉ OpenBrace): "{" # (11..12) - (members꞉ ContractMembers): [] # (12..12) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (close_brace꞉ CloseBrace): "}" # (13..14) - - (TrailingTrivia) ► (EndOfLine): "\n" # (14..15) - - (LeadingTrivia): # " \n/* new lines after this */\n\n" (15..48) - - (Whitespace): " " # (15..19) - - (EndOfLine): "\n" # (19..20) - - (MultiLineComment): "/* new lines after this */" # (20..46) - - (EndOfLine): "\n" # (46..47) - - (EndOfLine): "\n" # (47..48) + - (trailing_trivia꞉ EndOfLine): "\n" # (14..15) + - (leading_trivia꞉ Whitespace): " " # (15..19) + - (leading_trivia꞉ EndOfLine): "\n" # (19..20) + - (leading_trivia꞉ MultiLineComment): "/* new lines after this */" # (20..46) + - (leading_trivia꞉ EndOfLine): "\n" # (46..47) + - (leading_trivia꞉ EndOfLine): "\n" # (47..48) - (SKIPPED): "unexpectedchars\n" # (48..64) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.7.1-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.7.1-failure.yml index 20f724a7d9..5f63dad361 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.7.1-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.7.1-failure.yml @@ -22,18 +22,17 @@ Tree: - (members꞉ SourceUnitMembers): # "contract X { }\n" (0..15) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract X { }\n" (0..15) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "X" # (9..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (open_brace꞉ OpenBrace): "{" # (11..12) - (members꞉ ContractMembers): [] # (12..12) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (close_brace꞉ CloseBrace): "}" # (13..14) - - (TrailingTrivia) ► (EndOfLine): "\n" # (14..15) - - (LeadingTrivia): # " \n/* new lines after this */\n\n" (15..48) - - (Whitespace): " " # (15..19) - - (EndOfLine): "\n" # (19..20) - - (MultiLineComment): "/* new lines after this */" # (20..46) - - (EndOfLine): "\n" # (46..47) - - (EndOfLine): "\n" # (47..48) + - (trailing_trivia꞉ EndOfLine): "\n" # (14..15) + - (leading_trivia꞉ Whitespace): " " # (15..19) + - (leading_trivia꞉ EndOfLine): "\n" # (19..20) + - (leading_trivia꞉ MultiLineComment): "/* new lines after this */" # (20..46) + - (leading_trivia꞉ EndOfLine): "\n" # (46..47) + - (leading_trivia꞉ EndOfLine): "\n" # (47..48) - (SKIPPED): "unexpectedchars\n" # (48..64) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.7.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.7.4-failure.yml index 65f619f7b3..ce7b47f0de 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.7.4-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia_unexpected_after/generated/0.7.4-failure.yml @@ -22,18 +22,17 @@ Tree: - (members꞉ SourceUnitMembers): # "contract X { }\n" (0..15) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract X { }\n" (0..15) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "X" # (9..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (open_brace꞉ OpenBrace): "{" # (11..12) - (members꞉ ContractMembers): [] # (12..12) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (close_brace꞉ CloseBrace): "}" # (13..14) - - (TrailingTrivia) ► (EndOfLine): "\n" # (14..15) - - (LeadingTrivia): # " \n/* new lines after this */\n\n" (15..48) - - (Whitespace): " " # (15..19) - - (EndOfLine): "\n" # (19..20) - - (MultiLineComment): "/* new lines after this */" # (20..46) - - (EndOfLine): "\n" # (46..47) - - (EndOfLine): "\n" # (47..48) + - (trailing_trivia꞉ EndOfLine): "\n" # (14..15) + - (leading_trivia꞉ Whitespace): " " # (15..19) + - (leading_trivia꞉ EndOfLine): "\n" # (19..20) + - (leading_trivia꞉ MultiLineComment): "/* new lines after this */" # (20..46) + - (leading_trivia꞉ EndOfLine): "\n" # (46..47) + - (leading_trivia꞉ EndOfLine): "\n" # (47..48) - (SKIPPED): "unexpectedchars\n" # (48..64) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.4.11-failure.yml index ada9880c2b..f5c4988e85 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.4.11-failure.yml @@ -45,25 +45,25 @@ Tree: - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "pragma solidity 0.0.0;\n" (0..23) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (0..6) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity 0.0.0" (6..21) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (7..15) - (expressions꞉ VersionPragmaExpressions): # " 0.0.0" (15..21) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.0.0" (15..21) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (item꞉ VersionPragmaValue): "0" # (16..17) - (separator꞉ Period): "." # (17..18) - (item꞉ VersionPragmaValue): "0" # (18..19) - (separator꞉ Period): "." # (19..20) - (item꞉ VersionPragmaValue): "0" # (20..21) - (semicolon꞉ Semicolon): ";" # (21..22) - - (TrailingTrivia) ► (EndOfLine): "\n" # (22..23) + - (trailing_trivia꞉ EndOfLine): "\n" # (22..23) - (item꞉ SourceUnitMember) ► (variant꞉ ImportDirective): # '\nimport "foo.sol";\n' (23..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (23..24) + - (leading_trivia꞉ EndOfLine): "\n" # (23..24) - (import_keyword꞉ ImportKeyword): "import" # (24..30) - (clause꞉ ImportClause) ► (variant꞉ PathImport) ► (path꞉ StringLiteral): # ' "foo.sol"' (30..40) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (variant꞉ DoubleQuotedStringLiteral): '"foo.sol"' # (31..40) - (semicolon꞉ Semicolon): ";" # (40..41) - - (TrailingTrivia) ► (EndOfLine): "\n" # (41..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (42..43) + - (trailing_trivia꞉ EndOfLine): "\n" # (41..42) + - (leading_trivia꞉ EndOfLine): "\n" # (42..43) - (SKIPPED): "using A for B;\n\ncontract C { }\n\ninterface I { }\n\nl..." # (43..243) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.6.0-failure.yml index 17226f6536..968c4b6538 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.6.0-failure.yml @@ -45,25 +45,25 @@ Tree: - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "pragma solidity 0.0.0;\n" (0..23) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (0..6) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity 0.0.0" (6..21) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (7..15) - (expressions꞉ VersionPragmaExpressions): # " 0.0.0" (15..21) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.0.0" (15..21) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (item꞉ VersionPragmaValue): "0" # (16..17) - (separator꞉ Period): "." # (17..18) - (item꞉ VersionPragmaValue): "0" # (18..19) - (separator꞉ Period): "." # (19..20) - (item꞉ VersionPragmaValue): "0" # (20..21) - (semicolon꞉ Semicolon): ";" # (21..22) - - (TrailingTrivia) ► (EndOfLine): "\n" # (22..23) + - (trailing_trivia꞉ EndOfLine): "\n" # (22..23) - (item꞉ SourceUnitMember) ► (variant꞉ ImportDirective): # '\nimport "foo.sol";\n' (23..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (23..24) + - (leading_trivia꞉ EndOfLine): "\n" # (23..24) - (import_keyword꞉ ImportKeyword): "import" # (24..30) - (clause꞉ ImportClause) ► (variant꞉ PathImport) ► (path꞉ StringLiteral): # ' "foo.sol"' (30..40) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (variant꞉ DoubleQuotedStringLiteral): '"foo.sol"' # (31..40) - (semicolon꞉ Semicolon): ";" # (40..41) - - (TrailingTrivia) ► (EndOfLine): "\n" # (41..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (42..43) + - (trailing_trivia꞉ EndOfLine): "\n" # (41..42) + - (leading_trivia꞉ EndOfLine): "\n" # (42..43) - (SKIPPED): "using A for B;\n\ncontract C { }\n\ninterface I { }\n\nl..." # (43..243) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.7.1-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.7.1-failure.yml index b92c713ffb..4b6523041a 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.7.1-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.7.1-failure.yml @@ -45,25 +45,25 @@ Tree: - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "pragma solidity 0.0.0;\n" (0..23) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (0..6) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity 0.0.0" (6..21) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (7..15) - (expressions꞉ VersionPragmaExpressions): # " 0.0.0" (15..21) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.0.0" (15..21) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (item꞉ VersionPragmaValue): "0" # (16..17) - (separator꞉ Period): "." # (17..18) - (item꞉ VersionPragmaValue): "0" # (18..19) - (separator꞉ Period): "." # (19..20) - (item꞉ VersionPragmaValue): "0" # (20..21) - (semicolon꞉ Semicolon): ";" # (21..22) - - (TrailingTrivia) ► (EndOfLine): "\n" # (22..23) + - (trailing_trivia꞉ EndOfLine): "\n" # (22..23) - (item꞉ SourceUnitMember) ► (variant꞉ ImportDirective): # '\nimport "foo.sol";\n' (23..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (23..24) + - (leading_trivia꞉ EndOfLine): "\n" # (23..24) - (import_keyword꞉ ImportKeyword): "import" # (24..30) - (clause꞉ ImportClause) ► (variant꞉ PathImport) ► (path꞉ StringLiteral): # ' "foo.sol"' (30..40) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (variant꞉ DoubleQuotedStringLiteral): '"foo.sol"' # (31..40) - (semicolon꞉ Semicolon): ";" # (40..41) - - (TrailingTrivia) ► (EndOfLine): "\n" # (41..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (42..43) + - (trailing_trivia꞉ EndOfLine): "\n" # (41..42) + - (leading_trivia꞉ EndOfLine): "\n" # (42..43) - (SKIPPED): "using A for B;\n\ncontract C { }\n\ninterface I { }\n\nl..." # (43..243) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.7.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.7.4-failure.yml index d3790a30ff..dc95563b2d 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.7.4-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.7.4-failure.yml @@ -45,25 +45,25 @@ Tree: - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "pragma solidity 0.0.0;\n" (0..23) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (0..6) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity 0.0.0" (6..21) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (7..15) - (expressions꞉ VersionPragmaExpressions): # " 0.0.0" (15..21) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.0.0" (15..21) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (item꞉ VersionPragmaValue): "0" # (16..17) - (separator꞉ Period): "." # (17..18) - (item꞉ VersionPragmaValue): "0" # (18..19) - (separator꞉ Period): "." # (19..20) - (item꞉ VersionPragmaValue): "0" # (20..21) - (semicolon꞉ Semicolon): ";" # (21..22) - - (TrailingTrivia) ► (EndOfLine): "\n" # (22..23) + - (trailing_trivia꞉ EndOfLine): "\n" # (22..23) - (item꞉ SourceUnitMember) ► (variant꞉ ImportDirective): # '\nimport "foo.sol";\n' (23..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (23..24) + - (leading_trivia꞉ EndOfLine): "\n" # (23..24) - (import_keyword꞉ ImportKeyword): "import" # (24..30) - (clause꞉ ImportClause) ► (variant꞉ PathImport) ► (path꞉ StringLiteral): # ' "foo.sol"' (30..40) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (variant꞉ DoubleQuotedStringLiteral): '"foo.sol"' # (31..40) - (semicolon꞉ Semicolon): ";" # (40..41) - - (TrailingTrivia) ► (EndOfLine): "\n" # (41..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (42..43) + - (trailing_trivia꞉ EndOfLine): "\n" # (41..42) + - (leading_trivia꞉ EndOfLine): "\n" # (42..43) - (SKIPPED): "using A for B;\n\ncontract C { }\n\ninterface I { }\n\nl..." # (43..243) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.0-failure.yml index 0e8b8e81ca..96a7dab5a7 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.0-failure.yml @@ -45,25 +45,25 @@ Tree: - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "pragma solidity 0.0.0;\n" (0..23) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (0..6) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity 0.0.0" (6..21) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (7..15) - (expressions꞉ VersionPragmaExpressions): # " 0.0.0" (15..21) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.0.0" (15..21) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (item꞉ VersionPragmaValue): "0" # (16..17) - (separator꞉ Period): "." # (17..18) - (item꞉ VersionPragmaValue): "0" # (18..19) - (separator꞉ Period): "." # (19..20) - (item꞉ VersionPragmaValue): "0" # (20..21) - (semicolon꞉ Semicolon): ";" # (21..22) - - (TrailingTrivia) ► (EndOfLine): "\n" # (22..23) + - (trailing_trivia꞉ EndOfLine): "\n" # (22..23) - (item꞉ SourceUnitMember) ► (variant꞉ ImportDirective): # '\nimport "foo.sol";\n' (23..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (23..24) + - (leading_trivia꞉ EndOfLine): "\n" # (23..24) - (import_keyword꞉ ImportKeyword): "import" # (24..30) - (clause꞉ ImportClause) ► (variant꞉ PathImport) ► (path꞉ StringLiteral): # ' "foo.sol"' (30..40) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (variant꞉ DoubleQuotedStringLiteral): '"foo.sol"' # (31..40) - (semicolon꞉ Semicolon): ";" # (40..41) - - (TrailingTrivia) ► (EndOfLine): "\n" # (41..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (42..43) + - (trailing_trivia꞉ EndOfLine): "\n" # (41..42) + - (leading_trivia꞉ EndOfLine): "\n" # (42..43) - (SKIPPED): "using A for B;\n\ncontract C { }\n\ninterface I { }\n\nl..." # (43..243) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml index 6478c72be7..52a607be44 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml @@ -43,114 +43,114 @@ Tree: - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "pragma solidity 0.0.0;\n" (0..23) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (0..6) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity 0.0.0" (6..21) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (7..15) - (expressions꞉ VersionPragmaExpressions): # " 0.0.0" (15..21) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.0.0" (15..21) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (item꞉ VersionPragmaValue): "0" # (16..17) - (separator꞉ Period): "." # (17..18) - (item꞉ VersionPragmaValue): "0" # (18..19) - (separator꞉ Period): "." # (19..20) - (item꞉ VersionPragmaValue): "0" # (20..21) - (semicolon꞉ Semicolon): ";" # (21..22) - - (TrailingTrivia) ► (EndOfLine): "\n" # (22..23) + - (trailing_trivia꞉ EndOfLine): "\n" # (22..23) - (item꞉ SourceUnitMember) ► (variant꞉ ImportDirective): # '\nimport "foo.sol";\n' (23..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (23..24) + - (leading_trivia꞉ EndOfLine): "\n" # (23..24) - (import_keyword꞉ ImportKeyword): "import" # (24..30) - (clause꞉ ImportClause) ► (variant꞉ PathImport) ► (path꞉ StringLiteral): # ' "foo.sol"' (30..40) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (variant꞉ DoubleQuotedStringLiteral): '"foo.sol"' # (31..40) - (semicolon꞉ Semicolon): ";" # (40..41) - - (TrailingTrivia) ► (EndOfLine): "\n" # (41..42) + - (trailing_trivia꞉ EndOfLine): "\n" # (41..42) - (item꞉ SourceUnitMember) ► (variant꞉ UsingDirective): # "\nusing A for B;\n" (42..58) - - (LeadingTrivia) ► (EndOfLine): "\n" # (42..43) + - (leading_trivia꞉ EndOfLine): "\n" # (42..43) - (using_keyword꞉ UsingKeyword): "using" # (43..48) - (clause꞉ UsingClause) ► (variant꞉ IdentifierPath): # " A" (48..50) - - (LeadingTrivia) ► (Whitespace): " " # (48..49) + - (leading_trivia꞉ Whitespace): " " # (48..49) - (item꞉ Identifier): "A" # (49..50) - - (LeadingTrivia) ► (Whitespace): " " # (50..51) + - (leading_trivia꞉ Whitespace): " " # (50..51) - (for_keyword꞉ ForKeyword): "for" # (51..54) - (target꞉ UsingTarget) ► (variant꞉ TypeName) ► (variant꞉ IdentifierPath): # " B" (54..56) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (item꞉ Identifier): "B" # (55..56) - (semicolon꞉ Semicolon): ";" # (56..57) - - (TrailingTrivia) ► (EndOfLine): "\n" # (57..58) + - (trailing_trivia꞉ EndOfLine): "\n" # (57..58) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "\ncontract C { }\n" (58..74) - - (LeadingTrivia) ► (EndOfLine): "\n" # (58..59) + - (leading_trivia꞉ EndOfLine): "\n" # (58..59) - (contract_keyword꞉ ContractKeyword): "contract" # (59..67) - - (LeadingTrivia) ► (Whitespace): " " # (67..68) + - (leading_trivia꞉ Whitespace): " " # (67..68) - (name꞉ Identifier): "C" # (68..69) - - (LeadingTrivia) ► (Whitespace): " " # (69..70) + - (leading_trivia꞉ Whitespace): " " # (69..70) - (open_brace꞉ OpenBrace): "{" # (70..71) - (members꞉ ContractMembers): [] # (71..71) - - (LeadingTrivia) ► (Whitespace): " " # (71..72) + - (leading_trivia꞉ Whitespace): " " # (71..72) - (close_brace꞉ CloseBrace): "}" # (72..73) - - (TrailingTrivia) ► (EndOfLine): "\n" # (73..74) + - (trailing_trivia꞉ EndOfLine): "\n" # (73..74) - (item꞉ SourceUnitMember) ► (variant꞉ InterfaceDefinition): # "\ninterface I { }\n" (74..91) - - (LeadingTrivia) ► (EndOfLine): "\n" # (74..75) + - (leading_trivia꞉ EndOfLine): "\n" # (74..75) - (interface_keyword꞉ InterfaceKeyword): "interface" # (75..84) - - (LeadingTrivia) ► (Whitespace): " " # (84..85) + - (leading_trivia꞉ Whitespace): " " # (84..85) - (name꞉ Identifier): "I" # (85..86) - - (LeadingTrivia) ► (Whitespace): " " # (86..87) + - (leading_trivia꞉ Whitespace): " " # (86..87) - (open_brace꞉ OpenBrace): "{" # (87..88) - (members꞉ InterfaceMembers): [] # (88..88) - - (LeadingTrivia) ► (Whitespace): " " # (88..89) + - (leading_trivia꞉ Whitespace): " " # (88..89) - (close_brace꞉ CloseBrace): "}" # (89..90) - - (TrailingTrivia) ► (EndOfLine): "\n" # (90..91) + - (trailing_trivia꞉ EndOfLine): "\n" # (90..91) - (item꞉ SourceUnitMember) ► (variant꞉ LibraryDefinition): # "\nlibrary L { }\n" (91..106) - - (LeadingTrivia) ► (EndOfLine): "\n" # (91..92) + - (leading_trivia꞉ EndOfLine): "\n" # (91..92) - (library_keyword꞉ LibraryKeyword): "library" # (92..99) - - (LeadingTrivia) ► (Whitespace): " " # (99..100) + - (leading_trivia꞉ Whitespace): " " # (99..100) - (name꞉ Identifier): "L" # (100..101) - - (LeadingTrivia) ► (Whitespace): " " # (101..102) + - (leading_trivia꞉ Whitespace): " " # (101..102) - (open_brace꞉ OpenBrace): "{" # (102..103) - (members꞉ LibraryMembers): [] # (103..103) - - (LeadingTrivia) ► (Whitespace): " " # (103..104) + - (leading_trivia꞉ Whitespace): " " # (103..104) - (close_brace꞉ CloseBrace): "}" # (104..105) - - (TrailingTrivia) ► (EndOfLine): "\n" # (105..106) + - (trailing_trivia꞉ EndOfLine): "\n" # (105..106) - (item꞉ SourceUnitMember) ► (variant꞉ StructDefinition): # "\nstruct S { }\n" (106..120) - - (LeadingTrivia) ► (EndOfLine): "\n" # (106..107) + - (leading_trivia꞉ EndOfLine): "\n" # (106..107) - (struct_keyword꞉ StructKeyword): "struct" # (107..113) - - (LeadingTrivia) ► (Whitespace): " " # (113..114) + - (leading_trivia꞉ Whitespace): " " # (113..114) - (name꞉ Identifier): "S" # (114..115) - - (LeadingTrivia) ► (Whitespace): " " # (115..116) + - (leading_trivia꞉ Whitespace): " " # (115..116) - (open_brace꞉ OpenBrace): "{" # (116..117) - (members꞉ StructMembers): [] # (117..117) - - (LeadingTrivia) ► (Whitespace): " " # (117..118) + - (leading_trivia꞉ Whitespace): " " # (117..118) - (close_brace꞉ CloseBrace): "}" # (118..119) - - (TrailingTrivia) ► (EndOfLine): "\n" # (119..120) + - (trailing_trivia꞉ EndOfLine): "\n" # (119..120) - (item꞉ SourceUnitMember) ► (variant꞉ EnumDefinition): # "\nenum E { }\n" (120..132) - - (LeadingTrivia) ► (EndOfLine): "\n" # (120..121) + - (leading_trivia꞉ EndOfLine): "\n" # (120..121) - (enum_keyword꞉ EnumKeyword): "enum" # (121..125) - - (LeadingTrivia) ► (Whitespace): " " # (125..126) + - (leading_trivia꞉ Whitespace): " " # (125..126) - (name꞉ Identifier): "E" # (126..127) - - (LeadingTrivia) ► (Whitespace): " " # (127..128) + - (leading_trivia꞉ Whitespace): " " # (127..128) - (open_brace꞉ OpenBrace): "{" # (128..129) - (members꞉ EnumMembers): [] # (129..129) - - (LeadingTrivia) ► (Whitespace): " " # (129..130) + - (leading_trivia꞉ Whitespace): " " # (129..130) - (close_brace꞉ CloseBrace): "}" # (130..131) - - (TrailingTrivia) ► (EndOfLine): "\n" # (131..132) + - (trailing_trivia꞉ EndOfLine): "\n" # (131..132) - (item꞉ SourceUnitMember) ► (variant꞉ ConstantDefinition): # "\nuint32 constant x = 0;\n" (132..156) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # "\nuint32" (132..139) - - (LeadingTrivia) ► (EndOfLine): "\n" # (132..133) + - (leading_trivia꞉ EndOfLine): "\n" # (132..133) - (variant꞉ UintKeyword): "uint32" # (133..139) - - (LeadingTrivia) ► (Whitespace): " " # (139..140) + - (leading_trivia꞉ Whitespace): " " # (139..140) - (constant_keyword꞉ ConstantKeyword): "constant" # (140..148) - - (LeadingTrivia) ► (Whitespace): " " # (148..149) + - (leading_trivia꞉ Whitespace): " " # (148..149) - (name꞉ Identifier): "x" # (149..150) - - (LeadingTrivia) ► (Whitespace): " " # (150..151) + - (leading_trivia꞉ Whitespace): " " # (150..151) - (equal꞉ Equal): "=" # (151..152) - (value꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 0" (152..154) - - (LeadingTrivia) ► (Whitespace): " " # (152..153) + - (leading_trivia꞉ Whitespace): " " # (152..153) - (literal꞉ DecimalLiteral): "0" # (153..154) - (semicolon꞉ Semicolon): ";" # (154..155) - - (TrailingTrivia) ► (EndOfLine): "\n" # (155..156) + - (trailing_trivia꞉ EndOfLine): "\n" # (155..156) - (item꞉ SourceUnitMember) ► (variant꞉ FunctionDefinition): # "\nfunction f() public { }\n" (156..181) - - (LeadingTrivia) ► (EndOfLine): "\n" # (156..157) + - (leading_trivia꞉ EndOfLine): "\n" # (156..157) - (function_keyword꞉ FunctionKeyword): "function" # (157..165) - (name꞉ FunctionName): # " f" (165..167) - - (LeadingTrivia) ► (Whitespace): " " # (165..166) + - (leading_trivia꞉ Whitespace): " " # (165..166) - (variant꞉ Identifier): "f" # (166..167) - (parameters꞉ ParametersDeclaration): # "()" (167..169) - (open_paren꞉ OpenParen): "(" # (167..168) @@ -158,19 +158,19 @@ Tree: - (close_paren꞉ CloseParen): ")" # (168..169) - (attributes꞉ FunctionAttributes): # " public" (169..176) - (item꞉ FunctionAttribute): # " public" (169..176) - - (LeadingTrivia) ► (Whitespace): " " # (169..170) + - (leading_trivia꞉ Whitespace): " " # (169..170) - (variant꞉ PublicKeyword): "public" # (170..176) - (body꞉ FunctionBody) ► (variant꞉ Block): # " { }\n" (176..181) - - (LeadingTrivia) ► (Whitespace): " " # (176..177) + - (leading_trivia꞉ Whitespace): " " # (176..177) - (open_brace꞉ OpenBrace): "{" # (177..178) - (statements꞉ Statements): [] # (178..178) - - (LeadingTrivia) ► (Whitespace): " " # (178..179) + - (leading_trivia꞉ Whitespace): " " # (178..179) - (close_brace꞉ CloseBrace): "}" # (179..180) - - (TrailingTrivia) ► (EndOfLine): "\n" # (180..181) + - (trailing_trivia꞉ EndOfLine): "\n" # (180..181) - (item꞉ SourceUnitMember) ► (variant꞉ ErrorDefinition): # "\nerror E1(string);\n" (181..200) - - (LeadingTrivia) ► (EndOfLine): "\n" # (181..182) + - (leading_trivia꞉ EndOfLine): "\n" # (181..182) - (error_keyword꞉ ErrorKeyword): "error" # (182..187) - - (LeadingTrivia) ► (Whitespace): " " # (187..188) + - (leading_trivia꞉ Whitespace): " " # (187..188) - (name꞉ Identifier): "E1" # (188..190) - (members꞉ ErrorParametersDeclaration): # "(string)" (190..198) - (open_paren꞉ OpenParen): "(" # (190..191) @@ -178,18 +178,18 @@ Tree: - (item꞉ ErrorParameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ StringKeyword): "string" # (191..197) - (close_paren꞉ CloseParen): ")" # (197..198) - (semicolon꞉ Semicolon): ";" # (198..199) - - (TrailingTrivia) ► (EndOfLine): "\n" # (199..200) + - (trailing_trivia꞉ EndOfLine): "\n" # (199..200) - (item꞉ SourceUnitMember) ► (variant꞉ UserDefinedValueTypeDefinition): # "\ntype T is bool;\n" (200..217) - - (LeadingTrivia) ► (EndOfLine): "\n" # (200..201) + - (leading_trivia꞉ EndOfLine): "\n" # (200..201) - (type_keyword꞉ TypeKeyword): "type" # (201..205) - - (LeadingTrivia) ► (Whitespace): " " # (205..206) + - (leading_trivia꞉ Whitespace): " " # (205..206) - (name꞉ Identifier): "T" # (206..207) - - (LeadingTrivia) ► (Whitespace): " " # (207..208) + - (leading_trivia꞉ Whitespace): " " # (207..208) - (is_keyword꞉ IsKeyword): "is" # (208..210) - (value_type꞉ ElementaryType): # " bool" (210..215) - - (LeadingTrivia) ► (Whitespace): " " # (210..211) + - (leading_trivia꞉ Whitespace): " " # (210..211) - (variant꞉ BoolKeyword): "bool" # (211..215) - (semicolon꞉ Semicolon): ";" # (215..216) - - (TrailingTrivia) ► (EndOfLine): "\n" # (216..217) - - (LeadingTrivia) ► (EndOfLine): "\n" # (217..218) + - (trailing_trivia꞉ EndOfLine): "\n" # (216..217) + - (leading_trivia꞉ EndOfLine): "\n" # (217..218) - (SKIPPED): "event E1(uint256 value);\n" # (218..243) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml index 66d945783d..04f5200116 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml @@ -34,114 +34,114 @@ Tree: - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "pragma solidity 0.0.0;\n" (0..23) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (0..6) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity 0.0.0" (6..21) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (7..15) - (expressions꞉ VersionPragmaExpressions): # " 0.0.0" (15..21) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.0.0" (15..21) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (item꞉ VersionPragmaValue): "0" # (16..17) - (separator꞉ Period): "." # (17..18) - (item꞉ VersionPragmaValue): "0" # (18..19) - (separator꞉ Period): "." # (19..20) - (item꞉ VersionPragmaValue): "0" # (20..21) - (semicolon꞉ Semicolon): ";" # (21..22) - - (TrailingTrivia) ► (EndOfLine): "\n" # (22..23) + - (trailing_trivia꞉ EndOfLine): "\n" # (22..23) - (item꞉ SourceUnitMember) ► (variant꞉ ImportDirective): # '\nimport "foo.sol";\n' (23..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (23..24) + - (leading_trivia꞉ EndOfLine): "\n" # (23..24) - (import_keyword꞉ ImportKeyword): "import" # (24..30) - (clause꞉ ImportClause) ► (variant꞉ PathImport) ► (path꞉ StringLiteral): # ' "foo.sol"' (30..40) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (variant꞉ DoubleQuotedStringLiteral): '"foo.sol"' # (31..40) - (semicolon꞉ Semicolon): ";" # (40..41) - - (TrailingTrivia) ► (EndOfLine): "\n" # (41..42) + - (trailing_trivia꞉ EndOfLine): "\n" # (41..42) - (item꞉ SourceUnitMember) ► (variant꞉ UsingDirective): # "\nusing A for B;\n" (42..58) - - (LeadingTrivia) ► (EndOfLine): "\n" # (42..43) + - (leading_trivia꞉ EndOfLine): "\n" # (42..43) - (using_keyword꞉ UsingKeyword): "using" # (43..48) - (clause꞉ UsingClause) ► (variant꞉ IdentifierPath): # " A" (48..50) - - (LeadingTrivia) ► (Whitespace): " " # (48..49) + - (leading_trivia꞉ Whitespace): " " # (48..49) - (item꞉ Identifier): "A" # (49..50) - - (LeadingTrivia) ► (Whitespace): " " # (50..51) + - (leading_trivia꞉ Whitespace): " " # (50..51) - (for_keyword꞉ ForKeyword): "for" # (51..54) - (target꞉ UsingTarget) ► (variant꞉ TypeName) ► (variant꞉ IdentifierPath): # " B" (54..56) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (item꞉ Identifier): "B" # (55..56) - (semicolon꞉ Semicolon): ";" # (56..57) - - (TrailingTrivia) ► (EndOfLine): "\n" # (57..58) + - (trailing_trivia꞉ EndOfLine): "\n" # (57..58) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "\ncontract C { }\n" (58..74) - - (LeadingTrivia) ► (EndOfLine): "\n" # (58..59) + - (leading_trivia꞉ EndOfLine): "\n" # (58..59) - (contract_keyword꞉ ContractKeyword): "contract" # (59..67) - - (LeadingTrivia) ► (Whitespace): " " # (67..68) + - (leading_trivia꞉ Whitespace): " " # (67..68) - (name꞉ Identifier): "C" # (68..69) - - (LeadingTrivia) ► (Whitespace): " " # (69..70) + - (leading_trivia꞉ Whitespace): " " # (69..70) - (open_brace꞉ OpenBrace): "{" # (70..71) - (members꞉ ContractMembers): [] # (71..71) - - (LeadingTrivia) ► (Whitespace): " " # (71..72) + - (leading_trivia꞉ Whitespace): " " # (71..72) - (close_brace꞉ CloseBrace): "}" # (72..73) - - (TrailingTrivia) ► (EndOfLine): "\n" # (73..74) + - (trailing_trivia꞉ EndOfLine): "\n" # (73..74) - (item꞉ SourceUnitMember) ► (variant꞉ InterfaceDefinition): # "\ninterface I { }\n" (74..91) - - (LeadingTrivia) ► (EndOfLine): "\n" # (74..75) + - (leading_trivia꞉ EndOfLine): "\n" # (74..75) - (interface_keyword꞉ InterfaceKeyword): "interface" # (75..84) - - (LeadingTrivia) ► (Whitespace): " " # (84..85) + - (leading_trivia꞉ Whitespace): " " # (84..85) - (name꞉ Identifier): "I" # (85..86) - - (LeadingTrivia) ► (Whitespace): " " # (86..87) + - (leading_trivia꞉ Whitespace): " " # (86..87) - (open_brace꞉ OpenBrace): "{" # (87..88) - (members꞉ InterfaceMembers): [] # (88..88) - - (LeadingTrivia) ► (Whitespace): " " # (88..89) + - (leading_trivia꞉ Whitespace): " " # (88..89) - (close_brace꞉ CloseBrace): "}" # (89..90) - - (TrailingTrivia) ► (EndOfLine): "\n" # (90..91) + - (trailing_trivia꞉ EndOfLine): "\n" # (90..91) - (item꞉ SourceUnitMember) ► (variant꞉ LibraryDefinition): # "\nlibrary L { }\n" (91..106) - - (LeadingTrivia) ► (EndOfLine): "\n" # (91..92) + - (leading_trivia꞉ EndOfLine): "\n" # (91..92) - (library_keyword꞉ LibraryKeyword): "library" # (92..99) - - (LeadingTrivia) ► (Whitespace): " " # (99..100) + - (leading_trivia꞉ Whitespace): " " # (99..100) - (name꞉ Identifier): "L" # (100..101) - - (LeadingTrivia) ► (Whitespace): " " # (101..102) + - (leading_trivia꞉ Whitespace): " " # (101..102) - (open_brace꞉ OpenBrace): "{" # (102..103) - (members꞉ LibraryMembers): [] # (103..103) - - (LeadingTrivia) ► (Whitespace): " " # (103..104) + - (leading_trivia꞉ Whitespace): " " # (103..104) - (close_brace꞉ CloseBrace): "}" # (104..105) - - (TrailingTrivia) ► (EndOfLine): "\n" # (105..106) + - (trailing_trivia꞉ EndOfLine): "\n" # (105..106) - (item꞉ SourceUnitMember) ► (variant꞉ StructDefinition): # "\nstruct S { }\n" (106..120) - - (LeadingTrivia) ► (EndOfLine): "\n" # (106..107) + - (leading_trivia꞉ EndOfLine): "\n" # (106..107) - (struct_keyword꞉ StructKeyword): "struct" # (107..113) - - (LeadingTrivia) ► (Whitespace): " " # (113..114) + - (leading_trivia꞉ Whitespace): " " # (113..114) - (name꞉ Identifier): "S" # (114..115) - - (LeadingTrivia) ► (Whitespace): " " # (115..116) + - (leading_trivia꞉ Whitespace): " " # (115..116) - (open_brace꞉ OpenBrace): "{" # (116..117) - (members꞉ StructMembers): [] # (117..117) - - (LeadingTrivia) ► (Whitespace): " " # (117..118) + - (leading_trivia꞉ Whitespace): " " # (117..118) - (close_brace꞉ CloseBrace): "}" # (118..119) - - (TrailingTrivia) ► (EndOfLine): "\n" # (119..120) + - (trailing_trivia꞉ EndOfLine): "\n" # (119..120) - (item꞉ SourceUnitMember) ► (variant꞉ EnumDefinition): # "\nenum E { }\n" (120..132) - - (LeadingTrivia) ► (EndOfLine): "\n" # (120..121) + - (leading_trivia꞉ EndOfLine): "\n" # (120..121) - (enum_keyword꞉ EnumKeyword): "enum" # (121..125) - - (LeadingTrivia) ► (Whitespace): " " # (125..126) + - (leading_trivia꞉ Whitespace): " " # (125..126) - (name꞉ Identifier): "E" # (126..127) - - (LeadingTrivia) ► (Whitespace): " " # (127..128) + - (leading_trivia꞉ Whitespace): " " # (127..128) - (open_brace꞉ OpenBrace): "{" # (128..129) - (members꞉ EnumMembers): [] # (129..129) - - (LeadingTrivia) ► (Whitespace): " " # (129..130) + - (leading_trivia꞉ Whitespace): " " # (129..130) - (close_brace꞉ CloseBrace): "}" # (130..131) - - (TrailingTrivia) ► (EndOfLine): "\n" # (131..132) + - (trailing_trivia꞉ EndOfLine): "\n" # (131..132) - (item꞉ SourceUnitMember) ► (variant꞉ ConstantDefinition): # "\nuint32 constant x = 0;\n" (132..156) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # "\nuint32" (132..139) - - (LeadingTrivia) ► (EndOfLine): "\n" # (132..133) + - (leading_trivia꞉ EndOfLine): "\n" # (132..133) - (variant꞉ UintKeyword): "uint32" # (133..139) - - (LeadingTrivia) ► (Whitespace): " " # (139..140) + - (leading_trivia꞉ Whitespace): " " # (139..140) - (constant_keyword꞉ ConstantKeyword): "constant" # (140..148) - - (LeadingTrivia) ► (Whitespace): " " # (148..149) + - (leading_trivia꞉ Whitespace): " " # (148..149) - (name꞉ Identifier): "x" # (149..150) - - (LeadingTrivia) ► (Whitespace): " " # (150..151) + - (leading_trivia꞉ Whitespace): " " # (150..151) - (equal꞉ Equal): "=" # (151..152) - (value꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 0" (152..154) - - (LeadingTrivia) ► (Whitespace): " " # (152..153) + - (leading_trivia꞉ Whitespace): " " # (152..153) - (literal꞉ DecimalLiteral): "0" # (153..154) - (semicolon꞉ Semicolon): ";" # (154..155) - - (TrailingTrivia) ► (EndOfLine): "\n" # (155..156) + - (trailing_trivia꞉ EndOfLine): "\n" # (155..156) - (item꞉ SourceUnitMember) ► (variant꞉ FunctionDefinition): # "\nfunction f() public { }\n" (156..181) - - (LeadingTrivia) ► (EndOfLine): "\n" # (156..157) + - (leading_trivia꞉ EndOfLine): "\n" # (156..157) - (function_keyword꞉ FunctionKeyword): "function" # (157..165) - (name꞉ FunctionName): # " f" (165..167) - - (LeadingTrivia) ► (Whitespace): " " # (165..166) + - (leading_trivia꞉ Whitespace): " " # (165..166) - (variant꞉ Identifier): "f" # (166..167) - (parameters꞉ ParametersDeclaration): # "()" (167..169) - (open_paren꞉ OpenParen): "(" # (167..168) @@ -149,19 +149,19 @@ Tree: - (close_paren꞉ CloseParen): ")" # (168..169) - (attributes꞉ FunctionAttributes): # " public" (169..176) - (item꞉ FunctionAttribute): # " public" (169..176) - - (LeadingTrivia) ► (Whitespace): " " # (169..170) + - (leading_trivia꞉ Whitespace): " " # (169..170) - (variant꞉ PublicKeyword): "public" # (170..176) - (body꞉ FunctionBody) ► (variant꞉ Block): # " { }\n" (176..181) - - (LeadingTrivia) ► (Whitespace): " " # (176..177) + - (leading_trivia꞉ Whitespace): " " # (176..177) - (open_brace꞉ OpenBrace): "{" # (177..178) - (statements꞉ Statements): [] # (178..178) - - (LeadingTrivia) ► (Whitespace): " " # (178..179) + - (leading_trivia꞉ Whitespace): " " # (178..179) - (close_brace꞉ CloseBrace): "}" # (179..180) - - (TrailingTrivia) ► (EndOfLine): "\n" # (180..181) + - (trailing_trivia꞉ EndOfLine): "\n" # (180..181) - (item꞉ SourceUnitMember) ► (variant꞉ ErrorDefinition): # "\nerror E1(string);\n" (181..200) - - (LeadingTrivia) ► (EndOfLine): "\n" # (181..182) + - (leading_trivia꞉ EndOfLine): "\n" # (181..182) - (error_keyword꞉ ErrorKeyword): "error" # (182..187) - - (LeadingTrivia) ► (Whitespace): " " # (187..188) + - (leading_trivia꞉ Whitespace): " " # (187..188) - (name꞉ Identifier): "E1" # (188..190) - (members꞉ ErrorParametersDeclaration): # "(string)" (190..198) - (open_paren꞉ OpenParen): "(" # (190..191) @@ -169,31 +169,31 @@ Tree: - (item꞉ ErrorParameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ StringKeyword): "string" # (191..197) - (close_paren꞉ CloseParen): ")" # (197..198) - (semicolon꞉ Semicolon): ";" # (198..199) - - (TrailingTrivia) ► (EndOfLine): "\n" # (199..200) + - (trailing_trivia꞉ EndOfLine): "\n" # (199..200) - (item꞉ SourceUnitMember) ► (variant꞉ UserDefinedValueTypeDefinition): # "\ntype T is bool;\n" (200..217) - - (LeadingTrivia) ► (EndOfLine): "\n" # (200..201) + - (leading_trivia꞉ EndOfLine): "\n" # (200..201) - (type_keyword꞉ TypeKeyword): "type" # (201..205) - - (LeadingTrivia) ► (Whitespace): " " # (205..206) + - (leading_trivia꞉ Whitespace): " " # (205..206) - (name꞉ Identifier): "T" # (206..207) - - (LeadingTrivia) ► (Whitespace): " " # (207..208) + - (leading_trivia꞉ Whitespace): " " # (207..208) - (is_keyword꞉ IsKeyword): "is" # (208..210) - (value_type꞉ ElementaryType): # " bool" (210..215) - - (LeadingTrivia) ► (Whitespace): " " # (210..211) + - (leading_trivia꞉ Whitespace): " " # (210..211) - (variant꞉ BoolKeyword): "bool" # (211..215) - (semicolon꞉ Semicolon): ";" # (215..216) - - (TrailingTrivia) ► (EndOfLine): "\n" # (216..217) + - (trailing_trivia꞉ EndOfLine): "\n" # (216..217) - (item꞉ SourceUnitMember) ► (variant꞉ EventDefinition): # "\nevent E1(uint256 value);\n" (217..243) - - (LeadingTrivia) ► (EndOfLine): "\n" # (217..218) + - (leading_trivia꞉ EndOfLine): "\n" # (217..218) - (event_keyword꞉ EventKeyword): "event" # (218..223) - - (LeadingTrivia) ► (Whitespace): " " # (223..224) + - (leading_trivia꞉ Whitespace): " " # (223..224) - (name꞉ Identifier): "E1" # (224..226) - (parameters꞉ EventParametersDeclaration): # "(uint256 value)" (226..241) - (open_paren꞉ OpenParen): "(" # (226..227) - (parameters꞉ EventParameters): # "uint256 value" (227..240) - (item꞉ EventParameter): # "uint256 value" (227..240) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (227..234) - - (LeadingTrivia) ► (Whitespace): " " # (234..235) + - (leading_trivia꞉ Whitespace): " " # (234..235) - (name꞉ Identifier): "value" # (235..240) - (close_paren꞉ CloseParen): ")" # (240..241) - (semicolon꞉ Semicolon): ";" # (241..242) - - (TrailingTrivia) ► (EndOfLine): "\n" # (242..243) + - (trailing_trivia꞉ EndOfLine): "\n" # (242..243) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.4-failure.yml index 1e4526d7a1..591df0284e 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.4-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.4-failure.yml @@ -45,25 +45,25 @@ Tree: - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "pragma solidity 0.0.0;\n" (0..23) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (0..6) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity 0.0.0" (6..21) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (7..15) - (expressions꞉ VersionPragmaExpressions): # " 0.0.0" (15..21) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.0.0" (15..21) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (item꞉ VersionPragmaValue): "0" # (16..17) - (separator꞉ Period): "." # (17..18) - (item꞉ VersionPragmaValue): "0" # (18..19) - (separator꞉ Period): "." # (19..20) - (item꞉ VersionPragmaValue): "0" # (20..21) - (semicolon꞉ Semicolon): ";" # (21..22) - - (TrailingTrivia) ► (EndOfLine): "\n" # (22..23) + - (trailing_trivia꞉ EndOfLine): "\n" # (22..23) - (item꞉ SourceUnitMember) ► (variant꞉ ImportDirective): # '\nimport "foo.sol";\n' (23..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (23..24) + - (leading_trivia꞉ EndOfLine): "\n" # (23..24) - (import_keyword꞉ ImportKeyword): "import" # (24..30) - (clause꞉ ImportClause) ► (variant꞉ PathImport) ► (path꞉ StringLiteral): # ' "foo.sol"' (30..40) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (variant꞉ DoubleQuotedStringLiteral): '"foo.sol"' # (31..40) - (semicolon꞉ Semicolon): ";" # (40..41) - - (TrailingTrivia) ► (EndOfLine): "\n" # (41..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (42..43) + - (trailing_trivia꞉ EndOfLine): "\n" # (41..42) + - (leading_trivia꞉ EndOfLine): "\n" # (42..43) - (SKIPPED): "using A for B;\n\ncontract C { }\n\ninterface I { }\n\nl..." # (43..243) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.8-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.8-failure.yml index bee9d3ebcb..ab90aa1113 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.8-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.8-failure.yml @@ -45,25 +45,25 @@ Tree: - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "pragma solidity 0.0.0;\n" (0..23) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (0..6) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity 0.0.0" (6..21) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (7..15) - (expressions꞉ VersionPragmaExpressions): # " 0.0.0" (15..21) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.0.0" (15..21) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (item꞉ VersionPragmaValue): "0" # (16..17) - (separator꞉ Period): "." # (17..18) - (item꞉ VersionPragmaValue): "0" # (18..19) - (separator꞉ Period): "." # (19..20) - (item꞉ VersionPragmaValue): "0" # (20..21) - (semicolon꞉ Semicolon): ";" # (21..22) - - (TrailingTrivia) ► (EndOfLine): "\n" # (22..23) + - (trailing_trivia꞉ EndOfLine): "\n" # (22..23) - (item꞉ SourceUnitMember) ► (variant꞉ ImportDirective): # '\nimport "foo.sol";\n' (23..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (23..24) + - (leading_trivia꞉ EndOfLine): "\n" # (23..24) - (import_keyword꞉ ImportKeyword): "import" # (24..30) - (clause꞉ ImportClause) ► (variant꞉ PathImport) ► (path꞉ StringLiteral): # ' "foo.sol"' (30..40) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (variant꞉ DoubleQuotedStringLiteral): '"foo.sol"' # (31..40) - (semicolon꞉ Semicolon): ";" # (40..41) - - (TrailingTrivia) ► (EndOfLine): "\n" # (41..42) - - (LeadingTrivia) ► (EndOfLine): "\n" # (42..43) + - (trailing_trivia꞉ EndOfLine): "\n" # (41..42) + - (leading_trivia꞉ EndOfLine): "\n" # (42..43) - (SKIPPED): "using A for B;\n\ncontract C { }\n\ninterface I { }\n\nl..." # (43..243) diff --git a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/multi_line/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_multi_line/generated/0.4.11-success.yml similarity index 55% rename from crates/solidity/testing/snapshots/cst_output/LeadingTrivia/multi_line/generated/0.4.11-success.yml rename to crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_multi_line/generated/0.4.11-success.yml index 13768b462f..d023b5b51a 100644 --- a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/multi_line/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_multi_line/generated/0.4.11-success.yml @@ -7,6 +7,7 @@ Source: > Errors: [] Tree: - - (LeadingTrivia): # "/* multi-line\n comment */\n" (0..28) - - (MultiLineComment): "/* multi-line\n comment */" # (0..27) - - (EndOfLine): "\n" # (27..28) + - (SourceUnit): # "/* multi-line\n comment */\n" (0..28) + - (members꞉ SourceUnitMembers): [] # (0..0) + - (leading_trivia꞉ MultiLineComment): "/* multi-line\n comment */" # (0..27) + - (leading_trivia꞉ EndOfLine): "\n" # (27..28) diff --git a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/multi_line/input.sol b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_multi_line/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/LeadingTrivia/multi_line/input.sol rename to crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_multi_line/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/multi_line_natspec_comment/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_multi_line_natspec_comment/generated/0.4.11-success.yml similarity index 63% rename from crates/solidity/testing/snapshots/cst_output/LeadingTrivia/multi_line_natspec_comment/generated/0.4.11-success.yml rename to crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_multi_line_natspec_comment/generated/0.4.11-success.yml index d0ecd48bb6..f83cd5fa88 100644 --- a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/multi_line_natspec_comment/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_multi_line_natspec_comment/generated/0.4.11-success.yml @@ -8,6 +8,7 @@ Source: > Errors: [] Tree: - - (LeadingTrivia): # "/**\n * @foo bar\n */\n" (0..20) - - (MultiLineNatSpecComment): "/**\n * @foo bar\n */" # (0..19) - - (EndOfLine): "\n" # (19..20) + - (SourceUnit): # "/**\n * @foo bar\n */\n" (0..20) + - (members꞉ SourceUnitMembers): [] # (0..0) + - (leading_trivia꞉ MultiLineNatSpecComment): "/**\n * @foo bar\n */" # (0..19) + - (leading_trivia꞉ EndOfLine): "\n" # (19..20) diff --git a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/multi_line_natspec_comment/input.sol b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_multi_line_natspec_comment/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/LeadingTrivia/multi_line_natspec_comment/input.sol rename to crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_multi_line_natspec_comment/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_multi_line_trailing_double_star/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_multi_line_trailing_double_star/generated/0.4.11-success.yml new file mode 100644 index 0000000000..1a6d7547c3 --- /dev/null +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_multi_line_trailing_double_star/generated/0.4.11-success.yml @@ -0,0 +1,12 @@ +# This file is generated automatically by infrastructure scripts. Please don't edit by hand. + +Source: > + 1 │ /* multi-line comment **/ │ 0..25 + +Errors: [] + +Tree: + - (SourceUnit): # "/* multi-line comment **/\n" (0..26) + - (members꞉ SourceUnitMembers): [] # (0..0) + - (leading_trivia꞉ MultiLineComment): "/* multi-line comment **/" # (0..25) + - (leading_trivia꞉ EndOfLine): "\n" # (25..26) diff --git a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/multi_line_trailing_double_star/input.sol b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_multi_line_trailing_double_star/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/LeadingTrivia/multi_line_trailing_double_star/input.sol rename to crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_multi_line_trailing_double_star/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/new_line/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_new_line/generated/0.4.11-success.yml similarity index 61% rename from crates/solidity/testing/snapshots/cst_output/LeadingTrivia/new_line/generated/0.4.11-success.yml rename to crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_new_line/generated/0.4.11-success.yml index 3ef89ea114..1b13d40f59 100644 --- a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/new_line/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_new_line/generated/0.4.11-success.yml @@ -6,4 +6,6 @@ Source: > Errors: [] Tree: - - (LeadingTrivia) ► (EndOfLine): "\n" # (0..1) + - (SourceUnit): # "\n" (0..1) + - (members꞉ SourceUnitMembers): [] # (0..0) + - (leading_trivia꞉ EndOfLine): "\n" # (0..1) diff --git a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/new_line/input.sol b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_new_line/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/LeadingTrivia/new_line/input.sol rename to crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_new_line/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_single_line_comment/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_single_line_comment/generated/0.4.11-success.yml new file mode 100644 index 0000000000..ec93f783bf --- /dev/null +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_single_line_comment/generated/0.4.11-success.yml @@ -0,0 +1,12 @@ +# This file is generated automatically by infrastructure scripts. Please don't edit by hand. + +Source: > + 1 │ // single line │ 0..14 + +Errors: [] + +Tree: + - (SourceUnit): # "// single line\n" (0..15) + - (members꞉ SourceUnitMembers): [] # (0..0) + - (leading_trivia꞉ SingleLineComment): "// single line" # (0..14) + - (leading_trivia꞉ EndOfLine): "\n" # (14..15) diff --git a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/single_line_comment/input.sol b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_single_line_comment/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/LeadingTrivia/single_line_comment/input.sol rename to crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_single_line_comment/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_single_line_natspec_comment/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_single_line_natspec_comment/generated/0.4.11-success.yml new file mode 100644 index 0000000000..37c5b917e9 --- /dev/null +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_single_line_natspec_comment/generated/0.4.11-success.yml @@ -0,0 +1,12 @@ +# This file is generated automatically by infrastructure scripts. Please don't edit by hand. + +Source: > + 1 │ /// foo bar │ 0..11 + +Errors: [] + +Tree: + - (SourceUnit): # "/// foo bar\n" (0..12) + - (members꞉ SourceUnitMembers): [] # (0..0) + - (leading_trivia꞉ SingleLineNatSpecComment): "/// foo bar" # (0..11) + - (leading_trivia꞉ EndOfLine): "\n" # (11..12) diff --git a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/single_line_natspec_comment/input.sol b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_single_line_natspec_comment/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/LeadingTrivia/single_line_natspec_comment/input.sol rename to crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_single_line_natspec_comment/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/whitespace/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_whitespace/generated/0.4.11-success.yml similarity index 61% rename from crates/solidity/testing/snapshots/cst_output/LeadingTrivia/whitespace/generated/0.4.11-success.yml rename to crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_whitespace/generated/0.4.11-success.yml index 67f0a06814..17816fb1d5 100644 --- a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/whitespace/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_whitespace/generated/0.4.11-success.yml @@ -6,4 +6,6 @@ Source: > Errors: [] Tree: - - (LeadingTrivia) ► (Whitespace): " " # (0..3) + - (SourceUnit): # " " (0..3) + - (members꞉ SourceUnitMembers): [] # (0..0) + - (leading_trivia꞉ Whitespace): " " # (0..3) diff --git a/crates/solidity/testing/snapshots/cst_output/LeadingTrivia/whitespace/input.sol b/crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_whitespace/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/LeadingTrivia/whitespace/input.sol rename to crates/solidity/testing/snapshots/cst_output/SourceUnit/leading_trivia_whitespace/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/partial_definition/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/partial_definition/generated/0.4.11-failure.yml index 325a554222..638362b640 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/partial_definition/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/partial_definition/generated/0.4.11-failure.yml @@ -19,13 +19,13 @@ Tree: - (members꞉ SourceUnitMembers): # "contract Sample {\n function" (0..28) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract Sample {\n function" (0..28) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (open_brace꞉ OpenBrace): "{" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (members꞉ ContractMembers): # " function" (18..28) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function" (18..28) - - (LeadingTrivia) ► (Whitespace): " " # (18..20) + - (leading_trivia꞉ Whitespace): " " # (18..20) - (function_keyword꞉ FunctionKeyword): "function" # (20..28) - (SKIPPED): "" # (28..28) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.4.11-failure.yml index afe82d3241..fe4ed6a01b 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.4.11-failure.yml @@ -27,65 +27,65 @@ Tree: - (SourceUnit) ► (members꞉ SourceUnitMembers): # "library SafeMath {\n function tryAdd(uint256 a, ui..." (0..212) - (item꞉ SourceUnitMember) ► (variant꞉ LibraryDefinition): # "library SafeMath {\n function tryAdd(uint256 a, ui..." (0..212) - (library_keyword꞉ LibraryKeyword): "library" # (0..7) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (name꞉ Identifier): "SafeMath" # (8..16) - - (LeadingTrivia) ► (Whitespace): " " # (16..17) + - (leading_trivia꞉ Whitespace): " " # (16..17) - (open_brace꞉ OpenBrace): "{" # (17..18) - - (TrailingTrivia) ► (EndOfLine): "\n" # (18..19) + - (trailing_trivia꞉ EndOfLine): "\n" # (18..19) - (members꞉ LibraryMembers): # " function tryAdd(uint256 a, uint256 b) internal p..." (19..210) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function tryAdd(uint256 a, uint256 b) internal p..." (19..210) - - (LeadingTrivia) ► (Whitespace): " " # (19..21) + - (leading_trivia꞉ Whitespace): " " # (19..21) - (function_keyword꞉ FunctionKeyword): "function" # (21..29) - (name꞉ FunctionName): # " tryAdd" (29..36) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (variant꞉ Identifier): "tryAdd" # (30..36) - (parameters꞉ ParametersDeclaration): # "(uint256 a, uint256 b)" (36..58) - (open_paren꞉ OpenParen): "(" # (36..37) - (parameters꞉ Parameters): # "uint256 a, uint256 b" (37..57) - (item꞉ Parameter): # "uint256 a" (37..46) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (37..44) - - (LeadingTrivia) ► (Whitespace): " " # (44..45) + - (leading_trivia꞉ Whitespace): " " # (44..45) - (name꞉ Identifier): "a" # (45..46) - (separator꞉ Comma): "," # (46..47) - (item꞉ Parameter): # " uint256 b" (47..57) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (47..55) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (variant꞉ UintKeyword): "uint256" # (48..55) - - (LeadingTrivia) ► (Whitespace): " " # (55..56) + - (leading_trivia꞉ Whitespace): " " # (55..56) - (name꞉ Identifier): "b" # (56..57) - (close_paren꞉ CloseParen): ")" # (57..58) - (attributes꞉ FunctionAttributes): # " internal pure" (58..72) - (item꞉ FunctionAttribute): # " internal" (58..67) - - (LeadingTrivia) ► (Whitespace): " " # (58..59) + - (leading_trivia꞉ Whitespace): " " # (58..59) - (variant꞉ InternalKeyword): "internal" # (59..67) - (item꞉ FunctionAttribute): # " pure" (67..72) - - (LeadingTrivia) ► (Whitespace): " " # (67..68) + - (leading_trivia꞉ Whitespace): " " # (67..68) - (variant꞉ PureKeyword): "pure" # (68..72) - (returns꞉ ReturnsDeclaration): # " returns (bool, uint256)" (72..96) - - (LeadingTrivia) ► (Whitespace): " " # (72..73) + - (leading_trivia꞉ Whitespace): " " # (72..73) - (returns_keyword꞉ ReturnsKeyword): "returns" # (73..80) - (variables꞉ ParametersDeclaration): # " (bool, uint256)" (80..96) - - (LeadingTrivia) ► (Whitespace): " " # (80..81) + - (leading_trivia꞉ Whitespace): " " # (80..81) - (open_paren꞉ OpenParen): "(" # (81..82) - (parameters꞉ Parameters): # "bool, uint256" (82..95) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ BoolKeyword): "bool" # (82..86) - (separator꞉ Comma): "," # (86..87) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (87..95) - - (LeadingTrivia) ► (Whitespace): " " # (87..88) + - (leading_trivia꞉ Whitespace): " " # (87..88) - (variant꞉ UintKeyword): "uint256" # (88..95) - (close_paren꞉ CloseParen): ")" # (95..96) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n unchecked {\n uint256 c = a + b;\n ..." (96..210) - - (LeadingTrivia) ► (Whitespace): " " # (96..97) + - (leading_trivia꞉ Whitespace): " " # (96..97) - (open_brace꞉ OpenBrace): "{" # (97..98) - - (TrailingTrivia) ► (EndOfLine): "\n" # (98..99) + - (trailing_trivia꞉ EndOfLine): "\n" # (98..99) - (statements꞉ Statements): # " unchecked " (99..113) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " unchecked " (99..113) - (expression꞉ Expression): # " unchecked" (99..112) - - (LeadingTrivia) ► (Whitespace): " " # (99..103) + - (leading_trivia꞉ Whitespace): " " # (99..103) - (variant꞉ Identifier): "unchecked" # (103..112) - - (LeadingTrivia) ► (Whitespace): " " # (112..113) + - (leading_trivia꞉ Whitespace): " " # (112..113) - (SKIPPED): "{\n uint256 c = a + b;\n if (c < a) return..." # (113..208) - (close_brace꞉ CloseBrace): "}" # (208..209) - - (TrailingTrivia) ► (EndOfLine): "\n" # (209..210) + - (trailing_trivia꞉ EndOfLine): "\n" # (209..210) - (close_brace꞉ CloseBrace): "}" # (210..211) - - (TrailingTrivia) ► (EndOfLine): "\n" # (211..212) + - (trailing_trivia꞉ EndOfLine): "\n" # (211..212) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.5.0-failure.yml index 43e47c66dc..8f115486f9 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.5.0-failure.yml @@ -27,61 +27,61 @@ Tree: - (SourceUnit) ► (members꞉ SourceUnitMembers): # "library SafeMath {\n function tryAdd(uint256 a, ui..." (0..212) - (item꞉ SourceUnitMember) ► (variant꞉ LibraryDefinition): # "library SafeMath {\n function tryAdd(uint256 a, ui..." (0..212) - (library_keyword꞉ LibraryKeyword): "library" # (0..7) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (name꞉ Identifier): "SafeMath" # (8..16) - - (LeadingTrivia) ► (Whitespace): " " # (16..17) + - (leading_trivia꞉ Whitespace): " " # (16..17) - (open_brace꞉ OpenBrace): "{" # (17..18) - - (TrailingTrivia) ► (EndOfLine): "\n" # (18..19) + - (trailing_trivia꞉ EndOfLine): "\n" # (18..19) - (members꞉ LibraryMembers): # " function tryAdd(uint256 a, uint256 b) internal p..." (19..210) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function tryAdd(uint256 a, uint256 b) internal p..." (19..210) - - (LeadingTrivia) ► (Whitespace): " " # (19..21) + - (leading_trivia꞉ Whitespace): " " # (19..21) - (function_keyword꞉ FunctionKeyword): "function" # (21..29) - (name꞉ FunctionName): # " tryAdd" (29..36) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (variant꞉ Identifier): "tryAdd" # (30..36) - (parameters꞉ ParametersDeclaration): # "(uint256 a, uint256 b)" (36..58) - (open_paren꞉ OpenParen): "(" # (36..37) - (parameters꞉ Parameters): # "uint256 a, uint256 b" (37..57) - (item꞉ Parameter): # "uint256 a" (37..46) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (37..44) - - (LeadingTrivia) ► (Whitespace): " " # (44..45) + - (leading_trivia꞉ Whitespace): " " # (44..45) - (name꞉ Identifier): "a" # (45..46) - (separator꞉ Comma): "," # (46..47) - (item꞉ Parameter): # " uint256 b" (47..57) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (47..55) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (variant꞉ UintKeyword): "uint256" # (48..55) - - (LeadingTrivia) ► (Whitespace): " " # (55..56) + - (leading_trivia꞉ Whitespace): " " # (55..56) - (name꞉ Identifier): "b" # (56..57) - (close_paren꞉ CloseParen): ")" # (57..58) - (attributes꞉ FunctionAttributes): # " internal pure" (58..72) - (item꞉ FunctionAttribute): # " internal" (58..67) - - (LeadingTrivia) ► (Whitespace): " " # (58..59) + - (leading_trivia꞉ Whitespace): " " # (58..59) - (variant꞉ InternalKeyword): "internal" # (59..67) - (item꞉ FunctionAttribute): # " pure" (67..72) - - (LeadingTrivia) ► (Whitespace): " " # (67..68) + - (leading_trivia꞉ Whitespace): " " # (67..68) - (variant꞉ PureKeyword): "pure" # (68..72) - (returns꞉ ReturnsDeclaration): # " returns (bool, uint256)" (72..96) - - (LeadingTrivia) ► (Whitespace): " " # (72..73) + - (leading_trivia꞉ Whitespace): " " # (72..73) - (returns_keyword꞉ ReturnsKeyword): "returns" # (73..80) - (variables꞉ ParametersDeclaration): # " (bool, uint256)" (80..96) - - (LeadingTrivia) ► (Whitespace): " " # (80..81) + - (leading_trivia꞉ Whitespace): " " # (80..81) - (open_paren꞉ OpenParen): "(" # (81..82) - (parameters꞉ Parameters): # "bool, uint256" (82..95) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ BoolKeyword): "bool" # (82..86) - (separator꞉ Comma): "," # (86..87) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (87..95) - - (LeadingTrivia) ► (Whitespace): " " # (87..88) + - (leading_trivia꞉ Whitespace): " " # (87..88) - (variant꞉ UintKeyword): "uint256" # (88..95) - (close_paren꞉ CloseParen): ")" # (95..96) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n unchecked {\n uint256 c = a + b;\n ..." (96..210) - - (LeadingTrivia) ► (Whitespace): " " # (96..97) + - (leading_trivia꞉ Whitespace): " " # (96..97) - (open_brace꞉ OpenBrace): "{" # (97..98) - - (TrailingTrivia) ► (EndOfLine): "\n" # (98..99) + - (trailing_trivia꞉ EndOfLine): "\n" # (98..99) - (statements꞉ Statements): [] # (99..99) - - (LeadingTrivia) ► (Whitespace): " " # (99..103) + - (leading_trivia꞉ Whitespace): " " # (99..103) - (SKIPPED): "unchecked {\n uint256 c = a + b;\n if (c <..." # (103..208) - (close_brace꞉ CloseBrace): "}" # (208..209) - - (TrailingTrivia) ► (EndOfLine): "\n" # (209..210) + - (trailing_trivia꞉ EndOfLine): "\n" # (209..210) - (close_brace꞉ CloseBrace): "}" # (210..211) - - (TrailingTrivia) ► (EndOfLine): "\n" # (211..212) + - (trailing_trivia꞉ EndOfLine): "\n" # (211..212) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.5.3-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.5.3-failure.yml index 3d3866ea7a..56c13132fb 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.5.3-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.5.3-failure.yml @@ -27,61 +27,61 @@ Tree: - (SourceUnit) ► (members꞉ SourceUnitMembers): # "library SafeMath {\n function tryAdd(uint256 a, ui..." (0..212) - (item꞉ SourceUnitMember) ► (variant꞉ LibraryDefinition): # "library SafeMath {\n function tryAdd(uint256 a, ui..." (0..212) - (library_keyword꞉ LibraryKeyword): "library" # (0..7) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (name꞉ Identifier): "SafeMath" # (8..16) - - (LeadingTrivia) ► (Whitespace): " " # (16..17) + - (leading_trivia꞉ Whitespace): " " # (16..17) - (open_brace꞉ OpenBrace): "{" # (17..18) - - (TrailingTrivia) ► (EndOfLine): "\n" # (18..19) + - (trailing_trivia꞉ EndOfLine): "\n" # (18..19) - (members꞉ LibraryMembers): # " function tryAdd(uint256 a, uint256 b) internal p..." (19..210) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function tryAdd(uint256 a, uint256 b) internal p..." (19..210) - - (LeadingTrivia) ► (Whitespace): " " # (19..21) + - (leading_trivia꞉ Whitespace): " " # (19..21) - (function_keyword꞉ FunctionKeyword): "function" # (21..29) - (name꞉ FunctionName): # " tryAdd" (29..36) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (variant꞉ Identifier): "tryAdd" # (30..36) - (parameters꞉ ParametersDeclaration): # "(uint256 a, uint256 b)" (36..58) - (open_paren꞉ OpenParen): "(" # (36..37) - (parameters꞉ Parameters): # "uint256 a, uint256 b" (37..57) - (item꞉ Parameter): # "uint256 a" (37..46) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (37..44) - - (LeadingTrivia) ► (Whitespace): " " # (44..45) + - (leading_trivia꞉ Whitespace): " " # (44..45) - (name꞉ Identifier): "a" # (45..46) - (separator꞉ Comma): "," # (46..47) - (item꞉ Parameter): # " uint256 b" (47..57) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (47..55) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (variant꞉ UintKeyword): "uint256" # (48..55) - - (LeadingTrivia) ► (Whitespace): " " # (55..56) + - (leading_trivia꞉ Whitespace): " " # (55..56) - (name꞉ Identifier): "b" # (56..57) - (close_paren꞉ CloseParen): ")" # (57..58) - (attributes꞉ FunctionAttributes): # " internal pure" (58..72) - (item꞉ FunctionAttribute): # " internal" (58..67) - - (LeadingTrivia) ► (Whitespace): " " # (58..59) + - (leading_trivia꞉ Whitespace): " " # (58..59) - (variant꞉ InternalKeyword): "internal" # (59..67) - (item꞉ FunctionAttribute): # " pure" (67..72) - - (LeadingTrivia) ► (Whitespace): " " # (67..68) + - (leading_trivia꞉ Whitespace): " " # (67..68) - (variant꞉ PureKeyword): "pure" # (68..72) - (returns꞉ ReturnsDeclaration): # " returns (bool, uint256)" (72..96) - - (LeadingTrivia) ► (Whitespace): " " # (72..73) + - (leading_trivia꞉ Whitespace): " " # (72..73) - (returns_keyword꞉ ReturnsKeyword): "returns" # (73..80) - (variables꞉ ParametersDeclaration): # " (bool, uint256)" (80..96) - - (LeadingTrivia) ► (Whitespace): " " # (80..81) + - (leading_trivia꞉ Whitespace): " " # (80..81) - (open_paren꞉ OpenParen): "(" # (81..82) - (parameters꞉ Parameters): # "bool, uint256" (82..95) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ BoolKeyword): "bool" # (82..86) - (separator꞉ Comma): "," # (86..87) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (87..95) - - (LeadingTrivia) ► (Whitespace): " " # (87..88) + - (leading_trivia꞉ Whitespace): " " # (87..88) - (variant꞉ UintKeyword): "uint256" # (88..95) - (close_paren꞉ CloseParen): ")" # (95..96) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n unchecked {\n uint256 c = a + b;\n ..." (96..210) - - (LeadingTrivia) ► (Whitespace): " " # (96..97) + - (leading_trivia꞉ Whitespace): " " # (96..97) - (open_brace꞉ OpenBrace): "{" # (97..98) - - (TrailingTrivia) ► (EndOfLine): "\n" # (98..99) + - (trailing_trivia꞉ EndOfLine): "\n" # (98..99) - (statements꞉ Statements): [] # (99..99) - - (LeadingTrivia) ► (Whitespace): " " # (99..103) + - (leading_trivia꞉ Whitespace): " " # (99..103) - (SKIPPED): "unchecked {\n uint256 c = a + b;\n if (c <..." # (103..208) - (close_brace꞉ CloseBrace): "}" # (208..209) - - (TrailingTrivia) ► (EndOfLine): "\n" # (209..210) + - (trailing_trivia꞉ EndOfLine): "\n" # (209..210) - (close_brace꞉ CloseBrace): "}" # (210..211) - - (TrailingTrivia) ► (EndOfLine): "\n" # (211..212) + - (trailing_trivia꞉ EndOfLine): "\n" # (211..212) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.6.0-failure.yml index 2f74cb1ca9..89cc3643b9 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.6.0-failure.yml @@ -27,61 +27,61 @@ Tree: - (SourceUnit) ► (members꞉ SourceUnitMembers): # "library SafeMath {\n function tryAdd(uint256 a, ui..." (0..212) - (item꞉ SourceUnitMember) ► (variant꞉ LibraryDefinition): # "library SafeMath {\n function tryAdd(uint256 a, ui..." (0..212) - (library_keyword꞉ LibraryKeyword): "library" # (0..7) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (name꞉ Identifier): "SafeMath" # (8..16) - - (LeadingTrivia) ► (Whitespace): " " # (16..17) + - (leading_trivia꞉ Whitespace): " " # (16..17) - (open_brace꞉ OpenBrace): "{" # (17..18) - - (TrailingTrivia) ► (EndOfLine): "\n" # (18..19) + - (trailing_trivia꞉ EndOfLine): "\n" # (18..19) - (members꞉ LibraryMembers): # " function tryAdd(uint256 a, uint256 b) internal p..." (19..210) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function tryAdd(uint256 a, uint256 b) internal p..." (19..210) - - (LeadingTrivia) ► (Whitespace): " " # (19..21) + - (leading_trivia꞉ Whitespace): " " # (19..21) - (function_keyword꞉ FunctionKeyword): "function" # (21..29) - (name꞉ FunctionName): # " tryAdd" (29..36) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (variant꞉ Identifier): "tryAdd" # (30..36) - (parameters꞉ ParametersDeclaration): # "(uint256 a, uint256 b)" (36..58) - (open_paren꞉ OpenParen): "(" # (36..37) - (parameters꞉ Parameters): # "uint256 a, uint256 b" (37..57) - (item꞉ Parameter): # "uint256 a" (37..46) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (37..44) - - (LeadingTrivia) ► (Whitespace): " " # (44..45) + - (leading_trivia꞉ Whitespace): " " # (44..45) - (name꞉ Identifier): "a" # (45..46) - (separator꞉ Comma): "," # (46..47) - (item꞉ Parameter): # " uint256 b" (47..57) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (47..55) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (variant꞉ UintKeyword): "uint256" # (48..55) - - (LeadingTrivia) ► (Whitespace): " " # (55..56) + - (leading_trivia꞉ Whitespace): " " # (55..56) - (name꞉ Identifier): "b" # (56..57) - (close_paren꞉ CloseParen): ")" # (57..58) - (attributes꞉ FunctionAttributes): # " internal pure" (58..72) - (item꞉ FunctionAttribute): # " internal" (58..67) - - (LeadingTrivia) ► (Whitespace): " " # (58..59) + - (leading_trivia꞉ Whitespace): " " # (58..59) - (variant꞉ InternalKeyword): "internal" # (59..67) - (item꞉ FunctionAttribute): # " pure" (67..72) - - (LeadingTrivia) ► (Whitespace): " " # (67..68) + - (leading_trivia꞉ Whitespace): " " # (67..68) - (variant꞉ PureKeyword): "pure" # (68..72) - (returns꞉ ReturnsDeclaration): # " returns (bool, uint256)" (72..96) - - (LeadingTrivia) ► (Whitespace): " " # (72..73) + - (leading_trivia꞉ Whitespace): " " # (72..73) - (returns_keyword꞉ ReturnsKeyword): "returns" # (73..80) - (variables꞉ ParametersDeclaration): # " (bool, uint256)" (80..96) - - (LeadingTrivia) ► (Whitespace): " " # (80..81) + - (leading_trivia꞉ Whitespace): " " # (80..81) - (open_paren꞉ OpenParen): "(" # (81..82) - (parameters꞉ Parameters): # "bool, uint256" (82..95) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ BoolKeyword): "bool" # (82..86) - (separator꞉ Comma): "," # (86..87) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (87..95) - - (LeadingTrivia) ► (Whitespace): " " # (87..88) + - (leading_trivia꞉ Whitespace): " " # (87..88) - (variant꞉ UintKeyword): "uint256" # (88..95) - (close_paren꞉ CloseParen): ")" # (95..96) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n unchecked {\n uint256 c = a + b;\n ..." (96..210) - - (LeadingTrivia) ► (Whitespace): " " # (96..97) + - (leading_trivia꞉ Whitespace): " " # (96..97) - (open_brace꞉ OpenBrace): "{" # (97..98) - - (TrailingTrivia) ► (EndOfLine): "\n" # (98..99) + - (trailing_trivia꞉ EndOfLine): "\n" # (98..99) - (statements꞉ Statements): [] # (99..99) - - (LeadingTrivia) ► (Whitespace): " " # (99..103) + - (leading_trivia꞉ Whitespace): " " # (99..103) - (SKIPPED): "unchecked {\n uint256 c = a + b;\n if (c <..." # (103..208) - (close_brace꞉ CloseBrace): "}" # (208..209) - - (TrailingTrivia) ► (EndOfLine): "\n" # (209..210) + - (trailing_trivia꞉ EndOfLine): "\n" # (209..210) - (close_brace꞉ CloseBrace): "}" # (210..211) - - (TrailingTrivia) ► (EndOfLine): "\n" # (211..212) + - (trailing_trivia꞉ EndOfLine): "\n" # (211..212) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.7.0-failure.yml index a3ce5b6e66..c56ae87f7b 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.7.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.7.0-failure.yml @@ -27,61 +27,61 @@ Tree: - (SourceUnit) ► (members꞉ SourceUnitMembers): # "library SafeMath {\n function tryAdd(uint256 a, ui..." (0..212) - (item꞉ SourceUnitMember) ► (variant꞉ LibraryDefinition): # "library SafeMath {\n function tryAdd(uint256 a, ui..." (0..212) - (library_keyword꞉ LibraryKeyword): "library" # (0..7) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (name꞉ Identifier): "SafeMath" # (8..16) - - (LeadingTrivia) ► (Whitespace): " " # (16..17) + - (leading_trivia꞉ Whitespace): " " # (16..17) - (open_brace꞉ OpenBrace): "{" # (17..18) - - (TrailingTrivia) ► (EndOfLine): "\n" # (18..19) + - (trailing_trivia꞉ EndOfLine): "\n" # (18..19) - (members꞉ LibraryMembers): # " function tryAdd(uint256 a, uint256 b) internal p..." (19..210) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function tryAdd(uint256 a, uint256 b) internal p..." (19..210) - - (LeadingTrivia) ► (Whitespace): " " # (19..21) + - (leading_trivia꞉ Whitespace): " " # (19..21) - (function_keyword꞉ FunctionKeyword): "function" # (21..29) - (name꞉ FunctionName): # " tryAdd" (29..36) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (variant꞉ Identifier): "tryAdd" # (30..36) - (parameters꞉ ParametersDeclaration): # "(uint256 a, uint256 b)" (36..58) - (open_paren꞉ OpenParen): "(" # (36..37) - (parameters꞉ Parameters): # "uint256 a, uint256 b" (37..57) - (item꞉ Parameter): # "uint256 a" (37..46) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (37..44) - - (LeadingTrivia) ► (Whitespace): " " # (44..45) + - (leading_trivia꞉ Whitespace): " " # (44..45) - (name꞉ Identifier): "a" # (45..46) - (separator꞉ Comma): "," # (46..47) - (item꞉ Parameter): # " uint256 b" (47..57) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (47..55) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (variant꞉ UintKeyword): "uint256" # (48..55) - - (LeadingTrivia) ► (Whitespace): " " # (55..56) + - (leading_trivia꞉ Whitespace): " " # (55..56) - (name꞉ Identifier): "b" # (56..57) - (close_paren꞉ CloseParen): ")" # (57..58) - (attributes꞉ FunctionAttributes): # " internal pure" (58..72) - (item꞉ FunctionAttribute): # " internal" (58..67) - - (LeadingTrivia) ► (Whitespace): " " # (58..59) + - (leading_trivia꞉ Whitespace): " " # (58..59) - (variant꞉ InternalKeyword): "internal" # (59..67) - (item꞉ FunctionAttribute): # " pure" (67..72) - - (LeadingTrivia) ► (Whitespace): " " # (67..68) + - (leading_trivia꞉ Whitespace): " " # (67..68) - (variant꞉ PureKeyword): "pure" # (68..72) - (returns꞉ ReturnsDeclaration): # " returns (bool, uint256)" (72..96) - - (LeadingTrivia) ► (Whitespace): " " # (72..73) + - (leading_trivia꞉ Whitespace): " " # (72..73) - (returns_keyword꞉ ReturnsKeyword): "returns" # (73..80) - (variables꞉ ParametersDeclaration): # " (bool, uint256)" (80..96) - - (LeadingTrivia) ► (Whitespace): " " # (80..81) + - (leading_trivia꞉ Whitespace): " " # (80..81) - (open_paren꞉ OpenParen): "(" # (81..82) - (parameters꞉ Parameters): # "bool, uint256" (82..95) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ BoolKeyword): "bool" # (82..86) - (separator꞉ Comma): "," # (86..87) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (87..95) - - (LeadingTrivia) ► (Whitespace): " " # (87..88) + - (leading_trivia꞉ Whitespace): " " # (87..88) - (variant꞉ UintKeyword): "uint256" # (88..95) - (close_paren꞉ CloseParen): ")" # (95..96) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n unchecked {\n uint256 c = a + b;\n ..." (96..210) - - (LeadingTrivia) ► (Whitespace): " " # (96..97) + - (leading_trivia꞉ Whitespace): " " # (96..97) - (open_brace꞉ OpenBrace): "{" # (97..98) - - (TrailingTrivia) ► (EndOfLine): "\n" # (98..99) + - (trailing_trivia꞉ EndOfLine): "\n" # (98..99) - (statements꞉ Statements): [] # (99..99) - - (LeadingTrivia) ► (Whitespace): " " # (99..103) + - (leading_trivia꞉ Whitespace): " " # (99..103) - (SKIPPED): "unchecked {\n uint256 c = a + b;\n if (c <..." # (103..208) - (close_brace꞉ CloseBrace): "}" # (208..209) - - (TrailingTrivia) ► (EndOfLine): "\n" # (209..210) + - (trailing_trivia꞉ EndOfLine): "\n" # (209..210) - (close_brace꞉ CloseBrace): "}" # (210..211) - - (TrailingTrivia) ► (EndOfLine): "\n" # (211..212) + - (trailing_trivia꞉ EndOfLine): "\n" # (211..212) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.8.0-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.8.0-success.yml index a7fd2c494c..13bffa4441 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.8.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/safe_math/generated/0.8.0-success.yml @@ -17,134 +17,134 @@ Tree: - (SourceUnit) ► (members꞉ SourceUnitMembers): # "library SafeMath {\n function tryAdd(uint256 a, ui..." (0..212) - (item꞉ SourceUnitMember) ► (variant꞉ LibraryDefinition): # "library SafeMath {\n function tryAdd(uint256 a, ui..." (0..212) - (library_keyword꞉ LibraryKeyword): "library" # (0..7) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (name꞉ Identifier): "SafeMath" # (8..16) - - (LeadingTrivia) ► (Whitespace): " " # (16..17) + - (leading_trivia꞉ Whitespace): " " # (16..17) - (open_brace꞉ OpenBrace): "{" # (17..18) - - (TrailingTrivia) ► (EndOfLine): "\n" # (18..19) + - (trailing_trivia꞉ EndOfLine): "\n" # (18..19) - (members꞉ LibraryMembers): # " function tryAdd(uint256 a, uint256 b) internal p..." (19..210) - (item꞉ ContractMember) ► (variant꞉ FunctionDefinition): # " function tryAdd(uint256 a, uint256 b) internal p..." (19..210) - - (LeadingTrivia) ► (Whitespace): " " # (19..21) + - (leading_trivia꞉ Whitespace): " " # (19..21) - (function_keyword꞉ FunctionKeyword): "function" # (21..29) - (name꞉ FunctionName): # " tryAdd" (29..36) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (variant꞉ Identifier): "tryAdd" # (30..36) - (parameters꞉ ParametersDeclaration): # "(uint256 a, uint256 b)" (36..58) - (open_paren꞉ OpenParen): "(" # (36..37) - (parameters꞉ Parameters): # "uint256 a, uint256 b" (37..57) - (item꞉ Parameter): # "uint256 a" (37..46) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (37..44) - - (LeadingTrivia) ► (Whitespace): " " # (44..45) + - (leading_trivia꞉ Whitespace): " " # (44..45) - (name꞉ Identifier): "a" # (45..46) - (separator꞉ Comma): "," # (46..47) - (item꞉ Parameter): # " uint256 b" (47..57) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (47..55) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (variant꞉ UintKeyword): "uint256" # (48..55) - - (LeadingTrivia) ► (Whitespace): " " # (55..56) + - (leading_trivia꞉ Whitespace): " " # (55..56) - (name꞉ Identifier): "b" # (56..57) - (close_paren꞉ CloseParen): ")" # (57..58) - (attributes꞉ FunctionAttributes): # " internal pure" (58..72) - (item꞉ FunctionAttribute): # " internal" (58..67) - - (LeadingTrivia) ► (Whitespace): " " # (58..59) + - (leading_trivia꞉ Whitespace): " " # (58..59) - (variant꞉ InternalKeyword): "internal" # (59..67) - (item꞉ FunctionAttribute): # " pure" (67..72) - - (LeadingTrivia) ► (Whitespace): " " # (67..68) + - (leading_trivia꞉ Whitespace): " " # (67..68) - (variant꞉ PureKeyword): "pure" # (68..72) - (returns꞉ ReturnsDeclaration): # " returns (bool, uint256)" (72..96) - - (LeadingTrivia) ► (Whitespace): " " # (72..73) + - (leading_trivia꞉ Whitespace): " " # (72..73) - (returns_keyword꞉ ReturnsKeyword): "returns" # (73..80) - (variables꞉ ParametersDeclaration): # " (bool, uint256)" (80..96) - - (LeadingTrivia) ► (Whitespace): " " # (80..81) + - (leading_trivia꞉ Whitespace): " " # (80..81) - (open_paren꞉ OpenParen): "(" # (81..82) - (parameters꞉ Parameters): # "bool, uint256" (82..95) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ BoolKeyword): "bool" # (82..86) - (separator꞉ Comma): "," # (86..87) - (item꞉ Parameter) ► (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (87..95) - - (LeadingTrivia) ► (Whitespace): " " # (87..88) + - (leading_trivia꞉ Whitespace): " " # (87..88) - (variant꞉ UintKeyword): "uint256" # (88..95) - (close_paren꞉ CloseParen): ")" # (95..96) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {\n unchecked {\n uint256 c = a + b;\n ..." (96..210) - - (LeadingTrivia) ► (Whitespace): " " # (96..97) + - (leading_trivia꞉ Whitespace): " " # (96..97) - (open_brace꞉ OpenBrace): "{" # (97..98) - - (TrailingTrivia) ► (EndOfLine): "\n" # (98..99) + - (trailing_trivia꞉ EndOfLine): "\n" # (98..99) - (statements꞉ Statements): # " unchecked {\n uint256 c = a + b;\n if ..." (99..206) - (item꞉ Statement) ► (variant꞉ UncheckedBlock): # " unchecked {\n uint256 c = a + b;\n if ..." (99..206) - - (LeadingTrivia) ► (Whitespace): " " # (99..103) + - (leading_trivia꞉ Whitespace): " " # (99..103) - (unchecked_keyword꞉ UncheckedKeyword): "unchecked" # (103..112) - (block꞉ Block): # " {\n uint256 c = a + b;\n if (c < a) retur..." (112..206) - - (LeadingTrivia) ► (Whitespace): " " # (112..113) + - (leading_trivia꞉ Whitespace): " " # (112..113) - (open_brace꞉ OpenBrace): "{" # (113..114) - - (TrailingTrivia) ► (EndOfLine): "\n" # (114..115) + - (trailing_trivia꞉ EndOfLine): "\n" # (114..115) - (statements꞉ Statements): # " uint256 c = a + b;\n if (c < a) return (..." (115..200) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # " uint256 c = a + b;\n" (115..140) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (115..128) - - (LeadingTrivia) ► (Whitespace): " " # (115..121) + - (leading_trivia꞉ Whitespace): " " # (115..121) - (variant꞉ UintKeyword): "uint256" # (121..128) - - (LeadingTrivia) ► (Whitespace): " " # (128..129) + - (leading_trivia꞉ Whitespace): " " # (128..129) - (name꞉ Identifier): "c" # (129..130) - (value꞉ VariableDeclarationValue): # " = a + b" (130..138) - - (LeadingTrivia) ► (Whitespace): " " # (130..131) + - (leading_trivia꞉ Whitespace): " " # (130..131) - (equal꞉ Equal): "=" # (131..132) - (expression꞉ Expression) ► (variant꞉ AdditiveExpression): # " a + b" (132..138) - (left_operand꞉ Expression): # " a" (132..134) - - (LeadingTrivia) ► (Whitespace): " " # (132..133) + - (leading_trivia꞉ Whitespace): " " # (132..133) - (variant꞉ Identifier): "a" # (133..134) - - (LeadingTrivia) ► (Whitespace): " " # (134..135) + - (leading_trivia꞉ Whitespace): " " # (134..135) - (operator꞉ Plus): "+" # (135..136) - (right_operand꞉ Expression): # " b" (136..138) - - (LeadingTrivia) ► (Whitespace): " " # (136..137) + - (leading_trivia꞉ Whitespace): " " # (136..137) - (variant꞉ Identifier): "b" # (137..138) - (semicolon꞉ Semicolon): ";" # (138..139) - - (TrailingTrivia) ► (EndOfLine): "\n" # (139..140) + - (trailing_trivia꞉ EndOfLine): "\n" # (139..140) - (item꞉ Statement) ► (variant꞉ IfStatement): # " if (c < a) return (false, 0);\n" (140..176) - - (LeadingTrivia) ► (Whitespace): " " # (140..146) + - (leading_trivia꞉ Whitespace): " " # (140..146) - (if_keyword꞉ IfKeyword): "if" # (146..148) - - (LeadingTrivia) ► (Whitespace): " " # (148..149) + - (leading_trivia꞉ Whitespace): " " # (148..149) - (open_paren꞉ OpenParen): "(" # (149..150) - (condition꞉ Expression) ► (variant꞉ ComparisonExpression): # "c < a" (150..155) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "c" # (150..151) - - (LeadingTrivia) ► (Whitespace): " " # (151..152) + - (leading_trivia꞉ Whitespace): " " # (151..152) - (operator꞉ LessThan): "<" # (152..153) - (right_operand꞉ Expression): # " a" (153..155) - - (LeadingTrivia) ► (Whitespace): " " # (153..154) + - (leading_trivia꞉ Whitespace): " " # (153..154) - (variant꞉ Identifier): "a" # (154..155) - (close_paren꞉ CloseParen): ")" # (155..156) - (body꞉ Statement) ► (variant꞉ ReturnStatement): # " return (false, 0);\n" (156..176) - - (LeadingTrivia) ► (Whitespace): " " # (156..157) + - (leading_trivia꞉ Whitespace): " " # (156..157) - (return_keyword꞉ ReturnKeyword): "return" # (157..163) - (expression꞉ Expression) ► (variant꞉ TupleExpression): # " (false, 0)" (163..174) - - (LeadingTrivia) ► (Whitespace): " " # (163..164) + - (leading_trivia꞉ Whitespace): " " # (163..164) - (open_paren꞉ OpenParen): "(" # (164..165) - (items꞉ TupleValues): # "false, 0" (165..173) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ FalseKeyword): "false" # (165..170) - (separator꞉ Comma): "," # (170..171) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 0" (171..173) - - (LeadingTrivia) ► (Whitespace): " " # (171..172) + - (leading_trivia꞉ Whitespace): " " # (171..172) - (literal꞉ DecimalLiteral): "0" # (172..173) - (close_paren꞉ CloseParen): ")" # (173..174) - (semicolon꞉ Semicolon): ";" # (174..175) - - (TrailingTrivia) ► (EndOfLine): "\n" # (175..176) + - (trailing_trivia꞉ EndOfLine): "\n" # (175..176) - (item꞉ Statement) ► (variant꞉ ReturnStatement): # " return (true, c);\n" (176..200) - - (LeadingTrivia) ► (Whitespace): " " # (176..182) + - (leading_trivia꞉ Whitespace): " " # (176..182) - (return_keyword꞉ ReturnKeyword): "return" # (182..188) - (expression꞉ Expression) ► (variant꞉ TupleExpression): # " (true, c)" (188..198) - - (LeadingTrivia) ► (Whitespace): " " # (188..189) + - (leading_trivia꞉ Whitespace): " " # (188..189) - (open_paren꞉ OpenParen): "(" # (189..190) - (items꞉ TupleValues): # "true, c" (190..197) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ TrueKeyword): "true" # (190..194) - (separator꞉ Comma): "," # (194..195) - (item꞉ TupleValue) ► (expression꞉ Expression): # " c" (195..197) - - (LeadingTrivia) ► (Whitespace): " " # (195..196) + - (leading_trivia꞉ Whitespace): " " # (195..196) - (variant꞉ Identifier): "c" # (196..197) - (close_paren꞉ CloseParen): ")" # (197..198) - (semicolon꞉ Semicolon): ";" # (198..199) - - (TrailingTrivia) ► (EndOfLine): "\n" # (199..200) - - (LeadingTrivia) ► (Whitespace): " " # (200..204) + - (trailing_trivia꞉ EndOfLine): "\n" # (199..200) + - (leading_trivia꞉ Whitespace): " " # (200..204) - (close_brace꞉ CloseBrace): "}" # (204..205) - - (TrailingTrivia) ► (EndOfLine): "\n" # (205..206) - - (LeadingTrivia) ► (Whitespace): " " # (206..208) + - (trailing_trivia꞉ EndOfLine): "\n" # (205..206) + - (leading_trivia꞉ Whitespace): " " # (206..208) - (close_brace꞉ CloseBrace): "}" # (208..209) - - (TrailingTrivia) ► (EndOfLine): "\n" # (209..210) + - (trailing_trivia꞉ EndOfLine): "\n" # (209..210) - (close_brace꞉ CloseBrace): "}" # (210..211) - - (TrailingTrivia) ► (EndOfLine): "\n" # (211..212) + - (trailing_trivia꞉ EndOfLine): "\n" # (211..212) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_event/generated/0.8.22-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_event/generated/0.8.22-success.yml index 417b3cfcc2..5be7f7997d 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_event/generated/0.8.22-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_event/generated/0.8.22-success.yml @@ -9,15 +9,15 @@ Tree: - (SourceUnit) ► (members꞉ SourceUnitMembers): # "event E1(uint256 value);\n" (0..25) - (item꞉ SourceUnitMember) ► (variant꞉ EventDefinition): # "event E1(uint256 value);\n" (0..25) - (event_keyword꞉ EventKeyword): "event" # (0..5) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (name꞉ Identifier): "E1" # (6..8) - (parameters꞉ EventParametersDeclaration): # "(uint256 value)" (8..23) - (open_paren꞉ OpenParen): "(" # (8..9) - (parameters꞉ EventParameters): # "uint256 value" (9..22) - (item꞉ EventParameter): # "uint256 value" (9..22) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (9..16) - - (LeadingTrivia) ► (Whitespace): " " # (16..17) + - (leading_trivia꞉ Whitespace): " " # (16..17) - (name꞉ Identifier): "value" # (17..22) - (close_paren꞉ CloseParen): ")" # (22..23) - (semicolon꞉ Semicolon): ";" # (23..24) - - (TrailingTrivia) ► (EndOfLine): "\n" # (24..25) + - (trailing_trivia꞉ EndOfLine): "\n" # (24..25) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_function/generated/0.7.1-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_function/generated/0.7.1-success.yml index cf710a29b3..0482ecc5df 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_function/generated/0.7.1-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_function/generated/0.7.1-success.yml @@ -10,7 +10,7 @@ Tree: - (item꞉ SourceUnitMember) ► (variant꞉ FunctionDefinition): # "function foo() { }" (0..18) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (name꞉ FunctionName): # " foo" (8..12) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (variant꞉ Identifier): "foo" # (9..12) - (parameters꞉ ParametersDeclaration): # "()" (12..14) - (open_paren꞉ OpenParen): "(" # (12..13) @@ -18,8 +18,8 @@ Tree: - (close_paren꞉ CloseParen): ")" # (13..14) - (attributes꞉ FunctionAttributes): [] # (14..14) - (body꞉ FunctionBody) ► (variant꞉ Block): # " { }" (14..18) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (open_brace꞉ OpenBrace): "{" # (15..16) - (statements꞉ Statements): [] # (16..16) - - (LeadingTrivia) ► (Whitespace): " " # (16..17) + - (leading_trivia꞉ Whitespace): " " # (16..17) - (close_brace꞉ CloseBrace): "}" # (17..18) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia/generated/0.4.11-success.yml index 2963c58197..51f8afec7f 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia/generated/0.4.11-success.yml @@ -16,28 +16,27 @@ Tree: - (SourceUnit) ► (members꞉ SourceUnitMembers): # "contract First {}\n\n\n// Newlines both before and af..." (0..148) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract First {}\n" (0..18) - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "First" # (9..14) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (open_brace꞉ OpenBrace): "{" # (15..16) - (members꞉ ContractMembers): [] # (16..16) - (close_brace꞉ CloseBrace): "}" # (16..17) - - (TrailingTrivia) ► (EndOfLine): "\n" # (17..18) + - (trailing_trivia꞉ EndOfLine): "\n" # (17..18) - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "\n\n// Newlines both before and after this comment s..." (18..148) - - (LeadingTrivia): # "\n\n// Newlines both before and after this comment s..." (18..129) - - (EndOfLine): "\n" # (18..19) - - (EndOfLine): "\n" # (19..20) - - (SingleLineComment): "// Newlines both before and after this comment sho..." # (20..73) - - (EndOfLine): "\n" # (73..74) - - (SingleLineComment): "// be included in the trivia of the second contrac..." # (74..126) - - (EndOfLine): "\n" # (126..127) - - (EndOfLine): "\n" # (127..128) - - (EndOfLine): "\n" # (128..129) + - (leading_trivia꞉ EndOfLine): "\n" # (18..19) + - (leading_trivia꞉ EndOfLine): "\n" # (19..20) + - (leading_trivia꞉ SingleLineComment): "// Newlines both before and after this comment sho..." # (20..73) + - (leading_trivia꞉ EndOfLine): "\n" # (73..74) + - (leading_trivia꞉ SingleLineComment): "// be included in the trivia of the second contrac..." # (74..126) + - (leading_trivia꞉ EndOfLine): "\n" # (126..127) + - (leading_trivia꞉ EndOfLine): "\n" # (127..128) + - (leading_trivia꞉ EndOfLine): "\n" # (128..129) - (contract_keyword꞉ ContractKeyword): "contract" # (129..137) - - (LeadingTrivia) ► (Whitespace): " " # (137..138) + - (leading_trivia꞉ Whitespace): " " # (137..138) - (name꞉ Identifier): "Second" # (138..144) - - (LeadingTrivia) ► (Whitespace): " " # (144..145) + - (leading_trivia꞉ Whitespace): " " # (144..145) - (open_brace꞉ OpenBrace): "{" # (145..146) - (members꞉ ContractMembers): [] # (146..146) - (close_brace꞉ CloseBrace): "}" # (146..147) - - (TrailingTrivia) ► (EndOfLine): "\n" # (147..148) + - (trailing_trivia꞉ EndOfLine): "\n" # (147..148) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_multi_line_spanning_multiple_lines/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_multi_line_spanning_multiple_lines/generated/0.4.11-success.yml new file mode 100644 index 0000000000..8561241dbe --- /dev/null +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_multi_line_spanning_multiple_lines/generated/0.4.11-success.yml @@ -0,0 +1,31 @@ +# This file is generated automatically by infrastructure scripts. Please don't edit by hand. + +Source: > + 1 │ contract A {} /* some │ 0..21 + 2 │ comment*/ │ 22..31 + 3 │ contract B {} │ 32..45 + +Errors: [] + +Tree: + - (SourceUnit) ► (members꞉ SourceUnitMembers): # "contract A {} /* some\ncomment*/\ncontract B {}\n" (0..46) + - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract A {}" (0..13) + - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) + - (leading_trivia꞉ Whitespace): " " # (8..9) + - (name꞉ Identifier): "A" # (9..10) + - (leading_trivia꞉ Whitespace): " " # (10..11) + - (open_brace꞉ OpenBrace): "{" # (11..12) + - (members꞉ ContractMembers): [] # (12..12) + - (close_brace꞉ CloseBrace): "}" # (12..13) + - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # " /* some\ncomment*/\ncontract B {}\n" (13..46) + - (leading_trivia꞉ Whitespace): " " # (13..14) + - (leading_trivia꞉ MultiLineComment): "/* some\ncomment*/" # (14..31) + - (leading_trivia꞉ EndOfLine): "\n" # (31..32) + - (contract_keyword꞉ ContractKeyword): "contract" # (32..40) + - (leading_trivia꞉ Whitespace): " " # (40..41) + - (name꞉ Identifier): "B" # (41..42) + - (leading_trivia꞉ Whitespace): " " # (42..43) + - (open_brace꞉ OpenBrace): "{" # (43..44) + - (members꞉ ContractMembers): [] # (44..44) + - (close_brace꞉ CloseBrace): "}" # (44..45) + - (trailing_trivia꞉ EndOfLine): "\n" # (45..46) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_multi_line_spanning_multiple_lines/input.sol b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_multi_line_spanning_multiple_lines/input.sol new file mode 100644 index 0000000000..f220f0ff04 --- /dev/null +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_multi_line_spanning_multiple_lines/input.sol @@ -0,0 +1,3 @@ +contract A {} /* some +comment*/ +contract B {} diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_multi_line_without_newline/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_multi_line_without_newline/generated/0.4.11-success.yml new file mode 100644 index 0000000000..ce4a1cb41b --- /dev/null +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_multi_line_without_newline/generated/0.4.11-success.yml @@ -0,0 +1,30 @@ +# This file is generated automatically by infrastructure scripts. Please don't edit by hand. + +Source: > + 1 │ contract A {} /* TODO: we should support this */ │ 0..48 + 2 │ contract B {} │ 49..62 + +Errors: [] + +Tree: + - (SourceUnit) ► (members꞉ SourceUnitMembers): # "contract A {} /* TODO: we should support this */\nc..." (0..63) + - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract A {}" (0..13) + - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) + - (leading_trivia꞉ Whitespace): " " # (8..9) + - (name꞉ Identifier): "A" # (9..10) + - (leading_trivia꞉ Whitespace): " " # (10..11) + - (open_brace꞉ OpenBrace): "{" # (11..12) + - (members꞉ ContractMembers): [] # (12..12) + - (close_brace꞉ CloseBrace): "}" # (12..13) + - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # " /* TODO: we should support this */\ncontract B {}\n" (13..63) + - (leading_trivia꞉ Whitespace): " " # (13..14) + - (leading_trivia꞉ MultiLineComment): "/* TODO: we should support this */" # (14..48) + - (leading_trivia꞉ EndOfLine): "\n" # (48..49) + - (contract_keyword꞉ ContractKeyword): "contract" # (49..57) + - (leading_trivia꞉ Whitespace): " " # (57..58) + - (name꞉ Identifier): "B" # (58..59) + - (leading_trivia꞉ Whitespace): " " # (59..60) + - (open_brace꞉ OpenBrace): "{" # (60..61) + - (members꞉ ContractMembers): [] # (61..61) + - (close_brace꞉ CloseBrace): "}" # (61..62) + - (trailing_trivia꞉ EndOfLine): "\n" # (62..63) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_multi_line_without_newline/input.sol b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_multi_line_without_newline/input.sol new file mode 100644 index 0000000000..fb972bb288 --- /dev/null +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_multi_line_without_newline/input.sol @@ -0,0 +1,2 @@ +contract A {} /* TODO: we should support this */ +contract B {} diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_only_until_newline/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_only_until_newline/generated/0.4.11-success.yml new file mode 100644 index 0000000000..dc17eefa6b --- /dev/null +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_only_until_newline/generated/0.4.11-success.yml @@ -0,0 +1,34 @@ +# This file is generated automatically by infrastructure scripts. Please don't edit by hand. + +Source: > + 1 │ contract A {} // first │ 0..22 + 2 │ // second │ 23..46 + 3 │ contract B {} │ 47..60 + +Errors: [] + +Tree: + - (SourceUnit) ► (members꞉ SourceUnitMembers): # "contract A {} // first\n // second\ncon..." (0..61) + - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # "contract A {} // first\n" (0..23) + - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) + - (leading_trivia꞉ Whitespace): " " # (8..9) + - (name꞉ Identifier): "A" # (9..10) + - (leading_trivia꞉ Whitespace): " " # (10..11) + - (open_brace꞉ OpenBrace): "{" # (11..12) + - (members꞉ ContractMembers): [] # (12..12) + - (close_brace꞉ CloseBrace): "}" # (12..13) + - (trailing_trivia꞉ Whitespace): " " # (13..14) + - (trailing_trivia꞉ SingleLineComment): "// first" # (14..22) + - (trailing_trivia꞉ EndOfLine): "\n" # (22..23) + - (item꞉ SourceUnitMember) ► (variant꞉ ContractDefinition): # " // second\ncontract B {}\n" (23..61) + - (leading_trivia꞉ Whitespace): " " # (23..37) + - (leading_trivia꞉ SingleLineComment): "// second" # (37..46) + - (leading_trivia꞉ EndOfLine): "\n" # (46..47) + - (contract_keyword꞉ ContractKeyword): "contract" # (47..55) + - (leading_trivia꞉ Whitespace): " " # (55..56) + - (name꞉ Identifier): "B" # (56..57) + - (leading_trivia꞉ Whitespace): " " # (57..58) + - (open_brace꞉ OpenBrace): "{" # (58..59) + - (members꞉ ContractMembers): [] # (59..59) + - (close_brace꞉ CloseBrace): "}" # (59..60) + - (trailing_trivia꞉ EndOfLine): "\n" # (60..61) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_only_until_newline/input.sol b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_only_until_newline/input.sol new file mode 100644 index 0000000000..0150e72dfc --- /dev/null +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia_only_until_newline/input.sol @@ -0,0 +1,3 @@ +contract A {} // first + // second +contract B {} diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.4.11-failure.yml index dd9a75a56f..9527a7e2b3 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.4.11-failure.yml @@ -41,16 +41,15 @@ Tree: - (SourceUnit): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..793) - (members꞉ SourceUnitMembers): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..56) - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..56) - - (LeadingTrivia): # "// SPDX-License-Identifier: MIT\n" (0..32) - - (SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) - - (EndOfLine): "\n" # (31..32) + - (leading_trivia꞉ SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) + - (leading_trivia꞉ EndOfLine): "\n" # (31..32) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (32..38) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity ^0.8.0" (38..54) - - (LeadingTrivia) ► (Whitespace): " " # (38..39) + - (leading_trivia꞉ Whitespace): " " # (38..39) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (39..47) - (expressions꞉ VersionPragmaExpressions): # " ^0.8.0" (47..54) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaPrefixExpression): # " ^0.8.0" (47..54) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (operator꞉ Caret): "^" # (48..49) - (operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # "0.8.0" (49..54) - (item꞉ VersionPragmaValue): "0" # (49..50) @@ -59,6 +58,6 @@ Tree: - (separator꞉ Period): "." # (52..53) - (item꞉ VersionPragmaValue): "0" # (53..54) - (semicolon꞉ Semicolon): ";" # (54..55) - - (TrailingTrivia) ► (EndOfLine): "\n" # (55..56) - - (LeadingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (55..56) + - (leading_trivia꞉ EndOfLine): "\n" # (56..57) - (SKIPPED): "using EnvelopeUtils for Envelope global;\nusing Tra..." # (57..793) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.6.0-failure.yml index 177d51efb5..dacd3ea6b5 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.6.0-failure.yml @@ -41,16 +41,15 @@ Tree: - (SourceUnit): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..793) - (members꞉ SourceUnitMembers): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..56) - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..56) - - (LeadingTrivia): # "// SPDX-License-Identifier: MIT\n" (0..32) - - (SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) - - (EndOfLine): "\n" # (31..32) + - (leading_trivia꞉ SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) + - (leading_trivia꞉ EndOfLine): "\n" # (31..32) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (32..38) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity ^0.8.0" (38..54) - - (LeadingTrivia) ► (Whitespace): " " # (38..39) + - (leading_trivia꞉ Whitespace): " " # (38..39) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (39..47) - (expressions꞉ VersionPragmaExpressions): # " ^0.8.0" (47..54) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaPrefixExpression): # " ^0.8.0" (47..54) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (operator꞉ Caret): "^" # (48..49) - (operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # "0.8.0" (49..54) - (item꞉ VersionPragmaValue): "0" # (49..50) @@ -59,6 +58,6 @@ Tree: - (separator꞉ Period): "." # (52..53) - (item꞉ VersionPragmaValue): "0" # (53..54) - (semicolon꞉ Semicolon): ";" # (54..55) - - (TrailingTrivia) ► (EndOfLine): "\n" # (55..56) - - (LeadingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (55..56) + - (leading_trivia꞉ EndOfLine): "\n" # (56..57) - (SKIPPED): "using EnvelopeUtils for Envelope global;\nusing Tra..." # (57..793) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.7.1-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.7.1-failure.yml index 0b6c05a3eb..c613c6bd8e 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.7.1-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.7.1-failure.yml @@ -41,16 +41,15 @@ Tree: - (SourceUnit): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..793) - (members꞉ SourceUnitMembers): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..56) - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..56) - - (LeadingTrivia): # "// SPDX-License-Identifier: MIT\n" (0..32) - - (SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) - - (EndOfLine): "\n" # (31..32) + - (leading_trivia꞉ SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) + - (leading_trivia꞉ EndOfLine): "\n" # (31..32) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (32..38) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity ^0.8.0" (38..54) - - (LeadingTrivia) ► (Whitespace): " " # (38..39) + - (leading_trivia꞉ Whitespace): " " # (38..39) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (39..47) - (expressions꞉ VersionPragmaExpressions): # " ^0.8.0" (47..54) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaPrefixExpression): # " ^0.8.0" (47..54) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (operator꞉ Caret): "^" # (48..49) - (operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # "0.8.0" (49..54) - (item꞉ VersionPragmaValue): "0" # (49..50) @@ -59,6 +58,6 @@ Tree: - (separator꞉ Period): "." # (52..53) - (item꞉ VersionPragmaValue): "0" # (53..54) - (semicolon꞉ Semicolon): ";" # (54..55) - - (TrailingTrivia) ► (EndOfLine): "\n" # (55..56) - - (LeadingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (55..56) + - (leading_trivia꞉ EndOfLine): "\n" # (56..57) - (SKIPPED): "using EnvelopeUtils for Envelope global;\nusing Tra..." # (57..793) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.7.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.7.4-failure.yml index 3750315a22..99c1bb2532 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.7.4-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.7.4-failure.yml @@ -41,16 +41,15 @@ Tree: - (SourceUnit): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..793) - (members꞉ SourceUnitMembers): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..56) - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..56) - - (LeadingTrivia): # "// SPDX-License-Identifier: MIT\n" (0..32) - - (SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) - - (EndOfLine): "\n" # (31..32) + - (leading_trivia꞉ SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) + - (leading_trivia꞉ EndOfLine): "\n" # (31..32) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (32..38) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity ^0.8.0" (38..54) - - (LeadingTrivia) ► (Whitespace): " " # (38..39) + - (leading_trivia꞉ Whitespace): " " # (38..39) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (39..47) - (expressions꞉ VersionPragmaExpressions): # " ^0.8.0" (47..54) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaPrefixExpression): # " ^0.8.0" (47..54) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (operator꞉ Caret): "^" # (48..49) - (operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # "0.8.0" (49..54) - (item꞉ VersionPragmaValue): "0" # (49..50) @@ -59,6 +58,6 @@ Tree: - (separator꞉ Period): "." # (52..53) - (item꞉ VersionPragmaValue): "0" # (53..54) - (semicolon꞉ Semicolon): ";" # (54..55) - - (TrailingTrivia) ► (EndOfLine): "\n" # (55..56) - - (LeadingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (55..56) + - (leading_trivia꞉ EndOfLine): "\n" # (56..57) - (SKIPPED): "using EnvelopeUtils for Envelope global;\nusing Tra..." # (57..793) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.0-failure.yml index 93ce165691..41b0dde086 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.0-failure.yml @@ -41,16 +41,15 @@ Tree: - (SourceUnit): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..793) - (members꞉ SourceUnitMembers): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..56) - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..56) - - (LeadingTrivia): # "// SPDX-License-Identifier: MIT\n" (0..32) - - (SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) - - (EndOfLine): "\n" # (31..32) + - (leading_trivia꞉ SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) + - (leading_trivia꞉ EndOfLine): "\n" # (31..32) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (32..38) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity ^0.8.0" (38..54) - - (LeadingTrivia) ► (Whitespace): " " # (38..39) + - (leading_trivia꞉ Whitespace): " " # (38..39) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (39..47) - (expressions꞉ VersionPragmaExpressions): # " ^0.8.0" (47..54) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaPrefixExpression): # " ^0.8.0" (47..54) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (operator꞉ Caret): "^" # (48..49) - (operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # "0.8.0" (49..54) - (item꞉ VersionPragmaValue): "0" # (49..50) @@ -59,6 +58,6 @@ Tree: - (separator꞉ Period): "." # (52..53) - (item꞉ VersionPragmaValue): "0" # (53..54) - (semicolon꞉ Semicolon): ";" # (54..55) - - (TrailingTrivia) ► (EndOfLine): "\n" # (55..56) - - (LeadingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (55..56) + - (leading_trivia꞉ EndOfLine): "\n" # (56..57) - (SKIPPED): "using EnvelopeUtils for Envelope global;\nusing Tra..." # (57..793) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml index 9c9f2d920e..85dcf2674f 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml @@ -30,16 +30,15 @@ Errors: [] Tree: - (SourceUnit) ► (members꞉ SourceUnitMembers): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..793) - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..56) - - (LeadingTrivia): # "// SPDX-License-Identifier: MIT\n" (0..32) - - (SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) - - (EndOfLine): "\n" # (31..32) + - (leading_trivia꞉ SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) + - (leading_trivia꞉ EndOfLine): "\n" # (31..32) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (32..38) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity ^0.8.0" (38..54) - - (LeadingTrivia) ► (Whitespace): " " # (38..39) + - (leading_trivia꞉ Whitespace): " " # (38..39) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (39..47) - (expressions꞉ VersionPragmaExpressions): # " ^0.8.0" (47..54) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaPrefixExpression): # " ^0.8.0" (47..54) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (operator꞉ Caret): "^" # (48..49) - (operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # "0.8.0" (49..54) - (item꞉ VersionPragmaValue): "0" # (49..50) @@ -48,95 +47,94 @@ Tree: - (separator꞉ Period): "." # (52..53) - (item꞉ VersionPragmaValue): "0" # (53..54) - (semicolon꞉ Semicolon): ";" # (54..55) - - (TrailingTrivia) ► (EndOfLine): "\n" # (55..56) + - (trailing_trivia꞉ EndOfLine): "\n" # (55..56) - (item꞉ SourceUnitMember) ► (variant꞉ UsingDirective): # "\nusing EnvelopeUtils for Envelope global;\n" (56..98) - - (LeadingTrivia) ► (EndOfLine): "\n" # (56..57) + - (leading_trivia꞉ EndOfLine): "\n" # (56..57) - (using_keyword꞉ UsingKeyword): "using" # (57..62) - (clause꞉ UsingClause) ► (variant꞉ IdentifierPath): # " EnvelopeUtils" (62..76) - - (LeadingTrivia) ► (Whitespace): " " # (62..63) + - (leading_trivia꞉ Whitespace): " " # (62..63) - (item꞉ Identifier): "EnvelopeUtils" # (63..76) - - (LeadingTrivia) ► (Whitespace): " " # (76..77) + - (leading_trivia꞉ Whitespace): " " # (76..77) - (for_keyword꞉ ForKeyword): "for" # (77..80) - (target꞉ UsingTarget) ► (variant꞉ TypeName) ► (variant꞉ IdentifierPath): # " Envelope" (80..89) - - (LeadingTrivia) ► (Whitespace): " " # (80..81) + - (leading_trivia꞉ Whitespace): " " # (80..81) - (item꞉ Identifier): "Envelope" # (81..89) - - (LeadingTrivia) ► (Whitespace): " " # (89..90) + - (leading_trivia꞉ Whitespace): " " # (89..90) - (global_keyword꞉ GlobalKeyword): "global" # (90..96) - (semicolon꞉ Semicolon): ";" # (96..97) - - (TrailingTrivia) ► (EndOfLine): "\n" # (97..98) + - (trailing_trivia꞉ EndOfLine): "\n" # (97..98) - (item꞉ SourceUnitMember) ► (variant꞉ UsingDirective): # "using TransactionUtils for Transaction global;\n" (98..145) - (using_keyword꞉ UsingKeyword): "using" # (98..103) - (clause꞉ UsingClause) ► (variant꞉ IdentifierPath): # " TransactionUtils" (103..120) - - (LeadingTrivia) ► (Whitespace): " " # (103..104) + - (leading_trivia꞉ Whitespace): " " # (103..104) - (item꞉ Identifier): "TransactionUtils" # (104..120) - - (LeadingTrivia) ► (Whitespace): " " # (120..121) + - (leading_trivia꞉ Whitespace): " " # (120..121) - (for_keyword꞉ ForKeyword): "for" # (121..124) - (target꞉ UsingTarget) ► (variant꞉ TypeName) ► (variant꞉ IdentifierPath): # " Transaction" (124..136) - - (LeadingTrivia) ► (Whitespace): " " # (124..125) + - (leading_trivia꞉ Whitespace): " " # (124..125) - (item꞉ Identifier): "Transaction" # (125..136) - - (LeadingTrivia) ► (Whitespace): " " # (136..137) + - (leading_trivia꞉ Whitespace): " " # (136..137) - (global_keyword꞉ GlobalKeyword): "global" # (137..143) - (semicolon꞉ Semicolon): ";" # (143..144) - - (TrailingTrivia) ► (EndOfLine): "\n" # (144..145) + - (trailing_trivia꞉ EndOfLine): "\n" # (144..145) - (item꞉ SourceUnitMember) ► (variant꞉ StructDefinition): # "\n/**\n * @notice Object with the necessary informat..." (145..793) - - (LeadingTrivia): # "\n/**\n * @notice Object with the necessary informat..." (145..643) - - (EndOfLine): "\n" # (145..146) - - (MultiLineNatSpecComment): "/**\n * @notice Object with the necessary informati..." # (146..642) - - (EndOfLine): "\n" # (642..643) + - (leading_trivia꞉ EndOfLine): "\n" # (145..146) + - (leading_trivia꞉ MultiLineNatSpecComment): "/**\n * @notice Object with the necessary informati..." # (146..642) + - (leading_trivia꞉ EndOfLine): "\n" # (642..643) - (struct_keyword꞉ StructKeyword): "struct" # (643..649) - - (LeadingTrivia) ► (Whitespace): " " # (649..650) + - (leading_trivia꞉ Whitespace): " " # (649..650) - (name꞉ Identifier): "Envelope" # (650..658) - - (LeadingTrivia) ► (Whitespace): " " # (658..659) + - (leading_trivia꞉ Whitespace): " " # (658..659) - (open_brace꞉ OpenBrace): "{" # (659..660) - - (TrailingTrivia) ► (EndOfLine): "\n" # (660..661) + - (trailing_trivia꞉ EndOfLine): "\n" # (660..661) - (members꞉ StructMembers): # " uint256 nonce;\n address origin;\n address desti..." (661..791) - (item꞉ StructMember): # " uint256 nonce;\n" (661..678) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (661..670) - - (LeadingTrivia) ► (Whitespace): " " # (661..663) + - (leading_trivia꞉ Whitespace): " " # (661..663) - (variant꞉ UintKeyword): "uint256" # (663..670) - - (LeadingTrivia) ► (Whitespace): " " # (670..671) + - (leading_trivia꞉ Whitespace): " " # (670..671) - (name꞉ Identifier): "nonce" # (671..676) - (semicolon꞉ Semicolon): ";" # (676..677) - - (TrailingTrivia) ► (EndOfLine): "\n" # (677..678) + - (trailing_trivia꞉ EndOfLine): "\n" # (677..678) - (item꞉ StructMember): # " address origin;\n" (678..696) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType): # " address" (678..687) - - (LeadingTrivia) ► (Whitespace): " " # (678..680) + - (leading_trivia꞉ Whitespace): " " # (678..680) - (address_keyword꞉ AddressKeyword): "address" # (680..687) - - (LeadingTrivia) ► (Whitespace): " " # (687..688) + - (leading_trivia꞉ Whitespace): " " # (687..688) - (name꞉ Identifier): "origin" # (688..694) - (semicolon꞉ Semicolon): ";" # (694..695) - - (TrailingTrivia) ► (EndOfLine): "\n" # (695..696) + - (trailing_trivia꞉ EndOfLine): "\n" # (695..696) - (item꞉ StructMember): # " address destination;\n" (696..719) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ AddressType): # " address" (696..705) - - (LeadingTrivia) ► (Whitespace): " " # (696..698) + - (leading_trivia꞉ Whitespace): " " # (696..698) - (address_keyword꞉ AddressKeyword): "address" # (698..705) - - (LeadingTrivia) ► (Whitespace): " " # (705..706) + - (leading_trivia꞉ Whitespace): " " # (705..706) - (name꞉ Identifier): "destination" # (706..717) - (semicolon꞉ Semicolon): ";" # (717..718) - - (TrailingTrivia) ► (EndOfLine): "\n" # (718..719) + - (trailing_trivia꞉ EndOfLine): "\n" # (718..719) - (item꞉ StructMember): # " uint256 originChainId;\n" (719..744) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (719..728) - - (LeadingTrivia) ► (Whitespace): " " # (719..721) + - (leading_trivia꞉ Whitespace): " " # (719..721) - (variant꞉ UintKeyword): "uint256" # (721..728) - - (LeadingTrivia) ► (Whitespace): " " # (728..729) + - (leading_trivia꞉ Whitespace): " " # (728..729) - (name꞉ Identifier): "originChainId" # (729..742) - (semicolon꞉ Semicolon): ";" # (742..743) - - (TrailingTrivia) ► (EndOfLine): "\n" # (743..744) + - (trailing_trivia꞉ EndOfLine): "\n" # (743..744) - (item꞉ StructMember): # " uint256 destinationChainId;\n" (744..774) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint256" (744..753) - - (LeadingTrivia) ► (Whitespace): " " # (744..746) + - (leading_trivia꞉ Whitespace): " " # (744..746) - (variant꞉ UintKeyword): "uint256" # (746..753) - - (LeadingTrivia) ► (Whitespace): " " # (753..754) + - (leading_trivia꞉ Whitespace): " " # (753..754) - (name꞉ Identifier): "destinationChainId" # (754..772) - (semicolon꞉ Semicolon): ";" # (772..773) - - (TrailingTrivia) ► (EndOfLine): "\n" # (773..774) + - (trailing_trivia꞉ EndOfLine): "\n" # (773..774) - (item꞉ StructMember): # " bytes message;\n" (774..791) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " bytes" (774..781) - - (LeadingTrivia) ► (Whitespace): " " # (774..776) + - (leading_trivia꞉ Whitespace): " " # (774..776) - (variant꞉ BytesKeyword): "bytes" # (776..781) - - (LeadingTrivia) ► (Whitespace): " " # (781..782) + - (leading_trivia꞉ Whitespace): " " # (781..782) - (name꞉ Identifier): "message" # (782..789) - (semicolon꞉ Semicolon): ";" # (789..790) - - (TrailingTrivia) ► (EndOfLine): "\n" # (790..791) + - (trailing_trivia꞉ EndOfLine): "\n" # (790..791) - (close_brace꞉ CloseBrace): "}" # (791..792) - - (TrailingTrivia) ► (EndOfLine): "\n" # (792..793) + - (trailing_trivia꞉ EndOfLine): "\n" # (792..793) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.4-failure.yml index 0455558021..69e8a7c2ab 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.4-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.4-failure.yml @@ -41,16 +41,15 @@ Tree: - (SourceUnit): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..793) - (members꞉ SourceUnitMembers): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..56) - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..56) - - (LeadingTrivia): # "// SPDX-License-Identifier: MIT\n" (0..32) - - (SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) - - (EndOfLine): "\n" # (31..32) + - (leading_trivia꞉ SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) + - (leading_trivia꞉ EndOfLine): "\n" # (31..32) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (32..38) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity ^0.8.0" (38..54) - - (LeadingTrivia) ► (Whitespace): " " # (38..39) + - (leading_trivia꞉ Whitespace): " " # (38..39) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (39..47) - (expressions꞉ VersionPragmaExpressions): # " ^0.8.0" (47..54) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaPrefixExpression): # " ^0.8.0" (47..54) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (operator꞉ Caret): "^" # (48..49) - (operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # "0.8.0" (49..54) - (item꞉ VersionPragmaValue): "0" # (49..50) @@ -59,6 +58,6 @@ Tree: - (separator꞉ Period): "." # (52..53) - (item꞉ VersionPragmaValue): "0" # (53..54) - (semicolon꞉ Semicolon): ";" # (54..55) - - (TrailingTrivia) ► (EndOfLine): "\n" # (55..56) - - (LeadingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (55..56) + - (leading_trivia꞉ EndOfLine): "\n" # (56..57) - (SKIPPED): "using EnvelopeUtils for Envelope global;\nusing Tra..." # (57..793) diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.8-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.8-failure.yml index 17391b6d11..782b597956 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.8-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.8-failure.yml @@ -41,16 +41,15 @@ Tree: - (SourceUnit): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..793) - (members꞉ SourceUnitMembers): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..56) - (item꞉ SourceUnitMember) ► (variant꞉ PragmaDirective): # "// SPDX-License-Identifier: MIT\npragma solidity ^0..." (0..56) - - (LeadingTrivia): # "// SPDX-License-Identifier: MIT\n" (0..32) - - (SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) - - (EndOfLine): "\n" # (31..32) + - (leading_trivia꞉ SingleLineComment): "// SPDX-License-Identifier: MIT" # (0..31) + - (leading_trivia꞉ EndOfLine): "\n" # (31..32) - (pragma_keyword꞉ PragmaKeyword): "pragma" # (32..38) - (pragma꞉ Pragma) ► (variant꞉ VersionPragma): # " solidity ^0.8.0" (38..54) - - (LeadingTrivia) ► (Whitespace): " " # (38..39) + - (leading_trivia꞉ Whitespace): " " # (38..39) - (solidity_keyword꞉ SolidityKeyword): "solidity" # (39..47) - (expressions꞉ VersionPragmaExpressions): # " ^0.8.0" (47..54) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaPrefixExpression): # " ^0.8.0" (47..54) - - (LeadingTrivia) ► (Whitespace): " " # (47..48) + - (leading_trivia꞉ Whitespace): " " # (47..48) - (operator꞉ Caret): "^" # (48..49) - (operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # "0.8.0" (49..54) - (item꞉ VersionPragmaValue): "0" # (49..50) @@ -59,6 +58,6 @@ Tree: - (separator꞉ Period): "." # (52..53) - (item꞉ VersionPragmaValue): "0" # (53..54) - (semicolon꞉ Semicolon): ";" # (54..55) - - (TrailingTrivia) ► (EndOfLine): "\n" # (55..56) - - (LeadingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (55..56) + - (leading_trivia꞉ EndOfLine): "\n" # (56..57) - (SKIPPED): "using EnvelopeUtils for Envelope global;\nusing Tra..." # (57..793) diff --git a/crates/solidity/testing/snapshots/cst_output/Statements/compound_tokens/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/Statements/compound_tokens/generated/0.4.11-success.yml index a31dca2c18..5b72d1b024 100644 --- a/crates/solidity/testing/snapshots/cst_output/Statements/compound_tokens/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/compound_tokens/generated/0.4.11-success.yml @@ -22,130 +22,130 @@ Tree: - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # "a && b;\n" (0..8) - (expression꞉ Expression) ► (variant꞉ AndExpression): # "a && b" (0..6) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (0..1) - - (LeadingTrivia) ► (Whitespace): " " # (1..2) + - (leading_trivia꞉ Whitespace): " " # (1..2) - (operator꞉ AmpersandAmpersand): "&&" # (2..4) - (right_operand꞉ Expression): # " b" (4..6) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (variant꞉ Identifier): "b" # (5..6) - (semicolon꞉ Semicolon): ";" # (6..7) - - (TrailingTrivia) ► (EndOfLine): "\n" # (7..8) + - (trailing_trivia꞉ EndOfLine): "\n" # (7..8) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # "a &= b;\n" (8..16) - (expression꞉ Expression) ► (variant꞉ AssignmentExpression): # "a &= b" (8..14) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (8..9) - - (LeadingTrivia) ► (Whitespace): " " # (9..10) + - (leading_trivia꞉ Whitespace): " " # (9..10) - (operator꞉ AmpersandEqual): "&=" # (10..12) - (right_operand꞉ Expression): # " b" (12..14) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (variant꞉ Identifier): "b" # (13..14) - (semicolon꞉ Semicolon): ";" # (14..15) - - (TrailingTrivia) ► (EndOfLine): "\n" # (15..16) + - (trailing_trivia꞉ EndOfLine): "\n" # (15..16) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # "a || b;\n" (16..24) - (expression꞉ Expression) ► (variant꞉ OrExpression): # "a || b" (16..22) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (16..17) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (operator꞉ BarBar): "||" # (18..20) - (right_operand꞉ Expression): # " b" (20..22) - - (LeadingTrivia) ► (Whitespace): " " # (20..21) + - (leading_trivia꞉ Whitespace): " " # (20..21) - (variant꞉ Identifier): "b" # (21..22) - (semicolon꞉ Semicolon): ";" # (22..23) - - (TrailingTrivia) ► (EndOfLine): "\n" # (23..24) + - (trailing_trivia꞉ EndOfLine): "\n" # (23..24) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # "a |= b;\n" (24..32) - (expression꞉ Expression) ► (variant꞉ AssignmentExpression): # "a |= b" (24..30) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (24..25) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (leading_trivia꞉ Whitespace): " " # (25..26) - (operator꞉ BarEqual): "|=" # (26..28) - (right_operand꞉ Expression): # " b" (28..30) - - (LeadingTrivia) ► (Whitespace): " " # (28..29) + - (leading_trivia꞉ Whitespace): " " # (28..29) - (variant꞉ Identifier): "b" # (29..30) - (semicolon꞉ Semicolon): ";" # (30..31) - - (TrailingTrivia) ► (EndOfLine): "\n" # (31..32) + - (trailing_trivia꞉ EndOfLine): "\n" # (31..32) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # "a / b;\n" (32..39) - (expression꞉ Expression) ► (variant꞉ MultiplicativeExpression): # "a / b" (32..37) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (32..33) - - (LeadingTrivia) ► (Whitespace): " " # (33..34) + - (leading_trivia꞉ Whitespace): " " # (33..34) - (operator꞉ Slash): "/" # (34..35) - (right_operand꞉ Expression): # " b" (35..37) - - (LeadingTrivia) ► (Whitespace): " " # (35..36) + - (leading_trivia꞉ Whitespace): " " # (35..36) - (variant꞉ Identifier): "b" # (36..37) - (semicolon꞉ Semicolon): ";" # (37..38) - - (TrailingTrivia) ► (EndOfLine): "\n" # (38..39) + - (trailing_trivia꞉ EndOfLine): "\n" # (38..39) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # "a /= b;\n" (39..47) - (expression꞉ Expression) ► (variant꞉ AssignmentExpression): # "a /= b" (39..45) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (39..40) - - (LeadingTrivia) ► (Whitespace): " " # (40..41) + - (leading_trivia꞉ Whitespace): " " # (40..41) - (operator꞉ SlashEqual): "/=" # (41..43) - (right_operand꞉ Expression): # " b" (43..45) - - (LeadingTrivia) ► (Whitespace): " " # (43..44) + - (leading_trivia꞉ Whitespace): " " # (43..44) - (variant꞉ Identifier): "b" # (44..45) - (semicolon꞉ Semicolon): ";" # (45..46) - - (TrailingTrivia) ► (EndOfLine): "\n" # (46..47) + - (trailing_trivia꞉ EndOfLine): "\n" # (46..47) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # "a > b;\n" (47..54) - (expression꞉ Expression) ► (variant꞉ ComparisonExpression): # "a > b" (47..52) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (47..48) - - (LeadingTrivia) ► (Whitespace): " " # (48..49) + - (leading_trivia꞉ Whitespace): " " # (48..49) - (operator꞉ GreaterThan): ">" # (49..50) - (right_operand꞉ Expression): # " b" (50..52) - - (LeadingTrivia) ► (Whitespace): " " # (50..51) + - (leading_trivia꞉ Whitespace): " " # (50..51) - (variant꞉ Identifier): "b" # (51..52) - (semicolon꞉ Semicolon): ";" # (52..53) - - (TrailingTrivia) ► (EndOfLine): "\n" # (53..54) + - (trailing_trivia꞉ EndOfLine): "\n" # (53..54) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # "a >= b;\n" (54..62) - (expression꞉ Expression) ► (variant꞉ ComparisonExpression): # "a >= b" (54..60) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (54..55) - - (LeadingTrivia) ► (Whitespace): " " # (55..56) + - (leading_trivia꞉ Whitespace): " " # (55..56) - (operator꞉ GreaterThanEqual): ">=" # (56..58) - (right_operand꞉ Expression): # " b" (58..60) - - (LeadingTrivia) ► (Whitespace): " " # (58..59) + - (leading_trivia꞉ Whitespace): " " # (58..59) - (variant꞉ Identifier): "b" # (59..60) - (semicolon꞉ Semicolon): ";" # (60..61) - - (TrailingTrivia) ► (EndOfLine): "\n" # (61..62) + - (trailing_trivia꞉ EndOfLine): "\n" # (61..62) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # "a >> b;\n" (62..70) - (expression꞉ Expression) ► (variant꞉ ShiftExpression): # "a >> b" (62..68) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (62..63) - - (LeadingTrivia) ► (Whitespace): " " # (63..64) + - (leading_trivia꞉ Whitespace): " " # (63..64) - (operator꞉ GreaterThanGreaterThan): ">>" # (64..66) - (right_operand꞉ Expression): # " b" (66..68) - - (LeadingTrivia) ► (Whitespace): " " # (66..67) + - (leading_trivia꞉ Whitespace): " " # (66..67) - (variant꞉ Identifier): "b" # (67..68) - (semicolon꞉ Semicolon): ";" # (68..69) - - (TrailingTrivia) ► (EndOfLine): "\n" # (69..70) + - (trailing_trivia꞉ EndOfLine): "\n" # (69..70) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # "a >>= b;\n" (70..79) - (expression꞉ Expression) ► (variant꞉ AssignmentExpression): # "a >>= b" (70..77) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (70..71) - - (LeadingTrivia) ► (Whitespace): " " # (71..72) + - (leading_trivia꞉ Whitespace): " " # (71..72) - (operator꞉ GreaterThanGreaterThanEqual): ">>=" # (72..75) - (right_operand꞉ Expression): # " b" (75..77) - - (LeadingTrivia) ► (Whitespace): " " # (75..76) + - (leading_trivia꞉ Whitespace): " " # (75..76) - (variant꞉ Identifier): "b" # (76..77) - (semicolon꞉ Semicolon): ";" # (77..78) - - (TrailingTrivia) ► (EndOfLine): "\n" # (78..79) + - (trailing_trivia꞉ EndOfLine): "\n" # (78..79) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # "a >>>= b;\n" (79..89) - (expression꞉ Expression) ► (variant꞉ AssignmentExpression): # "a >>>= b" (79..87) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (79..80) - - (LeadingTrivia) ► (Whitespace): " " # (80..81) + - (leading_trivia꞉ Whitespace): " " # (80..81) - (operator꞉ GreaterThanGreaterThanGreaterThanEqual): ">>>=" # (81..85) - (right_operand꞉ Expression): # " b" (85..87) - - (LeadingTrivia) ► (Whitespace): " " # (85..86) + - (leading_trivia꞉ Whitespace): " " # (85..86) - (variant꞉ Identifier): "b" # (86..87) - (semicolon꞉ Semicolon): ";" # (87..88) - - (TrailingTrivia) ► (EndOfLine): "\n" # (88..89) + - (trailing_trivia꞉ EndOfLine): "\n" # (88..89) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # "a << b;\n" (89..97) - (expression꞉ Expression) ► (variant꞉ ShiftExpression): # "a << b" (89..95) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (89..90) - - (LeadingTrivia) ► (Whitespace): " " # (90..91) + - (leading_trivia꞉ Whitespace): " " # (90..91) - (operator꞉ LessThanLessThan): "<<" # (91..93) - (right_operand꞉ Expression): # " b" (93..95) - - (LeadingTrivia) ► (Whitespace): " " # (93..94) + - (leading_trivia꞉ Whitespace): " " # (93..94) - (variant꞉ Identifier): "b" # (94..95) - (semicolon꞉ Semicolon): ";" # (95..96) - - (TrailingTrivia) ► (EndOfLine): "\n" # (96..97) + - (trailing_trivia꞉ EndOfLine): "\n" # (96..97) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # "a <<= b;\n" (97..106) - (expression꞉ Expression) ► (variant꞉ AssignmentExpression): # "a <<= b" (97..104) - (left_operand꞉ Expression) ► (variant꞉ Identifier): "a" # (97..98) - - (LeadingTrivia) ► (Whitespace): " " # (98..99) + - (leading_trivia꞉ Whitespace): " " # (98..99) - (operator꞉ LessThanLessThanEqual): "<<=" # (99..102) - (right_operand꞉ Expression): # " b" (102..104) - - (LeadingTrivia) ► (Whitespace): " " # (102..103) + - (leading_trivia꞉ Whitespace): " " # (102..103) - (variant꞉ Identifier): "b" # (103..104) - (semicolon꞉ Semicolon): ";" # (104..105) - - (TrailingTrivia) ► (EndOfLine): "\n" # (105..106) + - (trailing_trivia꞉ EndOfLine): "\n" # (105..106) diff --git a/crates/solidity/testing/snapshots/cst_output/Statements/contextual_keywords/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/Statements/contextual_keywords/generated/0.4.11-success.yml index 4e37093783..25e67a20e3 100644 --- a/crates/solidity/testing/snapshots/cst_output/Statements/contextual_keywords/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/contextual_keywords/generated/0.4.11-success.yml @@ -12,25 +12,25 @@ Tree: - (Statements): # "uint256 error;\nuint256 from;\nuint256 revert;\nuint2..." (0..61) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "uint256 error;\n" (0..15) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (0..7) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (name꞉ Identifier): "error" # (8..13) - (semicolon꞉ Semicolon): ";" # (13..14) - - (TrailingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (14..15) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "uint256 from;\n" (15..29) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (15..22) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (name꞉ Identifier): "from" # (23..27) - (semicolon꞉ Semicolon): ";" # (27..28) - - (TrailingTrivia) ► (EndOfLine): "\n" # (28..29) + - (trailing_trivia꞉ EndOfLine): "\n" # (28..29) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "uint256 revert;\n" (29..45) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (29..36) - - (LeadingTrivia) ► (Whitespace): " " # (36..37) + - (leading_trivia꞉ Whitespace): " " # (36..37) - (name꞉ Identifier): "revert" # (37..43) - (semicolon꞉ Semicolon): ";" # (43..44) - - (TrailingTrivia) ► (EndOfLine): "\n" # (44..45) + - (trailing_trivia꞉ EndOfLine): "\n" # (44..45) - (item꞉ Statement) ► (variant꞉ VariableDeclarationStatement): # "uint256 global;\n" (45..61) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint256" # (45..52) - - (LeadingTrivia) ► (Whitespace): " " # (52..53) + - (leading_trivia꞉ Whitespace): " " # (52..53) - (name꞉ Identifier): "global" # (53..59) - (semicolon꞉ Semicolon): ";" # (59..60) - - (TrailingTrivia) ► (EndOfLine): "\n" # (60..61) + - (trailing_trivia꞉ EndOfLine): "\n" # (60..61) diff --git a/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.4.11-failure.yml index 535bbac918..dd69744df7 100644 --- a/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.4.11-failure.yml @@ -26,39 +26,39 @@ Errors: # 2 total Tree: - (Statements): # "\nthrow invalid ;\n{ 1 * 2; 3 * b invalid; }\n" (0..43) - (item꞉ Statement) ► (variant꞉ ThrowStatement): # "\nthrow invalid ;\n" (0..17) - - (LeadingTrivia) ► (EndOfLine): "\n" # (0..1) + - (leading_trivia꞉ EndOfLine): "\n" # (0..1) - (throw_keyword꞉ ThrowKeyword): "throw" # (1..6) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (SKIPPED): "invalid " # (7..15) - (semicolon꞉ Semicolon): ";" # (15..16) - - (TrailingTrivia) ► (EndOfLine): "\n" # (16..17) + - (trailing_trivia꞉ EndOfLine): "\n" # (16..17) - (item꞉ Statement) ► (variant꞉ Block): # "{ 1 * 2; 3 * b invalid; }\n" (17..43) - (open_brace꞉ OpenBrace): "{" # (17..18) - (statements꞉ Statements): # " 1 * 2; 3 * b invalid;" (18..40) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " 1 * 2;" (18..25) - (expression꞉ Expression) ► (variant꞉ MultiplicativeExpression): # " 1 * 2" (18..24) - (left_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 1" (18..20) - - (LeadingTrivia) ► (Whitespace): " " # (18..19) + - (leading_trivia꞉ Whitespace): " " # (18..19) - (literal꞉ DecimalLiteral): "1" # (19..20) - - (LeadingTrivia) ► (Whitespace): " " # (20..21) + - (leading_trivia꞉ Whitespace): " " # (20..21) - (operator꞉ Asterisk): "*" # (21..22) - (right_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 2" (22..24) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (literal꞉ DecimalLiteral): "2" # (23..24) - (semicolon꞉ Semicolon): ";" # (24..25) - (item꞉ Statement) ► (variant꞉ ExpressionStatement): # " 3 * b invalid;" (25..40) - (expression꞉ Expression) ► (variant꞉ MultiplicativeExpression): # " 3 * b" (25..31) - (left_operand꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 3" (25..27) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (leading_trivia꞉ Whitespace): " " # (25..26) - (literal꞉ DecimalLiteral): "3" # (26..27) - - (LeadingTrivia) ► (Whitespace): " " # (27..28) + - (leading_trivia꞉ Whitespace): " " # (27..28) - (operator꞉ Asterisk): "*" # (28..29) - (right_operand꞉ Expression): # " b" (29..31) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (variant꞉ Identifier): "b" # (30..31) - - (LeadingTrivia) ► (Whitespace): " " # (31..32) + - (leading_trivia꞉ Whitespace): " " # (31..32) - (SKIPPED): "invalid" # (32..39) - (semicolon꞉ Semicolon): ";" # (39..40) - - (LeadingTrivia) ► (Whitespace): " " # (40..41) + - (leading_trivia꞉ Whitespace): " " # (40..41) - (close_brace꞉ CloseBrace): "}" # (41..42) - - (TrailingTrivia) ► (EndOfLine): "\n" # (42..43) + - (trailing_trivia꞉ EndOfLine): "\n" # (42..43) diff --git a/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.5.0-failure.yml index 00062def2e..7015fe0d61 100644 --- a/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.5.0-failure.yml @@ -18,5 +18,5 @@ Errors: # 1 total Tree: - (Statements): # "\nthrow invalid ;\n{ 1 * 2; 3 * b invalid; }\n" (0..43) - - (LeadingTrivia) ► (EndOfLine): "\n" # (0..1) + - (leading_trivia꞉ EndOfLine): "\n" # (0..1) - (SKIPPED): "throw invalid ;\n{ 1 * 2; 3 * b invalid; }\n" # (1..43) diff --git a/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.5.3-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.5.3-failure.yml index 58c83e66d1..1b5253832c 100644 --- a/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.5.3-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.5.3-failure.yml @@ -18,5 +18,5 @@ Errors: # 1 total Tree: - (Statements): # "\nthrow invalid ;\n{ 1 * 2; 3 * b invalid; }\n" (0..43) - - (LeadingTrivia) ► (EndOfLine): "\n" # (0..1) + - (leading_trivia꞉ EndOfLine): "\n" # (0..1) - (SKIPPED): "throw invalid ;\n{ 1 * 2; 3 * b invalid; }\n" # (1..43) diff --git a/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.6.0-failure.yml index 1bfd4b1b90..77a2eb08d8 100644 --- a/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.6.0-failure.yml @@ -18,5 +18,5 @@ Errors: # 1 total Tree: - (Statements): # "\nthrow invalid ;\n{ 1 * 2; 3 * b invalid; }\n" (0..43) - - (LeadingTrivia) ► (EndOfLine): "\n" # (0..1) + - (leading_trivia꞉ EndOfLine): "\n" # (0..1) - (SKIPPED): "throw invalid ;\n{ 1 * 2; 3 * b invalid; }\n" # (1..43) diff --git a/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.7.0-failure.yml index 6ba90bf604..ee763a529c 100644 --- a/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.7.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.7.0-failure.yml @@ -18,5 +18,5 @@ Errors: # 1 total Tree: - (Statements): # "\nthrow invalid ;\n{ 1 * 2; 3 * b invalid; }\n" (0..43) - - (LeadingTrivia) ► (EndOfLine): "\n" # (0..1) + - (leading_trivia꞉ EndOfLine): "\n" # (0..1) - (SKIPPED): "throw invalid ;\n{ 1 * 2; 3 * b invalid; }\n" # (1..43) diff --git a/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.8.0-failure.yml index 7fc177da2c..1422db0eab 100644 --- a/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.8.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.8.0-failure.yml @@ -18,5 +18,5 @@ Errors: # 1 total Tree: - (Statements): # "\nthrow invalid ;\n{ 1 * 2; 3 * b invalid; }\n" (0..43) - - (LeadingTrivia) ► (EndOfLine): "\n" # (0..1) + - (leading_trivia꞉ EndOfLine): "\n" # (0..1) - (SKIPPED): "throw invalid ;\n{ 1 * 2; 3 * b invalid; }\n" # (1..43) diff --git a/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.8.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.8.4-failure.yml index 205234b266..c3c061d02d 100644 --- a/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.8.4-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.8.4-failure.yml @@ -18,5 +18,5 @@ Errors: # 1 total Tree: - (Statements): # "\nthrow invalid ;\n{ 1 * 2; 3 * b invalid; }\n" (0..43) - - (LeadingTrivia) ► (EndOfLine): "\n" # (0..1) + - (leading_trivia꞉ EndOfLine): "\n" # (0..1) - (SKIPPED): "throw invalid ;\n{ 1 * 2; 3 * b invalid; }\n" # (1..43) diff --git a/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_cr_double_quote/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_cr_double_quote/generated/0.4.11-success.yml index 81db8bca91..ba4ef3c9ee 100644 --- a/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_cr_double_quote/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_cr_double_quote/generated/0.4.11-success.yml @@ -9,4 +9,4 @@ Errors: [] Tree: - (StringLiteral): # '"foo\\rbar"\r' (0..11) - (variant꞉ DoubleQuotedStringLiteral): '"foo\\rbar"' # (0..10) - - (TrailingTrivia) ► (EndOfLine): "\r" # (10..11) + - (trailing_trivia꞉ EndOfLine): "\r" # (10..11) diff --git a/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_cr_single_quote/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_cr_single_quote/generated/0.4.11-success.yml index 56eddbc142..8fe5b48ed4 100644 --- a/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_cr_single_quote/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_cr_single_quote/generated/0.4.11-success.yml @@ -9,4 +9,4 @@ Errors: [] Tree: - (StringLiteral): # "'foo\\rbar'\r" (0..11) - (variant꞉ SingleQuotedStringLiteral): "'foo\\rbar'" # (0..10) - - (TrailingTrivia) ► (EndOfLine): "\r" # (10..11) + - (trailing_trivia꞉ EndOfLine): "\r" # (10..11) diff --git a/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_crlf_double_quote/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_crlf_double_quote/generated/0.4.11-success.yml index 7be2cf3a70..01f3993b80 100644 --- a/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_crlf_double_quote/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_crlf_double_quote/generated/0.4.11-success.yml @@ -9,4 +9,4 @@ Errors: [] Tree: - (StringLiteral): # '"foo\\r\nbar"\r\n' (0..13) - (variant꞉ DoubleQuotedStringLiteral): '"foo\\r\nbar"' # (0..11) - - (TrailingTrivia) ► (EndOfLine): "\r\n" # (11..13) + - (trailing_trivia꞉ EndOfLine): "\r\n" # (11..13) diff --git a/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_crlf_single_quote/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_crlf_single_quote/generated/0.4.11-success.yml index 0adf395690..bc62335aeb 100644 --- a/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_crlf_single_quote/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_crlf_single_quote/generated/0.4.11-success.yml @@ -9,4 +9,4 @@ Errors: [] Tree: - (StringLiteral): # "'foo\\r\nbar'\r\n" (0..13) - (variant꞉ SingleQuotedStringLiteral): "'foo\\r\nbar'" # (0..11) - - (TrailingTrivia) ► (EndOfLine): "\r\n" # (11..13) + - (trailing_trivia꞉ EndOfLine): "\r\n" # (11..13) diff --git a/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_lf_double_quote/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_lf_double_quote/generated/0.4.11-success.yml index e30ff9b7cb..8cb223ba40 100644 --- a/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_lf_double_quote/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_lf_double_quote/generated/0.4.11-success.yml @@ -9,4 +9,4 @@ Errors: [] Tree: - (StringLiteral): # '"foo\\nbar"\n' (0..11) - (variant꞉ DoubleQuotedStringLiteral): '"foo\\nbar"' # (0..10) - - (TrailingTrivia) ► (EndOfLine): "\n" # (10..11) + - (trailing_trivia꞉ EndOfLine): "\n" # (10..11) diff --git a/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_lf_single_quote/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_lf_single_quote/generated/0.4.11-success.yml index 1989e560a3..f30182c25b 100644 --- a/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_lf_single_quote/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/StringLiteral/escape_lf_single_quote/generated/0.4.11-success.yml @@ -9,4 +9,4 @@ Errors: [] Tree: - (StringLiteral): # "'foo\\nbar'\n" (0..11) - (variant꞉ SingleQuotedStringLiteral): "'foo\\nbar'" # (0..10) - - (TrailingTrivia) ► (EndOfLine): "\n" # (10..11) + - (trailing_trivia꞉ EndOfLine): "\n" # (10..11) diff --git a/crates/solidity/testing/snapshots/cst_output/StringLiteral/tabs_double_quote/generated/0.4.12-success.yml b/crates/solidity/testing/snapshots/cst_output/StringLiteral/tabs_double_quote/generated/0.4.12-success.yml index bc7b64b701..713a930f4f 100644 --- a/crates/solidity/testing/snapshots/cst_output/StringLiteral/tabs_double_quote/generated/0.4.12-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/StringLiteral/tabs_double_quote/generated/0.4.12-success.yml @@ -8,4 +8,4 @@ Errors: [] Tree: - (StringLiteral): # '"tab:\t"\n' (0..8) - (variant꞉ DoubleQuotedStringLiteral): '"tab:\t"' # (0..7) - - (TrailingTrivia) ► (EndOfLine): "\n" # (7..8) + - (trailing_trivia꞉ EndOfLine): "\n" # (7..8) diff --git a/crates/solidity/testing/snapshots/cst_output/StringLiteral/tabs_single_quote/generated/0.4.12-success.yml b/crates/solidity/testing/snapshots/cst_output/StringLiteral/tabs_single_quote/generated/0.4.12-success.yml index cfc09624ca..a2320d7fae 100644 --- a/crates/solidity/testing/snapshots/cst_output/StringLiteral/tabs_single_quote/generated/0.4.12-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/StringLiteral/tabs_single_quote/generated/0.4.12-success.yml @@ -8,4 +8,4 @@ Errors: [] Tree: - (StringLiteral): # "'tab:\t'\n" (0..8) - (variant꞉ SingleQuotedStringLiteral): "'tab:\t'" # (0..7) - - (TrailingTrivia) ► (EndOfLine): "\n" # (7..8) + - (trailing_trivia꞉ EndOfLine): "\n" # (7..8) diff --git a/crates/solidity/testing/snapshots/cst_output/StringLiterals/both_quotes/generated/0.5.14-success.yml b/crates/solidity/testing/snapshots/cst_output/StringLiterals/both_quotes/generated/0.5.14-success.yml index 08e7ac0d48..7ae215520a 100644 --- a/crates/solidity/testing/snapshots/cst_output/StringLiterals/both_quotes/generated/0.5.14-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/StringLiterals/both_quotes/generated/0.5.14-success.yml @@ -9,5 +9,5 @@ Tree: - (StringLiterals): # '"foo" ''bar''' (0..11) - (item꞉ StringLiteral) ► (variant꞉ DoubleQuotedStringLiteral): '"foo"' # (0..5) - (item꞉ StringLiteral): # " 'bar'" (5..11) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (variant꞉ SingleQuotedStringLiteral): "'bar'" # (6..11) diff --git a/crates/solidity/testing/snapshots/cst_output/StringLiterals/double_quote_unicode/generated/0.5.14-success.yml b/crates/solidity/testing/snapshots/cst_output/StringLiterals/double_quote_unicode/generated/0.5.14-success.yml index cf34c13718..4814b7d551 100644 --- a/crates/solidity/testing/snapshots/cst_output/StringLiterals/double_quote_unicode/generated/0.5.14-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/StringLiterals/double_quote_unicode/generated/0.5.14-success.yml @@ -9,4 +9,4 @@ Tree: - (StringLiterals): # '"Fireworks 🎆"\n' (0..17) - (item꞉ StringLiteral): # '"Fireworks 🎆"\n' (0..17) - (variant꞉ DoubleQuotedStringLiteral): '"Fireworks 🎆"' # (0..16) - - (TrailingTrivia) ► (EndOfLine): "\n" # (16..17) + - (trailing_trivia꞉ EndOfLine): "\n" # (16..17) diff --git a/crates/solidity/testing/snapshots/cst_output/StringLiterals/single_quote/generated/0.5.14-success.yml b/crates/solidity/testing/snapshots/cst_output/StringLiterals/single_quote/generated/0.5.14-success.yml index 80608640c6..99e91470f2 100644 --- a/crates/solidity/testing/snapshots/cst_output/StringLiterals/single_quote/generated/0.5.14-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/StringLiterals/single_quote/generated/0.5.14-success.yml @@ -9,4 +9,4 @@ Tree: - (StringLiterals): # "'foo'\n" (0..6) - (item꞉ StringLiteral): # "'foo'\n" (0..6) - (variant꞉ SingleQuotedStringLiteral): "'foo'" # (0..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/StringLiterals/single_quote_unicode/generated/0.5.14-success.yml b/crates/solidity/testing/snapshots/cst_output/StringLiterals/single_quote_unicode/generated/0.5.14-success.yml index 4be9ccb623..94ff4bcf71 100644 --- a/crates/solidity/testing/snapshots/cst_output/StringLiterals/single_quote_unicode/generated/0.5.14-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/StringLiterals/single_quote_unicode/generated/0.5.14-success.yml @@ -9,4 +9,4 @@ Tree: - (StringLiterals): # "'Fireworks 🎆'\n" (0..17) - (item꞉ StringLiteral): # "'Fireworks 🎆'\n" (0..17) - (variant꞉ SingleQuotedStringLiteral): "'Fireworks 🎆'" # (0..16) - - (TrailingTrivia) ► (EndOfLine): "\n" # (16..17) + - (trailing_trivia꞉ EndOfLine): "\n" # (16..17) diff --git a/crates/solidity/testing/snapshots/cst_output/StructDefinition/no_members/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/StructDefinition/no_members/generated/0.4.11-success.yml index 2a9f2b22a5..3cb12fe4d7 100644 --- a/crates/solidity/testing/snapshots/cst_output/StructDefinition/no_members/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/StructDefinition/no_members/generated/0.4.11-success.yml @@ -8,11 +8,11 @@ Errors: [] Tree: - (StructDefinition): # "struct S { }\n" (0..13) - (struct_keyword꞉ StructKeyword): "struct" # (0..6) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (name꞉ Identifier): "S" # (7..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (open_brace꞉ OpenBrace): "{" # (9..10) - (members꞉ StructMembers): [] # (10..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (close_brace꞉ CloseBrace): "}" # (11..12) - - (TrailingTrivia) ► (EndOfLine): "\n" # (12..13) + - (trailing_trivia꞉ EndOfLine): "\n" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/multi_line_spanning_multiple_lines/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/multi_line_spanning_multiple_lines/generated/0.4.11-failure.yml deleted file mode 100644 index 80d6d7a63e..0000000000 --- a/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/multi_line_spanning_multiple_lines/generated/0.4.11-failure.yml +++ /dev/null @@ -1,21 +0,0 @@ -# This file is generated automatically by infrastructure scripts. Please don't edit by hand. - -Source: > - 1 │ /* some │ 0..8 - 2 │ comment*/ │ 9..18 - -Errors: # 1 total - - > - Error: Expected EndOfLine or SingleLineComment. - ╭─[crates/solidity/testing/snapshots/cst_output/TrailingTrivia/multi_line_spanning_multiple_lines/input.sol:1:2] - │ - 1 │ ╭─▶ /* some - 2 │ ├─▶ comment*/ - │ │ - │ ╰─────────────── Error occurred here. - ───╯ - -Tree: - - (TrailingTrivia): # " /* some\ncomment*/\n" (0..19) - - (Whitespace): " " # (0..1) - - (SKIPPED): "/* some\ncomment*/\n" # (1..19) diff --git a/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/multi_line_spanning_multiple_lines/input.sol b/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/multi_line_spanning_multiple_lines/input.sol deleted file mode 100644 index f706c76324..0000000000 --- a/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/multi_line_spanning_multiple_lines/input.sol +++ /dev/null @@ -1,2 +0,0 @@ - /* some -comment*/ diff --git a/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/multi_line_without_newline/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/multi_line_without_newline/generated/0.4.11-failure.yml deleted file mode 100644 index b2faae011a..0000000000 --- a/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/multi_line_without_newline/generated/0.4.11-failure.yml +++ /dev/null @@ -1,19 +0,0 @@ -# This file is generated automatically by infrastructure scripts. Please don't edit by hand. - -Source: > - 1 │ /* TODO: we should support this */ │ 0..35 - -Errors: # 1 total - - > - Error: Expected EndOfLine or SingleLineComment. - ╭─[crates/solidity/testing/snapshots/cst_output/TrailingTrivia/multi_line_without_newline/input.sol:1:2] - │ - 1 │ /* TODO: we should support this */ - │ ─────────────────┬───────────────── - │ ╰─────────────────── Error occurred here. - ───╯ - -Tree: - - (TrailingTrivia): # " /* TODO: we should support this */\n" (0..36) - - (Whitespace): " " # (0..1) - - (SKIPPED): "/* TODO: we should support this */\n" # (1..36) diff --git a/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/multi_line_without_newline/input.sol b/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/multi_line_without_newline/input.sol deleted file mode 100644 index 5c264d89f9..0000000000 --- a/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/multi_line_without_newline/input.sol +++ /dev/null @@ -1 +0,0 @@ - /* TODO: we should support this */ diff --git a/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/only_until_newline/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/only_until_newline/generated/0.4.11-failure.yml deleted file mode 100644 index a0aa25209f..0000000000 --- a/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/only_until_newline/generated/0.4.11-failure.yml +++ /dev/null @@ -1,22 +0,0 @@ -# This file is generated automatically by infrastructure scripts. Please don't edit by hand. - -Source: > - 1 │ // first │ 0..9 - 2 │ // second │ 10..20 - -Errors: # 1 total - - > - Error: Expected end of file. - ╭─[crates/solidity/testing/snapshots/cst_output/TrailingTrivia/only_until_newline/input.sol:2:1] - │ - 2 │ // second - │ ─────┬───── - │ ╰─────── Error occurred here. - ───╯ - -Tree: - - (TrailingTrivia): # " // first\n // second\n" (0..21) - - (Whitespace): " " # (0..1) - - (SingleLineComment): "// first" # (1..9) - - (EndOfLine): "\n" # (9..10) - - (SKIPPED): " // second\n" # (10..21) diff --git a/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/only_until_newline/input.sol b/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/only_until_newline/input.sol deleted file mode 100644 index 459eb11316..0000000000 --- a/crates/solidity/testing/snapshots/cst_output/TrailingTrivia/only_until_newline/input.sol +++ /dev/null @@ -1,2 +0,0 @@ - // first - // second diff --git a/crates/solidity/testing/snapshots/cst_output/TryStatement/try_catch/generated/0.6.0-success.yml b/crates/solidity/testing/snapshots/cst_output/TryStatement/try_catch/generated/0.6.0-success.yml index b65072533a..0bb595928b 100644 --- a/crates/solidity/testing/snapshots/cst_output/TryStatement/try_catch/generated/0.6.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TryStatement/try_catch/generated/0.6.0-success.yml @@ -11,7 +11,7 @@ Tree: - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # " a.b()" (3..9) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " a.b" (3..7) - (operand꞉ Expression): # " a" (3..5) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (variant꞉ Identifier): "a" # (4..5) - (period꞉ Period): "." # (5..6) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "b" # (6..7) @@ -20,16 +20,16 @@ Tree: - (arguments꞉ PositionalArguments): [] # (8..8) - (close_paren꞉ CloseParen): ")" # (8..9) - (body꞉ Block): # " {}" (9..12) - - (LeadingTrivia) ► (Whitespace): " " # (9..10) + - (leading_trivia꞉ Whitespace): " " # (9..10) - (open_brace꞉ OpenBrace): "{" # (10..11) - (statements꞉ Statements): [] # (11..11) - (close_brace꞉ CloseBrace): "}" # (11..12) - (catch_clauses꞉ CatchClauses): # " catch {}" (12..21) - (item꞉ CatchClause): # " catch {}" (12..21) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (catch_keyword꞉ CatchKeyword): "catch" # (13..18) - (body꞉ Block): # " {}" (18..21) - - (LeadingTrivia) ► (Whitespace): " " # (18..19) + - (leading_trivia꞉ Whitespace): " " # (18..19) - (open_brace꞉ OpenBrace): "{" # (19..20) - (statements꞉ Statements): [] # (20..20) - (close_brace꞉ CloseBrace): "}" # (20..21) diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_array_type/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_array_type/generated/0.4.11-success.yml index d93d8ef337..f79ca15b9e 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_array_type/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_array_type/generated/0.4.11-success.yml @@ -11,28 +11,28 @@ Tree: - (elements꞉ TupleDeconstructionElements): # "uint32 a, uint32[] memory b" (1..28) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ TypedTupleMember): # "uint32 a" (1..9) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint32" # (1..7) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (name꞉ Identifier): "a" # (8..9) - (separator꞉ Comma): "," # (9..10) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ TypedTupleMember): # " uint32[] memory b" (10..28) - (type_name꞉ TypeName) ► (variant꞉ ArrayTypeName): # " uint32[]" (10..19) - (operand꞉ TypeName) ► (variant꞉ ElementaryType): # " uint32" (10..17) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (variant꞉ UintKeyword): "uint32" # (11..17) - (open_bracket꞉ OpenBracket): "[" # (17..18) - (close_bracket꞉ CloseBracket): "]" # (18..19) - (storage_location꞉ StorageLocation): # " memory" (19..26) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (variant꞉ MemoryKeyword): "memory" # (20..26) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (name꞉ Identifier): "b" # (27..28) - (close_paren꞉ CloseParen): ")" # (28..29) - - (LeadingTrivia) ► (Whitespace): " " # (29..30) + - (leading_trivia꞉ Whitespace): " " # (29..30) - (equal꞉ Equal): "=" # (30..31) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # " abi.decode(data, (uint32, uint32[]))" (31..68) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " abi.decode" (31..42) - (operand꞉ Expression): # " abi" (31..35) - - (LeadingTrivia) ► (Whitespace): " " # (31..32) + - (leading_trivia꞉ Whitespace): " " # (31..32) - (variant꞉ Identifier): "abi" # (32..35) - (period꞉ Period): "." # (35..36) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "decode" # (36..42) @@ -42,14 +42,14 @@ Tree: - (item꞉ Expression) ► (variant꞉ Identifier): "data" # (43..47) - (separator꞉ Comma): "," # (47..48) - (item꞉ Expression) ► (variant꞉ TupleExpression): # " (uint32, uint32[])" (48..67) - - (LeadingTrivia) ► (Whitespace): " " # (48..49) + - (leading_trivia꞉ Whitespace): " " # (48..49) - (open_paren꞉ OpenParen): "(" # (49..50) - (items꞉ TupleValues): # "uint32, uint32[]" (50..66) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint32" # (50..56) - (separator꞉ Comma): "," # (56..57) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ IndexAccessExpression): # " uint32[]" (57..66) - (operand꞉ Expression) ► (variant꞉ ElementaryType): # " uint32" (57..64) - - (LeadingTrivia) ► (Whitespace): " " # (57..58) + - (leading_trivia꞉ Whitespace): " " # (57..58) - (variant꞉ UintKeyword): "uint32" # (58..64) - (open_bracket꞉ OpenBracket): "[" # (64..65) - (close_bracket꞉ CloseBracket): "]" # (65..66) diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_singleton_type/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_singleton_type/generated/0.4.11-success.yml index d95bd154ee..7b57f379f0 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_singleton_type/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_singleton_type/generated/0.4.11-success.yml @@ -11,22 +11,22 @@ Tree: - (elements꞉ TupleDeconstructionElements): # "uint32 a, uint32 b" (1..19) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ TypedTupleMember): # "uint32 a" (1..9) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint32" # (1..7) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (name꞉ Identifier): "a" # (8..9) - (separator꞉ Comma): "," # (9..10) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ TypedTupleMember): # " uint32 b" (10..19) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " uint32" (10..17) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (variant꞉ UintKeyword): "uint32" # (11..17) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (name꞉ Identifier): "b" # (18..19) - (close_paren꞉ CloseParen): ")" # (19..20) - - (LeadingTrivia) ► (Whitespace): " " # (20..21) + - (leading_trivia꞉ Whitespace): " " # (20..21) - (equal꞉ Equal): "=" # (21..22) - (expression꞉ Expression) ► (variant꞉ FunctionCallExpression): # " abi.decode(data, (uint32, uint32))" (22..57) - (operand꞉ Expression) ► (variant꞉ MemberAccessExpression): # " abi.decode" (22..33) - (operand꞉ Expression): # " abi" (22..26) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (variant꞉ Identifier): "abi" # (23..26) - (period꞉ Period): "." # (26..27) - (member꞉ MemberAccess) ► (variant꞉ Identifier): "decode" # (27..33) @@ -36,13 +36,13 @@ Tree: - (item꞉ Expression) ► (variant꞉ Identifier): "data" # (34..38) - (separator꞉ Comma): "," # (38..39) - (item꞉ Expression) ► (variant꞉ TupleExpression): # " (uint32, uint32)" (39..56) - - (LeadingTrivia) ► (Whitespace): " " # (39..40) + - (leading_trivia꞉ Whitespace): " " # (39..40) - (open_paren꞉ OpenParen): "(" # (40..41) - (items꞉ TupleValues): # "uint32, uint32" (41..55) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint32" # (41..47) - (separator꞉ Comma): "," # (47..48) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ ElementaryType): # " uint32" (48..55) - - (LeadingTrivia) ► (Whitespace): " " # (48..49) + - (leading_trivia꞉ Whitespace): " " # (48..49) - (variant꞉ UintKeyword): "uint32" # (49..55) - (close_paren꞉ CloseParen): ")" # (55..56) - (close_paren꞉ CloseParen): ")" # (56..57) diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/empty/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/empty/generated/0.4.11-success.yml index 7091c2f34f..9fa47d2109 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/empty/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/empty/generated/0.4.11-success.yml @@ -8,20 +8,19 @@ Errors: [] Tree: - (TupleDeconstructionStatement): # "// TODO(#671): Tuple expressions can't be empty\n()..." (0..57) - - (LeadingTrivia): # "// TODO(#671): Tuple expressions can't be empty\n" (0..48) - - (SingleLineComment): "// TODO(#671): Tuple expressions can't be empty" # (0..47) - - (EndOfLine): "\n" # (47..48) + - (leading_trivia꞉ SingleLineComment): "// TODO(#671): Tuple expressions can't be empty" # (0..47) + - (leading_trivia꞉ EndOfLine): "\n" # (47..48) - (open_paren꞉ OpenParen): "(" # (48..49) - (elements꞉ TupleDeconstructionElements): # "" (49..49) - (item꞉ TupleDeconstructionElement): [] # (49..49) - (close_paren꞉ CloseParen): ")" # (49..50) - - (LeadingTrivia) ► (Whitespace): " " # (50..51) + - (leading_trivia꞉ Whitespace): " " # (50..51) - (equal꞉ Equal): "=" # (51..52) - (expression꞉ Expression) ► (variant꞉ TupleExpression): # " ()" (52..55) - - (LeadingTrivia) ► (Whitespace): " " # (52..53) + - (leading_trivia꞉ Whitespace): " " # (52..53) - (open_paren꞉ OpenParen): "(" # (53..54) - (items꞉ TupleValues): # "" (54..54) - (item꞉ TupleValue): [] # (54..54) - (close_paren꞉ CloseParen): ")" # (54..55) - (semicolon꞉ Semicolon): ";" # (55..56) - - (TrailingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (56..57) diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/ignored_members/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/ignored_members/generated/0.4.11-success.yml index ba9ea0048b..f3742b3e5a 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/ignored_members/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/ignored_members/generated/0.4.11-success.yml @@ -12,19 +12,19 @@ Tree: - (item꞉ TupleDeconstructionElement): [] # (1..1) - (separator꞉ Comma): "," # (1..2) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ UntypedTupleMember): # " second" (2..9) - - (LeadingTrivia) ► (Whitespace): " " # (2..3) + - (leading_trivia꞉ Whitespace): " " # (2..3) - (name꞉ Identifier): "second" # (3..9) - (separator꞉ Comma): "," # (9..10) - (item꞉ TupleDeconstructionElement): [] # (10..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (separator꞉ Comma): "," # (11..12) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ UntypedTupleMember): # " fourth" (12..19) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (name꞉ Identifier): "fourth" # (13..19) - (close_paren꞉ CloseParen): ")" # (19..20) - - (LeadingTrivia) ► (Whitespace): " " # (20..21) + - (leading_trivia꞉ Whitespace): " " # (20..21) - (equal꞉ Equal): "=" # (21..22) - (expression꞉ Expression): # " rhs" (22..26) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (variant꞉ Identifier): "rhs" # (23..26) - (semicolon꞉ Semicolon): ";" # (26..27) diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.4.11-failure.yml index 937f4d320d..7766450211 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.4.11-failure.yml @@ -23,20 +23,20 @@ Tree: - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ UntypedTupleMember) ► (name꞉ Identifier): "a" # (1..2) - (separator꞉ Comma): "," # (2..3) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ UntypedTupleMember): # " b" (3..5) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (name꞉ Identifier): "b" # (4..5) - (close_paren꞉ CloseParen): ")" # (5..6) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (equal꞉ Equal): "=" # (7..8) - (expression꞉ Expression) ► (variant꞉ TupleExpression): # " (123, 135)\n" (8..20) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (open_paren꞉ OpenParen): "(" # (9..10) - (items꞉ TupleValues): # "123, 135" (10..18) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "123" # (10..13) - (separator꞉ Comma): "," # (13..14) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 135" (14..18) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (literal꞉ DecimalLiteral): "135" # (15..18) - (close_paren꞉ CloseParen): ")" # (18..19) - - (TrailingTrivia) ► (EndOfLine): "\n" # (19..20) + - (trailing_trivia꞉ EndOfLine): "\n" # (19..20) - (SKIPPED): "/**/\n{ throw; \n" # (20..35) diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.6.2-failure.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.6.2-failure.yml index 7b3a02fa9f..eadd1d91ab 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.6.2-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.6.2-failure.yml @@ -22,33 +22,31 @@ Tree: - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ UntypedTupleMember) ► (name꞉ Identifier): "a" # (1..2) - (separator꞉ Comma): "," # (2..3) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ UntypedTupleMember): # " b" (3..5) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (name꞉ Identifier): "b" # (4..5) - (close_paren꞉ CloseParen): ")" # (5..6) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (equal꞉ Equal): "=" # (7..8) - (expression꞉ Expression): # " (123, 135)\n/**/\n{" (8..26) - (variant꞉ TupleExpression): # " (123, 135)\n" (8..20) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (open_paren꞉ OpenParen): "(" # (9..10) - (items꞉ TupleValues): # "123, 135" (10..18) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "123" # (10..13) - (separator꞉ Comma): "," # (13..14) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 135" (14..18) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (literal꞉ DecimalLiteral): "135" # (15..18) - (close_paren꞉ CloseParen): ")" # (18..19) - - (TrailingTrivia) ► (EndOfLine): "\n" # (19..20) + - (trailing_trivia꞉ EndOfLine): "\n" # (19..20) - (options꞉ FunctionCallOptions) ► (variant꞉ NamedArgumentGroups): # "/**/\n{" (20..26) - (item꞉ NamedArgumentGroup): # "/**/\n{" (20..26) - - (LeadingTrivia): # "/**/\n" (20..25) - - (MultiLineComment): "/**/" # (20..24) - - (EndOfLine): "\n" # (24..25) + - (leading_trivia꞉ MultiLineComment): "/**/" # (20..24) + - (leading_trivia꞉ EndOfLine): "\n" # (24..25) - (open_brace꞉ OpenBrace): "{" # (25..26) - (arguments꞉ NamedArguments): [] # (26..26) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (SKIPPED): "throw" # (27..32) - (semicolon꞉ Semicolon): ";" # (32..33) - - (TrailingTrivia): # " \n" (33..35) - - (Whitespace): " " # (33..34) - - (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ Whitespace): " " # (33..34) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.8.0-failure.yml index ea3b97b72a..b7193eab8c 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.8.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.8.0-failure.yml @@ -22,32 +22,30 @@ Tree: - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ UntypedTupleMember) ► (name꞉ Identifier): "a" # (1..2) - (separator꞉ Comma): "," # (2..3) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ UntypedTupleMember): # " b" (3..5) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (name꞉ Identifier): "b" # (4..5) - (close_paren꞉ CloseParen): ")" # (5..6) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (equal꞉ Equal): "=" # (7..8) - (expression꞉ Expression): # " (123, 135)\n/**/\n{" (8..26) - (variant꞉ TupleExpression): # " (123, 135)\n" (8..20) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (open_paren꞉ OpenParen): "(" # (9..10) - (items꞉ TupleValues): # "123, 135" (10..18) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression) ► (literal꞉ DecimalLiteral): "123" # (10..13) - (separator꞉ Comma): "," # (13..14) - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 135" (14..18) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (literal꞉ DecimalLiteral): "135" # (15..18) - (close_paren꞉ CloseParen): ")" # (18..19) - - (TrailingTrivia) ► (EndOfLine): "\n" # (19..20) + - (trailing_trivia꞉ EndOfLine): "\n" # (19..20) - (options꞉ FunctionCallOptions) ► (variant꞉ NamedArgumentGroup): # "/**/\n{" (20..26) - - (LeadingTrivia): # "/**/\n" (20..25) - - (MultiLineComment): "/**/" # (20..24) - - (EndOfLine): "\n" # (24..25) + - (leading_trivia꞉ MultiLineComment): "/**/" # (20..24) + - (leading_trivia꞉ EndOfLine): "\n" # (24..25) - (open_brace꞉ OpenBrace): "{" # (25..26) - (arguments꞉ NamedArguments): [] # (26..26) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (SKIPPED): "throw" # (27..32) - (semicolon꞉ Semicolon): ";" # (32..33) - - (TrailingTrivia): # " \n" (33..35) - - (Whitespace): " " # (33..34) - - (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ Whitespace): " " # (33..34) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_location/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_location/generated/0.4.11-success.yml index 77c416e3cf..71c043fe7e 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_location/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_location/generated/0.4.11-success.yml @@ -11,16 +11,16 @@ Tree: - (elements꞉ TupleDeconstructionElements): # "memory with_location, without_location" (1..39) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ UntypedTupleMember): # "memory with_location" (1..21) - (storage_location꞉ StorageLocation) ► (variant꞉ MemoryKeyword): "memory" # (1..7) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (name꞉ Identifier): "with_location" # (8..21) - (separator꞉ Comma): "," # (21..22) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ UntypedTupleMember): # " without_location" (22..39) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (name꞉ Identifier): "without_location" # (23..39) - (close_paren꞉ CloseParen): ")" # (39..40) - - (LeadingTrivia) ► (Whitespace): " " # (40..41) + - (leading_trivia꞉ Whitespace): " " # (40..41) - (equal꞉ Equal): "=" # (41..42) - (expression꞉ Expression): # " rhs" (42..46) - - (LeadingTrivia) ► (Whitespace): " " # (42..43) + - (leading_trivia꞉ Whitespace): " " # (42..43) - (variant꞉ Identifier): "rhs" # (43..46) - (semicolon꞉ Semicolon): ";" # (46..47) diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type/generated/0.4.11-success.yml index b890d90a7f..317c6df202 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type/generated/0.4.11-success.yml @@ -11,16 +11,16 @@ Tree: - (elements꞉ TupleDeconstructionElements): # "bool with_type, without_type" (1..29) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ TypedTupleMember): # "bool with_type" (1..15) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ BoolKeyword): "bool" # (1..5) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (name꞉ Identifier): "with_type" # (6..15) - (separator꞉ Comma): "," # (15..16) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ UntypedTupleMember): # " without_type" (16..29) - - (LeadingTrivia) ► (Whitespace): " " # (16..17) + - (leading_trivia꞉ Whitespace): " " # (16..17) - (name꞉ Identifier): "without_type" # (17..29) - (close_paren꞉ CloseParen): ")" # (29..30) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (equal꞉ Equal): "=" # (31..32) - (expression꞉ Expression): # " rhs" (32..36) - - (LeadingTrivia) ► (Whitespace): " " # (32..33) + - (leading_trivia꞉ Whitespace): " " # (32..33) - (variant꞉ Identifier): "rhs" # (33..36) - (semicolon꞉ Semicolon): ";" # (36..37) diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type_and_location/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type_and_location/generated/0.4.11-success.yml index cd3c71d55f..17bffa9043 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type_and_location/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type_and_location/generated/0.4.11-success.yml @@ -12,24 +12,24 @@ Tree: - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ TypedTupleMember): # "bool memory x" (1..14) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ BoolKeyword): "bool" # (1..5) - (storage_location꞉ StorageLocation): # " memory" (5..12) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (variant꞉ MemoryKeyword): "memory" # (6..12) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (name꞉ Identifier): "x" # (13..14) - (separator꞉ Comma): "," # (14..15) - (item꞉ TupleDeconstructionElement) ► (member꞉ TupleMember) ► (variant꞉ TypedTupleMember): # " bool storage y" (15..30) - (type_name꞉ TypeName) ► (variant꞉ ElementaryType): # " bool" (15..20) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (variant꞉ BoolKeyword): "bool" # (16..20) - (storage_location꞉ StorageLocation): # " storage" (20..28) - - (LeadingTrivia) ► (Whitespace): " " # (20..21) + - (leading_trivia꞉ Whitespace): " " # (20..21) - (variant꞉ StorageKeyword): "storage" # (21..28) - - (LeadingTrivia) ► (Whitespace): " " # (28..29) + - (leading_trivia꞉ Whitespace): " " # (28..29) - (name꞉ Identifier): "y" # (29..30) - (close_paren꞉ CloseParen): ")" # (30..31) - - (LeadingTrivia) ► (Whitespace): " " # (31..32) + - (leading_trivia꞉ Whitespace): " " # (31..32) - (equal꞉ Equal): "=" # (32..33) - (expression꞉ Expression): # " rhs" (33..37) - - (LeadingTrivia) ► (Whitespace): " " # (33..34) + - (leading_trivia꞉ Whitespace): " " # (33..34) - (variant꞉ Identifier): "rhs" # (34..37) - (semicolon꞉ Semicolon): ";" # (37..38) diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_var/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_var/generated/0.4.11-success.yml index 30d15feabb..832ce7bfb1 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_var/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_var/generated/0.4.11-success.yml @@ -8,23 +8,22 @@ 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) + - (leading_trivia꞉ SingleLineComment): '// "var" should be disabled in "0.5.0":' # (0..39) + - (leading_trivia꞉ EndOfLine): "\n" # (39..40) - (var_keyword꞉ VarKeyword): "var" # (40..43) - - (LeadingTrivia) ► (Whitespace): " " # (43..44) + - (leading_trivia꞉ 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) + - (leading_trivia꞉ Whitespace): " " # (49..50) - (name꞉ Identifier): "bar" # (50..53) - (close_paren꞉ CloseParen): ")" # (53..54) - - (LeadingTrivia) ► (Whitespace): " " # (54..55) + - (leading_trivia꞉ Whitespace): " " # (54..55) - (equal꞉ Equal): "=" # (55..56) - (expression꞉ Expression): # " rhs" (56..60) - - (LeadingTrivia) ► (Whitespace): " " # (56..57) + - (leading_trivia꞉ Whitespace): " " # (56..57) - (variant꞉ Identifier): "rhs" # (57..60) - (semicolon꞉ Semicolon): ";" # (60..61) - - (TrailingTrivia) ► (EndOfLine): "\n" # (61..62) + - (trailing_trivia꞉ EndOfLine): "\n" # (61..62) diff --git a/crates/solidity/testing/snapshots/cst_output/TupleExpression/empty/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleExpression/empty/generated/0.4.11-success.yml index 102a78c1f8..4eb6b203e7 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleExpression/empty/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleExpression/empty/generated/0.4.11-success.yml @@ -10,5 +10,5 @@ Tree: - (open_paren꞉ OpenParen): "(" # (0..1) - (items꞉ TupleValues): # "" (1..1) - (item꞉ TupleValue): [] # (1..1) - - (LeadingTrivia) ► (Whitespace): " " # (1..2) + - (leading_trivia꞉ Whitespace): " " # (1..2) - (close_paren꞉ CloseParen): ")" # (2..3) diff --git a/crates/solidity/testing/snapshots/cst_output/TupleExpression/full/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleExpression/full/generated/0.4.11-success.yml index 1804fb9c72..4090b6085a 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleExpression/full/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleExpression/full/generated/0.4.11-success.yml @@ -12,14 +12,14 @@ Tree: - (item꞉ TupleValue) ► (expression꞉ Expression) ► (variant꞉ Identifier): "first" # (1..6) - (separator꞉ Comma): "," # (6..7) - (item꞉ TupleValue) ► (expression꞉ Expression): # " second" (7..14) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (variant꞉ Identifier): "second" # (8..14) - (separator꞉ Comma): "," # (14..15) - (item꞉ TupleValue) ► (expression꞉ Expression): # " third" (15..21) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (variant꞉ Identifier): "third" # (16..21) - (separator꞉ Comma): "," # (21..22) - (item꞉ TupleValue) ► (expression꞉ Expression): # " fourth" (22..29) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (variant꞉ Identifier): "fourth" # (23..29) - (close_paren꞉ CloseParen): ")" # (29..30) diff --git a/crates/solidity/testing/snapshots/cst_output/TupleExpression/missing_elements/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleExpression/missing_elements/generated/0.4.11-success.yml index 8e8f06268e..a168487acd 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleExpression/missing_elements/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleExpression/missing_elements/generated/0.4.11-success.yml @@ -12,13 +12,13 @@ Tree: - (item꞉ TupleValue): [] # (1..1) - (separator꞉ Comma): "," # (1..2) - (item꞉ TupleValue) ► (expression꞉ Expression): # " second" (2..9) - - (LeadingTrivia) ► (Whitespace): " " # (2..3) + - (leading_trivia꞉ Whitespace): " " # (2..3) - (variant꞉ Identifier): "second" # (3..9) - (separator꞉ Comma): "," # (9..10) - (item꞉ TupleValue): [] # (10..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (separator꞉ Comma): "," # (11..12) - (item꞉ TupleValue) ► (expression꞉ Expression): # " fourth" (12..19) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (variant꞉ Identifier): "fourth" # (13..19) - (close_paren꞉ CloseParen): ")" # (19..20) diff --git a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/multiple/generated/0.7.0-success.yml b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/multiple/generated/0.7.0-success.yml index ef791def94..998a75b192 100644 --- a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/multiple/generated/0.7.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/multiple/generated/0.7.0-success.yml @@ -9,5 +9,5 @@ Tree: - (UnicodeStringLiterals): # 'unicode"happy 😃" unicode''sad 😔''' (0..37) - (item꞉ UnicodeStringLiteral) ► (variant꞉ DoubleQuotedUnicodeStringLiteral): 'unicode"happy 😃"' # (0..19) - (item꞉ UnicodeStringLiteral): # " unicode'sad 😔'" (19..37) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (variant꞉ SingleQuotedUnicodeStringLiteral): "unicode'sad 😔'" # (20..37) diff --git a/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/internal_attribute/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/internal_attribute/generated/0.4.11-success.yml index 83a9800f0a..97d483387a 100644 --- a/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/internal_attribute/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/internal_attribute/generated/0.4.11-success.yml @@ -9,17 +9,17 @@ Tree: - (UnnamedFunctionDefinition): # "function () internal {}\n" (0..24) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (parameters꞉ ParametersDeclaration): # " ()" (8..11) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (open_paren꞉ OpenParen): "(" # (9..10) - (parameters꞉ Parameters): [] # (10..10) - (close_paren꞉ CloseParen): ")" # (10..11) - (attributes꞉ UnnamedFunctionAttributes): # " internal" (11..20) - (item꞉ UnnamedFunctionAttribute): # " internal" (11..20) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (variant꞉ InternalKeyword): "internal" # (12..20) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {}\n" (20..24) - - (LeadingTrivia) ► (Whitespace): " " # (20..21) + - (leading_trivia꞉ Whitespace): " " # (20..21) - (open_brace꞉ OpenBrace): "{" # (21..22) - (statements꞉ Statements): [] # (22..22) - (close_brace꞉ CloseBrace): "}" # (22..23) - - (TrailingTrivia) ► (EndOfLine): "\n" # (23..24) + - (trailing_trivia꞉ EndOfLine): "\n" # (23..24) diff --git a/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/internal_attribute/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/internal_attribute/generated/0.5.0-failure.yml index 6a21f48af4..b0609346aa 100644 --- a/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/internal_attribute/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/internal_attribute/generated/0.5.0-failure.yml @@ -17,7 +17,7 @@ Tree: - (UnnamedFunctionDefinition): # "function () internal {}\n" (0..24) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (parameters꞉ ParametersDeclaration): # " ()" (8..11) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (open_paren꞉ OpenParen): "(" # (9..10) - (parameters꞉ Parameters): [] # (10..10) - (close_paren꞉ CloseParen): ")" # (10..11) diff --git a/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/private_attribute/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/private_attribute/generated/0.4.11-success.yml index 14c5aa3674..2d54f901cf 100644 --- a/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/private_attribute/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/private_attribute/generated/0.4.11-success.yml @@ -9,17 +9,17 @@ Tree: - (UnnamedFunctionDefinition): # "function () private {}\n" (0..23) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (parameters꞉ ParametersDeclaration): # " ()" (8..11) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (open_paren꞉ OpenParen): "(" # (9..10) - (parameters꞉ Parameters): [] # (10..10) - (close_paren꞉ CloseParen): ")" # (10..11) - (attributes꞉ UnnamedFunctionAttributes): # " private" (11..19) - (item꞉ UnnamedFunctionAttribute): # " private" (11..19) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (variant꞉ PrivateKeyword): "private" # (12..19) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {}\n" (19..23) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (open_brace꞉ OpenBrace): "{" # (20..21) - (statements꞉ Statements): [] # (21..21) - (close_brace꞉ CloseBrace): "}" # (21..22) - - (TrailingTrivia) ► (EndOfLine): "\n" # (22..23) + - (trailing_trivia꞉ EndOfLine): "\n" # (22..23) diff --git a/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/private_attribute/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/private_attribute/generated/0.5.0-failure.yml index ceb718ffb8..a3639b3265 100644 --- a/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/private_attribute/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/private_attribute/generated/0.5.0-failure.yml @@ -17,7 +17,7 @@ Tree: - (UnnamedFunctionDefinition): # "function () private {}\n" (0..23) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (parameters꞉ ParametersDeclaration): # " ()" (8..11) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (open_paren꞉ OpenParen): "(" # (9..10) - (parameters꞉ Parameters): [] # (10..10) - (close_paren꞉ CloseParen): ")" # (10..11) diff --git a/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/public_attribute/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/public_attribute/generated/0.4.11-success.yml index acad4e9bcc..c2f769c9fc 100644 --- a/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/public_attribute/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/public_attribute/generated/0.4.11-success.yml @@ -9,17 +9,17 @@ Tree: - (UnnamedFunctionDefinition): # "function () public {}\n" (0..22) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (parameters꞉ ParametersDeclaration): # " ()" (8..11) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (open_paren꞉ OpenParen): "(" # (9..10) - (parameters꞉ Parameters): [] # (10..10) - (close_paren꞉ CloseParen): ")" # (10..11) - (attributes꞉ UnnamedFunctionAttributes): # " public" (11..18) - (item꞉ UnnamedFunctionAttribute): # " public" (11..18) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (variant꞉ PublicKeyword): "public" # (12..18) - (body꞉ FunctionBody) ► (variant꞉ Block): # " {}\n" (18..22) - - (LeadingTrivia) ► (Whitespace): " " # (18..19) + - (leading_trivia꞉ Whitespace): " " # (18..19) - (open_brace꞉ OpenBrace): "{" # (19..20) - (statements꞉ Statements): [] # (20..20) - (close_brace꞉ CloseBrace): "}" # (20..21) - - (TrailingTrivia) ► (EndOfLine): "\n" # (21..22) + - (trailing_trivia꞉ EndOfLine): "\n" # (21..22) diff --git a/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/public_attribute/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/public_attribute/generated/0.5.0-failure.yml index 9239261d3c..6b00510ec7 100644 --- a/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/public_attribute/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UnnamedFunctionDefinition/public_attribute/generated/0.5.0-failure.yml @@ -17,7 +17,7 @@ Tree: - (UnnamedFunctionDefinition): # "function () public {}\n" (0..22) - (function_keyword꞉ FunctionKeyword): "function" # (0..8) - (parameters꞉ ParametersDeclaration): # " ()" (8..11) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (open_paren꞉ OpenParen): "(" # (9..10) - (parameters꞉ Parameters): [] # (10..10) - (close_paren꞉ CloseParen): ")" # (10..11) diff --git a/crates/solidity/testing/snapshots/cst_output/UserDefinedValueTypeDefinition/bool/generated/0.8.8-success.yml b/crates/solidity/testing/snapshots/cst_output/UserDefinedValueTypeDefinition/bool/generated/0.8.8-success.yml index ef02e7080c..db8de9215e 100644 --- a/crates/solidity/testing/snapshots/cst_output/UserDefinedValueTypeDefinition/bool/generated/0.8.8-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UserDefinedValueTypeDefinition/bool/generated/0.8.8-success.yml @@ -8,11 +8,11 @@ Errors: [] Tree: - (UserDefinedValueTypeDefinition): # "type Foo is bool;" (0..17) - (type_keyword꞉ TypeKeyword): "type" # (0..4) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (name꞉ Identifier): "Foo" # (5..8) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (is_keyword꞉ IsKeyword): "is" # (9..11) - (value_type꞉ ElementaryType): # " bool" (11..16) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (variant꞉ BoolKeyword): "bool" # (12..16) - (semicolon꞉ Semicolon): ";" # (16..17) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/generated/0.8.13-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/generated/0.8.13-failure.yml index 2a171f2b14..36ac989ab1 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/generated/0.8.13-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/generated/0.8.13-failure.yml @@ -19,5 +19,5 @@ Tree: - (item꞉ Identifier): "foo" # (0..3) - (separator꞉ Period): "." # (3..4) - (item꞉ Identifier): "bar" # (4..7) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (SKIPPED): "as /" # (8..12) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/generated/0.8.19-success.yml b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/generated/0.8.19-success.yml index 0ce8ff6e91..6fc418cf64 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/generated/0.8.19-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/generated/0.8.19-success.yml @@ -12,8 +12,8 @@ Tree: - (separator꞉ Period): "." # (3..4) - (item꞉ Identifier): "bar" # (4..7) - (alias꞉ UsingAlias): # " as /" (7..12) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (as_keyword꞉ AsKeyword): "as" # (8..10) - (operator꞉ UsingOperator): # " /" (10..12) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (variant꞉ Slash): "/" # (11..12) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/generated/0.8.13-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/generated/0.8.13-failure.yml index 4277bfa0c1..c4e43e9c3e 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/generated/0.8.13-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/generated/0.8.13-failure.yml @@ -17,5 +17,5 @@ Tree: - (UsingDeconstructionSymbol): # "foo as /" (0..8) - (name꞉ IdentifierPath): # "foo" (0..3) - (item꞉ Identifier): "foo" # (0..3) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (SKIPPED): "as /" # (4..8) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/generated/0.8.19-success.yml b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/generated/0.8.19-success.yml index f8d8f0b232..eeb1aca7dc 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/generated/0.8.19-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/generated/0.8.19-success.yml @@ -10,8 +10,8 @@ Tree: - (name꞉ IdentifierPath): # "foo" (0..3) - (item꞉ Identifier): "foo" # (0..3) - (alias꞉ UsingAlias): # " as /" (3..8) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (as_keyword꞉ AsKeyword): "as" # (4..6) - (operator꞉ UsingOperator): # " /" (6..8) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (variant꞉ Slash): "/" # (7..8) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_empty/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_empty/generated/0.4.11-failure.yml index 3c77060204..c459e21ca7 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_empty/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_empty/generated/0.4.11-failure.yml @@ -16,11 +16,10 @@ Errors: # 1 total Tree: - (UsingDirective): # "// Empty using symbols list is not valid\nusing {} ..." (0..57) - - (LeadingTrivia): # "// Empty using symbols list is not valid\n" (0..41) - - (SingleLineComment): "// Empty using symbols list is not valid" # (0..40) - - (EndOfLine): "\n" # (40..41) + - (leading_trivia꞉ SingleLineComment): "// Empty using symbols list is not valid" # (0..40) + - (leading_trivia꞉ EndOfLine): "\n" # (40..41) - (using_keyword꞉ UsingKeyword): "using" # (41..46) - - (LeadingTrivia) ► (Whitespace): " " # (46..47) + - (leading_trivia꞉ Whitespace): " " # (46..47) - (SKIPPED): "{} for *" # (47..55) - (semicolon꞉ Semicolon): ";" # (55..56) - - (TrailingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (56..57) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_empty/generated/0.8.13-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_empty/generated/0.8.13-failure.yml index 43fef0aac5..fdd2501e34 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_empty/generated/0.8.13-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_empty/generated/0.8.13-failure.yml @@ -16,19 +16,18 @@ Errors: # 1 total Tree: - (UsingDirective): # "// Empty using symbols list is not valid\nusing {} ..." (0..57) - - (LeadingTrivia): # "// Empty using symbols list is not valid\n" (0..41) - - (SingleLineComment): "// Empty using symbols list is not valid" # (0..40) - - (EndOfLine): "\n" # (40..41) + - (leading_trivia꞉ SingleLineComment): "// Empty using symbols list is not valid" # (0..40) + - (leading_trivia꞉ EndOfLine): "\n" # (40..41) - (using_keyword꞉ UsingKeyword): "using" # (41..46) - (clause꞉ UsingClause) ► (variant꞉ UsingDeconstruction): # " {}" (46..49) - - (LeadingTrivia) ► (Whitespace): " " # (46..47) + - (leading_trivia꞉ Whitespace): " " # (46..47) - (open_brace꞉ OpenBrace): "{" # (47..48) - (SKIPPED): "" # (48..48) - (close_brace꞉ CloseBrace): "}" # (48..49) - - (LeadingTrivia) ► (Whitespace): " " # (49..50) + - (leading_trivia꞉ Whitespace): " " # (49..50) - (for_keyword꞉ ForKeyword): "for" # (50..53) - (target꞉ UsingTarget): # " *" (53..55) - - (LeadingTrivia) ► (Whitespace): " " # (53..54) + - (leading_trivia꞉ Whitespace): " " # (53..54) - (variant꞉ Asterisk): "*" # (54..55) - (semicolon꞉ Semicolon): ";" # (55..56) - - (TrailingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (56..57) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.4.11-failure.yml index 023f777a54..73841d2903 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.4.11-failure.yml @@ -16,6 +16,6 @@ Errors: # 1 total Tree: - (UsingDirective): # "using {add as +, sub, mul, div as /} for Int globa..." (0..52) - (using_keyword꞉ UsingKeyword): "using" # (0..5) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (SKIPPED): "{add as +, sub, mul, div as /} for Int global" # (6..51) - (semicolon꞉ Semicolon): ";" # (51..52) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.8.13-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.8.13-failure.yml index f06dfe74c5..2c1b460f70 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.8.13-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.8.13-failure.yml @@ -17,19 +17,19 @@ Tree: - (UsingDirective): # "using {add as +, sub, mul, div as /} for Int globa..." (0..52) - (using_keyword꞉ UsingKeyword): "using" # (0..5) - (clause꞉ UsingClause) ► (variant꞉ UsingDeconstruction): # " {add as +, sub, mul, div as /}" (5..36) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (open_brace꞉ OpenBrace): "{" # (6..7) - (symbols꞉ UsingDeconstructionSymbols): # "add" (7..10) - (item꞉ UsingDeconstructionSymbol) ► (name꞉ IdentifierPath): # "add" (7..10) - (item꞉ Identifier): "add" # (7..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (SKIPPED): "as +, sub, mul, div as /" # (11..35) - (close_brace꞉ CloseBrace): "}" # (35..36) - - (LeadingTrivia) ► (Whitespace): " " # (36..37) + - (leading_trivia꞉ Whitespace): " " # (36..37) - (for_keyword꞉ ForKeyword): "for" # (37..40) - (target꞉ UsingTarget) ► (variant꞉ TypeName) ► (variant꞉ IdentifierPath): # " Int" (40..44) - - (LeadingTrivia) ► (Whitespace): " " # (40..41) + - (leading_trivia꞉ Whitespace): " " # (40..41) - (item꞉ Identifier): "Int" # (41..44) - - (LeadingTrivia) ► (Whitespace): " " # (44..45) + - (leading_trivia꞉ Whitespace): " " # (44..45) - (global_keyword꞉ GlobalKeyword): "global" # (45..51) - (semicolon꞉ Semicolon): ";" # (51..52) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.8.19-success.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.8.19-success.yml index faf87f0c53..9baf59e747 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.8.19-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_multiple/generated/0.8.19-success.yml @@ -9,43 +9,43 @@ Tree: - (UsingDirective): # "using {add as +, sub, mul, div as /} for Int globa..." (0..52) - (using_keyword꞉ UsingKeyword): "using" # (0..5) - (clause꞉ UsingClause) ► (variant꞉ UsingDeconstruction): # " {add as +, sub, mul, div as /}" (5..36) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (open_brace꞉ OpenBrace): "{" # (6..7) - (symbols꞉ UsingDeconstructionSymbols): # "add as +, sub, mul, div as /" (7..35) - (item꞉ UsingDeconstructionSymbol): # "add as +" (7..15) - (name꞉ IdentifierPath): # "add" (7..10) - (item꞉ Identifier): "add" # (7..10) - (alias꞉ UsingAlias): # " as +" (10..15) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (as_keyword꞉ AsKeyword): "as" # (11..13) - (operator꞉ UsingOperator): # " +" (13..15) - - (LeadingTrivia) ► (Whitespace): " " # (13..14) + - (leading_trivia꞉ Whitespace): " " # (13..14) - (variant꞉ Plus): "+" # (14..15) - (separator꞉ Comma): "," # (15..16) - (item꞉ UsingDeconstructionSymbol) ► (name꞉ IdentifierPath): # " sub" (16..20) - - (LeadingTrivia) ► (Whitespace): " " # (16..17) + - (leading_trivia꞉ Whitespace): " " # (16..17) - (item꞉ Identifier): "sub" # (17..20) - (separator꞉ Comma): "," # (20..21) - (item꞉ UsingDeconstructionSymbol) ► (name꞉ IdentifierPath): # " mul" (21..25) - - (LeadingTrivia) ► (Whitespace): " " # (21..22) + - (leading_trivia꞉ Whitespace): " " # (21..22) - (item꞉ Identifier): "mul" # (22..25) - (separator꞉ Comma): "," # (25..26) - (item꞉ UsingDeconstructionSymbol): # " div as /" (26..35) - (name꞉ IdentifierPath): # " div" (26..30) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (item꞉ Identifier): "div" # (27..30) - (alias꞉ UsingAlias): # " as /" (30..35) - - (LeadingTrivia) ► (Whitespace): " " # (30..31) + - (leading_trivia꞉ Whitespace): " " # (30..31) - (as_keyword꞉ AsKeyword): "as" # (31..33) - (operator꞉ UsingOperator): # " /" (33..35) - - (LeadingTrivia) ► (Whitespace): " " # (33..34) + - (leading_trivia꞉ Whitespace): " " # (33..34) - (variant꞉ Slash): "/" # (34..35) - (close_brace꞉ CloseBrace): "}" # (35..36) - - (LeadingTrivia) ► (Whitespace): " " # (36..37) + - (leading_trivia꞉ Whitespace): " " # (36..37) - (for_keyword꞉ ForKeyword): "for" # (37..40) - (target꞉ UsingTarget) ► (variant꞉ TypeName) ► (variant꞉ IdentifierPath): # " Int" (40..44) - - (LeadingTrivia) ► (Whitespace): " " # (40..41) + - (leading_trivia꞉ Whitespace): " " # (40..41) - (item꞉ Identifier): "Int" # (41..44) - - (LeadingTrivia) ► (Whitespace): " " # (44..45) + - (leading_trivia꞉ Whitespace): " " # (44..45) - (global_keyword꞉ GlobalKeyword): "global" # (45..51) - (semicolon꞉ Semicolon): ";" # (51..52) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.4.11-failure.yml index 3a99f95ca0..c04d257f89 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.4.11-failure.yml @@ -16,6 +16,6 @@ Errors: # 1 total Tree: - (UsingDirective): # "using {add} for Int global;" (0..27) - (using_keyword꞉ UsingKeyword): "using" # (0..5) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (SKIPPED): "{add} for Int global" # (6..26) - (semicolon꞉ Semicolon): ";" # (26..27) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.8.13-success.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.8.13-success.yml index 91f0ee53eb..84a2c29318 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.8.13-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/destructure_single/generated/0.8.13-success.yml @@ -9,17 +9,17 @@ Tree: - (UsingDirective): # "using {add} for Int global;" (0..27) - (using_keyword꞉ UsingKeyword): "using" # (0..5) - (clause꞉ UsingClause) ► (variant꞉ UsingDeconstruction): # " {add}" (5..11) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (open_brace꞉ OpenBrace): "{" # (6..7) - (symbols꞉ UsingDeconstructionSymbols): # "add" (7..10) - (item꞉ UsingDeconstructionSymbol) ► (name꞉ IdentifierPath): # "add" (7..10) - (item꞉ Identifier): "add" # (7..10) - (close_brace꞉ CloseBrace): "}" # (10..11) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (for_keyword꞉ ForKeyword): "for" # (12..15) - (target꞉ UsingTarget) ► (variant꞉ TypeName) ► (variant꞉ IdentifierPath): # " Int" (15..19) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (item꞉ Identifier): "Int" # (16..19) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (global_keyword꞉ GlobalKeyword): "global" # (20..26) - (semicolon꞉ Semicolon): ";" # (26..27) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml index dd4646adb9..5b0b31d854 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml @@ -17,13 +17,13 @@ Tree: - (UsingDirective): # "using foo for bar global;" (0..25) - (using_keyword꞉ UsingKeyword): "using" # (0..5) - (clause꞉ UsingClause) ► (variant꞉ IdentifierPath): # " foo" (5..9) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (item꞉ Identifier): "foo" # (6..9) - - (LeadingTrivia) ► (Whitespace): " " # (9..10) + - (leading_trivia꞉ Whitespace): " " # (9..10) - (for_keyword꞉ ForKeyword): "for" # (10..13) - (target꞉ UsingTarget) ► (variant꞉ TypeName) ► (variant꞉ IdentifierPath): # " bar" (13..17) - - (LeadingTrivia) ► (Whitespace): " " # (13..14) + - (leading_trivia꞉ Whitespace): " " # (13..14) - (item꞉ Identifier): "bar" # (14..17) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (SKIPPED): "global" # (18..24) - (semicolon꞉ Semicolon): ";" # (24..25) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.8.13-success.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.8.13-success.yml index 7d52bc2f4e..4e4d40b6c3 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.8.13-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.8.13-success.yml @@ -9,13 +9,13 @@ Tree: - (UsingDirective): # "using foo for bar global;" (0..25) - (using_keyword꞉ UsingKeyword): "using" # (0..5) - (clause꞉ UsingClause) ► (variant꞉ IdentifierPath): # " foo" (5..9) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (item꞉ Identifier): "foo" # (6..9) - - (LeadingTrivia) ► (Whitespace): " " # (9..10) + - (leading_trivia꞉ Whitespace): " " # (9..10) - (for_keyword꞉ ForKeyword): "for" # (10..13) - (target꞉ UsingTarget) ► (variant꞉ TypeName) ► (variant꞉ IdentifierPath): # " bar" (13..17) - - (LeadingTrivia) ► (Whitespace): " " # (13..14) + - (leading_trivia꞉ Whitespace): " " # (13..14) - (item꞉ Identifier): "bar" # (14..17) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (global_keyword꞉ GlobalKeyword): "global" # (18..24) - (semicolon꞉ Semicolon): ";" # (24..25) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_unnamed/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_unnamed/generated/0.4.11-success.yml index ed057118c8..dc916a06cc 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_unnamed/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_unnamed/generated/0.4.11-success.yml @@ -9,11 +9,11 @@ Tree: - (UsingDirective): # "using foo for *;" (0..16) - (using_keyword꞉ UsingKeyword): "using" # (0..5) - (clause꞉ UsingClause) ► (variant꞉ IdentifierPath): # " foo" (5..9) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (item꞉ Identifier): "foo" # (6..9) - - (LeadingTrivia) ► (Whitespace): " " # (9..10) + - (leading_trivia꞉ Whitespace): " " # (9..10) - (for_keyword꞉ ForKeyword): "for" # (10..13) - (target꞉ UsingTarget): # " *" (13..15) - - (LeadingTrivia) ► (Whitespace): " " # (13..14) + - (leading_trivia꞉ Whitespace): " " # (13..14) - (variant꞉ Asterisk): "*" # (14..15) - (semicolon꞉ Semicolon): ";" # (15..16) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.4.11-failure.yml index 43aa7ec3eb..9c6480e2ba 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.4.11-failure.yml @@ -16,6 +16,6 @@ Errors: # 1 total Tree: - (UsingDirective): # "using {div as /} for Int global;" (0..32) - (using_keyword꞉ UsingKeyword): "using" # (0..5) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (SKIPPED): "{div as /} for Int global" # (6..31) - (semicolon꞉ Semicolon): ";" # (31..32) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.8.13-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.8.13-failure.yml index 8739309065..748cf1652f 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.8.13-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.8.13-failure.yml @@ -17,19 +17,19 @@ Tree: - (UsingDirective): # "using {div as /} for Int global;" (0..32) - (using_keyword꞉ UsingKeyword): "using" # (0..5) - (clause꞉ UsingClause) ► (variant꞉ UsingDeconstruction): # " {div as /}" (5..16) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (open_brace꞉ OpenBrace): "{" # (6..7) - (symbols꞉ UsingDeconstructionSymbols): # "div" (7..10) - (item꞉ UsingDeconstructionSymbol) ► (name꞉ IdentifierPath): # "div" (7..10) - (item꞉ Identifier): "div" # (7..10) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (SKIPPED): "as /" # (11..15) - (close_brace꞉ CloseBrace): "}" # (15..16) - - (LeadingTrivia) ► (Whitespace): " " # (16..17) + - (leading_trivia꞉ Whitespace): " " # (16..17) - (for_keyword꞉ ForKeyword): "for" # (17..20) - (target꞉ UsingTarget) ► (variant꞉ TypeName) ► (variant꞉ IdentifierPath): # " Int" (20..24) - - (LeadingTrivia) ► (Whitespace): " " # (20..21) + - (leading_trivia꞉ Whitespace): " " # (20..21) - (item꞉ Identifier): "Int" # (21..24) - - (LeadingTrivia) ► (Whitespace): " " # (24..25) + - (leading_trivia꞉ Whitespace): " " # (24..25) - (global_keyword꞉ GlobalKeyword): "global" # (25..31) - (semicolon꞉ Semicolon): ";" # (31..32) diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.8.19-success.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.8.19-success.yml index a5c7a5c05c..873781d1df 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.8.19-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/user_defined_operator/generated/0.8.19-success.yml @@ -9,24 +9,24 @@ Tree: - (UsingDirective): # "using {div as /} for Int global;" (0..32) - (using_keyword꞉ UsingKeyword): "using" # (0..5) - (clause꞉ UsingClause) ► (variant꞉ UsingDeconstruction): # " {div as /}" (5..16) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (open_brace꞉ OpenBrace): "{" # (6..7) - (symbols꞉ UsingDeconstructionSymbols): # "div as /" (7..15) - (item꞉ UsingDeconstructionSymbol): # "div as /" (7..15) - (name꞉ IdentifierPath): # "div" (7..10) - (item꞉ Identifier): "div" # (7..10) - (alias꞉ UsingAlias): # " as /" (10..15) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (as_keyword꞉ AsKeyword): "as" # (11..13) - (operator꞉ UsingOperator): # " /" (13..15) - - (LeadingTrivia) ► (Whitespace): " " # (13..14) + - (leading_trivia꞉ Whitespace): " " # (13..14) - (variant꞉ Slash): "/" # (14..15) - (close_brace꞉ CloseBrace): "}" # (15..16) - - (LeadingTrivia) ► (Whitespace): " " # (16..17) + - (leading_trivia꞉ Whitespace): " " # (16..17) - (for_keyword꞉ ForKeyword): "for" # (17..20) - (target꞉ UsingTarget) ► (variant꞉ TypeName) ► (variant꞉ IdentifierPath): # " Int" (20..24) - - (LeadingTrivia) ► (Whitespace): " " # (20..21) + - (leading_trivia꞉ Whitespace): " " # (20..21) - (item꞉ Identifier): "Int" # (21..24) - - (LeadingTrivia) ► (Whitespace): " " # (24..25) + - (leading_trivia꞉ Whitespace): " " # (24..25) - (global_keyword꞉ GlobalKeyword): "global" # (25..31) - (semicolon꞉ Semicolon): ";" # (31..32) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_abicoder/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_abicoder/generated/0.4.11-success.yml index c97c0dd11f..8bae621953 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_abicoder/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_abicoder/generated/0.4.11-success.yml @@ -9,11 +9,10 @@ Errors: [] Tree: - (VariableDeclarationStatement): # "// Always valid as an identifier (never reserved):..." (0..66) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "// Always valid as an identifier (never reserved):..." (0..55) - - (LeadingTrivia): # "// Always valid as an identifier (never reserved):..." (0..51) - - (SingleLineComment): "// Always valid as an identifier (never reserved):" # (0..50) - - (EndOfLine): "\n" # (50..51) + - (leading_trivia꞉ SingleLineComment): "// Always valid as an identifier (never reserved):" # (0..50) + - (leading_trivia꞉ EndOfLine): "\n" # (50..51) - (variant꞉ UintKeyword): "uint" # (51..55) - - (LeadingTrivia) ► (Whitespace): " " # (55..56) + - (leading_trivia꞉ Whitespace): " " # (55..56) - (name꞉ Identifier): "abicoder" # (56..64) - (semicolon꞉ Semicolon): ";" # (64..65) - - (TrailingTrivia) ► (EndOfLine): "\n" # (65..66) + - (trailing_trivia꞉ EndOfLine): "\n" # (65..66) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes/generated/0.4.11-failure.yml index 3e9fba73fe..b085f81004 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes/generated/0.4.11-failure.yml @@ -16,7 +16,7 @@ Errors: # 1 total Tree: - (VariableDeclarationStatement): # "uint bytes;\n" (0..12) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint" # (0..4) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (SKIPPED): "bytes" # (5..10) - (semicolon꞉ Semicolon): ";" # (10..11) - - (TrailingTrivia) ► (EndOfLine): "\n" # (11..12) + - (trailing_trivia꞉ EndOfLine): "\n" # (11..12) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes/generated/0.5.0-failure.yml index 2993c43640..f28524c9b5 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes/generated/0.5.0-failure.yml @@ -16,7 +16,7 @@ Errors: # 1 total Tree: - (VariableDeclarationStatement): # "uint bytes;\n" (0..12) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint" # (0..4) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (SKIPPED): "bytes" # (5..10) - (semicolon꞉ Semicolon): ";" # (10..11) - - (TrailingTrivia) ► (EndOfLine): "\n" # (11..12) + - (trailing_trivia꞉ EndOfLine): "\n" # (11..12) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes1/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes1/generated/0.4.11-failure.yml index 759c0db031..bfbaa4095c 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes1/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes1/generated/0.4.11-failure.yml @@ -16,7 +16,7 @@ Errors: # 1 total Tree: - (VariableDeclarationStatement): # "uint bytes1;\n" (0..13) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint" # (0..4) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (SKIPPED): "bytes1" # (5..11) - (semicolon꞉ Semicolon): ";" # (11..12) - - (TrailingTrivia) ► (EndOfLine): "\n" # (12..13) + - (trailing_trivia꞉ EndOfLine): "\n" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes1/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes1/generated/0.5.0-failure.yml index e787a26360..8ec03e1cde 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes1/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes1/generated/0.5.0-failure.yml @@ -16,7 +16,7 @@ Errors: # 1 total Tree: - (VariableDeclarationStatement): # "uint bytes1;\n" (0..13) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint" # (0..4) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (SKIPPED): "bytes1" # (5..11) - (semicolon꞉ Semicolon): ";" # (11..12) - - (TrailingTrivia) ► (EndOfLine): "\n" # (12..13) + - (trailing_trivia꞉ EndOfLine): "\n" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes11/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes11/generated/0.4.11-failure.yml index f3ec7fab82..cae2aa413c 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes11/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes11/generated/0.4.11-failure.yml @@ -16,7 +16,7 @@ Errors: # 1 total Tree: - (VariableDeclarationStatement): # "uint bytes11;\n" (0..14) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint" # (0..4) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (SKIPPED): "bytes11" # (5..12) - (semicolon꞉ Semicolon): ";" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes11/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes11/generated/0.5.0-failure.yml index 76ce8e74aa..fcd04fb5b9 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes11/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_bytes11/generated/0.5.0-failure.yml @@ -16,7 +16,7 @@ Errors: # 1 total Tree: - (VariableDeclarationStatement): # "uint bytes11;\n" (0..14) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint" # (0..4) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (SKIPPED): "bytes11" # (5..12) - (semicolon꞉ Semicolon): ";" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_experimental/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_experimental/generated/0.4.11-success.yml index 2da591d5f6..5d8d739924 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_experimental/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_experimental/generated/0.4.11-success.yml @@ -9,11 +9,10 @@ Errors: [] Tree: - (VariableDeclarationStatement): # "// Always valid as an identifier (never reserved):..." (0..70) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "// Always valid as an identifier (never reserved):..." (0..55) - - (LeadingTrivia): # "// Always valid as an identifier (never reserved):..." (0..51) - - (SingleLineComment): "// Always valid as an identifier (never reserved):" # (0..50) - - (EndOfLine): "\n" # (50..51) + - (leading_trivia꞉ SingleLineComment): "// Always valid as an identifier (never reserved):" # (0..50) + - (leading_trivia꞉ EndOfLine): "\n" # (50..51) - (variant꞉ UintKeyword): "uint" # (51..55) - - (LeadingTrivia) ► (Whitespace): " " # (55..56) + - (leading_trivia꞉ Whitespace): " " # (55..56) - (name꞉ Identifier): "experimental" # (56..68) - (semicolon꞉ Semicolon): ";" # (68..69) - - (TrailingTrivia) ► (EndOfLine): "\n" # (69..70) + - (trailing_trivia꞉ EndOfLine): "\n" # (69..70) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_solidity/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_solidity/generated/0.4.11-success.yml index 4fc8c0aa80..2a5250fce8 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_solidity/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_solidity/generated/0.4.11-success.yml @@ -9,11 +9,10 @@ Errors: [] Tree: - (VariableDeclarationStatement): # "// Always valid as an identifier (never reserved):..." (0..66) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "// Always valid as an identifier (never reserved):..." (0..55) - - (LeadingTrivia): # "// Always valid as an identifier (never reserved):..." (0..51) - - (SingleLineComment): "// Always valid as an identifier (never reserved):" # (0..50) - - (EndOfLine): "\n" # (50..51) + - (leading_trivia꞉ SingleLineComment): "// Always valid as an identifier (never reserved):" # (0..50) + - (leading_trivia꞉ EndOfLine): "\n" # (50..51) - (variant꞉ UintKeyword): "uint" # (51..55) - - (LeadingTrivia) ► (Whitespace): " " # (55..56) + - (leading_trivia꞉ Whitespace): " " # (55..56) - (name꞉ Identifier): "solidity" # (56..64) - (semicolon꞉ Semicolon): ";" # (64..65) - - (TrailingTrivia) ► (EndOfLine): "\n" # (65..66) + - (trailing_trivia꞉ EndOfLine): "\n" # (65..66) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed/generated/0.4.11-failure.yml index 8be3e6acc2..6d29d1ffac 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed/generated/0.4.11-failure.yml @@ -16,7 +16,7 @@ Errors: # 1 total Tree: - (VariableDeclarationStatement): # "uint ufixed;\n" (0..13) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint" # (0..4) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (SKIPPED): "ufixed" # (5..11) - (semicolon꞉ Semicolon): ";" # (11..12) - - (TrailingTrivia) ► (EndOfLine): "\n" # (12..13) + - (trailing_trivia꞉ EndOfLine): "\n" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed/generated/0.5.0-failure.yml index 11bb3db213..118c3cddb6 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed/generated/0.5.0-failure.yml @@ -16,7 +16,7 @@ Errors: # 1 total Tree: - (VariableDeclarationStatement): # "uint ufixed;\n" (0..13) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType) ► (variant꞉ UintKeyword): "uint" # (0..4) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (SKIPPED): "ufixed" # (5..11) - (semicolon꞉ Semicolon): ";" # (11..12) - - (TrailingTrivia) ► (EndOfLine): "\n" # (12..13) + - (trailing_trivia꞉ EndOfLine): "\n" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.11-success.yml index cb5a4c4bbe..5f2971b0ac 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.11-success.yml @@ -9,11 +9,10 @@ Errors: [] Tree: - (VariableDeclarationStatement): # "// This form is only reserved since 0.4.14:\nuint u..." (0..63) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "// This form is only reserved since 0.4.14:\nuint" (0..48) - - (LeadingTrivia): # "// This form is only reserved since 0.4.14:\n" (0..44) - - (SingleLineComment): "// This form is only reserved since 0.4.14:" # (0..43) - - (EndOfLine): "\n" # (43..44) + - (leading_trivia꞉ SingleLineComment): "// This form is only reserved since 0.4.14:" # (0..43) + - (leading_trivia꞉ EndOfLine): "\n" # (43..44) - (variant꞉ UintKeyword): "uint" # (44..48) - - (LeadingTrivia) ► (Whitespace): " " # (48..49) + - (leading_trivia꞉ Whitespace): " " # (48..49) - (name꞉ Identifier): "ufixed184x80" # (49..61) - (semicolon꞉ Semicolon): ";" # (61..62) - - (TrailingTrivia) ► (EndOfLine): "\n" # (62..63) + - (trailing_trivia꞉ EndOfLine): "\n" # (62..63) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.14-failure.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.14-failure.yml index 1592385329..6e76579009 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.14-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.14-failure.yml @@ -17,11 +17,10 @@ Errors: # 1 total Tree: - (VariableDeclarationStatement): # "// This form is only reserved since 0.4.14:\nuint u..." (0..63) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "// This form is only reserved since 0.4.14:\nuint" (0..48) - - (LeadingTrivia): # "// This form is only reserved since 0.4.14:\n" (0..44) - - (SingleLineComment): "// This form is only reserved since 0.4.14:" # (0..43) - - (EndOfLine): "\n" # (43..44) + - (leading_trivia꞉ SingleLineComment): "// This form is only reserved since 0.4.14:" # (0..43) + - (leading_trivia꞉ EndOfLine): "\n" # (43..44) - (variant꞉ UintKeyword): "uint" # (44..48) - - (LeadingTrivia) ► (Whitespace): " " # (48..49) + - (leading_trivia꞉ Whitespace): " " # (48..49) - (SKIPPED): "ufixed184x80" # (49..61) - (semicolon꞉ Semicolon): ";" # (61..62) - - (TrailingTrivia) ► (EndOfLine): "\n" # (62..63) + - (trailing_trivia꞉ EndOfLine): "\n" # (62..63) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed184x80/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed184x80/generated/0.5.0-failure.yml index 13760fb65f..c664cb1c62 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed184x80/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed184x80/generated/0.5.0-failure.yml @@ -17,11 +17,10 @@ Errors: # 1 total Tree: - (VariableDeclarationStatement): # "// This form is only reserved since 0.4.14:\nuint u..." (0..63) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "// This form is only reserved since 0.4.14:\nuint" (0..48) - - (LeadingTrivia): # "// This form is only reserved since 0.4.14:\n" (0..44) - - (SingleLineComment): "// This form is only reserved since 0.4.14:" # (0..43) - - (EndOfLine): "\n" # (43..44) + - (leading_trivia꞉ SingleLineComment): "// This form is only reserved since 0.4.14:" # (0..43) + - (leading_trivia꞉ EndOfLine): "\n" # (43..44) - (variant꞉ UintKeyword): "uint" # (44..48) - - (LeadingTrivia) ► (Whitespace): " " # (48..49) + - (leading_trivia꞉ Whitespace): " " # (48..49) - (SKIPPED): "ufixed184x80" # (49..61) - (semicolon꞉ Semicolon): ";" # (61..62) - - (TrailingTrivia) ► (EndOfLine): "\n" # (62..63) + - (trailing_trivia꞉ EndOfLine): "\n" # (62..63) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.11-success.yml index 306728e77e..57a021e448 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.11-success.yml @@ -9,11 +9,10 @@ Errors: [] Tree: - (VariableDeclarationStatement): # "// This form is only reserved since 0.4.14:\nuint u..." (0..60) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "// This form is only reserved since 0.4.14:\nuint" (0..48) - - (LeadingTrivia): # "// This form is only reserved since 0.4.14:\n" (0..44) - - (SingleLineComment): "// This form is only reserved since 0.4.14:" # (0..43) - - (EndOfLine): "\n" # (43..44) + - (leading_trivia꞉ SingleLineComment): "// This form is only reserved since 0.4.14:" # (0..43) + - (leading_trivia꞉ EndOfLine): "\n" # (43..44) - (variant꞉ UintKeyword): "uint" # (44..48) - - (LeadingTrivia) ► (Whitespace): " " # (48..49) + - (leading_trivia꞉ Whitespace): " " # (48..49) - (name꞉ Identifier): "ufixed8x0" # (49..58) - (semicolon꞉ Semicolon): ";" # (58..59) - - (TrailingTrivia) ► (EndOfLine): "\n" # (59..60) + - (trailing_trivia꞉ EndOfLine): "\n" # (59..60) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.14-failure.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.14-failure.yml index 61331bb26e..5902800764 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.14-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.14-failure.yml @@ -17,11 +17,10 @@ Errors: # 1 total Tree: - (VariableDeclarationStatement): # "// This form is only reserved since 0.4.14:\nuint u..." (0..60) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "// This form is only reserved since 0.4.14:\nuint" (0..48) - - (LeadingTrivia): # "// This form is only reserved since 0.4.14:\n" (0..44) - - (SingleLineComment): "// This form is only reserved since 0.4.14:" # (0..43) - - (EndOfLine): "\n" # (43..44) + - (leading_trivia꞉ SingleLineComment): "// This form is only reserved since 0.4.14:" # (0..43) + - (leading_trivia꞉ EndOfLine): "\n" # (43..44) - (variant꞉ UintKeyword): "uint" # (44..48) - - (LeadingTrivia) ► (Whitespace): " " # (48..49) + - (leading_trivia꞉ Whitespace): " " # (48..49) - (SKIPPED): "ufixed8x0" # (49..58) - (semicolon꞉ Semicolon): ";" # (58..59) - - (TrailingTrivia) ► (EndOfLine): "\n" # (59..60) + - (trailing_trivia꞉ EndOfLine): "\n" # (59..60) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x0/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x0/generated/0.5.0-failure.yml index 9c6579855d..98e9a84241 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x0/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x0/generated/0.5.0-failure.yml @@ -17,11 +17,10 @@ Errors: # 1 total Tree: - (VariableDeclarationStatement): # "// This form is only reserved since 0.4.14:\nuint u..." (0..60) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "// This form is only reserved since 0.4.14:\nuint" (0..48) - - (LeadingTrivia): # "// This form is only reserved since 0.4.14:\n" (0..44) - - (SingleLineComment): "// This form is only reserved since 0.4.14:" # (0..43) - - (EndOfLine): "\n" # (43..44) + - (leading_trivia꞉ SingleLineComment): "// This form is only reserved since 0.4.14:" # (0..43) + - (leading_trivia꞉ EndOfLine): "\n" # (43..44) - (variant꞉ UintKeyword): "uint" # (44..48) - - (LeadingTrivia) ► (Whitespace): " " # (48..49) + - (leading_trivia꞉ Whitespace): " " # (48..49) - (SKIPPED): "ufixed8x0" # (49..58) - (semicolon꞉ Semicolon): ";" # (58..59) - - (TrailingTrivia) ► (EndOfLine): "\n" # (59..60) + - (trailing_trivia꞉ EndOfLine): "\n" # (59..60) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x8/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x8/generated/0.4.11-failure.yml index 1a9e4d6cdc..fb872baa03 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x8/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x8/generated/0.4.11-failure.yml @@ -17,11 +17,10 @@ Errors: # 1 total Tree: - (VariableDeclarationStatement): # "// This form is always reserved:\nuint ufixed8x8;\n" (0..49) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "// This form is always reserved:\nuint" (0..37) - - (LeadingTrivia): # "// This form is always reserved:\n" (0..33) - - (SingleLineComment): "// This form is always reserved:" # (0..32) - - (EndOfLine): "\n" # (32..33) + - (leading_trivia꞉ SingleLineComment): "// This form is always reserved:" # (0..32) + - (leading_trivia꞉ EndOfLine): "\n" # (32..33) - (variant꞉ UintKeyword): "uint" # (33..37) - - (LeadingTrivia) ► (Whitespace): " " # (37..38) + - (leading_trivia꞉ Whitespace): " " # (37..38) - (SKIPPED): "ufixed8x8" # (38..47) - (semicolon꞉ Semicolon): ";" # (47..48) - - (TrailingTrivia) ► (EndOfLine): "\n" # (48..49) + - (trailing_trivia꞉ EndOfLine): "\n" # (48..49) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x8/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x8/generated/0.5.0-failure.yml index b1f0bd5702..ea6ff566c1 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x8/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/keyword_ufixed8x8/generated/0.5.0-failure.yml @@ -17,11 +17,10 @@ Errors: # 1 total Tree: - (VariableDeclarationStatement): # "// This form is always reserved:\nuint ufixed8x8;\n" (0..49) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ TypeName) ► (variant꞉ ElementaryType): # "// This form is always reserved:\nuint" (0..37) - - (LeadingTrivia): # "// This form is always reserved:\n" (0..33) - - (SingleLineComment): "// This form is always reserved:" # (0..32) - - (EndOfLine): "\n" # (32..33) + - (leading_trivia꞉ SingleLineComment): "// This form is always reserved:" # (0..32) + - (leading_trivia꞉ EndOfLine): "\n" # (32..33) - (variant꞉ UintKeyword): "uint" # (33..37) - - (LeadingTrivia) ► (Whitespace): " " # (37..38) + - (leading_trivia꞉ Whitespace): " " # (37..38) - (SKIPPED): "ufixed8x8" # (38..47) - (semicolon꞉ Semicolon): ";" # (47..48) - - (TrailingTrivia) ► (EndOfLine): "\n" # (48..49) + - (trailing_trivia꞉ EndOfLine): "\n" # (48..49) diff --git a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/var/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/var/generated/0.4.11-success.yml index 6e92cc9c90..1f02dcdd9e 100644 --- a/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/var/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VariableDeclarationStatement/var/generated/0.4.11-success.yml @@ -8,12 +8,12 @@ Errors: [] Tree: - (VariableDeclarationStatement): # "var z = 0;" (0..10) - (variable_type꞉ VariableDeclarationType) ► (variant꞉ VarKeyword): "var" # (0..3) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (name꞉ Identifier): "z" # (4..5) - (value꞉ VariableDeclarationValue): # " = 0" (5..9) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (equal꞉ Equal): "=" # (6..7) - (expression꞉ Expression) ► (variant꞉ DecimalNumberExpression): # " 0" (7..9) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (literal꞉ DecimalLiteral): "0" # (8..9) - (semicolon꞉ Semicolon): ";" # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/alternatives/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/alternatives/generated/0.4.11-success.yml index fae8142879..ed5c09619c 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/alternatives/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/alternatives/generated/0.4.11-success.yml @@ -12,25 +12,25 @@ Tree: - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaOrExpression): # " 0.5.0 || 0.6.0 || ^0.7.0" (8..33) - (left_operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaOrExpression): # " 0.5.0 || 0.6.0" (8..23) - (left_operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.5.0" (8..14) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (item꞉ VersionPragmaValue): "0" # (9..10) - (separator꞉ Period): "." # (10..11) - (item꞉ VersionPragmaValue): "5" # (11..12) - (separator꞉ Period): "." # (12..13) - (item꞉ VersionPragmaValue): "0" # (13..14) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (operator꞉ BarBar): "||" # (15..17) - (right_operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.6.0" (17..23) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (item꞉ VersionPragmaValue): "0" # (18..19) - (separator꞉ Period): "." # (19..20) - (item꞉ VersionPragmaValue): "6" # (20..21) - (separator꞉ Period): "." # (21..22) - (item꞉ VersionPragmaValue): "0" # (22..23) - - (LeadingTrivia) ► (Whitespace): " " # (23..24) + - (leading_trivia꞉ Whitespace): " " # (23..24) - (operator꞉ BarBar): "||" # (24..26) - (right_operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaPrefixExpression): # " ^0.7.0" (26..33) - - (LeadingTrivia) ► (Whitespace): " " # (26..27) + - (leading_trivia꞉ Whitespace): " " # (26..27) - (operator꞉ Caret): "^" # (27..28) - (operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # "0.7.0" (28..33) - (item꞉ VersionPragmaValue): "0" # (28..29) diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/equal_operator/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/equal_operator/generated/0.4.11-success.yml index 35ac9b199e..2670cbec1e 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/equal_operator/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/equal_operator/generated/0.4.11-success.yml @@ -10,7 +10,7 @@ Tree: - (solidity_keyword꞉ SolidityKeyword): "solidity" # (0..8) - (expressions꞉ VersionPragmaExpressions): # " =0.8.0" (8..15) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaPrefixExpression): # " =0.8.0" (8..15) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (operator꞉ Equal): "=" # (9..10) - (operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # "0.8.0" (10..15) - (item꞉ VersionPragmaValue): "0" # (10..11) diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/exact_version/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/exact_version/generated/0.4.11-success.yml index eca3eacd56..2ac823bcff 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/exact_version/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/exact_version/generated/0.4.11-success.yml @@ -10,7 +10,7 @@ Tree: - (solidity_keyword꞉ SolidityKeyword): "solidity" # (0..8) - (expressions꞉ VersionPragmaExpressions): # " 0.8.0" (8..14) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.8.0" (8..14) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (item꞉ VersionPragmaValue): "0" # (9..10) - (separator꞉ Period): "." # (10..11) - (item꞉ VersionPragmaValue): "8" # (11..12) diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/less_than_operator/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/less_than_operator/generated/0.4.11-success.yml index 73466a52a8..ce15a907f9 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/less_than_operator/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/less_than_operator/generated/0.4.11-success.yml @@ -10,7 +10,7 @@ Tree: - (solidity_keyword꞉ SolidityKeyword): "solidity" # (0..8) - (expressions꞉ VersionPragmaExpressions): # " <1.0.0" (8..15) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaPrefixExpression): # " <1.0.0" (8..15) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (operator꞉ LessThan): "<" # (9..10) - (operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # "1.0.0" (10..15) - (item꞉ VersionPragmaValue): "1" # (10..11) diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/multiple_exact_versions/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/multiple_exact_versions/generated/0.4.11-success.yml index 6ab44f0e80..89c034aacc 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/multiple_exact_versions/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/multiple_exact_versions/generated/0.4.11-success.yml @@ -10,14 +10,14 @@ Tree: - (solidity_keyword꞉ SolidityKeyword): "solidity" # (0..8) - (expressions꞉ VersionPragmaExpressions): # " 0.7.0 0.8.0" (8..20) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.7.0" (8..14) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (item꞉ VersionPragmaValue): "0" # (9..10) - (separator꞉ Period): "." # (10..11) - (item꞉ VersionPragmaValue): "7" # (11..12) - (separator꞉ Period): "." # (12..13) - (item꞉ VersionPragmaValue): "0" # (13..14) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.8.0" (14..20) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (item꞉ VersionPragmaValue): "0" # (15..16) - (separator꞉ Period): "." # (16..17) - (item꞉ VersionPragmaValue): "8" # (17..18) diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/nested_expressions/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/nested_expressions/generated/0.4.11-success.yml index 9336600a5d..500dc5cc2e 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/nested_expressions/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/nested_expressions/generated/0.4.11-success.yml @@ -11,7 +11,7 @@ Tree: - (expressions꞉ VersionPragmaExpressions): # " ^1.0.0 || 2.0.0-3.0.0" (8..30) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaOrExpression): # " ^1.0.0 || 2.0.0-3.0.0" (8..30) - (left_operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaPrefixExpression): # " ^1.0.0" (8..15) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (operator꞉ Caret): "^" # (9..10) - (operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # "1.0.0" (10..15) - (item꞉ VersionPragmaValue): "1" # (10..11) @@ -19,11 +19,11 @@ Tree: - (item꞉ VersionPragmaValue): "0" # (12..13) - (separator꞉ Period): "." # (13..14) - (item꞉ VersionPragmaValue): "0" # (14..15) - - (LeadingTrivia) ► (Whitespace): " " # (15..16) + - (leading_trivia꞉ Whitespace): " " # (15..16) - (operator꞉ BarBar): "||" # (16..18) - (right_operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaRangeExpression): # " 2.0.0-3.0.0" (18..30) - (left_operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 2.0.0" (18..24) - - (LeadingTrivia) ► (Whitespace): " " # (18..19) + - (leading_trivia꞉ Whitespace): " " # (18..19) - (item꞉ VersionPragmaValue): "2" # (19..20) - (separator꞉ Period): "." # (20..21) - (item꞉ VersionPragmaValue): "0" # (21..22) diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/ranges/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/ranges/generated/0.4.11-success.yml index e75cd6050b..cb378715e1 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/ranges/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/ranges/generated/0.4.11-success.yml @@ -11,16 +11,16 @@ Tree: - (expressions꞉ VersionPragmaExpressions): # " 0.6.0 - 0.7.0" (8..22) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaRangeExpression): # " 0.6.0 - 0.7.0" (8..22) - (left_operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.6.0" (8..14) - - (LeadingTrivia) ► (Whitespace): " " # (8..9) + - (leading_trivia꞉ Whitespace): " " # (8..9) - (item꞉ VersionPragmaValue): "0" # (9..10) - (separator꞉ Period): "." # (10..11) - (item꞉ VersionPragmaValue): "6" # (11..12) - (separator꞉ Period): "." # (12..13) - (item꞉ VersionPragmaValue): "0" # (13..14) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (operator꞉ Minus): "-" # (15..16) - (right_operand꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " 0.7.0" (16..22) - - (LeadingTrivia) ► (Whitespace): " " # (16..17) + - (leading_trivia꞉ Whitespace): " " # (16..17) - (item꞉ VersionPragmaValue): "0" # (17..18) - (separator꞉ Period): "." # (18..19) - (item꞉ VersionPragmaValue): "7" # (19..20) diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/with_trivia/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/with_trivia/generated/0.4.11-success.yml index a838f3c146..3932575c84 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/with_trivia/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/with_trivia/generated/0.4.11-success.yml @@ -10,25 +10,21 @@ Tree: - (solidity_keyword꞉ SolidityKeyword): "solidity" # (0..8) - (expressions꞉ VersionPragmaExpressions): # " /* comments */ 0 /* are */ . /* allowed */ 0 . /*..." (8..68) - (item꞉ VersionPragmaExpression) ► (variant꞉ VersionPragmaSpecifier): # " /* comments */ 0 /* are */ . /* allowed */ 0 . /*..." (8..68) - - (LeadingTrivia): # " /* comments */ " (8..24) - - (Whitespace): " " # (8..9) - - (MultiLineComment): "/* comments */" # (9..23) - - (Whitespace): " " # (23..24) + - (leading_trivia꞉ Whitespace): " " # (8..9) + - (leading_trivia꞉ MultiLineComment): "/* comments */" # (9..23) + - (leading_trivia꞉ Whitespace): " " # (23..24) - (item꞉ VersionPragmaValue): "0" # (24..25) - - (LeadingTrivia): # " /* are */ " (25..36) - - (Whitespace): " " # (25..26) - - (MultiLineComment): "/* are */" # (26..35) - - (Whitespace): " " # (35..36) + - (leading_trivia꞉ Whitespace): " " # (25..26) + - (leading_trivia꞉ MultiLineComment): "/* are */" # (26..35) + - (leading_trivia꞉ Whitespace): " " # (35..36) - (separator꞉ Period): "." # (36..37) - - (LeadingTrivia): # " /* allowed */ " (37..52) - - (Whitespace): " " # (37..38) - - (MultiLineComment): "/* allowed */" # (38..51) - - (Whitespace): " " # (51..52) + - (leading_trivia꞉ Whitespace): " " # (37..38) + - (leading_trivia꞉ MultiLineComment): "/* allowed */" # (38..51) + - (leading_trivia꞉ Whitespace): " " # (51..52) - (item꞉ VersionPragmaValue): "0" # (52..53) - - (LeadingTrivia) ► (Whitespace): " " # (53..54) + - (leading_trivia꞉ Whitespace): " " # (53..54) - (separator꞉ Period): "." # (54..55) - - (LeadingTrivia): # " /* here */ " (55..67) - - (Whitespace): " " # (55..56) - - (MultiLineComment): "/* here */" # (56..66) - - (Whitespace): " " # (66..67) + - (leading_trivia꞉ Whitespace): " " # (55..56) + - (leading_trivia꞉ MultiLineComment): "/* here */" # (56..66) + - (leading_trivia꞉ Whitespace): " " # (66..67) - (item꞉ VersionPragmaValue): "0" # (67..68) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/colon_equal_separated/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/colon_equal_separated/generated/0.4.11-success.yml index a7ab2a3d9a..4e97c74b33 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/colon_equal_separated/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/colon_equal_separated/generated/0.4.11-success.yml @@ -10,16 +10,15 @@ Tree: - (YulAssignmentStatement): # '// ColonEqual was two separate tokens before "0.5....' (0..64) - (names꞉ YulIdentifierPaths): # '// ColonEqual was two separate tokens before "0.5....' (0..57) - (item꞉ YulIdentifierPath): # '// ColonEqual was two separate tokens before "0.5....' (0..57) - - (LeadingTrivia): # '// ColonEqual was two separate tokens before "0.5....' (0..54) - - (SingleLineComment): '// ColonEqual was two separate tokens before "0.5....' # (0..53) - - (EndOfLine): "\n" # (53..54) + - (leading_trivia꞉ SingleLineComment): '// ColonEqual was two separate tokens before "0.5....' # (0..53) + - (leading_trivia꞉ EndOfLine): "\n" # (53..54) - (item꞉ YulIdentifier): "foo" # (54..57) - (assignment꞉ YulAssignmentOperator) ► (variant꞉ YulColonAndEqual): # " : =" (57..61) - - (LeadingTrivia) ► (Whitespace): " " # (57..58) + - (leading_trivia꞉ Whitespace): " " # (57..58) - (colon꞉ Colon): ":" # (58..59) - - (LeadingTrivia) ► (Whitespace): " " # (59..60) + - (leading_trivia꞉ Whitespace): " " # (59..60) - (equal꞉ Equal): "=" # (60..61) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (61..64) - - (LeadingTrivia) ► (Whitespace): " " # (61..62) + - (leading_trivia꞉ Whitespace): " " # (61..62) - (variant꞉ YulDecimalLiteral): "0" # (62..63) - - (TrailingTrivia) ► (EndOfLine): "\n" # (63..64) + - (trailing_trivia꞉ EndOfLine): "\n" # (63..64) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/colon_equal_separated/generated/0.5.5-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/colon_equal_separated/generated/0.5.5-failure.yml index ba5c6be90f..c5d35509ac 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/colon_equal_separated/generated/0.5.5-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/colon_equal_separated/generated/0.5.5-failure.yml @@ -18,8 +18,7 @@ Tree: - (YulAssignmentStatement): # '// ColonEqual was two separate tokens before "0.5....' (0..64) - (names꞉ YulIdentifierPaths): # '// ColonEqual was two separate tokens before "0.5....' (0..57) - (item꞉ YulIdentifierPath): # '// ColonEqual was two separate tokens before "0.5....' (0..57) - - (LeadingTrivia): # '// ColonEqual was two separate tokens before "0.5....' (0..54) - - (SingleLineComment): '// ColonEqual was two separate tokens before "0.5....' # (0..53) - - (EndOfLine): "\n" # (53..54) + - (leading_trivia꞉ SingleLineComment): '// ColonEqual was two separate tokens before "0.5....' # (0..53) + - (leading_trivia꞉ EndOfLine): "\n" # (53..54) - (item꞉ YulIdentifier): "foo" # (54..57) - (SKIPPED): " : = 0\n" # (57..64) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_basefee/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_basefee/generated/0.4.11-success.yml index d6297e2eb7..d20f6869df 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_basefee/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_basefee/generated/0.4.11-success.yml @@ -11,9 +11,9 @@ Tree: - (item꞉ YulIdentifierPath): # "basefee" (0..7) - (item꞉ YulIdentifier): "basefee" # (0..7) - (assignment꞉ YulAssignmentOperator): # " :=" (7..10) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (variant꞉ ColonEqual): ":=" # (8..10) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (10..13) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (variant꞉ YulDecimalLiteral): "0" # (11..12) - - (TrailingTrivia) ► (EndOfLine): "\n" # (12..13) + - (trailing_trivia꞉ EndOfLine): "\n" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_chainid/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_chainid/generated/0.4.11-success.yml index 2278ffaecd..1c8ed5b859 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_chainid/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_chainid/generated/0.4.11-success.yml @@ -11,9 +11,9 @@ Tree: - (item꞉ YulIdentifierPath): # "chainid" (0..7) - (item꞉ YulIdentifier): "chainid" # (0..7) - (assignment꞉ YulAssignmentOperator): # " :=" (7..10) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (variant꞉ ColonEqual): ":=" # (8..10) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (10..13) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (variant꞉ YulDecimalLiteral): "0" # (11..12) - - (TrailingTrivia) ► (EndOfLine): "\n" # (12..13) + - (trailing_trivia꞉ EndOfLine): "\n" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_create2/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_create2/generated/0.4.11-success.yml index 466ca78188..c0bcae4673 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_create2/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_create2/generated/0.4.11-success.yml @@ -11,9 +11,9 @@ Tree: - (item꞉ YulIdentifierPath): # "create2" (0..7) - (item꞉ YulIdentifier): "create2" # (0..7) - (assignment꞉ YulAssignmentOperator): # " :=" (7..10) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (variant꞉ ColonEqual): ":=" # (8..10) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (10..13) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (variant꞉ YulDecimalLiteral): "0" # (11..12) - - (TrailingTrivia) ► (EndOfLine): "\n" # (12..13) + - (trailing_trivia꞉ EndOfLine): "\n" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_extcodehash/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_extcodehash/generated/0.4.11-success.yml index 74c9bd7807..9688179af7 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_extcodehash/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_extcodehash/generated/0.4.11-success.yml @@ -11,9 +11,9 @@ Tree: - (item꞉ YulIdentifierPath): # "extcodehash" (0..11) - (item꞉ YulIdentifier): "extcodehash" # (0..11) - (assignment꞉ YulAssignmentOperator): # " :=" (11..14) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (variant꞉ ColonEqual): ":=" # (12..14) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (14..17) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (variant꞉ YulDecimalLiteral): "0" # (15..16) - - (TrailingTrivia) ► (EndOfLine): "\n" # (16..17) + - (trailing_trivia꞉ EndOfLine): "\n" # (16..17) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_keccak256/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_keccak256/generated/0.4.11-success.yml index 014490d57f..b0742af53a 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_keccak256/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_keccak256/generated/0.4.11-success.yml @@ -11,9 +11,9 @@ Tree: - (item꞉ YulIdentifierPath): # "keccak256" (0..9) - (item꞉ YulIdentifier): "keccak256" # (0..9) - (assignment꞉ YulAssignmentOperator): # " :=" (9..12) - - (LeadingTrivia) ► (Whitespace): " " # (9..10) + - (leading_trivia꞉ Whitespace): " " # (9..10) - (variant꞉ ColonEqual): ":=" # (10..12) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (12..15) - - (LeadingTrivia) ► (Whitespace): " " # (12..13) + - (leading_trivia꞉ Whitespace): " " # (12..13) - (variant꞉ YulDecimalLiteral): "0" # (13..14) - - (TrailingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (14..15) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_prevrandao/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_prevrandao/generated/0.4.11-success.yml index 6fce9ad3bf..3e89355a69 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_prevrandao/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_prevrandao/generated/0.4.11-success.yml @@ -11,9 +11,9 @@ Tree: - (item꞉ YulIdentifierPath): # "prevrandao" (0..10) - (item꞉ YulIdentifier): "prevrandao" # (0..10) - (assignment꞉ YulAssignmentOperator): # " :=" (10..13) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (variant꞉ ColonEqual): ":=" # (11..13) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (13..16) - - (LeadingTrivia) ► (Whitespace): " " # (13..14) + - (leading_trivia꞉ Whitespace): " " # (13..14) - (variant꞉ YulDecimalLiteral): "0" # (14..15) - - (TrailingTrivia) ► (EndOfLine): "\n" # (15..16) + - (trailing_trivia꞉ EndOfLine): "\n" # (15..16) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_returndatacopy/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_returndatacopy/generated/0.4.11-success.yml index b3c1153ad8..17e465c0ee 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_returndatacopy/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_returndatacopy/generated/0.4.11-success.yml @@ -11,9 +11,9 @@ Tree: - (item꞉ YulIdentifierPath): # "returndatacopy" (0..14) - (item꞉ YulIdentifier): "returndatacopy" # (0..14) - (assignment꞉ YulAssignmentOperator): # " :=" (14..17) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (variant꞉ ColonEqual): ":=" # (15..17) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (17..20) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (variant꞉ YulDecimalLiteral): "0" # (18..19) - - (TrailingTrivia) ► (EndOfLine): "\n" # (19..20) + - (trailing_trivia꞉ EndOfLine): "\n" # (19..20) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_returndatasize/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_returndatasize/generated/0.4.11-success.yml index a0aec248a5..92093960dc 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_returndatasize/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_returndatasize/generated/0.4.11-success.yml @@ -11,9 +11,9 @@ Tree: - (item꞉ YulIdentifierPath): # "returndatasize" (0..14) - (item꞉ YulIdentifier): "returndatasize" # (0..14) - (assignment꞉ YulAssignmentOperator): # " :=" (14..17) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (variant꞉ ColonEqual): ":=" # (15..17) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (17..20) - - (LeadingTrivia) ► (Whitespace): " " # (17..18) + - (leading_trivia꞉ Whitespace): " " # (17..18) - (variant꞉ YulDecimalLiteral): "0" # (18..19) - - (TrailingTrivia) ► (EndOfLine): "\n" # (19..20) + - (trailing_trivia꞉ EndOfLine): "\n" # (19..20) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_sar/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_sar/generated/0.4.11-success.yml index bfd04d0b49..7dd43cb0a7 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_sar/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_sar/generated/0.4.11-success.yml @@ -11,9 +11,9 @@ Tree: - (item꞉ YulIdentifierPath): # "sar" (0..3) - (item꞉ YulIdentifier): "sar" # (0..3) - (assignment꞉ YulAssignmentOperator): # " :=" (3..6) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (variant꞉ ColonEqual): ":=" # (4..6) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (6..9) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (variant꞉ YulDecimalLiteral): "0" # (7..8) - - (TrailingTrivia) ► (EndOfLine): "\n" # (8..9) + - (trailing_trivia꞉ EndOfLine): "\n" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_selfbalance/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_selfbalance/generated/0.4.11-success.yml index c69ac3ec1d..4ed601e706 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_selfbalance/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_selfbalance/generated/0.4.11-success.yml @@ -11,9 +11,9 @@ Tree: - (item꞉ YulIdentifierPath): # "selfbalance" (0..11) - (item꞉ YulIdentifier): "selfbalance" # (0..11) - (assignment꞉ YulAssignmentOperator): # " :=" (11..14) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (variant꞉ ColonEqual): ":=" # (12..14) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (14..17) - - (LeadingTrivia) ► (Whitespace): " " # (14..15) + - (leading_trivia꞉ Whitespace): " " # (14..15) - (variant꞉ YulDecimalLiteral): "0" # (15..16) - - (TrailingTrivia) ► (EndOfLine): "\n" # (16..17) + - (trailing_trivia꞉ EndOfLine): "\n" # (16..17) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_sha3/generated/0.5.0-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_sha3/generated/0.5.0-success.yml index f0c5e3b202..2e9586b364 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_sha3/generated/0.5.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_sha3/generated/0.5.0-success.yml @@ -11,9 +11,9 @@ Tree: - (item꞉ YulIdentifierPath): # "sha3" (0..4) - (item꞉ YulIdentifier): "sha3" # (0..4) - (assignment꞉ YulAssignmentOperator): # " :=" (4..7) - - (LeadingTrivia) ► (Whitespace): " " # (4..5) + - (leading_trivia꞉ Whitespace): " " # (4..5) - (variant꞉ ColonEqual): ":=" # (5..7) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (7..10) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (variant꞉ YulDecimalLiteral): "0" # (8..9) - - (TrailingTrivia) ► (EndOfLine): "\n" # (9..10) + - (trailing_trivia꞉ EndOfLine): "\n" # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_shl/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_shl/generated/0.4.11-success.yml index 5264718256..a042d4e324 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_shl/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_shl/generated/0.4.11-success.yml @@ -11,9 +11,9 @@ Tree: - (item꞉ YulIdentifierPath): # "shl" (0..3) - (item꞉ YulIdentifier): "shl" # (0..3) - (assignment꞉ YulAssignmentOperator): # " :=" (3..6) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (variant꞉ ColonEqual): ":=" # (4..6) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (6..9) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (variant꞉ YulDecimalLiteral): "0" # (7..8) - - (TrailingTrivia) ► (EndOfLine): "\n" # (8..9) + - (trailing_trivia꞉ EndOfLine): "\n" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_shr/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_shr/generated/0.4.11-success.yml index 6368e97f39..001f779d53 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_shr/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_shr/generated/0.4.11-success.yml @@ -11,9 +11,9 @@ Tree: - (item꞉ YulIdentifierPath): # "shr" (0..3) - (item꞉ YulIdentifier): "shr" # (0..3) - (assignment꞉ YulAssignmentOperator): # " :=" (3..6) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (variant꞉ ColonEqual): ":=" # (4..6) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (6..9) - - (LeadingTrivia) ► (Whitespace): " " # (6..7) + - (leading_trivia꞉ Whitespace): " " # (6..7) - (variant꞉ YulDecimalLiteral): "0" # (7..8) - - (TrailingTrivia) ► (EndOfLine): "\n" # (8..9) + - (trailing_trivia꞉ EndOfLine): "\n" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_staticcall/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_staticcall/generated/0.4.11-success.yml index 4ac0609138..b7fd0d4af2 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_staticcall/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_staticcall/generated/0.4.11-success.yml @@ -11,9 +11,9 @@ Tree: - (item꞉ YulIdentifierPath): # "staticcall" (0..10) - (item꞉ YulIdentifier): "staticcall" # (0..10) - (assignment꞉ YulAssignmentOperator): # " :=" (10..13) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (variant꞉ ColonEqual): ":=" # (11..13) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (13..16) - - (LeadingTrivia) ► (Whitespace): " " # (13..14) + - (leading_trivia꞉ Whitespace): " " # (13..14) - (variant꞉ YulDecimalLiteral): "0" # (14..15) - - (TrailingTrivia) ► (EndOfLine): "\n" # (15..16) + - (trailing_trivia꞉ EndOfLine): "\n" # (15..16) diff --git a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_suicide/generated/0.5.0-success.yml b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_suicide/generated/0.5.0-success.yml index f7713b4bee..f4cd70347c 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_suicide/generated/0.5.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulAssignmentStatement/identifier_suicide/generated/0.5.0-success.yml @@ -11,9 +11,9 @@ Tree: - (item꞉ YulIdentifierPath): # "suicide" (0..7) - (item꞉ YulIdentifier): "suicide" # (0..7) - (assignment꞉ YulAssignmentOperator): # " :=" (7..10) - - (LeadingTrivia) ► (Whitespace): " " # (7..8) + - (leading_trivia꞉ Whitespace): " " # (7..8) - (variant꞉ ColonEqual): ":=" # (8..10) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (10..13) - - (LeadingTrivia) ► (Whitespace): " " # (10..11) + - (leading_trivia꞉ Whitespace): " " # (10..11) - (variant꞉ YulDecimalLiteral): "0" # (11..12) - - (TrailingTrivia) ► (EndOfLine): "\n" # (12..13) + - (trailing_trivia꞉ EndOfLine): "\n" # (12..13) 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 66ecb3e5af..8c3f85dd1e 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 @@ -12,43 +12,43 @@ Errors: [] Tree: - (YulBlock): # "{\n\tfunction mult(a, b) -> result {\n\t\tresult := mul..." (0..62) - (open_brace꞉ OpenBrace): "{" # (0..1) - - (TrailingTrivia) ► (EndOfLine): "\n" # (1..2) + - (trailing_trivia꞉ EndOfLine): "\n" # (1..2) - (statements꞉ YulStatements): # "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." (2..60) - (item꞉ YulStatement) ► (variant꞉ YulFunctionDefinition): # "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." (2..60) - - (LeadingTrivia) ► (Whitespace): "\t" # (2..3) + - (leading_trivia꞉ Whitespace): "\t" # (2..3) - (function_keyword꞉ YulFunctionKeyword): "function" # (3..11) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (name꞉ YulIdentifier): "mult" # (12..16) - (parameters꞉ YulParametersDeclaration): # "(a, b)" (16..22) - (open_paren꞉ OpenParen): "(" # (16..17) - (parameters꞉ YulParameters): # "a, b" (17..21) - (item꞉ YulIdentifier): "a" # (17..18) - (separator꞉ Comma): "," # (18..19) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (item꞉ YulIdentifier): "b" # (20..21) - (close_paren꞉ CloseParen): ")" # (21..22) - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - (variables꞉ YulReturnVariables): # " result" (25..32) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (leading_trivia꞉ Whitespace): " " # (25..26) - (item꞉ YulIdentifier): "result" # (26..32) - (body꞉ YulBlock): # " {\n\t\tresult := mul(a, b)\n\t}\n" (32..60) - - (LeadingTrivia) ► (Whitespace): " " # (32..33) + - (leading_trivia꞉ Whitespace): " " # (32..33) - (open_brace꞉ OpenBrace): "{" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n" (35..57) - (item꞉ YulStatement) ► (variant꞉ YulAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - (names꞉ YulIdentifierPaths): # "\t\tresult" (35..43) - (item꞉ YulIdentifierPath): # "\t\tresult" (35..43) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (35..37) + - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) - (item꞉ YulIdentifier): "result" # (37..43) - (assignment꞉ YulAssignmentOperator): # " :=" (43..46) - - (LeadingTrivia) ► (Whitespace): " " # (43..44) + - (leading_trivia꞉ Whitespace): " " # (43..44) - (variant꞉ ColonEqual): ":=" # (44..46) - (expression꞉ YulExpression) ► (variant꞉ YulFunctionCallExpression): # " mul(a, b)\n" (46..57) - (operand꞉ YulExpression) ► (variant꞉ YulBuiltInFunction): # " mul" (46..50) - - (LeadingTrivia) ► (Whitespace): " " # (46..47) + - (leading_trivia꞉ Whitespace): " " # (46..47) - (variant꞉ YulMulKeyword): "mul" # (47..50) - (open_paren꞉ OpenParen): "(" # (50..51) - (arguments꞉ YulArguments): # "a, b" (51..55) @@ -56,12 +56,12 @@ Tree: - (item꞉ YulIdentifier): "a" # (51..52) - (separator꞉ Comma): "," # (52..53) - (item꞉ YulExpression) ► (variant꞉ YulIdentifierPath): # " b" (53..55) - - (LeadingTrivia) ► (Whitespace): " " # (53..54) + - (leading_trivia꞉ Whitespace): " " # (53..54) - (item꞉ YulIdentifier): "b" # (54..55) - (close_paren꞉ CloseParen): ")" # (55..56) - - (TrailingTrivia) ► (EndOfLine): "\n" # (56..57) - - (LeadingTrivia) ► (Whitespace): "\t" # (57..58) + - (trailing_trivia꞉ EndOfLine): "\n" # (56..57) + - (leading_trivia꞉ Whitespace): "\t" # (57..58) - (close_brace꞉ CloseBrace): "}" # (58..59) - - (TrailingTrivia) ► (EndOfLine): "\n" # (59..60) + - (trailing_trivia꞉ EndOfLine): "\n" # (59..60) - (close_brace꞉ CloseBrace): "}" # (60..61) - - (TrailingTrivia) ► (EndOfLine): "\n" # (61..62) + - (trailing_trivia꞉ EndOfLine): "\n" # (61..62) 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 ffe63c89c3..66f88ac273 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 @@ -22,43 +22,43 @@ Errors: # 1 total Tree: - (YulBlock): # "{\n\tfunction mult(a, b) -> result {\n\t\tresult := mul..." (0..85) - (open_brace꞉ OpenBrace): "{" # (0..1) - - (TrailingTrivia) ► (EndOfLine): "\n" # (1..2) + - (trailing_trivia꞉ EndOfLine): "\n" # (1..2) - (statements꞉ YulStatements): # "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." (2..83) - (item꞉ YulStatement) ► (variant꞉ YulFunctionDefinition): # "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." (2..83) - - (LeadingTrivia) ► (Whitespace): "\t" # (2..3) + - (leading_trivia꞉ Whitespace): "\t" # (2..3) - (function_keyword꞉ YulFunctionKeyword): "function" # (3..11) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (name꞉ YulIdentifier): "mult" # (12..16) - (parameters꞉ YulParametersDeclaration): # "(a, b)" (16..22) - (open_paren꞉ OpenParen): "(" # (16..17) - (parameters꞉ YulParameters): # "a, b" (17..21) - (item꞉ YulIdentifier): "a" # (17..18) - (separator꞉ Comma): "," # (18..19) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (item꞉ YulIdentifier): "b" # (20..21) - (close_paren꞉ CloseParen): ")" # (21..22) - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - (variables꞉ YulReturnVariables): # " result" (25..32) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (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) - - (LeadingTrivia) ► (Whitespace): " " # (32..33) + - (leading_trivia꞉ Whitespace): " " # (32..33) - (open_brace꞉ OpenBrace): "{" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n\t\tresult" (35..65) - (item꞉ YulStatement) ► (variant꞉ YulAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - (names꞉ YulIdentifierPaths): # "\t\tresult" (35..43) - (item꞉ YulIdentifierPath): # "\t\tresult" (35..43) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (35..37) + - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) - (item꞉ YulIdentifier): "result" # (37..43) - (assignment꞉ YulAssignmentOperator): # " :=" (43..46) - - (LeadingTrivia) ► (Whitespace): " " # (43..44) + - (leading_trivia꞉ Whitespace): " " # (43..44) - (variant꞉ ColonEqual): ":=" # (44..46) - (expression꞉ YulExpression) ► (variant꞉ YulFunctionCallExpression): # " mul(a, b)\n" (46..57) - (operand꞉ YulExpression) ► (variant꞉ YulBuiltInFunction): # " mul" (46..50) - - (LeadingTrivia) ► (Whitespace): " " # (46..47) + - (leading_trivia꞉ Whitespace): " " # (46..47) - (variant꞉ YulMulKeyword): "mul" # (47..50) - (open_paren꞉ OpenParen): "(" # (50..51) - (arguments꞉ YulArguments): # "a, b" (51..55) @@ -66,16 +66,16 @@ Tree: - (item꞉ YulIdentifier): "a" # (51..52) - (separator꞉ Comma): "," # (52..53) - (item꞉ YulExpression) ► (variant꞉ YulIdentifierPath): # " b" (53..55) - - (LeadingTrivia) ► (Whitespace): " " # (53..54) + - (leading_trivia꞉ Whitespace): " " # (53..54) - (item꞉ YulIdentifier): "b" # (54..55) - (close_paren꞉ CloseParen): ")" # (55..56) - - (TrailingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (56..57) - (item꞉ YulStatement) ► (variant꞉ YulExpression) ► (variant꞉ YulIdentifierPath): # "\t\tresult" (57..65) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (57..59) + - (leading_trivia꞉ Whitespace): "\t\t" # (57..59) - (item꞉ YulIdentifier): "result" # (59..65) - - (LeadingTrivia) ► (Whitespace): " " # (65..66) + - (leading_trivia꞉ Whitespace): " " # (65..66) - (SKIPPED): ":= [mul(a, b)\n\t" # (66..81) - (close_brace꞉ CloseBrace): "}" # (81..82) - - (TrailingTrivia) ► (EndOfLine): "\n" # (82..83) + - (trailing_trivia꞉ EndOfLine): "\n" # (82..83) - (close_brace꞉ CloseBrace): "}" # (83..84) - - (TrailingTrivia) ► (EndOfLine): "\n" # (84..85) + - (trailing_trivia꞉ EndOfLine): "\n" # (84..85) 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 420d5efcaa..531d3440ed 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 @@ -22,43 +22,43 @@ Errors: # 1 total Tree: - (YulBlock): # "{\n\tfunction mult(a, b) -> result {\n\t\tresult := mul..." (0..85) - (open_brace꞉ OpenBrace): "{" # (0..1) - - (TrailingTrivia) ► (EndOfLine): "\n" # (1..2) + - (trailing_trivia꞉ EndOfLine): "\n" # (1..2) - (statements꞉ YulStatements): # "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." (2..83) - (item꞉ YulStatement) ► (variant꞉ YulFunctionDefinition): # "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." (2..83) - - (LeadingTrivia) ► (Whitespace): "\t" # (2..3) + - (leading_trivia꞉ Whitespace): "\t" # (2..3) - (function_keyword꞉ YulFunctionKeyword): "function" # (3..11) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (name꞉ YulIdentifier): "mult" # (12..16) - (parameters꞉ YulParametersDeclaration): # "(a, b)" (16..22) - (open_paren꞉ OpenParen): "(" # (16..17) - (parameters꞉ YulParameters): # "a, b" (17..21) - (item꞉ YulIdentifier): "a" # (17..18) - (separator꞉ Comma): "," # (18..19) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (item꞉ YulIdentifier): "b" # (20..21) - (close_paren꞉ CloseParen): ")" # (21..22) - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - (variables꞉ YulReturnVariables): # " result" (25..32) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (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) - - (LeadingTrivia) ► (Whitespace): " " # (32..33) + - (leading_trivia꞉ Whitespace): " " # (32..33) - (open_brace꞉ OpenBrace): "{" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n\t\tresult" (35..65) - (item꞉ YulStatement) ► (variant꞉ YulAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - (names꞉ YulIdentifierPaths): # "\t\tresult" (35..43) - (item꞉ YulIdentifierPath): # "\t\tresult" (35..43) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (35..37) + - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) - (item꞉ YulIdentifier): "result" # (37..43) - (assignment꞉ YulAssignmentOperator): # " :=" (43..46) - - (LeadingTrivia) ► (Whitespace): " " # (43..44) + - (leading_trivia꞉ Whitespace): " " # (43..44) - (variant꞉ ColonEqual): ":=" # (44..46) - (expression꞉ YulExpression) ► (variant꞉ YulFunctionCallExpression): # " mul(a, b)\n" (46..57) - (operand꞉ YulExpression) ► (variant꞉ YulBuiltInFunction): # " mul" (46..50) - - (LeadingTrivia) ► (Whitespace): " " # (46..47) + - (leading_trivia꞉ Whitespace): " " # (46..47) - (variant꞉ YulMulKeyword): "mul" # (47..50) - (open_paren꞉ OpenParen): "(" # (50..51) - (arguments꞉ YulArguments): # "a, b" (51..55) @@ -66,16 +66,16 @@ Tree: - (item꞉ YulIdentifier): "a" # (51..52) - (separator꞉ Comma): "," # (52..53) - (item꞉ YulExpression) ► (variant꞉ YulIdentifierPath): # " b" (53..55) - - (LeadingTrivia) ► (Whitespace): " " # (53..54) + - (leading_trivia꞉ Whitespace): " " # (53..54) - (item꞉ YulIdentifier): "b" # (54..55) - (close_paren꞉ CloseParen): ")" # (55..56) - - (TrailingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (56..57) - (item꞉ YulStatement) ► (variant꞉ YulExpression) ► (variant꞉ YulIdentifierPath): # "\t\tresult" (57..65) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (57..59) + - (leading_trivia꞉ Whitespace): "\t\t" # (57..59) - (item꞉ YulIdentifier): "result" # (59..65) - - (LeadingTrivia) ► (Whitespace): " " # (65..66) + - (leading_trivia꞉ Whitespace): " " # (65..66) - (SKIPPED): ":= [mul(a, b)\n\t" # (66..81) - (close_brace꞉ CloseBrace): "}" # (81..82) - - (TrailingTrivia) ► (EndOfLine): "\n" # (82..83) + - (trailing_trivia꞉ EndOfLine): "\n" # (82..83) - (close_brace꞉ CloseBrace): "}" # (83..84) - - (TrailingTrivia) ► (EndOfLine): "\n" # (84..85) + - (trailing_trivia꞉ EndOfLine): "\n" # (84..85) 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 7478412d8e..ccd3111888 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 @@ -22,43 +22,43 @@ Errors: # 1 total Tree: - (YulBlock): # "{\n\tfunction mult(a, b) -> result {\n\t\tresult := mul..." (0..85) - (open_brace꞉ OpenBrace): "{" # (0..1) - - (TrailingTrivia) ► (EndOfLine): "\n" # (1..2) + - (trailing_trivia꞉ EndOfLine): "\n" # (1..2) - (statements꞉ YulStatements): # "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." (2..83) - (item꞉ YulStatement) ► (variant꞉ YulFunctionDefinition): # "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." (2..83) - - (LeadingTrivia) ► (Whitespace): "\t" # (2..3) + - (leading_trivia꞉ Whitespace): "\t" # (2..3) - (function_keyword꞉ YulFunctionKeyword): "function" # (3..11) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (name꞉ YulIdentifier): "mult" # (12..16) - (parameters꞉ YulParametersDeclaration): # "(a, b)" (16..22) - (open_paren꞉ OpenParen): "(" # (16..17) - (parameters꞉ YulParameters): # "a, b" (17..21) - (item꞉ YulIdentifier): "a" # (17..18) - (separator꞉ Comma): "," # (18..19) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (item꞉ YulIdentifier): "b" # (20..21) - (close_paren꞉ CloseParen): ")" # (21..22) - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - (variables꞉ YulReturnVariables): # " result" (25..32) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (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) - - (LeadingTrivia) ► (Whitespace): " " # (32..33) + - (leading_trivia꞉ Whitespace): " " # (32..33) - (open_brace꞉ OpenBrace): "{" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n\t\tresult" (35..65) - (item꞉ YulStatement) ► (variant꞉ YulAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - (names꞉ YulIdentifierPaths): # "\t\tresult" (35..43) - (item꞉ YulIdentifierPath): # "\t\tresult" (35..43) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (35..37) + - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) - (item꞉ YulIdentifier): "result" # (37..43) - (assignment꞉ YulAssignmentOperator): # " :=" (43..46) - - (LeadingTrivia) ► (Whitespace): " " # (43..44) + - (leading_trivia꞉ Whitespace): " " # (43..44) - (variant꞉ ColonEqual): ":=" # (44..46) - (expression꞉ YulExpression) ► (variant꞉ YulFunctionCallExpression): # " mul(a, b)\n" (46..57) - (operand꞉ YulExpression) ► (variant꞉ YulBuiltInFunction): # " mul" (46..50) - - (LeadingTrivia) ► (Whitespace): " " # (46..47) + - (leading_trivia꞉ Whitespace): " " # (46..47) - (variant꞉ YulMulKeyword): "mul" # (47..50) - (open_paren꞉ OpenParen): "(" # (50..51) - (arguments꞉ YulArguments): # "a, b" (51..55) @@ -66,16 +66,16 @@ Tree: - (item꞉ YulIdentifier): "a" # (51..52) - (separator꞉ Comma): "," # (52..53) - (item꞉ YulExpression) ► (variant꞉ YulIdentifierPath): # " b" (53..55) - - (LeadingTrivia) ► (Whitespace): " " # (53..54) + - (leading_trivia꞉ Whitespace): " " # (53..54) - (item꞉ YulIdentifier): "b" # (54..55) - (close_paren꞉ CloseParen): ")" # (55..56) - - (TrailingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (56..57) - (item꞉ YulStatement) ► (variant꞉ YulExpression) ► (variant꞉ YulIdentifierPath): # "\t\tresult" (57..65) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (57..59) + - (leading_trivia꞉ Whitespace): "\t\t" # (57..59) - (item꞉ YulIdentifier): "result" # (59..65) - - (LeadingTrivia) ► (Whitespace): " " # (65..66) + - (leading_trivia꞉ Whitespace): " " # (65..66) - (SKIPPED): ":= [mul(a, b)\n\t" # (66..81) - (close_brace꞉ CloseBrace): "}" # (81..82) - - (TrailingTrivia) ► (EndOfLine): "\n" # (82..83) + - (trailing_trivia꞉ EndOfLine): "\n" # (82..83) - (close_brace꞉ CloseBrace): "}" # (83..84) - - (TrailingTrivia) ► (EndOfLine): "\n" # (84..85) + - (trailing_trivia꞉ EndOfLine): "\n" # (84..85) 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 0a2f992b8a..1e1ac9ad7a 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 @@ -22,43 +22,43 @@ Errors: # 1 total Tree: - (YulBlock): # "{\n\tfunction mult(a, b) -> result {\n\t\tresult := mul..." (0..85) - (open_brace꞉ OpenBrace): "{" # (0..1) - - (TrailingTrivia) ► (EndOfLine): "\n" # (1..2) + - (trailing_trivia꞉ EndOfLine): "\n" # (1..2) - (statements꞉ YulStatements): # "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." (2..83) - (item꞉ YulStatement) ► (variant꞉ YulFunctionDefinition): # "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." (2..83) - - (LeadingTrivia) ► (Whitespace): "\t" # (2..3) + - (leading_trivia꞉ Whitespace): "\t" # (2..3) - (function_keyword꞉ YulFunctionKeyword): "function" # (3..11) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (name꞉ YulIdentifier): "mult" # (12..16) - (parameters꞉ YulParametersDeclaration): # "(a, b)" (16..22) - (open_paren꞉ OpenParen): "(" # (16..17) - (parameters꞉ YulParameters): # "a, b" (17..21) - (item꞉ YulIdentifier): "a" # (17..18) - (separator꞉ Comma): "," # (18..19) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (item꞉ YulIdentifier): "b" # (20..21) - (close_paren꞉ CloseParen): ")" # (21..22) - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - (variables꞉ YulReturnVariables): # " result" (25..32) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (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) - - (LeadingTrivia) ► (Whitespace): " " # (32..33) + - (leading_trivia꞉ Whitespace): " " # (32..33) - (open_brace꞉ OpenBrace): "{" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n\t\tresult" (35..65) - (item꞉ YulStatement) ► (variant꞉ YulAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - (names꞉ YulIdentifierPaths): # "\t\tresult" (35..43) - (item꞉ YulIdentifierPath): # "\t\tresult" (35..43) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (35..37) + - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) - (item꞉ YulIdentifier): "result" # (37..43) - (assignment꞉ YulAssignmentOperator): # " :=" (43..46) - - (LeadingTrivia) ► (Whitespace): " " # (43..44) + - (leading_trivia꞉ Whitespace): " " # (43..44) - (variant꞉ ColonEqual): ":=" # (44..46) - (expression꞉ YulExpression) ► (variant꞉ YulFunctionCallExpression): # " mul(a, b)\n" (46..57) - (operand꞉ YulExpression) ► (variant꞉ YulBuiltInFunction): # " mul" (46..50) - - (LeadingTrivia) ► (Whitespace): " " # (46..47) + - (leading_trivia꞉ Whitespace): " " # (46..47) - (variant꞉ YulMulKeyword): "mul" # (47..50) - (open_paren꞉ OpenParen): "(" # (50..51) - (arguments꞉ YulArguments): # "a, b" (51..55) @@ -66,16 +66,16 @@ Tree: - (item꞉ YulIdentifier): "a" # (51..52) - (separator꞉ Comma): "," # (52..53) - (item꞉ YulExpression) ► (variant꞉ YulIdentifierPath): # " b" (53..55) - - (LeadingTrivia) ► (Whitespace): " " # (53..54) + - (leading_trivia꞉ Whitespace): " " # (53..54) - (item꞉ YulIdentifier): "b" # (54..55) - (close_paren꞉ CloseParen): ")" # (55..56) - - (TrailingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (56..57) - (item꞉ YulStatement) ► (variant꞉ YulExpression) ► (variant꞉ YulIdentifierPath): # "\t\tresult" (57..65) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (57..59) + - (leading_trivia꞉ Whitespace): "\t\t" # (57..59) - (item꞉ YulIdentifier): "result" # (59..65) - - (LeadingTrivia) ► (Whitespace): " " # (65..66) + - (leading_trivia꞉ Whitespace): " " # (65..66) - (SKIPPED): ":= [mul(a, b)\n\t" # (66..81) - (close_brace꞉ CloseBrace): "}" # (81..82) - - (TrailingTrivia) ► (EndOfLine): "\n" # (82..83) + - (trailing_trivia꞉ EndOfLine): "\n" # (82..83) - (close_brace꞉ CloseBrace): "}" # (83..84) - - (TrailingTrivia) ► (EndOfLine): "\n" # (84..85) + - (trailing_trivia꞉ EndOfLine): "\n" # (84..85) 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 760a79cbc9..8fdfbb60a1 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 @@ -22,43 +22,43 @@ Errors: # 1 total Tree: - (YulBlock): # "{\n\tfunction mult(a, b) -> result {\n\t\tresult := mul..." (0..85) - (open_brace꞉ OpenBrace): "{" # (0..1) - - (TrailingTrivia) ► (EndOfLine): "\n" # (1..2) + - (trailing_trivia꞉ EndOfLine): "\n" # (1..2) - (statements꞉ YulStatements): # "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." (2..83) - (item꞉ YulStatement) ► (variant꞉ YulFunctionDefinition): # "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." (2..83) - - (LeadingTrivia) ► (Whitespace): "\t" # (2..3) + - (leading_trivia꞉ Whitespace): "\t" # (2..3) - (function_keyword꞉ YulFunctionKeyword): "function" # (3..11) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (name꞉ YulIdentifier): "mult" # (12..16) - (parameters꞉ YulParametersDeclaration): # "(a, b)" (16..22) - (open_paren꞉ OpenParen): "(" # (16..17) - (parameters꞉ YulParameters): # "a, b" (17..21) - (item꞉ YulIdentifier): "a" # (17..18) - (separator꞉ Comma): "," # (18..19) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (item꞉ YulIdentifier): "b" # (20..21) - (close_paren꞉ CloseParen): ")" # (21..22) - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - (variables꞉ YulReturnVariables): # " result" (25..32) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (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) - - (LeadingTrivia) ► (Whitespace): " " # (32..33) + - (leading_trivia꞉ Whitespace): " " # (32..33) - (open_brace꞉ OpenBrace): "{" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n\t\tresult" (35..65) - (item꞉ YulStatement) ► (variant꞉ YulAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - (names꞉ YulIdentifierPaths): # "\t\tresult" (35..43) - (item꞉ YulIdentifierPath): # "\t\tresult" (35..43) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (35..37) + - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) - (item꞉ YulIdentifier): "result" # (37..43) - (assignment꞉ YulAssignmentOperator): # " :=" (43..46) - - (LeadingTrivia) ► (Whitespace): " " # (43..44) + - (leading_trivia꞉ Whitespace): " " # (43..44) - (variant꞉ ColonEqual): ":=" # (44..46) - (expression꞉ YulExpression) ► (variant꞉ YulFunctionCallExpression): # " mul(a, b)\n" (46..57) - (operand꞉ YulExpression) ► (variant꞉ YulBuiltInFunction): # " mul" (46..50) - - (LeadingTrivia) ► (Whitespace): " " # (46..47) + - (leading_trivia꞉ Whitespace): " " # (46..47) - (variant꞉ YulMulKeyword): "mul" # (47..50) - (open_paren꞉ OpenParen): "(" # (50..51) - (arguments꞉ YulArguments): # "a, b" (51..55) @@ -66,16 +66,16 @@ Tree: - (item꞉ YulIdentifier): "a" # (51..52) - (separator꞉ Comma): "," # (52..53) - (item꞉ YulExpression) ► (variant꞉ YulIdentifierPath): # " b" (53..55) - - (LeadingTrivia) ► (Whitespace): " " # (53..54) + - (leading_trivia꞉ Whitespace): " " # (53..54) - (item꞉ YulIdentifier): "b" # (54..55) - (close_paren꞉ CloseParen): ")" # (55..56) - - (TrailingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (56..57) - (item꞉ YulStatement) ► (variant꞉ YulExpression) ► (variant꞉ YulIdentifierPath): # "\t\tresult" (57..65) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (57..59) + - (leading_trivia꞉ Whitespace): "\t\t" # (57..59) - (item꞉ YulIdentifier): "result" # (59..65) - - (LeadingTrivia) ► (Whitespace): " " # (65..66) + - (leading_trivia꞉ Whitespace): " " # (65..66) - (SKIPPED): ":= [mul(a, b)\n\t" # (66..81) - (close_brace꞉ CloseBrace): "}" # (81..82) - - (TrailingTrivia) ► (EndOfLine): "\n" # (82..83) + - (trailing_trivia꞉ EndOfLine): "\n" # (82..83) - (close_brace꞉ CloseBrace): "}" # (83..84) - - (TrailingTrivia) ► (EndOfLine): "\n" # (84..85) + - (trailing_trivia꞉ EndOfLine): "\n" # (84..85) 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 f8befdbee4..b4fb9b60b4 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 @@ -22,43 +22,43 @@ Errors: # 1 total Tree: - (YulBlock): # "{\n\tfunction mult(a, b) -> result {\n\t\tresult := mul..." (0..85) - (open_brace꞉ OpenBrace): "{" # (0..1) - - (TrailingTrivia) ► (EndOfLine): "\n" # (1..2) + - (trailing_trivia꞉ EndOfLine): "\n" # (1..2) - (statements꞉ YulStatements): # "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." (2..83) - (item꞉ YulStatement) ► (variant꞉ YulFunctionDefinition): # "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." (2..83) - - (LeadingTrivia) ► (Whitespace): "\t" # (2..3) + - (leading_trivia꞉ Whitespace): "\t" # (2..3) - (function_keyword꞉ YulFunctionKeyword): "function" # (3..11) - - (LeadingTrivia) ► (Whitespace): " " # (11..12) + - (leading_trivia꞉ Whitespace): " " # (11..12) - (name꞉ YulIdentifier): "mult" # (12..16) - (parameters꞉ YulParametersDeclaration): # "(a, b)" (16..22) - (open_paren꞉ OpenParen): "(" # (16..17) - (parameters꞉ YulParameters): # "a, b" (17..21) - (item꞉ YulIdentifier): "a" # (17..18) - (separator꞉ Comma): "," # (18..19) - - (LeadingTrivia) ► (Whitespace): " " # (19..20) + - (leading_trivia꞉ Whitespace): " " # (19..20) - (item꞉ YulIdentifier): "b" # (20..21) - (close_paren꞉ CloseParen): ")" # (21..22) - (returns꞉ YulReturnsDeclaration): # " -> result" (22..32) - - (LeadingTrivia) ► (Whitespace): " " # (22..23) + - (leading_trivia꞉ Whitespace): " " # (22..23) - (minus_greater_than꞉ MinusGreaterThan): "->" # (23..25) - (variables꞉ YulReturnVariables): # " result" (25..32) - - (LeadingTrivia) ► (Whitespace): " " # (25..26) + - (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) - - (LeadingTrivia) ► (Whitespace): " " # (32..33) + - (leading_trivia꞉ Whitespace): " " # (32..33) - (open_brace꞉ OpenBrace): "{" # (33..34) - - (TrailingTrivia) ► (EndOfLine): "\n" # (34..35) + - (trailing_trivia꞉ EndOfLine): "\n" # (34..35) - (statements꞉ YulStatements): # "\t\tresult := mul(a, b)\n\t\tresult" (35..65) - (item꞉ YulStatement) ► (variant꞉ YulAssignmentStatement): # "\t\tresult := mul(a, b)\n" (35..57) - (names꞉ YulIdentifierPaths): # "\t\tresult" (35..43) - (item꞉ YulIdentifierPath): # "\t\tresult" (35..43) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (35..37) + - (leading_trivia꞉ Whitespace): "\t\t" # (35..37) - (item꞉ YulIdentifier): "result" # (37..43) - (assignment꞉ YulAssignmentOperator): # " :=" (43..46) - - (LeadingTrivia) ► (Whitespace): " " # (43..44) + - (leading_trivia꞉ Whitespace): " " # (43..44) - (variant꞉ ColonEqual): ":=" # (44..46) - (expression꞉ YulExpression) ► (variant꞉ YulFunctionCallExpression): # " mul(a, b)\n" (46..57) - (operand꞉ YulExpression) ► (variant꞉ YulBuiltInFunction): # " mul" (46..50) - - (LeadingTrivia) ► (Whitespace): " " # (46..47) + - (leading_trivia꞉ Whitespace): " " # (46..47) - (variant꞉ YulMulKeyword): "mul" # (47..50) - (open_paren꞉ OpenParen): "(" # (50..51) - (arguments꞉ YulArguments): # "a, b" (51..55) @@ -66,16 +66,16 @@ Tree: - (item꞉ YulIdentifier): "a" # (51..52) - (separator꞉ Comma): "," # (52..53) - (item꞉ YulExpression) ► (variant꞉ YulIdentifierPath): # " b" (53..55) - - (LeadingTrivia) ► (Whitespace): " " # (53..54) + - (leading_trivia꞉ Whitespace): " " # (53..54) - (item꞉ YulIdentifier): "b" # (54..55) - (close_paren꞉ CloseParen): ")" # (55..56) - - (TrailingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (56..57) - (item꞉ YulStatement) ► (variant꞉ YulExpression) ► (variant꞉ YulIdentifierPath): # "\t\tresult" (57..65) - - (LeadingTrivia) ► (Whitespace): "\t\t" # (57..59) + - (leading_trivia꞉ Whitespace): "\t\t" # (57..59) - (item꞉ YulIdentifier): "result" # (59..65) - - (LeadingTrivia) ► (Whitespace): " " # (65..66) + - (leading_trivia꞉ Whitespace): " " # (65..66) - (SKIPPED): ":= [mul(a, b)\n\t" # (66..81) - (close_brace꞉ CloseBrace): "}" # (81..82) - - (TrailingTrivia) ► (EndOfLine): "\n" # (82..83) + - (trailing_trivia꞉ EndOfLine): "\n" # (82..83) - (close_brace꞉ CloseBrace): "}" # (83..84) - - (TrailingTrivia) ► (EndOfLine): "\n" # (84..85) + - (trailing_trivia꞉ EndOfLine): "\n" # (84..85) diff --git a/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_path/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_path/generated/0.4.11-success.yml index 111aa9d74a..277ce8fd3e 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_path/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_path/generated/0.4.11-success.yml @@ -8,8 +8,8 @@ Errors: [] Tree: - (YulExpression) ► (variant꞉ YulIdentifierPath): # "foo . bar\n" (0..10) - (item꞉ YulIdentifier): "foo" # (0..3) - - (LeadingTrivia) ► (Whitespace): " " # (3..4) + - (leading_trivia꞉ Whitespace): " " # (3..4) - (separator꞉ Period): "." # (4..5) - - (LeadingTrivia) ► (Whitespace): " " # (5..6) + - (leading_trivia꞉ Whitespace): " " # (5..6) - (item꞉ YulIdentifier): "bar" # (6..9) - - (TrailingTrivia) ► (EndOfLine): "\n" # (9..10) + - (trailing_trivia꞉ EndOfLine): "\n" # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_with_dot/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_with_dot/generated/0.4.11-success.yml index ae5d7cb63f..1811659702 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_with_dot/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_with_dot/generated/0.4.11-success.yml @@ -8,10 +8,9 @@ Errors: [] Tree: - (YulExpression) ► (variant꞉ YulIdentifierPath): # "// identifiers with dots were allowed specifically..." (0..90) - - (LeadingTrivia): # "// identifiers with dots were allowed specifically..." (0..82) - - (SingleLineComment): "// identifiers with dots were allowed specifically..." # (0..81) - - (EndOfLine): "\n" # (81..82) + - (leading_trivia꞉ SingleLineComment): "// identifiers with dots were allowed specifically..." # (0..81) + - (leading_trivia꞉ EndOfLine): "\n" # (81..82) - (item꞉ YulIdentifier): "foo" # (82..85) - (separator꞉ Period): "." # (85..86) - (item꞉ YulIdentifier): "bar" # (86..89) - - (TrailingTrivia) ► (EndOfLine): "\n" # (89..90) + - (trailing_trivia꞉ EndOfLine): "\n" # (89..90) diff --git a/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_with_dot/generated/0.5.8-success.yml b/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_with_dot/generated/0.5.8-success.yml index 1e4a115bec..bf41ba6b4e 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_with_dot/generated/0.5.8-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_with_dot/generated/0.5.8-success.yml @@ -8,8 +8,7 @@ Errors: [] Tree: - (YulExpression) ► (variant꞉ YulIdentifierPath): # "// identifiers with dots were allowed specifically..." (0..90) - - (LeadingTrivia): # "// identifiers with dots were allowed specifically..." (0..82) - - (SingleLineComment): "// identifiers with dots were allowed specifically..." # (0..81) - - (EndOfLine): "\n" # (81..82) + - (leading_trivia꞉ SingleLineComment): "// identifiers with dots were allowed specifically..." # (0..81) + - (leading_trivia꞉ EndOfLine): "\n" # (81..82) - (item꞉ YulIdentifier): "foo.bar" # (82..89) - - (TrailingTrivia) ► (EndOfLine): "\n" # (89..90) + - (trailing_trivia꞉ EndOfLine): "\n" # (89..90) diff --git a/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_with_dot/generated/0.7.0-success.yml b/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_with_dot/generated/0.7.0-success.yml index ae5d7cb63f..1811659702 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_with_dot/generated/0.7.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulExpression/identifier_with_dot/generated/0.7.0-success.yml @@ -8,10 +8,9 @@ Errors: [] Tree: - (YulExpression) ► (variant꞉ YulIdentifierPath): # "// identifiers with dots were allowed specifically..." (0..90) - - (LeadingTrivia): # "// identifiers with dots were allowed specifically..." (0..82) - - (SingleLineComment): "// identifiers with dots were allowed specifically..." # (0..81) - - (EndOfLine): "\n" # (81..82) + - (leading_trivia꞉ SingleLineComment): "// identifiers with dots were allowed specifically..." # (0..81) + - (leading_trivia꞉ EndOfLine): "\n" # (81..82) - (item꞉ YulIdentifier): "foo" # (82..85) - (separator꞉ Period): "." # (85..86) - (item꞉ YulIdentifier): "bar" # (86..89) - - (TrailingTrivia) ► (EndOfLine): "\n" # (89..90) + - (trailing_trivia꞉ EndOfLine): "\n" # (89..90) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_add/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_add/generated/0.4.11-success.yml index e51aa1ac4f..9e298b2332 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_add/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_add/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_addmod/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_addmod/generated/0.4.11-success.yml index fd6d19904e..7ba93dc0cc 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_addmod/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_addmod/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (6..7) - (arguments꞉ YulArguments): [] # (7..7) - (close_paren꞉ CloseParen): ")" # (7..8) - - (TrailingTrivia) ► (EndOfLine): "\n" # (8..9) + - (trailing_trivia꞉ EndOfLine): "\n" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_address/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_address/generated/0.4.11-success.yml index a18205dfe0..e7ad66d6bc 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_address/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_address/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (7..8) - (arguments꞉ YulArguments): [] # (8..8) - (close_paren꞉ CloseParen): ")" # (8..9) - - (TrailingTrivia) ► (EndOfLine): "\n" # (9..10) + - (trailing_trivia꞉ EndOfLine): "\n" # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_and/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_and/generated/0.4.11-success.yml index 70df33ee32..4f7ec2e30c 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_and/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_and/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_balance/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_balance/generated/0.4.11-success.yml index f4f72db618..36b6f1ce0d 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_balance/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_balance/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (7..8) - (arguments꞉ YulArguments): [] # (8..8) - (close_paren꞉ CloseParen): ")" # (8..9) - - (TrailingTrivia) ► (EndOfLine): "\n" # (9..10) + - (trailing_trivia꞉ EndOfLine): "\n" # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_basefee/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_basefee/generated/0.4.11-success.yml index 386b1e49a4..33a20e6bda 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_basefee/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_basefee/generated/0.4.11-success.yml @@ -12,4 +12,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (7..8) - (arguments꞉ YulArguments): [] # (8..8) - (close_paren꞉ CloseParen): ")" # (8..9) - - (TrailingTrivia) ► (EndOfLine): "\n" # (9..10) + - (trailing_trivia꞉ EndOfLine): "\n" # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_basefee/generated/0.8.7-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_basefee/generated/0.8.7-success.yml index 6308c47b81..e58573e013 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_basefee/generated/0.8.7-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_basefee/generated/0.8.7-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (7..8) - (arguments꞉ YulArguments): [] # (8..8) - (close_paren꞉ CloseParen): ")" # (8..9) - - (TrailingTrivia) ► (EndOfLine): "\n" # (9..10) + - (trailing_trivia꞉ EndOfLine): "\n" # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_blockhash/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_blockhash/generated/0.4.11-success.yml index a9927868b3..99c79e3280 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_blockhash/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_blockhash/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (9..10) - (arguments꞉ YulArguments): [] # (10..10) - (close_paren꞉ CloseParen): ")" # (10..11) - - (TrailingTrivia) ► (EndOfLine): "\n" # (11..12) + - (trailing_trivia꞉ EndOfLine): "\n" # (11..12) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_byte/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_byte/generated/0.4.11-success.yml index b53eb290ea..82d8fa838b 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_byte/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_byte/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (4..5) - (arguments꞉ YulArguments): [] # (5..5) - (close_paren꞉ CloseParen): ")" # (5..6) - - (TrailingTrivia) ► (EndOfLine): "\n" # (6..7) + - (trailing_trivia꞉ EndOfLine): "\n" # (6..7) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_call/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_call/generated/0.4.11-success.yml index c6a8d3356b..78fec798cf 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_call/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_call/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (4..5) - (arguments꞉ YulArguments): [] # (5..5) - (close_paren꞉ CloseParen): ")" # (5..6) - - (TrailingTrivia) ► (EndOfLine): "\n" # (6..7) + - (trailing_trivia꞉ EndOfLine): "\n" # (6..7) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_callcode/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_callcode/generated/0.4.11-success.yml index 7225a3d505..10bf481685 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_callcode/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_callcode/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (8..9) - (arguments꞉ YulArguments): [] # (9..9) - (close_paren꞉ CloseParen): ")" # (9..10) - - (TrailingTrivia) ► (EndOfLine): "\n" # (10..11) + - (trailing_trivia꞉ EndOfLine): "\n" # (10..11) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_calldatacopy/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_calldatacopy/generated/0.4.11-success.yml index 9227388ee3..df4ef2692b 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_calldatacopy/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_calldatacopy/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (12..13) - (arguments꞉ YulArguments): [] # (13..13) - (close_paren꞉ CloseParen): ")" # (13..14) - - (TrailingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (14..15) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_calldataload/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_calldataload/generated/0.4.11-success.yml index 4a010d8b4b..20035779c4 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_calldataload/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_calldataload/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (12..13) - (arguments꞉ YulArguments): [] # (13..13) - (close_paren꞉ CloseParen): ")" # (13..14) - - (TrailingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (14..15) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_calldatasize/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_calldatasize/generated/0.4.11-success.yml index f5672351fd..5e1066c318 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_calldatasize/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_calldatasize/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (12..13) - (arguments꞉ YulArguments): [] # (13..13) - (close_paren꞉ CloseParen): ")" # (13..14) - - (TrailingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (14..15) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_caller/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_caller/generated/0.4.11-success.yml index 8a3ac64c64..cf201f76aa 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_caller/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_caller/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (6..7) - (arguments꞉ YulArguments): [] # (7..7) - (close_paren꞉ CloseParen): ")" # (7..8) - - (TrailingTrivia) ► (EndOfLine): "\n" # (8..9) + - (trailing_trivia꞉ EndOfLine): "\n" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_callvalue/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_callvalue/generated/0.4.11-success.yml index eb75342f38..468d9dda9a 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_callvalue/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_callvalue/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (9..10) - (arguments꞉ YulArguments): [] # (10..10) - (close_paren꞉ CloseParen): ")" # (10..11) - - (TrailingTrivia) ► (EndOfLine): "\n" # (11..12) + - (trailing_trivia꞉ EndOfLine): "\n" # (11..12) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_chainid/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_chainid/generated/0.4.11-success.yml index b8f462a484..6607eb49fb 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_chainid/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_chainid/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (7..8) - (arguments꞉ YulArguments): [] # (8..8) - (close_paren꞉ CloseParen): ")" # (8..9) - - (TrailingTrivia) ► (EndOfLine): "\n" # (9..10) + - (trailing_trivia꞉ EndOfLine): "\n" # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_coinbase/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_coinbase/generated/0.4.11-success.yml index 7b448f39d6..e791bea060 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_coinbase/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_coinbase/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (8..9) - (arguments꞉ YulArguments): [] # (9..9) - (close_paren꞉ CloseParen): ")" # (9..10) - - (TrailingTrivia) ► (EndOfLine): "\n" # (10..11) + - (trailing_trivia꞉ EndOfLine): "\n" # (10..11) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_create/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_create/generated/0.4.11-success.yml index 5084727602..b850cc635d 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_create/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_create/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (6..7) - (arguments꞉ YulArguments): [] # (7..7) - (close_paren꞉ CloseParen): ")" # (7..8) - - (TrailingTrivia) ► (EndOfLine): "\n" # (8..9) + - (trailing_trivia꞉ EndOfLine): "\n" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_create2/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_create2/generated/0.4.11-success.yml index ce1944f3e1..9765cd4489 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_create2/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_create2/generated/0.4.11-success.yml @@ -12,4 +12,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (7..8) - (arguments꞉ YulArguments): [] # (8..8) - (close_paren꞉ CloseParen): ")" # (8..9) - - (TrailingTrivia) ► (EndOfLine): "\n" # (9..10) + - (trailing_trivia꞉ EndOfLine): "\n" # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_create2/generated/0.4.12-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_create2/generated/0.4.12-success.yml index bf55dc04dd..a3787d1945 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_create2/generated/0.4.12-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_create2/generated/0.4.12-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (7..8) - (arguments꞉ YulArguments): [] # (8..8) - (close_paren꞉ CloseParen): ")" # (8..9) - - (TrailingTrivia) ► (EndOfLine): "\n" # (9..10) + - (trailing_trivia꞉ EndOfLine): "\n" # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_delegatecall/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_delegatecall/generated/0.4.11-success.yml index f2713ff0d4..fd313d78fc 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_delegatecall/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_delegatecall/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (12..13) - (arguments꞉ YulArguments): [] # (13..13) - (close_paren꞉ CloseParen): ")" # (13..14) - - (TrailingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (14..15) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_difficulty/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_difficulty/generated/0.4.11-success.yml index f8637b4a40..3cf54f3c21 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_difficulty/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_difficulty/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (10..11) - (arguments꞉ YulArguments): [] # (11..11) - (close_paren꞉ CloseParen): ")" # (11..12) - - (TrailingTrivia) ► (EndOfLine): "\n" # (12..13) + - (trailing_trivia꞉ EndOfLine): "\n" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_div/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_div/generated/0.4.11-success.yml index 885af9a5a4..f34ce4ff74 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_div/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_div/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_eq/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_eq/generated/0.4.11-success.yml index 6005754031..e7755af271 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_eq/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_eq/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (2..3) - (arguments꞉ YulArguments): [] # (3..3) - (close_paren꞉ CloseParen): ")" # (3..4) - - (TrailingTrivia) ► (EndOfLine): "\n" # (4..5) + - (trailing_trivia꞉ EndOfLine): "\n" # (4..5) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_exp/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_exp/generated/0.4.11-success.yml index dc28325a87..3f48dd8602 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_exp/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_exp/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodecopy/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodecopy/generated/0.4.11-success.yml index d4a0872ccf..61e43a0a06 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodecopy/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodecopy/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (11..12) - (arguments꞉ YulArguments): [] # (12..12) - (close_paren꞉ CloseParen): ")" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodehash/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodehash/generated/0.4.11-success.yml index 8ec1337d0c..985b523fa7 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodehash/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodehash/generated/0.4.11-success.yml @@ -12,4 +12,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (11..12) - (arguments꞉ YulArguments): [] # (12..12) - (close_paren꞉ CloseParen): ")" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodehash/generated/0.5.0-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodehash/generated/0.5.0-success.yml index 8f792b49e7..c95aab9a1d 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodehash/generated/0.5.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodehash/generated/0.5.0-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (11..12) - (arguments꞉ YulArguments): [] # (12..12) - (close_paren꞉ CloseParen): ")" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodesize/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodesize/generated/0.4.11-success.yml index 09f5441a78..0254caba80 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodesize/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_extcodesize/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (11..12) - (arguments꞉ YulArguments): [] # (12..12) - (close_paren꞉ CloseParen): ")" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gas/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gas/generated/0.4.11-success.yml index 3aef21bc3b..cc07342e0d 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gas/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gas/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gaslimit/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gaslimit/generated/0.4.11-success.yml index ce97c2dcd9..ff9307481c 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gaslimit/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gaslimit/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (8..9) - (arguments꞉ YulArguments): [] # (9..9) - (close_paren꞉ CloseParen): ")" # (9..10) - - (TrailingTrivia) ► (EndOfLine): "\n" # (10..11) + - (trailing_trivia꞉ EndOfLine): "\n" # (10..11) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gasprice/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gasprice/generated/0.4.11-success.yml index ecafaad208..2f17d3431f 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gasprice/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gasprice/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (8..9) - (arguments꞉ YulArguments): [] # (9..9) - (close_paren꞉ CloseParen): ")" # (9..10) - - (TrailingTrivia) ► (EndOfLine): "\n" # (10..11) + - (trailing_trivia꞉ EndOfLine): "\n" # (10..11) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gt/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gt/generated/0.4.11-success.yml index 3fa2e102f8..da48813d61 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gt/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_gt/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (2..3) - (arguments꞉ YulArguments): [] # (3..3) - (close_paren꞉ CloseParen): ")" # (3..4) - - (TrailingTrivia) ► (EndOfLine): "\n" # (4..5) + - (trailing_trivia꞉ EndOfLine): "\n" # (4..5) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_invalid/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_invalid/generated/0.4.11-success.yml index 2a4c956c12..08cfe3cc30 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_invalid/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_invalid/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (7..8) - (arguments꞉ YulArguments): [] # (8..8) - (close_paren꞉ CloseParen): ")" # (8..9) - - (TrailingTrivia) ► (EndOfLine): "\n" # (9..10) + - (trailing_trivia꞉ EndOfLine): "\n" # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_iszero/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_iszero/generated/0.4.11-success.yml index ab9a084ebc..ae9173b7a0 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_iszero/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_iszero/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (6..7) - (arguments꞉ YulArguments): [] # (7..7) - (close_paren꞉ CloseParen): ")" # (7..8) - - (TrailingTrivia) ► (EndOfLine): "\n" # (8..9) + - (trailing_trivia꞉ EndOfLine): "\n" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_keccak256/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_keccak256/generated/0.4.11-success.yml index 826db8c559..5de3ef8a36 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_keccak256/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_keccak256/generated/0.4.11-success.yml @@ -12,4 +12,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (9..10) - (arguments꞉ YulArguments): [] # (10..10) - (close_paren꞉ CloseParen): ")" # (10..11) - - (TrailingTrivia) ► (EndOfLine): "\n" # (11..12) + - (trailing_trivia꞉ EndOfLine): "\n" # (11..12) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_keccak256/generated/0.4.12-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_keccak256/generated/0.4.12-success.yml index a2587951d7..2926f236ed 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_keccak256/generated/0.4.12-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_keccak256/generated/0.4.12-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (9..10) - (arguments꞉ YulArguments): [] # (10..10) - (close_paren꞉ CloseParen): ")" # (10..11) - - (TrailingTrivia) ► (EndOfLine): "\n" # (11..12) + - (trailing_trivia꞉ EndOfLine): "\n" # (11..12) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log0/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log0/generated/0.4.11-success.yml index dc52616249..7f54588fe8 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log0/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log0/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (4..5) - (arguments꞉ YulArguments): [] # (5..5) - (close_paren꞉ CloseParen): ")" # (5..6) - - (TrailingTrivia) ► (EndOfLine): "\n" # (6..7) + - (trailing_trivia꞉ EndOfLine): "\n" # (6..7) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log1/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log1/generated/0.4.11-success.yml index 2f3ea5af31..df9a9da600 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log1/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log1/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (4..5) - (arguments꞉ YulArguments): [] # (5..5) - (close_paren꞉ CloseParen): ")" # (5..6) - - (TrailingTrivia) ► (EndOfLine): "\n" # (6..7) + - (trailing_trivia꞉ EndOfLine): "\n" # (6..7) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log2/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log2/generated/0.4.11-success.yml index 0385c83741..d2bf81615d 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log2/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log2/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (4..5) - (arguments꞉ YulArguments): [] # (5..5) - (close_paren꞉ CloseParen): ")" # (5..6) - - (TrailingTrivia) ► (EndOfLine): "\n" # (6..7) + - (trailing_trivia꞉ EndOfLine): "\n" # (6..7) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log3/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log3/generated/0.4.11-success.yml index 0155df2361..fcd835257c 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log3/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log3/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (4..5) - (arguments꞉ YulArguments): [] # (5..5) - (close_paren꞉ CloseParen): ")" # (5..6) - - (TrailingTrivia) ► (EndOfLine): "\n" # (6..7) + - (trailing_trivia꞉ EndOfLine): "\n" # (6..7) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log4/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log4/generated/0.4.11-success.yml index ef60f52823..5984c6f05f 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log4/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_log4/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (4..5) - (arguments꞉ YulArguments): [] # (5..5) - (close_paren꞉ CloseParen): ")" # (5..6) - - (TrailingTrivia) ► (EndOfLine): "\n" # (6..7) + - (trailing_trivia꞉ EndOfLine): "\n" # (6..7) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_lt/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_lt/generated/0.4.11-success.yml index d090f9d090..08397fdd58 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_lt/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_lt/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (2..3) - (arguments꞉ YulArguments): [] # (3..3) - (close_paren꞉ CloseParen): ")" # (3..4) - - (TrailingTrivia) ► (EndOfLine): "\n" # (4..5) + - (trailing_trivia꞉ EndOfLine): "\n" # (4..5) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mload/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mload/generated/0.4.11-success.yml index 3d11b97eb6..7664a1e806 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mload/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mload/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (5..6) - (arguments꞉ YulArguments): [] # (6..6) - (close_paren꞉ CloseParen): ")" # (6..7) - - (TrailingTrivia) ► (EndOfLine): "\n" # (7..8) + - (trailing_trivia꞉ EndOfLine): "\n" # (7..8) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mod/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mod/generated/0.4.11-success.yml index 9445fb14d0..cd913f8acc 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mod/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mod/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_msize/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_msize/generated/0.4.11-success.yml index 3119e7e62e..e4c30913b9 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_msize/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_msize/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (5..6) - (arguments꞉ YulArguments): [] # (6..6) - (close_paren꞉ CloseParen): ")" # (6..7) - - (TrailingTrivia) ► (EndOfLine): "\n" # (7..8) + - (trailing_trivia꞉ EndOfLine): "\n" # (7..8) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mstore/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mstore/generated/0.4.11-success.yml index 1ac893c3c0..ab24a15851 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mstore/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mstore/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (6..7) - (arguments꞉ YulArguments): [] # (7..7) - (close_paren꞉ CloseParen): ")" # (7..8) - - (TrailingTrivia) ► (EndOfLine): "\n" # (8..9) + - (trailing_trivia꞉ EndOfLine): "\n" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mstore8/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mstore8/generated/0.4.11-success.yml index b966414d1c..f1b9e358d6 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mstore8/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mstore8/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (7..8) - (arguments꞉ YulArguments): [] # (8..8) - (close_paren꞉ CloseParen): ")" # (8..9) - - (TrailingTrivia) ► (EndOfLine): "\n" # (9..10) + - (trailing_trivia꞉ EndOfLine): "\n" # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mul/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mul/generated/0.4.11-success.yml index d9b222eb5b..ac44b9a2b4 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mul/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mul/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mulmod/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mulmod/generated/0.4.11-success.yml index e001a2facf..0202fc2800 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mulmod/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_mulmod/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (6..7) - (arguments꞉ YulArguments): [] # (7..7) - (close_paren꞉ CloseParen): ")" # (7..8) - - (TrailingTrivia) ► (EndOfLine): "\n" # (8..9) + - (trailing_trivia꞉ EndOfLine): "\n" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_not/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_not/generated/0.4.11-success.yml index 09103d83ac..3b088cd8ce 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_not/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_not/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_number/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_number/generated/0.4.11-success.yml index 626e0f592b..39fe4f07c7 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_number/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_number/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (6..7) - (arguments꞉ YulArguments): [] # (7..7) - (close_paren꞉ CloseParen): ")" # (7..8) - - (TrailingTrivia) ► (EndOfLine): "\n" # (8..9) + - (trailing_trivia꞉ EndOfLine): "\n" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_or/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_or/generated/0.4.11-success.yml index 3b51a3a97c..401b8ae3be 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_or/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_or/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (2..3) - (arguments꞉ YulArguments): [] # (3..3) - (close_paren꞉ CloseParen): ")" # (3..4) - - (TrailingTrivia) ► (EndOfLine): "\n" # (4..5) + - (trailing_trivia꞉ EndOfLine): "\n" # (4..5) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_origin/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_origin/generated/0.4.11-success.yml index 194076bbf6..c1d77df01b 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_origin/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_origin/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (6..7) - (arguments꞉ YulArguments): [] # (7..7) - (close_paren꞉ CloseParen): ")" # (7..8) - - (TrailingTrivia) ► (EndOfLine): "\n" # (8..9) + - (trailing_trivia꞉ EndOfLine): "\n" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_pop/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_pop/generated/0.4.11-success.yml index 9d35ebc47f..8f59bcb19a 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_pop/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_pop/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_prevrandao/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_prevrandao/generated/0.4.11-success.yml index 0aa3ab3174..6e52c8ebc3 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_prevrandao/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_prevrandao/generated/0.4.11-success.yml @@ -12,4 +12,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (10..11) - (arguments꞉ YulArguments): [] # (11..11) - (close_paren꞉ CloseParen): ")" # (11..12) - - (TrailingTrivia) ► (EndOfLine): "\n" # (12..13) + - (trailing_trivia꞉ EndOfLine): "\n" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_prevrandao/generated/0.8.18-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_prevrandao/generated/0.8.18-success.yml index 7a3475057d..e947ec5625 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_prevrandao/generated/0.8.18-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_prevrandao/generated/0.8.18-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (10..11) - (arguments꞉ YulArguments): [] # (11..11) - (close_paren꞉ CloseParen): ")" # (11..12) - - (TrailingTrivia) ► (EndOfLine): "\n" # (12..13) + - (trailing_trivia꞉ EndOfLine): "\n" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_return/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_return/generated/0.4.11-success.yml index 7ec3c5d318..4f796e4535 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_return/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_return/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (6..7) - (arguments꞉ YulArguments): [] # (7..7) - (close_paren꞉ CloseParen): ")" # (7..8) - - (TrailingTrivia) ► (EndOfLine): "\n" # (8..9) + - (trailing_trivia꞉ EndOfLine): "\n" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatacopy/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatacopy/generated/0.4.11-success.yml index 27688ac782..63c5c6d63b 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatacopy/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatacopy/generated/0.4.11-success.yml @@ -12,4 +12,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (14..15) - (arguments꞉ YulArguments): [] # (15..15) - (close_paren꞉ CloseParen): ")" # (15..16) - - (TrailingTrivia) ► (EndOfLine): "\n" # (16..17) + - (trailing_trivia꞉ EndOfLine): "\n" # (16..17) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatacopy/generated/0.4.12-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatacopy/generated/0.4.12-success.yml index 6ad8e6dda9..de17c07f0e 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatacopy/generated/0.4.12-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatacopy/generated/0.4.12-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (14..15) - (arguments꞉ YulArguments): [] # (15..15) - (close_paren꞉ CloseParen): ")" # (15..16) - - (TrailingTrivia) ► (EndOfLine): "\n" # (16..17) + - (trailing_trivia꞉ EndOfLine): "\n" # (16..17) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatasize/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatasize/generated/0.4.11-success.yml index 2e00219546..9ab2a2695b 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatasize/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatasize/generated/0.4.11-success.yml @@ -12,4 +12,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (14..15) - (arguments꞉ YulArguments): [] # (15..15) - (close_paren꞉ CloseParen): ")" # (15..16) - - (TrailingTrivia) ► (EndOfLine): "\n" # (16..17) + - (trailing_trivia꞉ EndOfLine): "\n" # (16..17) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatasize/generated/0.4.12-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatasize/generated/0.4.12-success.yml index 1307c05317..7aa9cdef78 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatasize/generated/0.4.12-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_returndatasize/generated/0.4.12-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (14..15) - (arguments꞉ YulArguments): [] # (15..15) - (close_paren꞉ CloseParen): ")" # (15..16) - - (TrailingTrivia) ► (EndOfLine): "\n" # (16..17) + - (trailing_trivia꞉ EndOfLine): "\n" # (16..17) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_revert/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_revert/generated/0.4.11-success.yml index 10dee1fd42..fa0da71eb6 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_revert/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_revert/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (6..7) - (arguments꞉ YulArguments): [] # (7..7) - (close_paren꞉ CloseParen): ")" # (7..8) - - (TrailingTrivia) ► (EndOfLine): "\n" # (8..9) + - (trailing_trivia꞉ EndOfLine): "\n" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sar/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sar/generated/0.4.11-success.yml index a7dba1f99f..2d3f97aa78 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sar/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sar/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sdiv/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sdiv/generated/0.4.11-success.yml index 0f4205f931..b10bb524b7 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sdiv/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sdiv/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (4..5) - (arguments꞉ YulArguments): [] # (5..5) - (close_paren꞉ CloseParen): ")" # (5..6) - - (TrailingTrivia) ► (EndOfLine): "\n" # (6..7) + - (trailing_trivia꞉ EndOfLine): "\n" # (6..7) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_selfbalance/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_selfbalance/generated/0.4.11-success.yml index 269667b86f..b5b3191284 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_selfbalance/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_selfbalance/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (11..12) - (arguments꞉ YulArguments): [] # (12..12) - (close_paren꞉ CloseParen): ")" # (12..13) - - (TrailingTrivia) ► (EndOfLine): "\n" # (13..14) + - (trailing_trivia꞉ EndOfLine): "\n" # (13..14) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_selfdestruct/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_selfdestruct/generated/0.4.11-success.yml index 8fff63cb8d..90eccebbbd 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_selfdestruct/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_selfdestruct/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (12..13) - (arguments꞉ YulArguments): [] # (13..13) - (close_paren꞉ CloseParen): ")" # (13..14) - - (TrailingTrivia) ► (EndOfLine): "\n" # (14..15) + - (trailing_trivia꞉ EndOfLine): "\n" # (14..15) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sgt/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sgt/generated/0.4.11-success.yml index ae5860502a..92da8aa018 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sgt/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sgt/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sha3/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sha3/generated/0.4.11-success.yml index 96e4dabc3f..83170f359f 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sha3/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sha3/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (4..5) - (arguments꞉ YulArguments): [] # (5..5) - (close_paren꞉ CloseParen): ")" # (5..6) - - (TrailingTrivia) ► (EndOfLine): "\n" # (6..7) + - (trailing_trivia꞉ EndOfLine): "\n" # (6..7) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sha3/generated/0.5.0-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sha3/generated/0.5.0-success.yml index db0f330235..cbf1678a93 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sha3/generated/0.5.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sha3/generated/0.5.0-success.yml @@ -12,4 +12,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (4..5) - (arguments꞉ YulArguments): [] # (5..5) - (close_paren꞉ CloseParen): ")" # (5..6) - - (TrailingTrivia) ► (EndOfLine): "\n" # (6..7) + - (trailing_trivia꞉ EndOfLine): "\n" # (6..7) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_shl/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_shl/generated/0.4.11-success.yml index 3f883f8147..37c53a64b6 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_shl/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_shl/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_shr/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_shr/generated/0.4.11-success.yml index 0ca3c96b77..a89b7b2f7a 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_shr/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_shr/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_signextend/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_signextend/generated/0.4.11-success.yml index baed7dfeb0..c06903da96 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_signextend/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_signextend/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (10..11) - (arguments꞉ YulArguments): [] # (11..11) - (close_paren꞉ CloseParen): ")" # (11..12) - - (TrailingTrivia) ► (EndOfLine): "\n" # (12..13) + - (trailing_trivia꞉ EndOfLine): "\n" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sload/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sload/generated/0.4.11-success.yml index b918e7070f..fc44462be1 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sload/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sload/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (5..6) - (arguments꞉ YulArguments): [] # (6..6) - (close_paren꞉ CloseParen): ")" # (6..7) - - (TrailingTrivia) ► (EndOfLine): "\n" # (7..8) + - (trailing_trivia꞉ EndOfLine): "\n" # (7..8) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_slt/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_slt/generated/0.4.11-success.yml index 4a7ec4b7e2..83e57bd307 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_slt/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_slt/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_smod/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_smod/generated/0.4.11-success.yml index b804952ba7..7f62281d86 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_smod/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_smod/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (4..5) - (arguments꞉ YulArguments): [] # (5..5) - (close_paren꞉ CloseParen): ")" # (5..6) - - (TrailingTrivia) ► (EndOfLine): "\n" # (6..7) + - (trailing_trivia꞉ EndOfLine): "\n" # (6..7) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sstore/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sstore/generated/0.4.11-success.yml index 93da6ea277..3cb35181fd 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sstore/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sstore/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (6..7) - (arguments꞉ YulArguments): [] # (7..7) - (close_paren꞉ CloseParen): ")" # (7..8) - - (TrailingTrivia) ► (EndOfLine): "\n" # (8..9) + - (trailing_trivia꞉ EndOfLine): "\n" # (8..9) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_staticcall/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_staticcall/generated/0.4.11-success.yml index 95fde32aab..6b5f5e3966 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_staticcall/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_staticcall/generated/0.4.11-success.yml @@ -12,4 +12,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (10..11) - (arguments꞉ YulArguments): [] # (11..11) - (close_paren꞉ CloseParen): ")" # (11..12) - - (TrailingTrivia) ► (EndOfLine): "\n" # (12..13) + - (trailing_trivia꞉ EndOfLine): "\n" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_staticcall/generated/0.4.12-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_staticcall/generated/0.4.12-success.yml index f85b16d6bd..85569d84a7 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_staticcall/generated/0.4.12-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_staticcall/generated/0.4.12-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (10..11) - (arguments꞉ YulArguments): [] # (11..11) - (close_paren꞉ CloseParen): ")" # (11..12) - - (TrailingTrivia) ► (EndOfLine): "\n" # (12..13) + - (trailing_trivia꞉ EndOfLine): "\n" # (12..13) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_stop/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_stop/generated/0.4.11-success.yml index 4a1e484d49..fa70fbc036 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_stop/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_stop/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (4..5) - (arguments꞉ YulArguments): [] # (5..5) - (close_paren꞉ CloseParen): ")" # (5..6) - - (TrailingTrivia) ► (EndOfLine): "\n" # (6..7) + - (trailing_trivia꞉ EndOfLine): "\n" # (6..7) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sub/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sub/generated/0.4.11-success.yml index 081eaba1d7..08e39c73a5 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sub/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_sub/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_suicide/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_suicide/generated/0.4.11-success.yml index 6ee3d80716..d2c8b00e28 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_suicide/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_suicide/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (7..8) - (arguments꞉ YulArguments): [] # (8..8) - (close_paren꞉ CloseParen): ")" # (8..9) - - (TrailingTrivia) ► (EndOfLine): "\n" # (9..10) + - (trailing_trivia꞉ EndOfLine): "\n" # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_suicide/generated/0.5.0-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_suicide/generated/0.5.0-success.yml index ef6be2b965..b024a162b4 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_suicide/generated/0.5.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_suicide/generated/0.5.0-success.yml @@ -12,4 +12,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (7..8) - (arguments꞉ YulArguments): [] # (8..8) - (close_paren꞉ CloseParen): ")" # (8..9) - - (TrailingTrivia) ► (EndOfLine): "\n" # (9..10) + - (trailing_trivia꞉ EndOfLine): "\n" # (9..10) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_timestamp/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_timestamp/generated/0.4.11-success.yml index ede1ff17f0..e9d08df288 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_timestamp/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_timestamp/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (9..10) - (arguments꞉ YulArguments): [] # (10..10) - (close_paren꞉ CloseParen): ")" # (10..11) - - (TrailingTrivia) ► (EndOfLine): "\n" # (11..12) + - (trailing_trivia꞉ EndOfLine): "\n" # (11..12) diff --git a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_xor/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_xor/generated/0.4.11-success.yml index 56d4213000..284191c230 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_xor/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulFunctionCallExpression/built_in_xor/generated/0.4.11-success.yml @@ -11,4 +11,4 @@ Tree: - (open_paren꞉ OpenParen): "(" # (3..4) - (arguments꞉ YulArguments): [] # (4..4) - (close_paren꞉ CloseParen): ")" # (4..5) - - (TrailingTrivia) ► (EndOfLine): "\n" # (5..6) + - (trailing_trivia꞉ EndOfLine): "\n" # (5..6) diff --git a/crates/solidity/testing/snapshots/cst_output/YulLabel/single_label/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulLabel/single_label/generated/0.4.11-success.yml index 85d84ea03a..86f876935c 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulLabel/single_label/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulLabel/single_label/generated/0.4.11-success.yml @@ -9,4 +9,4 @@ Tree: - (YulLabel): # "foo:\n" (0..5) - (label꞉ YulIdentifier): "foo" # (0..3) - (colon꞉ Colon): ":" # (3..4) - - (TrailingTrivia) ► (EndOfLine): "\n" # (4..5) + - (trailing_trivia꞉ EndOfLine): "\n" # (4..5) 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 7d54116f6f..f5d2ee683b 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 @@ -8,21 +8,20 @@ Errors: [] Tree: - (YulVariableDeclarationStatement): # '// ColonEqual was two separate tokens before "0.5....' (0..68) - - (LeadingTrivia): # '// ColonEqual was two separate tokens before "0.5....' (0..54) - - (SingleLineComment): '// ColonEqual was two separate tokens before "0.5....' # (0..53) - - (EndOfLine): "\n" # (53..54) + - (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) - (names꞉ YulIdentifierPaths): # " foo" (57..61) - (item꞉ YulIdentifierPath): # " foo" (57..61) - - (LeadingTrivia) ► (Whitespace): " " # (57..58) + - (leading_trivia꞉ Whitespace): " " # (57..58) - (item꞉ YulIdentifier): "foo" # (58..61) - (value꞉ YulVariableDeclarationValue): # " : = 0\n" (61..68) - (assignment꞉ YulAssignmentOperator) ► (variant꞉ YulColonAndEqual): # " : =" (61..65) - - (LeadingTrivia) ► (Whitespace): " " # (61..62) + - (leading_trivia꞉ Whitespace): " " # (61..62) - (colon꞉ Colon): ":" # (62..63) - - (LeadingTrivia) ► (Whitespace): " " # (63..64) + - (leading_trivia꞉ Whitespace): " " # (63..64) - (equal꞉ Equal): "=" # (64..65) - (expression꞉ YulExpression) ► (variant꞉ YulLiteral): # " 0\n" (65..68) - - (LeadingTrivia) ► (Whitespace): " " # (65..66) + - (leading_trivia꞉ Whitespace): " " # (65..66) - (variant꞉ YulDecimalLiteral): "0" # (66..67) - - (TrailingTrivia) ► (EndOfLine): "\n" # (67..68) + - (trailing_trivia꞉ EndOfLine): "\n" # (67..68) 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 3ac2b50f10..8a66949c13 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 @@ -16,13 +16,12 @@ Errors: # 1 total Tree: - (YulVariableDeclarationStatement): # '// ColonEqual was two separate tokens before "0.5....' (0..68) - - (LeadingTrivia): # '// ColonEqual was two separate tokens before "0.5....' (0..54) - - (SingleLineComment): '// ColonEqual was two separate tokens before "0.5....' # (0..53) - - (EndOfLine): "\n" # (53..54) + - (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) - (names꞉ YulIdentifierPaths): # " foo" (57..61) - (item꞉ YulIdentifierPath): # " foo" (57..61) - - (LeadingTrivia) ► (Whitespace): " " # (57..58) + - (leading_trivia꞉ Whitespace): " " # (57..58) - (item꞉ YulIdentifier): "foo" # (58..61) - - (LeadingTrivia) ► (Whitespace): " " # (61..62) + - (leading_trivia꞉ Whitespace): " " # (61..62) - (SKIPPED): ": = 0\n" # (62..68) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes/generated/0.4.11-failure.yml index ddd3721e43..53fef7a01e 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes/generated/0.4.11-failure.yml @@ -16,8 +16,7 @@ Errors: # 1 total Tree: - (YulVariableDeclarationStatement): # "// Unreserved in Yul specifically since 0.7.1:\nlet..." (0..57) - - (LeadingTrivia): # "// Unreserved in Yul specifically since 0.7.1:\n" (0..47) - - (SingleLineComment): "// Unreserved in Yul specifically since 0.7.1:" # (0..46) - - (EndOfLine): "\n" # (46..47) + - (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) - (SKIPPED): " bytes\n" # (50..57) 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 25fc5ec6f0..8087cdfff6 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 @@ -8,12 +8,11 @@ Errors: [] Tree: - (YulVariableDeclarationStatement): # "// Unreserved in Yul specifically since 0.7.1:\nlet..." (0..57) - - (LeadingTrivia): # "// Unreserved in Yul specifically since 0.7.1:\n" (0..47) - - (SingleLineComment): "// Unreserved in Yul specifically since 0.7.1:" # (0..46) - - (EndOfLine): "\n" # (46..47) + - (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) - (names꞉ YulIdentifierPaths): # " bytes\n" (50..57) - (item꞉ YulIdentifierPath): # " bytes\n" (50..57) - - (LeadingTrivia) ► (Whitespace): " " # (50..51) + - (leading_trivia꞉ Whitespace): " " # (50..51) - (item꞉ YulIdentifier): "bytes" # (51..56) - - (TrailingTrivia) ► (EndOfLine): "\n" # (56..57) + - (trailing_trivia꞉ EndOfLine): "\n" # (56..57) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes1/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes1/generated/0.4.11-failure.yml index 8d53fa86f5..31157ca306 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes1/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes1/generated/0.4.11-failure.yml @@ -16,8 +16,7 @@ Errors: # 1 total Tree: - (YulVariableDeclarationStatement): # "// Unreserved in Yul specifically since 0.7.1:\nlet..." (0..58) - - (LeadingTrivia): # "// Unreserved in Yul specifically since 0.7.1:\n" (0..47) - - (SingleLineComment): "// Unreserved in Yul specifically since 0.7.1:" # (0..46) - - (EndOfLine): "\n" # (46..47) + - (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) - (SKIPPED): " bytes1\n" # (50..58) 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 3b7548301e..738f04f6c0 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 @@ -8,12 +8,11 @@ Errors: [] Tree: - (YulVariableDeclarationStatement): # "// Unreserved in Yul specifically since 0.7.1:\nlet..." (0..58) - - (LeadingTrivia): # "// Unreserved in Yul specifically since 0.7.1:\n" (0..47) - - (SingleLineComment): "// Unreserved in Yul specifically since 0.7.1:" # (0..46) - - (EndOfLine): "\n" # (46..47) + - (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) - (names꞉ YulIdentifierPaths): # " bytes1\n" (50..58) - (item꞉ YulIdentifierPath): # " bytes1\n" (50..58) - - (LeadingTrivia) ► (Whitespace): " " # (50..51) + - (leading_trivia꞉ Whitespace): " " # (50..51) - (item꞉ YulIdentifier): "bytes1" # (51..57) - - (TrailingTrivia) ► (EndOfLine): "\n" # (57..58) + - (trailing_trivia꞉ EndOfLine): "\n" # (57..58) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes11/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes11/generated/0.4.11-failure.yml index 167e90a785..99ddba1ed0 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes11/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_bytes11/generated/0.4.11-failure.yml @@ -16,8 +16,7 @@ Errors: # 1 total Tree: - (YulVariableDeclarationStatement): # "// Unreserved in Yul specifically since 0.7.1:\nlet..." (0..59) - - (LeadingTrivia): # "// Unreserved in Yul specifically since 0.7.1:\n" (0..47) - - (SingleLineComment): "// Unreserved in Yul specifically since 0.7.1:" # (0..46) - - (EndOfLine): "\n" # (46..47) + - (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) - (SKIPPED): " bytes11\n" # (50..59) 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 f0ba9c12fe..9f6ccf8dcf 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 @@ -8,12 +8,11 @@ Errors: [] Tree: - (YulVariableDeclarationStatement): # "// Unreserved in Yul specifically since 0.7.1:\nlet..." (0..59) - - (LeadingTrivia): # "// Unreserved in Yul specifically since 0.7.1:\n" (0..47) - - (SingleLineComment): "// Unreserved in Yul specifically since 0.7.1:" # (0..46) - - (EndOfLine): "\n" # (46..47) + - (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) - (names꞉ YulIdentifierPaths): # " bytes11\n" (50..59) - (item꞉ YulIdentifierPath): # " bytes11\n" (50..59) - - (LeadingTrivia) ► (Whitespace): " " # (50..51) + - (leading_trivia꞉ Whitespace): " " # (50..51) - (item꞉ YulIdentifier): "bytes11" # (51..58) - - (TrailingTrivia) ► (EndOfLine): "\n" # (58..59) + - (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 342b097e2b..23159b65fb 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 @@ -8,12 +8,11 @@ Errors: [] Tree: - (YulVariableDeclarationStatement): # "// This form is reserved only since 0.4.14 until 0..." (0..80) - - (LeadingTrivia): # "// This form is reserved only since 0.4.14 until 0..." (0..63) - - (SingleLineComment): "// This form is reserved only since 0.4.14 until 0..." # (0..62) - - (EndOfLine): "\n" # (62..63) + - (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) - (names꞉ YulIdentifierPaths): # " ufixed184x80\n" (66..80) - (item꞉ YulIdentifierPath): # " ufixed184x80\n" (66..80) - - (LeadingTrivia) ► (Whitespace): " " # (66..67) + - (leading_trivia꞉ Whitespace): " " # (66..67) - (item꞉ YulIdentifier): "ufixed184x80" # (67..79) - - (TrailingTrivia) ► (EndOfLine): "\n" # (79..80) + - (trailing_trivia꞉ EndOfLine): "\n" # (79..80) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.14-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.14-failure.yml index 6431d52b8c..0521857910 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.14-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed184x80/generated/0.4.14-failure.yml @@ -16,8 +16,7 @@ Errors: # 1 total Tree: - (YulVariableDeclarationStatement): # "// This form is reserved only since 0.4.14 until 0..." (0..80) - - (LeadingTrivia): # "// This form is reserved only since 0.4.14 until 0..." (0..63) - - (SingleLineComment): "// This form is reserved only since 0.4.14 until 0..." # (0..62) - - (EndOfLine): "\n" # (62..63) + - (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) - (SKIPPED): " ufixed184x80\n" # (66..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 342b097e2b..23159b65fb 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 @@ -8,12 +8,11 @@ Errors: [] Tree: - (YulVariableDeclarationStatement): # "// This form is reserved only since 0.4.14 until 0..." (0..80) - - (LeadingTrivia): # "// This form is reserved only since 0.4.14 until 0..." (0..63) - - (SingleLineComment): "// This form is reserved only since 0.4.14 until 0..." # (0..62) - - (EndOfLine): "\n" # (62..63) + - (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) - (names꞉ YulIdentifierPaths): # " ufixed184x80\n" (66..80) - (item꞉ YulIdentifierPath): # " ufixed184x80\n" (66..80) - - (LeadingTrivia) ► (Whitespace): " " # (66..67) + - (leading_trivia꞉ Whitespace): " " # (66..67) - (item꞉ YulIdentifier): "ufixed184x80" # (67..79) - - (TrailingTrivia) ► (EndOfLine): "\n" # (79..80) + - (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 a25fba5069..6e29dfc995 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 @@ -8,12 +8,11 @@ Errors: [] Tree: - (YulVariableDeclarationStatement): # "// This form is reserved only since 0.4.14 until 0..." (0..77) - - (LeadingTrivia): # "// This form is reserved only since 0.4.14 until 0..." (0..63) - - (SingleLineComment): "// This form is reserved only since 0.4.14 until 0..." # (0..62) - - (EndOfLine): "\n" # (62..63) + - (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) - (names꞉ YulIdentifierPaths): # " ufixed8x0\n" (66..77) - (item꞉ YulIdentifierPath): # " ufixed8x0\n" (66..77) - - (LeadingTrivia) ► (Whitespace): " " # (66..67) + - (leading_trivia꞉ Whitespace): " " # (66..67) - (item꞉ YulIdentifier): "ufixed8x0" # (67..76) - - (TrailingTrivia) ► (EndOfLine): "\n" # (76..77) + - (trailing_trivia꞉ EndOfLine): "\n" # (76..77) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.14-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.14-failure.yml index 2465cc2bf8..b0d1dff4d4 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.14-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x0/generated/0.4.14-failure.yml @@ -16,8 +16,7 @@ Errors: # 1 total Tree: - (YulVariableDeclarationStatement): # "// This form is reserved only since 0.4.14 until 0..." (0..77) - - (LeadingTrivia): # "// This form is reserved only since 0.4.14 until 0..." (0..63) - - (SingleLineComment): "// This form is reserved only since 0.4.14 until 0..." # (0..62) - - (EndOfLine): "\n" # (62..63) + - (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) - (SKIPPED): " ufixed8x0\n" # (66..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 a25fba5069..6e29dfc995 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 @@ -8,12 +8,11 @@ Errors: [] Tree: - (YulVariableDeclarationStatement): # "// This form is reserved only since 0.4.14 until 0..." (0..77) - - (LeadingTrivia): # "// This form is reserved only since 0.4.14 until 0..." (0..63) - - (SingleLineComment): "// This form is reserved only since 0.4.14 until 0..." # (0..62) - - (EndOfLine): "\n" # (62..63) + - (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) - (names꞉ YulIdentifierPaths): # " ufixed8x0\n" (66..77) - (item꞉ YulIdentifierPath): # " ufixed8x0\n" (66..77) - - (LeadingTrivia) ► (Whitespace): " " # (66..67) + - (leading_trivia꞉ Whitespace): " " # (66..67) - (item꞉ YulIdentifier): "ufixed8x0" # (67..76) - - (TrailingTrivia) ► (EndOfLine): "\n" # (76..77) + - (trailing_trivia꞉ EndOfLine): "\n" # (76..77) diff --git a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x8/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x8/generated/0.4.11-failure.yml index 000a8c939f..5719351980 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x8/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulVariableDeclarationStatement/keyword_ufixed8x8/generated/0.4.11-failure.yml @@ -16,8 +16,7 @@ Errors: # 1 total Tree: - (YulVariableDeclarationStatement): # "// This form is always reserved until 0.7.1 in Yul..." (0..66) - - (LeadingTrivia): # "// This form is always reserved until 0.7.1 in Yul..." (0..52) - - (SingleLineComment): "// This form is always reserved until 0.7.1 in Yul..." # (0..51) - - (EndOfLine): "\n" # (51..52) + - (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) - (SKIPPED): " ufixed8x8\n" # (55..66) 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 f312fde49b..bbbf039055 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 @@ -8,12 +8,11 @@ Errors: [] Tree: - (YulVariableDeclarationStatement): # "// This form is always reserved until 0.7.1 in Yul..." (0..66) - - (LeadingTrivia): # "// This form is always reserved until 0.7.1 in Yul..." (0..52) - - (SingleLineComment): "// This form is always reserved until 0.7.1 in Yul..." # (0..51) - - (EndOfLine): "\n" # (51..52) + - (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) - (names꞉ YulIdentifierPaths): # " ufixed8x8\n" (55..66) - (item꞉ YulIdentifierPath): # " ufixed8x8\n" (55..66) - - (LeadingTrivia) ► (Whitespace): " " # (55..56) + - (leading_trivia꞉ Whitespace): " " # (55..56) - (item꞉ YulIdentifier): "ufixed8x8" # (56..65) - - (TrailingTrivia) ► (EndOfLine): "\n" # (65..66) + - (trailing_trivia꞉ EndOfLine): "\n" # (65..66) diff --git a/crates/testlang/outputs/cargo/slang_testlang/src/generated/cst.rs b/crates/testlang/outputs/cargo/slang_testlang/src/generated/cst.rs index fe454e0a31..bdc126ca60 100644 --- a/crates/testlang/outputs/cargo/slang_testlang/src/generated/cst.rs +++ b/crates/testlang/outputs/cargo/slang_testlang/src/generated/cst.rs @@ -162,7 +162,7 @@ impl Node { pub fn is_trivia(&self) -> bool { match self { - Self::Rule(rule) => rule.kind.is_trivia(), + Self::Rule(_) => false, Self::Token(token) => token.kind.is_trivia(), } } diff --git a/crates/testlang/outputs/cargo/slang_testlang/src/generated/kinds.rs b/crates/testlang/outputs/cargo/slang_testlang/src/generated/kinds.rs index 56c813112b..fa322a62cd 100644 --- a/crates/testlang/outputs/cargo/slang_testlang/src/generated/kinds.rs +++ b/crates/testlang/outputs/cargo/slang_testlang/src/generated/kinds.rs @@ -20,7 +20,6 @@ use napi_derive::napi; pub enum RuleKind { AdditionExpression, Expression, - LeadingTrivia, Literal, MemberAccessExpression, NegationExpression, @@ -28,24 +27,12 @@ pub enum RuleKind { SourceUnit, SourceUnitMember, SourceUnitMembers, - TrailingTrivia, Tree, TreeNode, TreeNodeChild, TreeNodeChildren, } -impl RuleKind { - pub fn is_trivia(&self) -> bool { - #[allow(clippy::match_like_matches_macro)] - match self { - Self::LeadingTrivia => true, - Self::TrailingTrivia => true, - _ => false, - } - } -} - #[derive( Debug, Eq, @@ -69,6 +56,8 @@ pub enum NodeLabel { Operand, LeftOperand, RightOperand, + LeadingTrivia, + TrailingTrivia, // Generated CloseBracket, Keyword, diff --git a/crates/testlang/outputs/cargo/slang_testlang/src/generated/language.rs b/crates/testlang/outputs/cargo/slang_testlang/src/generated/language.rs index 8229c2ce22..a3ce22cc71 100644 --- a/crates/testlang/outputs/cargo/slang_testlang/src/generated/language.rs +++ b/crates/testlang/outputs/cargo/slang_testlang/src/generated/language.rs @@ -208,30 +208,6 @@ impl Language { .with_kind(RuleKind::Expression) } - #[allow(unused_assignments, unused_parens)] - fn leading_trivia(&self, input: &mut ParserContext<'_>) -> ParserResult { - OneOrMoreHelper::run(input, |input| { - ChoiceHelper::run(input, |mut choice, input| { - let result = - self.parse_token::(input, TokenKind::Whitespace); - choice.consider(input, result)?; - let result = - self.parse_token::(input, TokenKind::EndOfLine); - choice.consider(input, result)?; - let result = self.parse_token::( - input, - TokenKind::SingleLineComment, - ); - choice.consider(input, result)?; - let result = self - .parse_token::(input, TokenKind::MultiLineComment); - choice.consider(input, result)?; - choice.finish(input) - }) - }) - .with_kind(RuleKind::LeadingTrivia) - } - #[allow(unused_assignments, unused_parens)] fn literal(&self, input: &mut ParserContext<'_>) -> ParserResult { ChoiceHelper::run(input, |mut choice, input| { @@ -346,24 +322,6 @@ impl Language { .with_kind(RuleKind::SourceUnitMembers) } - #[allow(unused_assignments, unused_parens)] - fn trailing_trivia(&self, input: &mut ParserContext<'_>) -> ParserResult { - SequenceHelper::run(|mut seq| { - seq.elem(OptionalHelper::transform( - self.parse_token::(input, TokenKind::Whitespace), - ))?; - seq.elem(OptionalHelper::transform( - self.parse_token::( - input, - TokenKind::SingleLineComment, - ), - ))?; - seq.elem(self.parse_token::(input, TokenKind::EndOfLine))?; - seq.finish() - }) - .with_kind(RuleKind::TrailingTrivia) - } - #[allow(unused_assignments, unused_parens)] fn tree(&self, input: &mut ParserContext<'_>) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -465,6 +423,53 @@ impl Language { .with_kind(RuleKind::TreeNodeChildren) } + #[allow(unused_assignments, unused_parens)] + fn leading_trivia(&self, input: &mut ParserContext<'_>) -> ParserResult { + OneOrMoreHelper::run(input, |input| { + ChoiceHelper::run(input, |mut choice, input| { + let result = self + .parse_token::(input, TokenKind::Whitespace) + .with_label(NodeLabel::LeadingTrivia); + choice.consider(input, result)?; + let result = self + .parse_token::(input, TokenKind::EndOfLine) + .with_label(NodeLabel::LeadingTrivia); + choice.consider(input, result)?; + let result = self + .parse_token::(input, TokenKind::SingleLineComment) + .with_label(NodeLabel::LeadingTrivia); + choice.consider(input, result)?; + let result = self + .parse_token::(input, TokenKind::MultiLineComment) + .with_label(NodeLabel::LeadingTrivia); + choice.consider(input, result)?; + choice.finish(input) + }) + }) + } + + #[allow(unused_assignments, unused_parens)] + fn trailing_trivia(&self, input: &mut ParserContext<'_>) -> ParserResult { + SequenceHelper::run(|mut seq| { + seq.elem(OptionalHelper::transform( + self.parse_token::(input, TokenKind::Whitespace) + .with_label(NodeLabel::TrailingTrivia), + ))?; + seq.elem(OptionalHelper::transform( + self.parse_token::( + input, + TokenKind::SingleLineComment, + ) + .with_label(NodeLabel::TrailingTrivia), + ))?; + seq.elem( + self.parse_token::(input, TokenKind::EndOfLine) + .with_label(NodeLabel::TrailingTrivia), + )?; + seq.finish() + }) + } + /******************************************** * Scanner Functions ********************************************/ @@ -643,23 +648,19 @@ impl Language { pub fn parse(&self, kind: RuleKind, input: &str) -> ParseOutput { match kind { - RuleKind::AdditionExpression => Self::addition_expression.parse(self, input, true), - RuleKind::Expression => Self::expression.parse(self, input, true), - RuleKind::LeadingTrivia => Self::leading_trivia.parse(self, input, false), - RuleKind::Literal => Self::literal.parse(self, input, true), - RuleKind::MemberAccessExpression => { - Self::member_access_expression.parse(self, input, true) - } - RuleKind::NegationExpression => Self::negation_expression.parse(self, input, true), - RuleKind::SeparatedIdentifiers => Self::separated_identifiers.parse(self, input, true), - RuleKind::SourceUnit => Self::source_unit.parse(self, input, true), - RuleKind::SourceUnitMember => Self::source_unit_member.parse(self, input, true), - RuleKind::SourceUnitMembers => Self::source_unit_members.parse(self, input, true), - RuleKind::TrailingTrivia => Self::trailing_trivia.parse(self, input, false), - RuleKind::Tree => Self::tree.parse(self, input, true), - RuleKind::TreeNode => Self::tree_node.parse(self, input, true), - RuleKind::TreeNodeChild => Self::tree_node_child.parse(self, input, true), - RuleKind::TreeNodeChildren => Self::tree_node_children.parse(self, input, true), + RuleKind::AdditionExpression => Self::addition_expression.parse(self, input), + RuleKind::Expression => Self::expression.parse(self, input), + RuleKind::Literal => Self::literal.parse(self, input), + RuleKind::MemberAccessExpression => Self::member_access_expression.parse(self, input), + RuleKind::NegationExpression => Self::negation_expression.parse(self, input), + RuleKind::SeparatedIdentifiers => Self::separated_identifiers.parse(self, input), + RuleKind::SourceUnit => Self::source_unit.parse(self, input), + RuleKind::SourceUnitMember => Self::source_unit_member.parse(self, input), + RuleKind::SourceUnitMembers => Self::source_unit_members.parse(self, input), + RuleKind::Tree => Self::tree.parse(self, input), + RuleKind::TreeNode => Self::tree_node.parse(self, input), + RuleKind::TreeNodeChild => Self::tree_node_child.parse(self, input), + RuleKind::TreeNodeChildren => Self::tree_node_children.parse(self, input), } } } diff --git a/crates/testlang/outputs/cargo/slang_testlang/src/generated/parser_support/parser_function.rs b/crates/testlang/outputs/cargo/slang_testlang/src/generated/parser_support/parser_function.rs index fffdf93c8f..c38482610d 100644 --- a/crates/testlang/outputs/cargo/slang_testlang/src/generated/parser_support/parser_function.rs +++ b/crates/testlang/outputs/cargo/slang_testlang/src/generated/parser_support/parser_function.rs @@ -15,7 +15,7 @@ pub trait ParserFunction where Self: Fn(&L, &mut ParserContext<'_>) -> ParserResult, { - fn parse(&self, language: &L, input: &str, collect_trivia: bool) -> ParseOutput; + fn parse(&self, language: &L, input: &str) -> ParseOutput; } impl ParserFunction for F @@ -23,33 +23,30 @@ where L: Lexer, F: Fn(&L, &mut ParserContext<'_>) -> ParserResult, { - fn parse(&self, language: &L, input: &str, collect_trivia: bool) -> ParseOutput { + fn parse(&self, language: &L, input: &str) -> ParseOutput { let mut stream = ParserContext::new(input); let mut result = self(language, &mut stream); // For a succesful/recovered parse, collect any remaining trivia as part of the parse result - // TODO(#737): Remove this once we unconditionally collect trivia - if collect_trivia { - if let ParserResult::Match(r#match) = &mut result { - let [topmost] = r#match.nodes.as_mut_slice() else { - unreachable!( - "Match at the top level of a parse does not have exactly one Rule node" - ) - }; - - let eof_trivia = match Lexer::leading_trivia(language, &mut stream) { - ParserResult::Match(eof_trivia) if !eof_trivia.nodes.is_empty() => { - Some(eof_trivia.nodes) - } - _ => None, - }; + if let ParserResult::Match(r#match) = &mut result { + let [topmost] = r#match.nodes.as_mut_slice() else { + unreachable!( + "Match at the top level of a parse does not have exactly one Rule node" + ) + }; + + let eof_trivia = match Lexer::leading_trivia(language, &mut stream) { + ParserResult::Match(eof_trivia) if !eof_trivia.nodes.is_empty() => { + Some(eof_trivia.nodes) + } + _ => None, + }; - if let (cst::Node::Rule(rule), Some(eof_trivia)) = (&mut topmost.node, eof_trivia) { - let mut new_children = rule.children.clone(); - new_children.extend(eof_trivia); + if let (cst::Node::Rule(rule), Some(eof_trivia)) = (&mut topmost.node, eof_trivia) { + let mut new_children = rule.children.clone(); + new_children.extend(eof_trivia); - topmost.node = cst::Node::rule(rule.kind, new_children); - } + topmost.node = cst::Node::rule(rule.kind, new_children); } } diff --git a/crates/testlang/outputs/cargo/slang_testlang/src/generated/parser_support/parser_result.rs b/crates/testlang/outputs/cargo/slang_testlang/src/generated/parser_support/parser_result.rs index 9a885edd44..21b61c668e 100644 --- a/crates/testlang/outputs/cargo/slang_testlang/src/generated/parser_support/parser_result.rs +++ b/crates/testlang/outputs/cargo/slang_testlang/src/generated/parser_support/parser_result.rs @@ -84,6 +84,14 @@ impl ParserResult { { *prev_label = Some(label); } + // Also allow to name a single trivia token node + else if let ParserResult::Match(Match { nodes, .. }) = &mut self { + if let [node] = nodes.as_mut_slice() { + if node.as_token().is_some_and(|tok| tok.kind.is_trivia()) { + node.label = Some(label); + } + } + } self } diff --git a/crates/testlang/outputs/cargo/slang_testlang/src/generated/parser_support/sequence_helper.rs b/crates/testlang/outputs/cargo/slang_testlang/src/generated/parser_support/sequence_helper.rs index 1d5b1b4596..d7d2a55d84 100644 --- a/crates/testlang/outputs/cargo/slang_testlang/src/generated/parser_support/sequence_helper.rs +++ b/crates/testlang/outputs/cargo/slang_testlang/src/generated/parser_support/sequence_helper.rs @@ -125,17 +125,27 @@ impl SequenceHelper { return; } - let tokens: Vec<_> = - next.nodes.iter().filter_map(|node| node.as_token()).collect(); - let mut rules = next.nodes.iter().filter_map(|node| node.as_rule()); - - let is_single_token_with_trivia = - tokens.len() == 1 && rules.all(|rule| rule.kind.is_trivia()); - let next_token = tokens.first().map(|token| token.kind); - - // NOTE: We only support skipping to a single token (optionally with trivia) - debug_assert!(is_single_token_with_trivia); - debug_assert_eq!(next_token, Some(running.found)); + // We only support skipping to a single, significant token. + // Sanity check that we are recovering to the expected one. + let next_token = next.nodes.iter().try_fold(None, |acc, node| { + match &**node { + cst::Node::Token(token) if token.kind.is_trivia() => Ok(acc), + cst::Node::Token(token) => { + match acc { + None => Ok(Some(token.kind)), + Some(..) => { + debug_assert!(false, "Recovery skipped to multiple tokens: {acc:?}, {token:?}"); + Err(()) + } + } + } + cst::Node::Rule(rule) => { + debug_assert!(false, "Recovery skipped to a rule: {rule:?}"); + Err(()) + } + } + }); + debug_assert_eq!(next_token, Ok(Some(running.found))); running.nodes.push(LabeledNode::anonymous(cst::Node::token( TokenKind::SKIPPED, diff --git a/crates/testlang/outputs/npm/package/src/generated/index.d.ts b/crates/testlang/outputs/npm/package/src/generated/index.d.ts index 54f0274118..4fa4bda6db 100644 --- a/crates/testlang/outputs/npm/package/src/generated/index.d.ts +++ b/crates/testlang/outputs/npm/package/src/generated/index.d.ts @@ -12,7 +12,6 @@ export namespace kinds { export enum RuleKind { AdditionExpression = "AdditionExpression", Expression = "Expression", - LeadingTrivia = "LeadingTrivia", Literal = "Literal", MemberAccessExpression = "MemberAccessExpression", NegationExpression = "NegationExpression", @@ -20,7 +19,6 @@ export namespace kinds { SourceUnit = "SourceUnit", SourceUnitMember = "SourceUnitMember", SourceUnitMembers = "SourceUnitMembers", - TrailingTrivia = "TrailingTrivia", Tree = "Tree", TreeNode = "TreeNode", TreeNodeChild = "TreeNodeChild", @@ -33,6 +31,8 @@ export namespace kinds { Operand = "Operand", LeftOperand = "LeftOperand", RightOperand = "RightOperand", + LeadingTrivia = "LeadingTrivia", + TrailingTrivia = "TrailingTrivia", CloseBracket = "CloseBracket", Keyword = "Keyword", Member = "Member", diff --git a/crates/testlang/outputs/npm/tests/src/tests/cst-cursor.ts b/crates/testlang/outputs/npm/tests/src/tests/cst-cursor.ts index 8526ddeb7e..51e5f65fe0 100644 --- a/crates/testlang/outputs/npm/tests/src/tests/cst-cursor.ts +++ b/crates/testlang/outputs/npm/tests/src/tests/cst-cursor.ts @@ -29,9 +29,6 @@ test("use cursor", () => { expectRule(cursor.node(), RuleKind.TreeNode); expect(cursor.goToNext()).toBe(true); - expectRule(cursor.node(), RuleKind.LeadingTrivia); - expect(cursor.goToNext()).toBe(true); - expectToken(cursor.node(), TokenKind.Whitespace, " "); expect(cursor.goToNext()).toBe(true); @@ -53,9 +50,6 @@ test("use cursor", () => { expectRule(cursor.node(), RuleKind.TreeNode); expect(cursor.goToNext()).toBe(true); - expectRule(cursor.node(), RuleKind.LeadingTrivia); - expect(cursor.goToNext()).toBe(true); - expectToken(cursor.node(), TokenKind.Whitespace, " "); expect(cursor.goToNext()).toBe(true); @@ -74,9 +68,6 @@ test("use cursor", () => { expectRule(cursor.node(), RuleKind.TreeNodeChild); expect(cursor.goToNext()).toBe(true); - expectRule(cursor.node(), RuleKind.LeadingTrivia); - expect(cursor.goToNext()).toBe(true); - expectToken(cursor.node(), TokenKind.Whitespace, " "); expect(cursor.goToNext()).toBe(true); @@ -89,9 +80,6 @@ test("use cursor", () => { expectRule(cursor.node(), RuleKind.TreeNodeChild); expect(cursor.goToNext()).toBe(true); - expectRule(cursor.node(), RuleKind.LeadingTrivia); - expect(cursor.goToNext()).toBe(true); - expectToken(cursor.node(), TokenKind.Whitespace, " "); expect(cursor.goToNext()).toBe(true);