From cf0d99d77e3a60d9699221abc93dc7290cf8ce75 Mon Sep 17 00:00:00 2001 From: OmarTawfik <15987992+OmarTawfik@users.noreply.github.com> Date: Thu, 23 Nov 2023 15:31:31 -0800 Subject: [PATCH] fix import statements grammar - fix v2 to use the same name as v0/v1 for `PathImport` and `NamedImport` - sync all three versions to use the same names for `ImportDeconstruction` and `UsingDeconstruction`, which is consistent with similar node kinds in the grammar. --- .../04-imports/productions.yml | 26 +- .../inputs/language/src/definition.rs | 40 +-- crates/solidity/inputs/language/src/dsl.rs | 16 +- .../cargo/crate/src/generated/kinds.rs | 24 +- .../cargo/crate/src/generated/language.rs | 300 +++++++++--------- ...Symbol.rs => UsingDeconstructionSymbol.rs} | 8 +- .../tests/src/cst_output/generated/mod.rs | 4 +- .../outputs/npm/crate/src/generated/kinds.rs | 24 +- .../npm/crate/src/generated/language.rs | 300 +++++++++--------- .../npm/package/src/generated/index.d.ts | 24 +- .../unversioned.md | 5 - .../unversioned.md | 5 - .../unversioned.md | 5 + .../unversioned.md | 5 + .../unversioned.md | 4 +- .../import-directive/unversioned.md | 2 +- .../0.8.13.md | 4 +- .../using-deconstruction-symbol/0.8.19.md | 5 + .../using-deconstruction-symbols/0.8.13.md | 5 + .../04-imports/using-deconstruction/0.8.13.md | 5 + .../using-directive-deconstruction/0.8.13.md | 5 - .../using-directive-symbol/0.8.19.md | 5 - .../using-directive-symbols/0.8.13.md | 5 - .../04-imports/using-directive/0.8.13.md | 2 +- .../generated/public/grammar/v0.4.11/index.md | 6 +- .../generated/public/grammar/v0.4.21/index.md | 6 +- .../generated/public/grammar/v0.4.22/index.md | 6 +- .../generated/public/grammar/v0.5.0/index.md | 6 +- .../generated/public/grammar/v0.5.3/index.md | 6 +- .../generated/public/grammar/v0.6.0/index.md | 6 +- .../generated/public/grammar/v0.6.11/index.md | 6 +- .../generated/public/grammar/v0.6.2/index.md | 6 +- .../generated/public/grammar/v0.6.5/index.md | 6 +- .../generated/public/grammar/v0.7.0/index.md | 6 +- .../generated/public/grammar/v0.7.1/index.md | 6 +- .../generated/public/grammar/v0.7.4/index.md | 6 +- .../generated/public/grammar/v0.8.0/index.md | 6 +- .../generated/public/grammar/v0.8.13/index.md | 12 +- .../generated/public/grammar/v0.8.18/index.md | 12 +- .../generated/public/grammar/v0.8.19/index.md | 12 +- .../generated/public/grammar/v0.8.22/index.md | 12 +- .../generated/public/grammar/v0.8.4/index.md | 6 +- .../generated/public/grammar/v0.8.8/index.md | 6 +- .../generated/0.4.11-failure.yml | 2 +- .../generated/0.4.11-success.yml | 10 +- .../generated/0.4.11-success.yml | 6 +- .../generated/0.4.11-failure.yml | 2 +- .../generated/0.8.13-success.yml | 2 +- .../identifier_path/input.sol | 0 .../generated/0.4.11-failure.yml | 2 +- .../generated/0.8.13-failure.yml | 4 +- .../generated/0.8.19-success.yml | 2 +- .../identifier_path_as_operator/input.sol | 0 .../single_id/generated/0.4.11-failure.yml | 2 +- .../single_id/generated/0.8.13-success.yml | 2 +- .../single_id/input.sol | 0 .../generated/0.4.11-failure.yml | 2 +- .../generated/0.8.13-failure.yml | 4 +- .../generated/0.8.19-success.yml | 2 +- .../single_id_as_operator/input.sol | 0 .../generated/0.8.13-failure.yml | 2 +- .../generated/0.8.13-failure.yml | 6 +- .../generated/0.8.19-success.yml | 12 +- .../generated/0.8.13-success.yml | 6 +- .../generated/0.8.13-failure.yml | 6 +- .../generated/0.8.19-success.yml | 6 +- 66 files changed, 523 insertions(+), 523 deletions(-) rename crates/solidity/outputs/cargo/tests/src/cst_output/generated/{UsingDirectiveSymbol.rs => UsingDeconstructionSymbol.rs} (56%) delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md rename crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/{deconstruction-import => import-deconstruction}/unversioned.md (57%) rename crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/{using-directive-symbol => using-deconstruction-symbol}/0.8.13.md (52%) create mode 100644 crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbol/0.8.19.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbols/0.8.13.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction/0.8.13.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/0.8.13.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.19.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols/0.8.13.md rename crates/solidity/testing/snapshots/cst_output/{UsingDirectiveSymbol => UsingDeconstructionSymbol}/identifier_path/generated/0.4.11-failure.yml (90%) rename crates/solidity/testing/snapshots/cst_output/{UsingDirectiveSymbol => UsingDeconstructionSymbol}/identifier_path/generated/0.8.13-success.yml (87%) rename crates/solidity/testing/snapshots/cst_output/{UsingDirectiveSymbol => UsingDeconstructionSymbol}/identifier_path/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{UsingDirectiveSymbol => UsingDeconstructionSymbol}/identifier_path_as_operator/generated/0.4.11-failure.yml (89%) rename crates/solidity/testing/snapshots/cst_output/{UsingDirectiveSymbol => UsingDeconstructionSymbol}/identifier_path_as_operator/generated/0.8.13-failure.yml (84%) rename crates/solidity/testing/snapshots/cst_output/{UsingDirectiveSymbol => UsingDeconstructionSymbol}/identifier_path_as_operator/generated/0.8.19-success.yml (88%) rename crates/solidity/testing/snapshots/cst_output/{UsingDirectiveSymbol => UsingDeconstructionSymbol}/identifier_path_as_operator/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{UsingDirectiveSymbol => UsingDeconstructionSymbol}/single_id/generated/0.4.11-failure.yml (91%) rename crates/solidity/testing/snapshots/cst_output/{UsingDirectiveSymbol => UsingDeconstructionSymbol}/single_id/generated/0.8.13-success.yml (85%) rename crates/solidity/testing/snapshots/cst_output/{UsingDirectiveSymbol => UsingDeconstructionSymbol}/single_id/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{UsingDirectiveSymbol => UsingDeconstructionSymbol}/single_id_as_operator/generated/0.4.11-failure.yml (89%) rename crates/solidity/testing/snapshots/cst_output/{UsingDirectiveSymbol => UsingDeconstructionSymbol}/single_id_as_operator/generated/0.8.13-failure.yml (83%) rename crates/solidity/testing/snapshots/cst_output/{UsingDirectiveSymbol => UsingDeconstructionSymbol}/single_id_as_operator/generated/0.8.19-success.yml (87%) rename crates/solidity/testing/snapshots/cst_output/{UsingDirectiveSymbol => UsingDeconstructionSymbol}/single_id_as_operator/input.sol (100%) diff --git a/crates/solidity/inputs/language/definition/01-file-structure/04-imports/productions.yml b/crates/solidity/inputs/language/definition/01-file-structure/04-imports/productions.yml index d9cc15d7f9..fc0d482386 100644 --- a/crates/solidity/inputs/language/definition/01-file-structure/04-imports/productions.yml +++ b/crates/solidity/inputs/language/definition/01-file-structure/04-imports/productions.yml @@ -10,7 +10,7 @@ - choice: - reference: "PathImport" - reference: "NamedImport" - - reference: "DeconstructionImport" + - reference: "ImportDeconstruction" terminator: reference: "Semicolon" @@ -34,7 +34,7 @@ - reference: "FromKeyword" - reference: "AsciiStringLiteral" -- name: "DeconstructionImport" +- name: "ImportDeconstruction" kind: "Parser" unversioned: sequence: @@ -42,22 +42,22 @@ open: reference: "OpenBrace" parser: - reference: "DeconstructionImportSymbols" + reference: "ImportDeconstructionSymbols" close: reference: "CloseBrace" - reference: "FromKeyword" - reference: "AsciiStringLiteral" -- name: "DeconstructionImportSymbols" +- name: "ImportDeconstructionSymbols" kind: "Parser" unversioned: separatedBy: separator: reference: "Comma" parser: - reference: "DeconstructionImportSymbol" + reference: "ImportDeconstructionSymbol" -- name: "DeconstructionImportSymbol" +- name: "ImportDeconstructionSymbol" kind: "Parser" unversioned: sequence: @@ -82,7 +82,7 @@ - reference: "TypeName" terminator: reference: "Semicolon" - # Added an optional `global` keyword and `UsingDirectiveDeconstruction` + # Added an optional `global` keyword and `UsingDeconstruction` 0.8.13: terminatedBy: parser: @@ -90,7 +90,7 @@ - reference: "UsingKeyword" - choice: - reference: "IdentifierPath" - - reference: "UsingDirectiveDeconstruction" + - reference: "UsingDeconstruction" - reference: "ForKeyword" - choice: - reference: "Asterisk" @@ -100,7 +100,7 @@ terminator: reference: "Semicolon" -- name: "UsingDirectiveDeconstruction" +- name: "UsingDeconstruction" kind: "Parser" versioned: 0.8.13: @@ -108,11 +108,11 @@ open: reference: "OpenBrace" parser: - reference: "UsingDirectiveSymbols" + reference: "UsingDeconstructionSymbols" close: reference: "CloseBrace" -- name: "UsingDirectiveSymbols" +- name: "UsingDeconstructionSymbols" kind: "Parser" versioned: 0.8.13: @@ -120,9 +120,9 @@ separator: reference: "Comma" parser: - reference: "UsingDirectiveSymbol" + reference: "UsingDeconstructionSymbol" -- name: "UsingDirectiveSymbol" +- name: "UsingDeconstructionSymbol" kind: "Parser" versioned: 0.8.13: diff --git a/crates/solidity/inputs/language/src/definition.rs b/crates/solidity/inputs/language/src/definition.rs index 40dfaed3db..06d9ef356f 100644 --- a/crates/solidity/inputs/language/src/definition.rs +++ b/crates/solidity/inputs/language/src/definition.rs @@ -222,30 +222,30 @@ codegen_language_macros::compile!(Language( error_recovery = FieldsErrorRecovery(terminator = semicolon), fields = ( import_keyword = Required(Terminal([ImportKeyword])), - symbol = Required(NonTerminal(ImportSymbol)), + clause = Required(NonTerminal(ImportClause)), semicolon = Required(Terminal([Semicolon])) ) ), Enum( - name = ImportSymbol, + name = ImportClause, variants = [ - EnumVariant(name = Path, reference = PathImportSymbol), - EnumVariant(name = Named, reference = NamedImportSymbol), + EnumVariant(name = Path, reference = PathImport), + EnumVariant(name = Named, reference = NamedImport), EnumVariant( name = Deconstruction, - reference = ImportSymbolDeconstruction + reference = ImportDeconstruction ) ] ), Struct( - name = PathImportSymbol, + name = PathImport, fields = ( path = Required(Terminal([AsciiStringLiteral])), alias = Optional(kind = NonTerminal(ImportAlias)) ) ), Struct( - name = NamedImportSymbol, + name = NamedImport, fields = ( asterisk = Required(Terminal([Asterisk])), alias = Required(NonTerminal(ImportAlias)), @@ -254,26 +254,26 @@ codegen_language_macros::compile!(Language( ) ), Struct( - name = ImportSymbolDeconstruction, + name = ImportDeconstruction, error_recovery = FieldsErrorRecovery( delimiters = FieldDelimiters(open = open_brace, close = close_brace) ), fields = ( open_brace = Required(Terminal([OpenBrace])), - fields = Required(NonTerminal(ImportDeconstructionFields)), + symbols = Required(NonTerminal(ImportDeconstructionSymbols)), close_brace = Required(Terminal([CloseBrace])), from_keyword = Required(Terminal([FromKeyword])), path = Required(Terminal([AsciiStringLiteral])) ) ), Separated( - name = ImportDeconstructionFields, - separated = ImportDeconstructionField, + name = ImportDeconstructionSymbols, + separated = ImportDeconstructionSymbol, separator = Comma ), Struct( - name = ImportDeconstructionField, + name = ImportDeconstructionSymbol, fields = ( name = Required(Terminal([Identifier])), alias = Optional(kind = NonTerminal(ImportAlias)) @@ -296,7 +296,7 @@ codegen_language_macros::compile!(Language( error_recovery = FieldsErrorRecovery(terminator = semicolon), fields = ( using_keyword = Required(Terminal([UsingKeyword])), - symbol = Required(NonTerminal(UsingSymbol)), + clause = Required(NonTerminal(UsingClause)), for_keyword = Required(Terminal([ForKeyword])), target = Required(NonTerminal(UsingTarget)), global_keyword = Optional( @@ -307,18 +307,18 @@ codegen_language_macros::compile!(Language( ) ), Enum( - name = UsingSymbol, + name = UsingClause, variants = [ EnumVariant(name = Path, reference = IdentifierPath), EnumVariant( name = Deconstruction, enabled = From("0.8.13"), - reference = UsingSymbolDeconstruction + reference = UsingDeconstruction ) ] ), Struct( - name = UsingSymbolDeconstruction, + name = UsingDeconstruction, enabled = From("0.8.13"), error_recovery = FieldsErrorRecovery( delimiters = @@ -326,18 +326,18 @@ codegen_language_macros::compile!(Language( ), fields = ( open_brace = Required(Terminal([OpenBrace])), - fields = Required(NonTerminal(UsingDeconstructionFields)), + symbols = Required(NonTerminal(UsingDeconstructionSymbols)), close_brace = Required(Terminal([CloseBrace])) ) ), Separated( - name = UsingDeconstructionFields, - separated = UsingDeconstructionField, + name = UsingDeconstructionSymbols, + separated = UsingDeconstructionSymbol, separator = Comma, enabled = From("0.8.13") ), Struct( - name = UsingDeconstructionField, + name = UsingDeconstructionSymbol, enabled = From("0.8.13"), fields = ( name = Required(NonTerminal(IdentifierPath)), diff --git a/crates/solidity/inputs/language/src/dsl.rs b/crates/solidity/inputs/language/src/dsl.rs index 85bee76798..b5b05515db 100644 --- a/crates/solidity/inputs/language/src/dsl.rs +++ b/crates/solidity/inputs/language/src/dsl.rs @@ -252,11 +252,11 @@ slang_grammar! { { introduced in "0.5.0" CalldataKeyword} ) ; - parser DeconstructionImport = ((DeconstructionImportSymbols delimited by OpenBrace and CloseBrace) FromKeyword AsciiStringLiteral) ; + parser ImportDeconstruction = ((ImportDeconstructionSymbols delimited by OpenBrace and CloseBrace) FromKeyword AsciiStringLiteral) ; - parser DeconstructionImportSymbol = (Identifier ((AsKeyword Identifier) ?)) ; + parser ImportDeconstructionSymbol = (Identifier ((AsKeyword Identifier) ?)) ; - parser DeconstructionImportSymbols = (DeconstructionImportSymbol separated by Comma) ; + parser ImportDeconstructionSymbols = (ImportDeconstructionSymbol separated by Comma) ; parser DeleteStatement = ((DeleteKeyword Expression) terminated by Semicolon) ; @@ -364,7 +364,7 @@ slang_grammar! { parser IfStatement = (IfKeyword (Expression delimited by OpenParen and CloseParen) Statement ((ElseKeyword Statement) ?)) ; - parser ImportDirective = ((ImportKeyword (PathImport | NamedImport | DeconstructionImport)) terminated by Semicolon) ; + parser ImportDirective = ((ImportKeyword (PathImport | NamedImport | ImportDeconstruction)) terminated by Semicolon) ; inline parser IndexAccessOperator = (((Expression ?) ((Colon (Expression ?)) ?)) delimited by OpenBracket and CloseBracket) ; @@ -550,19 +550,19 @@ slang_grammar! { parser UserDefinedValueTypeDefinition = { introduced in "0.8.8" ((TypeKeyword Identifier IsKeyword ElementaryType) terminated by Semicolon) } ; - parser UsingDirective = ((UsingKeyword (IdentifierPath | UsingDirectiveDeconstruction) ForKeyword (Asterisk | TypeName) ({ introduced in "0.8.13" GlobalKeyword } ?)) terminated by Semicolon) ; + parser UsingDirective = ((UsingKeyword (IdentifierPath | UsingDeconstruction) ForKeyword (Asterisk | TypeName) ({ introduced in "0.8.13" GlobalKeyword } ?)) terminated by Semicolon) ; - parser UsingDirectiveDeconstruction = { introduced in "0.8.13" (UsingDirectiveSymbols delimited by OpenBrace and CloseBrace) }; + parser UsingDeconstruction = { introduced in "0.8.13" (UsingDeconstructionSymbols delimited by OpenBrace and CloseBrace) }; inline parser UsingDirectiveOperator = { introduced in "0.8.19" (Ampersand | Asterisk | BangEqual | Bar | Caret | EqualEqual | GreaterThan | GreaterThanEqual | LessThan | LessThanEqual | Minus | Percent | Plus | Slash | Tilde) } ; - parser UsingDirectiveSymbol = { + parser UsingDeconstructionSymbol = { introduced in "0.8.13" (IdentifierPath { introduced in "0.8.19" ((AsKeyword UsingDirectiveOperator) ?) } ) } ; - parser UsingDirectiveSymbols = (UsingDirectiveSymbol separated by Comma) ; + parser UsingDeconstructionSymbols = (UsingDeconstructionSymbol separated by Comma) ; parser VariableDeclaration = (VariableDeclarationType (DataLocation ?) Identifier) ; diff --git a/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs b/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs index 8d614ebf20..7cd8f294a2 100644 --- a/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs +++ b/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs @@ -38,9 +38,6 @@ pub enum ProductionKind { ContractDefinition, ContractMembers, DecimalNumberExpression, - DeconstructionImport, - DeconstructionImportSymbol, - DeconstructionImportSymbols, DeleteStatement, DoWhileStatement, EmitStatement, @@ -70,6 +67,9 @@ pub enum ProductionKind { HexStringLiterals, IdentifierPath, IfStatement, + ImportDeconstruction, + ImportDeconstructionSymbol, + ImportDeconstructionSymbols, ImportDirective, InheritanceSpecifier, InheritanceType, @@ -126,10 +126,10 @@ pub enum ProductionKind { UnnamedFunctionAttributes, UnnamedFunctionDefinition, UserDefinedValueTypeDefinition, + UsingDeconstruction, + UsingDeconstructionSymbol, + UsingDeconstructionSymbols, UsingDirective, - UsingDirectiveDeconstruction, - UsingDirectiveSymbol, - UsingDirectiveSymbols, VariableDeclaration, VariableDeclarationStatement, VersionPragma, @@ -197,9 +197,6 @@ pub enum RuleKind { ContractDefinition, ContractMembers, DecimalNumberExpression, - DeconstructionImport, - DeconstructionImportSymbol, - DeconstructionImportSymbols, DeleteStatement, DoWhileStatement, EmitStatement, @@ -230,6 +227,9 @@ pub enum RuleKind { HexStringLiterals, IdentifierPath, IfStatement, + ImportDeconstruction, + ImportDeconstructionSymbol, + ImportDeconstructionSymbols, ImportDirective, IndexAccessExpression, InheritanceSpecifier, @@ -290,10 +290,10 @@ pub enum RuleKind { UnnamedFunctionAttributes, UnnamedFunctionDefinition, UserDefinedValueTypeDefinition, + UsingDeconstruction, + UsingDeconstructionSymbol, + UsingDeconstructionSymbols, UsingDirective, - UsingDirectiveDeconstruction, - UsingDirectiveSymbol, - UsingDirectiveSymbols, VariableDeclaration, VariableDeclarationStatement, VersionPragma, diff --git a/crates/solidity/outputs/cargo/crate/src/generated/language.rs b/crates/solidity/outputs/cargo/crate/src/generated/language.rs index f0768200f3..65be8aa693 100644 --- a/crates/solidity/outputs/cargo/crate/src/generated/language.rs +++ b/crates/solidity/outputs/cargo/crate/src/generated/language.rs @@ -766,78 +766,6 @@ impl Language { .with_kind(RuleKind::DecimalNumberExpression) } - #[allow(unused_assignments, unused_parens)] - fn deconstruction_import(&self, input: &mut ParserContext) -> ParserResult { - SequenceHelper::run(|mut seq| { - seq.elem(SequenceHelper::run(|mut seq| { - let mut delim_guard = input.open_delim(TokenKind::CloseBrace); - let input = delim_guard.ctx(); - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::OpenBrace, - ))?; - seq.elem( - self.deconstruction_import_symbols(input) - .recover_until_with_nested_delims::<_, LexicalContextType::Default>( - input, - self, - TokenKind::CloseBrace, - RecoverFromNoMatch::Yes, - ), - )?; - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::CloseBrace, - ))?; - seq.finish() - }))?; - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::FromKeyword, - ))?; - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::AsciiStringLiteral, - ))?; - seq.finish() - }) - .with_kind(RuleKind::DeconstructionImport) - } - - #[allow(unused_assignments, unused_parens)] - fn deconstruction_import_symbol(&self, input: &mut ParserContext) -> ParserResult { - SequenceHelper::run(|mut seq| { - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::Identifier, - ))?; - seq.elem(OptionalHelper::transform(SequenceHelper::run(|mut seq| { - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::AsKeyword, - ))?; - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::Identifier, - ))?; - seq.finish() - })))?; - seq.finish() - }) - .with_kind(RuleKind::DeconstructionImportSymbol) - } - - #[allow(unused_assignments, unused_parens)] - fn deconstruction_import_symbols(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| self.deconstruction_import_symbol(input), - TokenKind::Comma, - ) - .with_kind(RuleKind::DeconstructionImportSymbols) - } - #[allow(unused_assignments, unused_parens)] fn delete_statement(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -2605,6 +2533,78 @@ impl Language { .with_kind(RuleKind::IfStatement) } + #[allow(unused_assignments, unused_parens)] + fn import_deconstruction(&self, input: &mut ParserContext) -> ParserResult { + SequenceHelper::run(|mut seq| { + seq.elem(SequenceHelper::run(|mut seq| { + let mut delim_guard = input.open_delim(TokenKind::CloseBrace); + let input = delim_guard.ctx(); + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::OpenBrace, + ))?; + seq.elem( + self.import_deconstruction_symbols(input) + .recover_until_with_nested_delims::<_, LexicalContextType::Default>( + input, + self, + TokenKind::CloseBrace, + RecoverFromNoMatch::Yes, + ), + )?; + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::CloseBrace, + ))?; + seq.finish() + }))?; + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::FromKeyword, + ))?; + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::AsciiStringLiteral, + ))?; + seq.finish() + }) + .with_kind(RuleKind::ImportDeconstruction) + } + + #[allow(unused_assignments, unused_parens)] + fn import_deconstruction_symbol(&self, input: &mut ParserContext) -> ParserResult { + SequenceHelper::run(|mut seq| { + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::Identifier, + ))?; + seq.elem(OptionalHelper::transform(SequenceHelper::run(|mut seq| { + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::AsKeyword, + ))?; + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::Identifier, + ))?; + seq.finish() + })))?; + seq.finish() + }) + .with_kind(RuleKind::ImportDeconstructionSymbol) + } + + #[allow(unused_assignments, unused_parens)] + fn import_deconstruction_symbols(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| self.import_deconstruction_symbol(input), + TokenKind::Comma, + ) + .with_kind(RuleKind::ImportDeconstructionSymbols) + } + #[allow(unused_assignments, unused_parens)] fn import_directive(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -2619,7 +2619,7 @@ impl Language { choice.consider(input, result)?; let result = self.named_import(input); choice.consider(input, result)?; - let result = self.deconstruction_import(input); + let result = self.import_deconstruction(input); choice.consider(input, result)?; choice.finish(input) }))?; @@ -4354,63 +4354,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn using_directive(&self, input: &mut ParserContext) -> ParserResult { - SequenceHelper::run(|mut seq| { - seq.elem( - SequenceHelper::run(|mut seq| { - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::UsingKeyword, - ))?; - seq.elem(ChoiceHelper::run(input, |mut choice, input| { - let result = self.identifier_path(input); - choice.consider(input, result)?; - let result = self.using_directive_deconstruction(input); - choice.consider(input, result)?; - choice.finish(input) - }))?; - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::ForKeyword, - ))?; - seq.elem(ChoiceHelper::run(input, |mut choice, input| { - let result = self.parse_token_with_trivia::( - input, - TokenKind::Asterisk, - ); - choice.consider(input, result)?; - let result = self.type_name(input); - choice.consider(input, result)?; - choice.finish(input) - }))?; - if self.version_is_at_least_0_8_13 { - seq.elem(OptionalHelper::transform( - self.parse_token_with_trivia::( - input, - TokenKind::GlobalKeyword, - ), - ))?; - } - seq.finish() - }) - .recover_until_with_nested_delims::<_, LexicalContextType::Default>( - input, - self, - TokenKind::Semicolon, - RecoverFromNoMatch::No, - ), - )?; - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::Semicolon, - ))?; - seq.finish() - }) - .with_kind(RuleKind::UsingDirective) - } - - #[allow(unused_assignments, unused_parens)] - fn using_directive_deconstruction(&self, input: &mut ParserContext) -> ParserResult { + fn using_deconstruction(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_8_13 { SequenceHelper::run(|mut seq| { let mut delim_guard = input.open_delim(TokenKind::CloseBrace); @@ -4420,7 +4364,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - self.using_directive_symbols(input) + self.using_deconstruction_symbols(input) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -4437,11 +4381,11 @@ impl Language { } else { ParserResult::disabled() } - .with_kind(RuleKind::UsingDirectiveDeconstruction) + .with_kind(RuleKind::UsingDeconstruction) } #[allow(unused_assignments, unused_parens)] - fn using_directive_symbol(&self, input: &mut ParserContext) -> ParserResult { + fn using_deconstruction_symbol(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_8_13 { SequenceHelper::run(|mut seq| { seq.elem(self.identifier_path(input))?; @@ -4556,18 +4500,74 @@ impl Language { } else { ParserResult::disabled() } - .with_kind(RuleKind::UsingDirectiveSymbol) + .with_kind(RuleKind::UsingDeconstructionSymbol) } #[allow(unused_assignments, unused_parens)] - fn using_directive_symbols(&self, input: &mut ParserContext) -> ParserResult { + fn using_deconstruction_symbols(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::Default>( input, self, - |input| self.using_directive_symbol(input), + |input| self.using_deconstruction_symbol(input), TokenKind::Comma, ) - .with_kind(RuleKind::UsingDirectiveSymbols) + .with_kind(RuleKind::UsingDeconstructionSymbols) + } + + #[allow(unused_assignments, unused_parens)] + fn using_directive(&self, input: &mut ParserContext) -> ParserResult { + SequenceHelper::run(|mut seq| { + seq.elem( + SequenceHelper::run(|mut seq| { + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::UsingKeyword, + ))?; + seq.elem(ChoiceHelper::run(input, |mut choice, input| { + let result = self.identifier_path(input); + choice.consider(input, result)?; + let result = self.using_deconstruction(input); + choice.consider(input, result)?; + choice.finish(input) + }))?; + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::ForKeyword, + ))?; + seq.elem(ChoiceHelper::run(input, |mut choice, input| { + let result = self.parse_token_with_trivia::( + input, + TokenKind::Asterisk, + ); + choice.consider(input, result)?; + let result = self.type_name(input); + choice.consider(input, result)?; + choice.finish(input) + }))?; + if self.version_is_at_least_0_8_13 { + seq.elem(OptionalHelper::transform( + self.parse_token_with_trivia::( + input, + TokenKind::GlobalKeyword, + ), + ))?; + } + seq.finish() + }) + .recover_until_with_nested_delims::<_, LexicalContextType::Default>( + input, + self, + TokenKind::Semicolon, + RecoverFromNoMatch::No, + ), + )?; + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::Semicolon, + ))?; + seq.finish() + }) + .with_kind(RuleKind::UsingDirective) } #[allow(unused_assignments, unused_parens)] @@ -5968,13 +5968,6 @@ impl Language { ProductionKind::DecimalNumberExpression => { Self::decimal_number_expression.parse(self, input) } - ProductionKind::DeconstructionImport => Self::deconstruction_import.parse(self, input), - ProductionKind::DeconstructionImportSymbol => { - Self::deconstruction_import_symbol.parse(self, input) - } - ProductionKind::DeconstructionImportSymbols => { - Self::deconstruction_import_symbols.parse(self, input) - } ProductionKind::DeleteStatement => Self::delete_statement.parse(self, input), ProductionKind::DoWhileStatement => Self::do_while_statement.parse(self, input), ProductionKind::EmitStatement => Self::emit_statement.parse(self, input), @@ -6014,6 +6007,13 @@ impl Language { ProductionKind::HexStringLiterals => Self::hex_string_literals.parse(self, input), ProductionKind::IdentifierPath => Self::identifier_path.parse(self, input), ProductionKind::IfStatement => Self::if_statement.parse(self, input), + ProductionKind::ImportDeconstruction => Self::import_deconstruction.parse(self, input), + ProductionKind::ImportDeconstructionSymbol => { + Self::import_deconstruction_symbol.parse(self, input) + } + ProductionKind::ImportDeconstructionSymbols => { + Self::import_deconstruction_symbols.parse(self, input) + } ProductionKind::ImportDirective => Self::import_directive.parse(self, input), ProductionKind::InheritanceSpecifier => Self::inheritance_specifier.parse(self, input), ProductionKind::InheritanceType => Self::inheritance_type.parse(self, input), @@ -6092,14 +6092,14 @@ impl Language { ProductionKind::UserDefinedValueTypeDefinition => { Self::user_defined_value_type_definition.parse(self, input) } - ProductionKind::UsingDirective => Self::using_directive.parse(self, input), - ProductionKind::UsingDirectiveDeconstruction => { - Self::using_directive_deconstruction.parse(self, input) + ProductionKind::UsingDeconstruction => Self::using_deconstruction.parse(self, input), + ProductionKind::UsingDeconstructionSymbol => { + Self::using_deconstruction_symbol.parse(self, input) } - ProductionKind::UsingDirectiveSymbol => Self::using_directive_symbol.parse(self, input), - ProductionKind::UsingDirectiveSymbols => { - Self::using_directive_symbols.parse(self, input) + ProductionKind::UsingDeconstructionSymbols => { + Self::using_deconstruction_symbols.parse(self, input) } + ProductionKind::UsingDirective => Self::using_directive.parse(self, input), ProductionKind::VariableDeclaration => Self::variable_declaration.parse(self, input), ProductionKind::VariableDeclarationStatement => { Self::variable_declaration_statement.parse(self, input) diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/UsingDirectiveSymbol.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/UsingDeconstructionSymbol.rs similarity index 56% rename from crates/solidity/outputs/cargo/tests/src/cst_output/generated/UsingDirectiveSymbol.rs rename to crates/solidity/outputs/cargo/tests/src/cst_output/generated/UsingDeconstructionSymbol.rs index aad35a72e3..f5d97b1916 100644 --- a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/UsingDirectiveSymbol.rs +++ b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/UsingDeconstructionSymbol.rs @@ -5,20 +5,20 @@ use anyhow::Result; #[test] fn identifier_path() -> Result<()> { - return run("UsingDirectiveSymbol", "identifier_path"); + return run("UsingDeconstructionSymbol", "identifier_path"); } #[test] fn identifier_path_as_operator() -> Result<()> { - return run("UsingDirectiveSymbol", "identifier_path_as_operator"); + return run("UsingDeconstructionSymbol", "identifier_path_as_operator"); } #[test] fn single_id() -> Result<()> { - return run("UsingDirectiveSymbol", "single_id"); + return run("UsingDeconstructionSymbol", "single_id"); } #[test] fn single_id_as_operator() -> Result<()> { - return run("UsingDirectiveSymbol", "single_id_as_operator"); + return run("UsingDeconstructionSymbol", "single_id_as_operator"); } 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 30de55b323..ac8f589f86 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 @@ -72,9 +72,9 @@ mod UnicodeStringLiterals; #[allow(non_snake_case)] mod UserDefinedValueTypeDefinition; #[allow(non_snake_case)] -mod UsingDirective; +mod UsingDeconstructionSymbol; #[allow(non_snake_case)] -mod UsingDirectiveSymbol; +mod UsingDirective; #[allow(non_snake_case)] mod VariableDeclarationStatement; #[allow(non_snake_case)] diff --git a/crates/solidity/outputs/npm/crate/src/generated/kinds.rs b/crates/solidity/outputs/npm/crate/src/generated/kinds.rs index 8d614ebf20..7cd8f294a2 100644 --- a/crates/solidity/outputs/npm/crate/src/generated/kinds.rs +++ b/crates/solidity/outputs/npm/crate/src/generated/kinds.rs @@ -38,9 +38,6 @@ pub enum ProductionKind { ContractDefinition, ContractMembers, DecimalNumberExpression, - DeconstructionImport, - DeconstructionImportSymbol, - DeconstructionImportSymbols, DeleteStatement, DoWhileStatement, EmitStatement, @@ -70,6 +67,9 @@ pub enum ProductionKind { HexStringLiterals, IdentifierPath, IfStatement, + ImportDeconstruction, + ImportDeconstructionSymbol, + ImportDeconstructionSymbols, ImportDirective, InheritanceSpecifier, InheritanceType, @@ -126,10 +126,10 @@ pub enum ProductionKind { UnnamedFunctionAttributes, UnnamedFunctionDefinition, UserDefinedValueTypeDefinition, + UsingDeconstruction, + UsingDeconstructionSymbol, + UsingDeconstructionSymbols, UsingDirective, - UsingDirectiveDeconstruction, - UsingDirectiveSymbol, - UsingDirectiveSymbols, VariableDeclaration, VariableDeclarationStatement, VersionPragma, @@ -197,9 +197,6 @@ pub enum RuleKind { ContractDefinition, ContractMembers, DecimalNumberExpression, - DeconstructionImport, - DeconstructionImportSymbol, - DeconstructionImportSymbols, DeleteStatement, DoWhileStatement, EmitStatement, @@ -230,6 +227,9 @@ pub enum RuleKind { HexStringLiterals, IdentifierPath, IfStatement, + ImportDeconstruction, + ImportDeconstructionSymbol, + ImportDeconstructionSymbols, ImportDirective, IndexAccessExpression, InheritanceSpecifier, @@ -290,10 +290,10 @@ pub enum RuleKind { UnnamedFunctionAttributes, UnnamedFunctionDefinition, UserDefinedValueTypeDefinition, + UsingDeconstruction, + UsingDeconstructionSymbol, + UsingDeconstructionSymbols, UsingDirective, - UsingDirectiveDeconstruction, - UsingDirectiveSymbol, - UsingDirectiveSymbols, VariableDeclaration, VariableDeclarationStatement, VersionPragma, diff --git a/crates/solidity/outputs/npm/crate/src/generated/language.rs b/crates/solidity/outputs/npm/crate/src/generated/language.rs index f0768200f3..65be8aa693 100644 --- a/crates/solidity/outputs/npm/crate/src/generated/language.rs +++ b/crates/solidity/outputs/npm/crate/src/generated/language.rs @@ -766,78 +766,6 @@ impl Language { .with_kind(RuleKind::DecimalNumberExpression) } - #[allow(unused_assignments, unused_parens)] - fn deconstruction_import(&self, input: &mut ParserContext) -> ParserResult { - SequenceHelper::run(|mut seq| { - seq.elem(SequenceHelper::run(|mut seq| { - let mut delim_guard = input.open_delim(TokenKind::CloseBrace); - let input = delim_guard.ctx(); - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::OpenBrace, - ))?; - seq.elem( - self.deconstruction_import_symbols(input) - .recover_until_with_nested_delims::<_, LexicalContextType::Default>( - input, - self, - TokenKind::CloseBrace, - RecoverFromNoMatch::Yes, - ), - )?; - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::CloseBrace, - ))?; - seq.finish() - }))?; - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::FromKeyword, - ))?; - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::AsciiStringLiteral, - ))?; - seq.finish() - }) - .with_kind(RuleKind::DeconstructionImport) - } - - #[allow(unused_assignments, unused_parens)] - fn deconstruction_import_symbol(&self, input: &mut ParserContext) -> ParserResult { - SequenceHelper::run(|mut seq| { - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::Identifier, - ))?; - seq.elem(OptionalHelper::transform(SequenceHelper::run(|mut seq| { - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::AsKeyword, - ))?; - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::Identifier, - ))?; - seq.finish() - })))?; - seq.finish() - }) - .with_kind(RuleKind::DeconstructionImportSymbol) - } - - #[allow(unused_assignments, unused_parens)] - fn deconstruction_import_symbols(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| self.deconstruction_import_symbol(input), - TokenKind::Comma, - ) - .with_kind(RuleKind::DeconstructionImportSymbols) - } - #[allow(unused_assignments, unused_parens)] fn delete_statement(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -2605,6 +2533,78 @@ impl Language { .with_kind(RuleKind::IfStatement) } + #[allow(unused_assignments, unused_parens)] + fn import_deconstruction(&self, input: &mut ParserContext) -> ParserResult { + SequenceHelper::run(|mut seq| { + seq.elem(SequenceHelper::run(|mut seq| { + let mut delim_guard = input.open_delim(TokenKind::CloseBrace); + let input = delim_guard.ctx(); + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::OpenBrace, + ))?; + seq.elem( + self.import_deconstruction_symbols(input) + .recover_until_with_nested_delims::<_, LexicalContextType::Default>( + input, + self, + TokenKind::CloseBrace, + RecoverFromNoMatch::Yes, + ), + )?; + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::CloseBrace, + ))?; + seq.finish() + }))?; + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::FromKeyword, + ))?; + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::AsciiStringLiteral, + ))?; + seq.finish() + }) + .with_kind(RuleKind::ImportDeconstruction) + } + + #[allow(unused_assignments, unused_parens)] + fn import_deconstruction_symbol(&self, input: &mut ParserContext) -> ParserResult { + SequenceHelper::run(|mut seq| { + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::Identifier, + ))?; + seq.elem(OptionalHelper::transform(SequenceHelper::run(|mut seq| { + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::AsKeyword, + ))?; + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::Identifier, + ))?; + seq.finish() + })))?; + seq.finish() + }) + .with_kind(RuleKind::ImportDeconstructionSymbol) + } + + #[allow(unused_assignments, unused_parens)] + fn import_deconstruction_symbols(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| self.import_deconstruction_symbol(input), + TokenKind::Comma, + ) + .with_kind(RuleKind::ImportDeconstructionSymbols) + } + #[allow(unused_assignments, unused_parens)] fn import_directive(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -2619,7 +2619,7 @@ impl Language { choice.consider(input, result)?; let result = self.named_import(input); choice.consider(input, result)?; - let result = self.deconstruction_import(input); + let result = self.import_deconstruction(input); choice.consider(input, result)?; choice.finish(input) }))?; @@ -4354,63 +4354,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn using_directive(&self, input: &mut ParserContext) -> ParserResult { - SequenceHelper::run(|mut seq| { - seq.elem( - SequenceHelper::run(|mut seq| { - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::UsingKeyword, - ))?; - seq.elem(ChoiceHelper::run(input, |mut choice, input| { - let result = self.identifier_path(input); - choice.consider(input, result)?; - let result = self.using_directive_deconstruction(input); - choice.consider(input, result)?; - choice.finish(input) - }))?; - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::ForKeyword, - ))?; - seq.elem(ChoiceHelper::run(input, |mut choice, input| { - let result = self.parse_token_with_trivia::( - input, - TokenKind::Asterisk, - ); - choice.consider(input, result)?; - let result = self.type_name(input); - choice.consider(input, result)?; - choice.finish(input) - }))?; - if self.version_is_at_least_0_8_13 { - seq.elem(OptionalHelper::transform( - self.parse_token_with_trivia::( - input, - TokenKind::GlobalKeyword, - ), - ))?; - } - seq.finish() - }) - .recover_until_with_nested_delims::<_, LexicalContextType::Default>( - input, - self, - TokenKind::Semicolon, - RecoverFromNoMatch::No, - ), - )?; - seq.elem(self.parse_token_with_trivia::( - input, - TokenKind::Semicolon, - ))?; - seq.finish() - }) - .with_kind(RuleKind::UsingDirective) - } - - #[allow(unused_assignments, unused_parens)] - fn using_directive_deconstruction(&self, input: &mut ParserContext) -> ParserResult { + fn using_deconstruction(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_8_13 { SequenceHelper::run(|mut seq| { let mut delim_guard = input.open_delim(TokenKind::CloseBrace); @@ -4420,7 +4364,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - self.using_directive_symbols(input) + self.using_deconstruction_symbols(input) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -4437,11 +4381,11 @@ impl Language { } else { ParserResult::disabled() } - .with_kind(RuleKind::UsingDirectiveDeconstruction) + .with_kind(RuleKind::UsingDeconstruction) } #[allow(unused_assignments, unused_parens)] - fn using_directive_symbol(&self, input: &mut ParserContext) -> ParserResult { + fn using_deconstruction_symbol(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_8_13 { SequenceHelper::run(|mut seq| { seq.elem(self.identifier_path(input))?; @@ -4556,18 +4500,74 @@ impl Language { } else { ParserResult::disabled() } - .with_kind(RuleKind::UsingDirectiveSymbol) + .with_kind(RuleKind::UsingDeconstructionSymbol) } #[allow(unused_assignments, unused_parens)] - fn using_directive_symbols(&self, input: &mut ParserContext) -> ParserResult { + fn using_deconstruction_symbols(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::Default>( input, self, - |input| self.using_directive_symbol(input), + |input| self.using_deconstruction_symbol(input), TokenKind::Comma, ) - .with_kind(RuleKind::UsingDirectiveSymbols) + .with_kind(RuleKind::UsingDeconstructionSymbols) + } + + #[allow(unused_assignments, unused_parens)] + fn using_directive(&self, input: &mut ParserContext) -> ParserResult { + SequenceHelper::run(|mut seq| { + seq.elem( + SequenceHelper::run(|mut seq| { + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::UsingKeyword, + ))?; + seq.elem(ChoiceHelper::run(input, |mut choice, input| { + let result = self.identifier_path(input); + choice.consider(input, result)?; + let result = self.using_deconstruction(input); + choice.consider(input, result)?; + choice.finish(input) + }))?; + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::ForKeyword, + ))?; + seq.elem(ChoiceHelper::run(input, |mut choice, input| { + let result = self.parse_token_with_trivia::( + input, + TokenKind::Asterisk, + ); + choice.consider(input, result)?; + let result = self.type_name(input); + choice.consider(input, result)?; + choice.finish(input) + }))?; + if self.version_is_at_least_0_8_13 { + seq.elem(OptionalHelper::transform( + self.parse_token_with_trivia::( + input, + TokenKind::GlobalKeyword, + ), + ))?; + } + seq.finish() + }) + .recover_until_with_nested_delims::<_, LexicalContextType::Default>( + input, + self, + TokenKind::Semicolon, + RecoverFromNoMatch::No, + ), + )?; + seq.elem(self.parse_token_with_trivia::( + input, + TokenKind::Semicolon, + ))?; + seq.finish() + }) + .with_kind(RuleKind::UsingDirective) } #[allow(unused_assignments, unused_parens)] @@ -5968,13 +5968,6 @@ impl Language { ProductionKind::DecimalNumberExpression => { Self::decimal_number_expression.parse(self, input) } - ProductionKind::DeconstructionImport => Self::deconstruction_import.parse(self, input), - ProductionKind::DeconstructionImportSymbol => { - Self::deconstruction_import_symbol.parse(self, input) - } - ProductionKind::DeconstructionImportSymbols => { - Self::deconstruction_import_symbols.parse(self, input) - } ProductionKind::DeleteStatement => Self::delete_statement.parse(self, input), ProductionKind::DoWhileStatement => Self::do_while_statement.parse(self, input), ProductionKind::EmitStatement => Self::emit_statement.parse(self, input), @@ -6014,6 +6007,13 @@ impl Language { ProductionKind::HexStringLiterals => Self::hex_string_literals.parse(self, input), ProductionKind::IdentifierPath => Self::identifier_path.parse(self, input), ProductionKind::IfStatement => Self::if_statement.parse(self, input), + ProductionKind::ImportDeconstruction => Self::import_deconstruction.parse(self, input), + ProductionKind::ImportDeconstructionSymbol => { + Self::import_deconstruction_symbol.parse(self, input) + } + ProductionKind::ImportDeconstructionSymbols => { + Self::import_deconstruction_symbols.parse(self, input) + } ProductionKind::ImportDirective => Self::import_directive.parse(self, input), ProductionKind::InheritanceSpecifier => Self::inheritance_specifier.parse(self, input), ProductionKind::InheritanceType => Self::inheritance_type.parse(self, input), @@ -6092,14 +6092,14 @@ impl Language { ProductionKind::UserDefinedValueTypeDefinition => { Self::user_defined_value_type_definition.parse(self, input) } - ProductionKind::UsingDirective => Self::using_directive.parse(self, input), - ProductionKind::UsingDirectiveDeconstruction => { - Self::using_directive_deconstruction.parse(self, input) + ProductionKind::UsingDeconstruction => Self::using_deconstruction.parse(self, input), + ProductionKind::UsingDeconstructionSymbol => { + Self::using_deconstruction_symbol.parse(self, input) } - ProductionKind::UsingDirectiveSymbol => Self::using_directive_symbol.parse(self, input), - ProductionKind::UsingDirectiveSymbols => { - Self::using_directive_symbols.parse(self, input) + ProductionKind::UsingDeconstructionSymbols => { + Self::using_deconstruction_symbols.parse(self, input) } + ProductionKind::UsingDirective => Self::using_directive.parse(self, input), ProductionKind::VariableDeclaration => Self::variable_declaration.parse(self, input), ProductionKind::VariableDeclarationStatement => { Self::variable_declaration_statement.parse(self, input) 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 f25b3ab4e8..ce6d1e2413 100644 --- a/crates/solidity/outputs/npm/package/src/generated/index.d.ts +++ b/crates/solidity/outputs/npm/package/src/generated/index.d.ts @@ -33,9 +33,6 @@ export namespace kinds { ContractDefinition = "ContractDefinition", ContractMembers = "ContractMembers", DecimalNumberExpression = "DecimalNumberExpression", - DeconstructionImport = "DeconstructionImport", - DeconstructionImportSymbol = "DeconstructionImportSymbol", - DeconstructionImportSymbols = "DeconstructionImportSymbols", DeleteStatement = "DeleteStatement", DoWhileStatement = "DoWhileStatement", EmitStatement = "EmitStatement", @@ -65,6 +62,9 @@ export namespace kinds { HexStringLiterals = "HexStringLiterals", IdentifierPath = "IdentifierPath", IfStatement = "IfStatement", + ImportDeconstruction = "ImportDeconstruction", + ImportDeconstructionSymbol = "ImportDeconstructionSymbol", + ImportDeconstructionSymbols = "ImportDeconstructionSymbols", ImportDirective = "ImportDirective", InheritanceSpecifier = "InheritanceSpecifier", InheritanceType = "InheritanceType", @@ -121,10 +121,10 @@ export namespace kinds { UnnamedFunctionAttributes = "UnnamedFunctionAttributes", UnnamedFunctionDefinition = "UnnamedFunctionDefinition", UserDefinedValueTypeDefinition = "UserDefinedValueTypeDefinition", + UsingDeconstruction = "UsingDeconstruction", + UsingDeconstructionSymbol = "UsingDeconstructionSymbol", + UsingDeconstructionSymbols = "UsingDeconstructionSymbols", UsingDirective = "UsingDirective", - UsingDirectiveDeconstruction = "UsingDirectiveDeconstruction", - UsingDirectiveSymbol = "UsingDirectiveSymbol", - UsingDirectiveSymbols = "UsingDirectiveSymbols", VariableDeclaration = "VariableDeclaration", VariableDeclarationStatement = "VariableDeclarationStatement", VersionPragma = "VersionPragma", @@ -178,9 +178,6 @@ export namespace kinds { ContractDefinition = "ContractDefinition", ContractMembers = "ContractMembers", DecimalNumberExpression = "DecimalNumberExpression", - DeconstructionImport = "DeconstructionImport", - DeconstructionImportSymbol = "DeconstructionImportSymbol", - DeconstructionImportSymbols = "DeconstructionImportSymbols", DeleteStatement = "DeleteStatement", DoWhileStatement = "DoWhileStatement", EmitStatement = "EmitStatement", @@ -211,6 +208,9 @@ export namespace kinds { HexStringLiterals = "HexStringLiterals", IdentifierPath = "IdentifierPath", IfStatement = "IfStatement", + ImportDeconstruction = "ImportDeconstruction", + ImportDeconstructionSymbol = "ImportDeconstructionSymbol", + ImportDeconstructionSymbols = "ImportDeconstructionSymbols", ImportDirective = "ImportDirective", IndexAccessExpression = "IndexAccessExpression", InheritanceSpecifier = "InheritanceSpecifier", @@ -271,10 +271,10 @@ export namespace kinds { UnnamedFunctionAttributes = "UnnamedFunctionAttributes", UnnamedFunctionDefinition = "UnnamedFunctionDefinition", UserDefinedValueTypeDefinition = "UserDefinedValueTypeDefinition", + UsingDeconstruction = "UsingDeconstruction", + UsingDeconstructionSymbol = "UsingDeconstructionSymbol", + UsingDeconstructionSymbols = "UsingDeconstructionSymbols", UsingDirective = "UsingDirective", - UsingDirectiveDeconstruction = "UsingDirectiveDeconstruction", - UsingDirectiveSymbol = "UsingDirectiveSymbol", - UsingDirectiveSymbols = "UsingDirectiveSymbols", VariableDeclaration = "VariableDeclaration", VariableDeclarationStatement = "VariableDeclarationStatement", VersionPragma = "VersionPragma", diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md deleted file mode 100644 index 4f4c17a101..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #DeconstructionImportSymbol } -DeconstructionImportSymbol = IDENTIFIER (AS_KEYWORD IDENTIFIER)?; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md deleted file mode 100644 index 525ced5cfc..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #DeconstructionImportSymbols } -DeconstructionImportSymbols = DeconstructionImportSymbol (COMMA DeconstructionImportSymbol)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md new file mode 100644 index 0000000000..7f15b929e7 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #ImportDeconstructionSymbol } +ImportDeconstructionSymbol = IDENTIFIER (AS_KEYWORD IDENTIFIER)?; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md new file mode 100644 index 0000000000..c7a333dafe --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #ImportDeconstructionSymbols } +ImportDeconstructionSymbols = ImportDeconstructionSymbol (COMMA ImportDeconstructionSymbol)*; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md similarity index 57% rename from crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md rename to crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md index bc28e4c063..ecaee90760 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md @@ -1,5 +1,5 @@ -```{ .ebnf .slang-ebnf #DeconstructionImport } -DeconstructionImport = OPEN_BRACE DeconstructionImportSymbols CLOSE_BRACE FROM_KEYWORD ASCII_STRING_LITERAL; +```{ .ebnf .slang-ebnf #ImportDeconstruction } +ImportDeconstruction = OPEN_BRACE ImportDeconstructionSymbols CLOSE_BRACE FROM_KEYWORD ASCII_STRING_LITERAL; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md index 0da8e0d32e..54023af686 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #ImportDirective } -ImportDirective = IMPORT_KEYWORD (PathImport | NamedImport | DeconstructionImport) SEMICOLON; +ImportDirective = IMPORT_KEYWORD (PathImport | NamedImport | ImportDeconstruction) SEMICOLON; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.13.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbol/0.8.13.md similarity index 52% rename from crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.13.md rename to crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbol/0.8.13.md index 5d723a875a..c8ac2d6696 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.13.md +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbol/0.8.13.md @@ -1,5 +1,5 @@ -```{ .ebnf .slang-ebnf #UsingDirectiveSymbol } -UsingDirectiveSymbol = IdentifierPath; +```{ .ebnf .slang-ebnf #UsingDeconstructionSymbol } +UsingDeconstructionSymbol = IdentifierPath; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbol/0.8.19.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbol/0.8.19.md new file mode 100644 index 0000000000..49ad2eaa7e --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbol/0.8.19.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #UsingDeconstructionSymbol } +UsingDeconstructionSymbol = IdentifierPath (AS_KEYWORD «UsingDirectiveOperator»)?; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbols/0.8.13.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbols/0.8.13.md new file mode 100644 index 0000000000..56448ee3ed --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbols/0.8.13.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #UsingDeconstructionSymbols } +UsingDeconstructionSymbols = UsingDeconstructionSymbol (COMMA UsingDeconstructionSymbol)*; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction/0.8.13.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction/0.8.13.md new file mode 100644 index 0000000000..1c3aece766 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction/0.8.13.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #UsingDeconstruction } +UsingDeconstruction = OPEN_BRACE UsingDeconstructionSymbols CLOSE_BRACE; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/0.8.13.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/0.8.13.md deleted file mode 100644 index 8a44bc7b1d..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/0.8.13.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #UsingDirectiveDeconstruction } -UsingDirectiveDeconstruction = OPEN_BRACE UsingDirectiveSymbols CLOSE_BRACE; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.19.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.19.md deleted file mode 100644 index d03fc1819a..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.19.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #UsingDirectiveSymbol } -UsingDirectiveSymbol = IdentifierPath (AS_KEYWORD «UsingDirectiveOperator»)?; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols/0.8.13.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols/0.8.13.md deleted file mode 100644 index 3882298d85..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols/0.8.13.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #UsingDirectiveSymbols } -UsingDirectiveSymbols = UsingDirectiveSymbol (COMMA UsingDirectiveSymbol)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md index 138c41fd7c..9cfd4da301 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #UsingDirective } -UsingDirective = USING_KEYWORD (IdentifierPath | UsingDirectiveDeconstruction) FOR_KEYWORD (ASTERISK | TypeName) GLOBAL_KEYWORD? SEMICOLON; +UsingDirective = USING_KEYWORD (IdentifierPath | UsingDeconstruction) FOR_KEYWORD (ASTERISK | TypeName) GLOBAL_KEYWORD? SEMICOLON; ``` diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.11/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.11/index.md index afb71ff7b8..3acbbfc867 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.11/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.11/index.md @@ -29,9 +29,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.21/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.21/index.md index 584cfc5b99..3b3a205441 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.21/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.21/index.md @@ -29,9 +29,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.22/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.22/index.md index 8b697b035f..228d73617a 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.4.22/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.4.22/index.md @@ -29,9 +29,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.5.0/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.5.0/index.md index 5dab914365..5f7c76c3a7 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.5.0/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.5.0/index.md @@ -29,9 +29,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.5.3/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.5.3/index.md index 3f2fab81a6..08f4a587f7 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.5.3/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.5.3/index.md @@ -29,9 +29,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.0/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.0/index.md index 1ebb402e8e..546d24c8ef 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.0/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.0/index.md @@ -29,9 +29,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.11/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.11/index.md index 455e13d197..39dcff7d55 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.11/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.11/index.md @@ -29,9 +29,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.2/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.2/index.md index 597c6ef16c..4209680297 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.2/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.2/index.md @@ -29,9 +29,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.5/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.5/index.md index 411eb1c0ca..7bb6bebd69 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.6.5/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.6.5/index.md @@ -29,9 +29,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.0/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.0/index.md index fab3324cb2..df76d33144 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.0/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.0/index.md @@ -29,9 +29,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.1/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.1/index.md index 5749db8b0a..c7a2e44abb 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.1/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.1/index.md @@ -29,9 +29,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.4/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.4/index.md index 8442f49b23..093078720a 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.7.4/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.7.4/index.md @@ -29,9 +29,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.0/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.0/index.md index 28f951da2f..5c4063cc62 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.0/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.0/index.md @@ -29,9 +29,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.13/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.13/index.md index ff433d442f..d92c2e1707 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.13/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.13/index.md @@ -29,13 +29,13 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.13.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction/0.8.13.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbols/0.8.13.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbol/0.8.13.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.18/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.18/index.md index 1c8059c305..a905b6efd9 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.18/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.18/index.md @@ -29,13 +29,13 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.13.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction/0.8.13.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbols/0.8.13.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbol/0.8.13.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.19/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.19/index.md index 5cd8a9bcb4..361db5fd3c 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.19/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.19/index.md @@ -29,13 +29,13 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.19.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction/0.8.13.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbols/0.8.13.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbol/0.8.19.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-operator/0.8.19.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.22/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.22/index.md index eb965427ed..1ad2474de5 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.22/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.22/index.md @@ -29,13 +29,13 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-deconstruction/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.19.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction/0.8.13.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbols/0.8.13.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-deconstruction-symbol/0.8.19.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-operator/0.8.19.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.4/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.4/index.md index f9e0a0969c..2ef62f9067 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.4/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.4/index.md @@ -29,9 +29,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md" ### 1.5. Trivia diff --git a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.8/index.md b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.8/index.md index 63968acf6e..a8d417eb00 100644 --- a/crates/solidity/outputs/spec/generated/public/grammar/v0.8.8/index.md +++ b/crates/solidity/outputs/spec/generated/public/grammar/v0.8.8/index.md @@ -29,9 +29,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-directive/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/path-import/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/named-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbol/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbols/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/import-deconstruction-symbol/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md" ### 1.5. Trivia 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 e23efb2ed3..7bb104f74e 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 @@ -19,7 +19,7 @@ Tree: - LeadingTrivia (Rule): # 0..31 "// Empty imports are not valid\n" - SingleLineComment (Trivia): "// Empty imports are not valid" # 0..30 - ImportKeyword (Token): "import" # 31..37 - - DeconstructionImport (Rule): # 37..51 ' {} from "foo"' + - ImportDeconstruction (Rule): # 37..51 ' {} from "foo"' - OpenBrace (Token): "{" # 38..39 - SKIPPED (Token): "" # 39..39 - CloseBrace (Token): "}" # 39..40 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 9cd29e1ed5..403168a68d 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 @@ -8,18 +8,18 @@ Errors: [] Tree: - ImportDirective (Rule): # 0..45 'import { A1 as A2, B1, C1 as C2 } from "foo";' - ImportKeyword (Token): "import" # 0..6 - - DeconstructionImport (Rule): # 6..44 ' { A1 as A2, B1, C1 as C2 } from "foo"' + - ImportDeconstruction (Rule): # 6..44 ' { A1 as A2, B1, C1 as C2 } from "foo"' - OpenBrace (Token): "{" # 7..8 - - DeconstructionImportSymbols (Rule): # 8..31 " A1 as A2, B1, C1 as C2" - - DeconstructionImportSymbol (Rule): # 8..17 " A1 as A2" + - ImportDeconstructionSymbols (Rule): # 8..31 " A1 as A2, B1, C1 as C2" + - ImportDeconstructionSymbol (Rule): # 8..17 " A1 as A2" - Identifier (Token): "A1" # 9..11 - AsKeyword (Token): "as" # 12..14 - Identifier (Token): "A2" # 15..17 - Comma (Token): "," # 17..18 - - DeconstructionImportSymbol (Rule): # 18..21 " B1" + - ImportDeconstructionSymbol (Rule): # 18..21 " B1" - Identifier (Token): "B1" # 19..21 - Comma (Token): "," # 21..22 - - DeconstructionImportSymbol (Rule): # 22..31 " C1 as C2" + - ImportDeconstructionSymbol (Rule): # 22..31 " C1 as C2" - Identifier (Token): "C1" # 23..25 - AsKeyword (Token): "as" # 26..28 - Identifier (Token): "C2" # 29..31 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 177ef3b8b3..a0d8d7633c 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 @@ -8,10 +8,10 @@ Errors: [] Tree: - ImportDirective (Rule): # 0..29 'import { x as y } from "foo";' - ImportKeyword (Token): "import" # 0..6 - - DeconstructionImport (Rule): # 6..28 ' { x as y } from "foo"' + - ImportDeconstruction (Rule): # 6..28 ' { x as y } from "foo"' - OpenBrace (Token): "{" # 7..8 - - DeconstructionImportSymbols (Rule): # 8..15 " x as y" - - DeconstructionImportSymbol (Rule): # 8..15 " x as y" + - ImportDeconstructionSymbols (Rule): # 8..15 " x as y" + - ImportDeconstructionSymbol (Rule): # 8..15 " x as y" - Identifier (Token): "x" # 9..10 - AsKeyword (Token): "as" # 11..13 - Identifier (Token): "y" # 14..15 diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path/generated/0.4.11-failure.yml similarity index 90% rename from crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path/generated/0.4.11-failure.yml index 8b19b10df8..c9ed1a1286 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path/generated/0.4.11-failure.yml @@ -6,7 +6,7 @@ Source: > Errors: # 1 total - > Error: Expected end of file. - ╭─[crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path/input.sol:1:1] │ 1 │ foo.bar │ ───┬─── diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path/generated/0.8.13-success.yml b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path/generated/0.8.13-success.yml similarity index 87% rename from crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path/generated/0.8.13-success.yml rename to crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path/generated/0.8.13-success.yml index 745640ecda..add86874b4 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path/generated/0.8.13-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path/generated/0.8.13-success.yml @@ -6,7 +6,7 @@ Source: > Errors: [] Tree: - - UsingDirectiveSymbol (Rule): # 0..7 "foo.bar" + - UsingDeconstructionSymbol (Rule): # 0..7 "foo.bar" - IdentifierPath (Rule): # 0..7 "foo.bar" - Identifier (Token): "foo" # 0..3 - Period (Token): "." # 3..4 diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path/input.sol b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path/input.sol rename to crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path_as_operator/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/generated/0.4.11-failure.yml similarity index 89% rename from crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path_as_operator/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/generated/0.4.11-failure.yml index a035f715e0..0c08bb5973 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path_as_operator/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/generated/0.4.11-failure.yml @@ -6,7 +6,7 @@ Source: > Errors: # 1 total - > Error: Expected end of file. - ╭─[crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path_as_operator/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/input.sol:1:1] │ 1 │ foo.bar as / │ ──────┬───── diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/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 similarity index 84% rename from crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path_as_operator/generated/0.8.13-failure.yml rename to crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/generated/0.8.13-failure.yml index acafdfb3ec..058e7cfe58 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/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 @@ -6,7 +6,7 @@ Source: > Errors: # 1 total - > Error: Expected Period. - ╭─[crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path_as_operator/input.sol:1:8] + ╭─[crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/input.sol:1:8] │ 1 │ foo.bar as / │ ──┬── @@ -14,7 +14,7 @@ Errors: # 1 total ───╯ Tree: - - UsingDirectiveSymbol (Rule): # 0..12 "foo.bar as /" + - UsingDeconstructionSymbol (Rule): # 0..12 "foo.bar as /" - IdentifierPath (Rule): # 0..7 "foo.bar" - Identifier (Token): "foo" # 0..3 - Period (Token): "." # 3..4 diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/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 similarity index 88% rename from crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path_as_operator/generated/0.8.19-success.yml rename to crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/generated/0.8.19-success.yml index 4b629a2288..873462110c 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/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 @@ -6,7 +6,7 @@ Source: > Errors: [] Tree: - - UsingDirectiveSymbol (Rule): # 0..12 "foo.bar as /" + - UsingDeconstructionSymbol (Rule): # 0..12 "foo.bar as /" - IdentifierPath (Rule): # 0..7 "foo.bar" - Identifier (Token): "foo" # 0..3 - Period (Token): "." # 3..4 diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path_as_operator/input.sol b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/identifier_path_as_operator/input.sol rename to crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/identifier_path_as_operator/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id/generated/0.4.11-failure.yml similarity index 91% rename from crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id/generated/0.4.11-failure.yml index b446f82fa0..7e68562314 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id/generated/0.4.11-failure.yml @@ -6,7 +6,7 @@ Source: > Errors: # 1 total - > Error: Expected end of file. - ╭─[crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id/input.sol:1:1] │ 1 │ foo │ ─┬─ diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id/generated/0.8.13-success.yml b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id/generated/0.8.13-success.yml similarity index 85% rename from crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id/generated/0.8.13-success.yml rename to crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id/generated/0.8.13-success.yml index d24406c40d..368d990842 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id/generated/0.8.13-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id/generated/0.8.13-success.yml @@ -6,6 +6,6 @@ Source: > Errors: [] Tree: - - UsingDirectiveSymbol (Rule): # 0..3 "foo" + - UsingDeconstructionSymbol (Rule): # 0..3 "foo" - IdentifierPath (Rule): # 0..3 "foo" - Identifier (Token): "foo" # 0..3 diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id/input.sol b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id/input.sol rename to crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id_as_operator/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/generated/0.4.11-failure.yml similarity index 89% rename from crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id_as_operator/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/generated/0.4.11-failure.yml index bc5d88eef9..bf9071cfc2 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id_as_operator/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/generated/0.4.11-failure.yml @@ -6,7 +6,7 @@ Source: > Errors: # 1 total - > Error: Expected end of file. - ╭─[crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id_as_operator/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/input.sol:1:1] │ 1 │ foo as / │ ────┬─── diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/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 similarity index 83% rename from crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id_as_operator/generated/0.8.13-failure.yml rename to crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/generated/0.8.13-failure.yml index 8e056c58c5..fa420b9f8d 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/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 @@ -6,7 +6,7 @@ Source: > Errors: # 1 total - > Error: Expected Period. - ╭─[crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id_as_operator/input.sol:1:4] + ╭─[crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/input.sol:1:4] │ 1 │ foo as / │ ──┬── @@ -14,7 +14,7 @@ Errors: # 1 total ───╯ Tree: - - UsingDirectiveSymbol (Rule): # 0..8 "foo as /" + - UsingDeconstructionSymbol (Rule): # 0..8 "foo as /" - IdentifierPath (Rule): # 0..3 "foo" - Identifier (Token): "foo" # 0..3 - SKIPPED (Token): " as /" # 3..8 diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/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 similarity index 87% rename from crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id_as_operator/generated/0.8.19-success.yml rename to crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/generated/0.8.19-success.yml index 1a7220e058..fdbfbc2890 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/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 @@ -6,7 +6,7 @@ Source: > Errors: [] Tree: - - UsingDirectiveSymbol (Rule): # 0..8 "foo as /" + - UsingDeconstructionSymbol (Rule): # 0..8 "foo as /" - IdentifierPath (Rule): # 0..3 "foo" - Identifier (Token): "foo" # 0..3 - AsKeyword (Token): "as" # 4..6 diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id_as_operator/input.sol b/crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/UsingDirectiveSymbol/single_id_as_operator/input.sol rename to crates/solidity/testing/snapshots/cst_output/UsingDeconstructionSymbol/single_id_as_operator/input.sol 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 7e7fb01220..3ea734487c 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 @@ -19,7 +19,7 @@ Tree: - LeadingTrivia (Rule): # 0..41 "// Empty using symbols list is not valid\n" - SingleLineComment (Trivia): "// Empty using symbols list is not valid" # 0..40 - UsingKeyword (Token): "using" # 41..46 - - UsingDirectiveDeconstruction (Rule): # 46..49 " {}" + - UsingDeconstruction (Rule): # 46..49 " {}" - OpenBrace (Token): "{" # 47..48 - SKIPPED (Token): "" # 48..48 - CloseBrace (Token): "}" # 48..49 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 4cbcb288b6..83cf7e00ba 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 @@ -16,10 +16,10 @@ Errors: # 1 total Tree: - UsingDirective (Rule): # 0..52 "using {add as +, sub, mul, div as /} for Int globa..." - UsingKeyword (Token): "using" # 0..5 - - UsingDirectiveDeconstruction (Rule): # 5..36 " {add as +, sub, mul, div as /}" + - UsingDeconstruction (Rule): # 5..36 " {add as +, sub, mul, div as /}" - OpenBrace (Token): "{" # 6..7 - - UsingDirectiveSymbols (Rule): # 7..10 "add" - - UsingDirectiveSymbol (Rule): # 7..10 "add" + - UsingDeconstructionSymbols (Rule): # 7..10 "add" + - UsingDeconstructionSymbol (Rule): # 7..10 "add" - IdentifierPath (Rule): # 7..10 "add" - Identifier (Token): "add" # 7..10 - SKIPPED (Token): "as +, sub, mul, div as /" # 11..35 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 fa2b093757..c95720c406 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 @@ -8,24 +8,24 @@ Errors: [] Tree: - UsingDirective (Rule): # 0..52 "using {add as +, sub, mul, div as /} for Int globa..." - UsingKeyword (Token): "using" # 0..5 - - UsingDirectiveDeconstruction (Rule): # 5..36 " {add as +, sub, mul, div as /}" + - UsingDeconstruction (Rule): # 5..36 " {add as +, sub, mul, div as /}" - OpenBrace (Token): "{" # 6..7 - - UsingDirectiveSymbols (Rule): # 7..35 "add as +, sub, mul, div as /" - - UsingDirectiveSymbol (Rule): # 7..15 "add as +" + - UsingDeconstructionSymbols (Rule): # 7..35 "add as +, sub, mul, div as /" + - UsingDeconstructionSymbol (Rule): # 7..15 "add as +" - IdentifierPath (Rule): # 7..10 "add" - Identifier (Token): "add" # 7..10 - AsKeyword (Token): "as" # 11..13 - Plus (Token): "+" # 14..15 - Comma (Token): "," # 15..16 - - UsingDirectiveSymbol (Rule): # 16..20 " sub" + - UsingDeconstructionSymbol (Rule): # 16..20 " sub" - IdentifierPath (Rule): # 16..20 " sub" - Identifier (Token): "sub" # 17..20 - Comma (Token): "," # 20..21 - - UsingDirectiveSymbol (Rule): # 21..25 " mul" + - UsingDeconstructionSymbol (Rule): # 21..25 " mul" - IdentifierPath (Rule): # 21..25 " mul" - Identifier (Token): "mul" # 22..25 - Comma (Token): "," # 25..26 - - UsingDirectiveSymbol (Rule): # 26..35 " div as /" + - UsingDeconstructionSymbol (Rule): # 26..35 " div as /" - IdentifierPath (Rule): # 26..30 " div" - Identifier (Token): "div" # 27..30 - AsKeyword (Token): "as" # 31..33 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 47c196e7bf..cb007836a0 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 @@ -8,10 +8,10 @@ Errors: [] Tree: - UsingDirective (Rule): # 0..27 "using {add} for Int global;" - UsingKeyword (Token): "using" # 0..5 - - UsingDirectiveDeconstruction (Rule): # 5..11 " {add}" + - UsingDeconstruction (Rule): # 5..11 " {add}" - OpenBrace (Token): "{" # 6..7 - - UsingDirectiveSymbols (Rule): # 7..10 "add" - - UsingDirectiveSymbol (Rule): # 7..10 "add" + - UsingDeconstructionSymbols (Rule): # 7..10 "add" + - UsingDeconstructionSymbol (Rule): # 7..10 "add" - IdentifierPath (Rule): # 7..10 "add" - Identifier (Token): "add" # 7..10 - CloseBrace (Token): "}" # 10..11 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 e96fb96b7b..1ef9b4501a 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 @@ -16,10 +16,10 @@ Errors: # 1 total Tree: - UsingDirective (Rule): # 0..32 "using {div as /} for Int global;" - UsingKeyword (Token): "using" # 0..5 - - UsingDirectiveDeconstruction (Rule): # 5..16 " {div as /}" + - UsingDeconstruction (Rule): # 5..16 " {div as /}" - OpenBrace (Token): "{" # 6..7 - - UsingDirectiveSymbols (Rule): # 7..10 "div" - - UsingDirectiveSymbol (Rule): # 7..10 "div" + - UsingDeconstructionSymbols (Rule): # 7..10 "div" + - UsingDeconstructionSymbol (Rule): # 7..10 "div" - IdentifierPath (Rule): # 7..10 "div" - Identifier (Token): "div" # 7..10 - SKIPPED (Token): "as /" # 11..15 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 80e1bbc85a..846e36cea6 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 @@ -8,10 +8,10 @@ Errors: [] Tree: - UsingDirective (Rule): # 0..32 "using {div as /} for Int global;" - UsingKeyword (Token): "using" # 0..5 - - UsingDirectiveDeconstruction (Rule): # 5..16 " {div as /}" + - UsingDeconstruction (Rule): # 5..16 " {div as /}" - OpenBrace (Token): "{" # 6..7 - - UsingDirectiveSymbols (Rule): # 7..15 "div as /" - - UsingDirectiveSymbol (Rule): # 7..15 "div as /" + - UsingDeconstructionSymbols (Rule): # 7..15 "div as /" + - UsingDeconstructionSymbol (Rule): # 7..15 "div as /" - IdentifierPath (Rule): # 7..10 "div" - Identifier (Token): "div" # 7..10 - AsKeyword (Token): "as" # 11..13