From bea802f58f26c02c2dac55a60a30342d4888108e Mon Sep 17 00:00:00 2001 From: Igor Matuszewski Date: Mon, 20 Nov 2023 19:43:17 +0100 Subject: [PATCH 1/4] Backport a couple of added/removed grammar nodes from v2 to v0/v1 (#664) Part of #652 --- .../04-imports/productions.yml | 9 ++----- .../02-declaration-statements/productions.yml | 24 ++++++++----------- crates/solidity/inputs/language/src/dsl.rs | 10 ++++---- .../cargo/crate/src/generated/kinds.rs | 2 -- .../cargo/crate/src/generated/language.rs | 9 +------ .../outputs/npm/crate/src/generated/kinds.rs | 2 -- .../npm/crate/src/generated/language.rs | 9 +------ .../npm/package/src/generated/index.d.ts | 2 -- .../04-imports/using-directive/0.4.11.md | 2 +- .../04-imports/using-directive/0.8.13.md | 2 +- .../unversioned.md | 2 +- .../variable-declaration-type/0.4.11.md | 5 ++++ .../variable-declaration-type/0.5.0.md} | 4 ++-- .../variable-declaration/0.4.11.md | 5 ---- .../variable-declaration/0.5.0.md | 5 ---- .../generated/public/grammar/v0.4.11/index.md | 3 +-- .../generated/public/grammar/v0.4.21/index.md | 3 +-- .../generated/public/grammar/v0.4.22/index.md | 3 +-- .../generated/public/grammar/v0.5.0/index.md | 3 +-- .../generated/public/grammar/v0.5.3/index.md | 3 +-- .../generated/public/grammar/v0.6.0/index.md | 3 +-- .../generated/public/grammar/v0.6.11/index.md | 3 +-- .../generated/public/grammar/v0.6.2/index.md | 3 +-- .../generated/public/grammar/v0.6.5/index.md | 3 +-- .../generated/public/grammar/v0.7.0/index.md | 3 +-- .../generated/public/grammar/v0.7.1/index.md | 3 +-- .../generated/public/grammar/v0.7.4/index.md | 3 +-- .../generated/public/grammar/v0.8.0/index.md | 3 +-- .../generated/public/grammar/v0.8.13/index.md | 3 +-- .../generated/public/grammar/v0.8.18/index.md | 3 +-- .../generated/public/grammar/v0.8.19/index.md | 3 +-- .../generated/public/grammar/v0.8.22/index.md | 3 +-- .../generated/public/grammar/v0.8.4/index.md | 3 +-- .../generated/public/grammar/v0.8.8/index.md | 3 +-- .../generated/0.4.11-success.yml | 5 ++-- .../everything/generated/0.8.13-failure.yml | 5 ++-- .../everything/generated/0.8.22-success.yml | 5 ++-- .../generated/0.8.13-success.yml | 10 ++++---- .../path_named/generated/0.4.11-failure.yml | 5 ++-- .../path_named/generated/0.8.13-success.yml | 5 ++-- .../path_unnamed/generated/0.4.11-success.yml | 5 ++-- 41 files changed, 63 insertions(+), 126 deletions(-) create mode 100644 crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md rename crates/solidity/outputs/spec/generated/ebnf/{01-file-structure/04-imports/using-directive-path/unversioned.md => 04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md} (53%) delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.4.11.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md 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 00456cb5d2..755603087f 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 @@ -75,7 +75,7 @@ parser: sequence: - reference: "UsingKeyword" - - reference: "UsingDirectivePath" + - reference: "IdentifierPath" - reference: "ForKeyword" - choice: - reference: "Asterisk" @@ -89,7 +89,7 @@ sequence: - reference: "UsingKeyword" - choice: - - reference: "UsingDirectivePath" + - reference: "IdentifierPath" - reference: "UsingDirectiveDeconstruction" - reference: "ForKeyword" - choice: @@ -100,11 +100,6 @@ terminator: reference: "Semicolon" -- name: "UsingDirectivePath" - kind: "Parser" - unversioned: - reference: "IdentifierPath" - - name: "UsingDirectiveDeconstruction" kind: "Parser" versioned: diff --git a/crates/solidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml b/crates/solidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml index 5510916ed4..2371ffc86b 100644 --- a/crates/solidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml +++ b/crates/solidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml @@ -49,7 +49,10 @@ terminatedBy: parser: sequence: - - reference: "VariableDeclaration" + - reference: "VariableDeclarationType" + - optional: + reference: "DataLocation" + - reference: "Identifier" - optional: sequence: - reference: "Equal" @@ -57,24 +60,17 @@ terminator: reference: "Semicolon" -- name: "VariableDeclaration" +- name: "VariableDeclarationType" kind: "Parser" + inlined: true versioned: 0.4.11: - sequence: - - choice: - - reference: "VarKeyword" - - reference: "TypeName" - - optional: - reference: "DataLocation" - - reference: "Identifier" + choice: + - reference: "VarKeyword" + - reference: "TypeName" 0.5.0: # removed "VarKeyword" - sequence: - - reference: "TypeName" - - optional: - reference: "DataLocation" - - reference: "Identifier" + reference: "TypeName" - name: "DataLocation" kind: "Parser" diff --git a/crates/solidity/inputs/language/src/dsl.rs b/crates/solidity/inputs/language/src/dsl.rs index 26c658439f..302b13573f 100644 --- a/crates/solidity/inputs/language/src/dsl.rs +++ b/crates/solidity/inputs/language/src/dsl.rs @@ -550,7 +550,7 @@ slang_grammar! { parser UserDefinedValueTypeDefinition = { introduced in "0.8.8" ((TypeKeyword Identifier IsKeyword ElementaryType) terminated by Semicolon) } ; - parser UsingDirective = ((UsingKeyword (UsingDirectivePath | UsingDirectiveDeconstruction) ForKeyword (Asterisk | TypeName) ({ introduced in "0.8.13" GlobalKeyword } ?)) terminated by Semicolon) ; + parser UsingDirective = ((UsingKeyword (IdentifierPath | UsingDirectiveDeconstruction) ForKeyword (Asterisk | TypeName) ({ introduced in "0.8.13" GlobalKeyword } ?)) terminated by Semicolon) ; parser UsingDirectiveDeconstruction = { introduced in "0.8.13" (UsingDirectiveSymbolsList delimited by OpenBrace and CloseBrace) }; @@ -558,17 +558,15 @@ slang_grammar! { introduced in "0.8.19" (Ampersand | Asterisk | BangEqual | Bar | Caret | EqualEqual | GreaterThan | GreaterThanEqual | LessThan | LessThanEqual | Minus | Percent | Plus | Slash | Tilde) } ; - parser UsingDirectivePath = IdentifierPath ; - parser UsingDirectiveSymbol = { introduced in "0.8.13" (IdentifierPath { introduced in "0.8.19" ((AsKeyword UsingDirectiveOperator) ?) } ) } ; parser UsingDirectiveSymbolsList = (UsingDirectiveSymbol separated by Comma) ; - parser VariableDeclaration = ( - ({ removed in "0.5.0" VarKeyword } | TypeName) (DataLocation ?) Identifier - ) ; + parser VariableDeclaration = (VariableDeclarationType (DataLocation ?) Identifier) ; + + inline parser VariableDeclarationType = ({ removed in "0.5.0" VarKeyword } | TypeName) ; parser VariableDeclarationStatement = ((VariableDeclaration ((Equal Expression) ?)) terminated by Semicolon) ; diff --git a/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs b/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs index 143e1306a9..3eab6c6c27 100644 --- a/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs +++ b/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs @@ -128,7 +128,6 @@ pub enum ProductionKind { UserDefinedValueTypeDefinition, UsingDirective, UsingDirectiveDeconstruction, - UsingDirectivePath, UsingDirectiveSymbol, UsingDirectiveSymbolsList, VariableDeclaration, @@ -293,7 +292,6 @@ pub enum RuleKind { UserDefinedValueTypeDefinition, UsingDirective, UsingDirectiveDeconstruction, - UsingDirectivePath, UsingDirectiveSymbol, UsingDirectiveSymbolsList, VariableDeclaration, diff --git a/crates/solidity/outputs/cargo/crate/src/generated/language.rs b/crates/solidity/outputs/cargo/crate/src/generated/language.rs index f0310d5894..3740bf1e1d 100644 --- a/crates/solidity/outputs/cargo/crate/src/generated/language.rs +++ b/crates/solidity/outputs/cargo/crate/src/generated/language.rs @@ -4369,7 +4369,7 @@ impl Language { TokenKind::UsingKeyword, ))?; seq.elem(ChoiceHelper::run(input, |mut choice, input| { - let result = self.using_directive_path(input); + let result = self.identifier_path(input); choice.consider(input, result)?; let result = self.using_directive_deconstruction(input); choice.consider(input, result)?; @@ -4446,12 +4446,6 @@ impl Language { .with_kind(RuleKind::UsingDirectiveDeconstruction) } - #[allow(unused_assignments, unused_parens)] - fn using_directive_path(&self, input: &mut ParserContext) -> ParserResult { - self.identifier_path(input) - .with_kind(RuleKind::UsingDirectivePath) - } - #[allow(unused_assignments, unused_parens)] fn using_directive_symbol(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_8_13 { @@ -6120,7 +6114,6 @@ impl Language { ProductionKind::UsingDirectiveDeconstruction => { Self::using_directive_deconstruction.parse(self, input) } - ProductionKind::UsingDirectivePath => Self::using_directive_path.parse(self, input), ProductionKind::UsingDirectiveSymbol => Self::using_directive_symbol.parse(self, input), ProductionKind::UsingDirectiveSymbolsList => { Self::using_directive_symbols_list.parse(self, input) diff --git a/crates/solidity/outputs/npm/crate/src/generated/kinds.rs b/crates/solidity/outputs/npm/crate/src/generated/kinds.rs index 143e1306a9..3eab6c6c27 100644 --- a/crates/solidity/outputs/npm/crate/src/generated/kinds.rs +++ b/crates/solidity/outputs/npm/crate/src/generated/kinds.rs @@ -128,7 +128,6 @@ pub enum ProductionKind { UserDefinedValueTypeDefinition, UsingDirective, UsingDirectiveDeconstruction, - UsingDirectivePath, UsingDirectiveSymbol, UsingDirectiveSymbolsList, VariableDeclaration, @@ -293,7 +292,6 @@ pub enum RuleKind { UserDefinedValueTypeDefinition, UsingDirective, UsingDirectiveDeconstruction, - UsingDirectivePath, UsingDirectiveSymbol, UsingDirectiveSymbolsList, VariableDeclaration, diff --git a/crates/solidity/outputs/npm/crate/src/generated/language.rs b/crates/solidity/outputs/npm/crate/src/generated/language.rs index f0310d5894..3740bf1e1d 100644 --- a/crates/solidity/outputs/npm/crate/src/generated/language.rs +++ b/crates/solidity/outputs/npm/crate/src/generated/language.rs @@ -4369,7 +4369,7 @@ impl Language { TokenKind::UsingKeyword, ))?; seq.elem(ChoiceHelper::run(input, |mut choice, input| { - let result = self.using_directive_path(input); + let result = self.identifier_path(input); choice.consider(input, result)?; let result = self.using_directive_deconstruction(input); choice.consider(input, result)?; @@ -4446,12 +4446,6 @@ impl Language { .with_kind(RuleKind::UsingDirectiveDeconstruction) } - #[allow(unused_assignments, unused_parens)] - fn using_directive_path(&self, input: &mut ParserContext) -> ParserResult { - self.identifier_path(input) - .with_kind(RuleKind::UsingDirectivePath) - } - #[allow(unused_assignments, unused_parens)] fn using_directive_symbol(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_8_13 { @@ -6120,7 +6114,6 @@ impl Language { ProductionKind::UsingDirectiveDeconstruction => { Self::using_directive_deconstruction.parse(self, input) } - ProductionKind::UsingDirectivePath => Self::using_directive_path.parse(self, input), ProductionKind::UsingDirectiveSymbol => Self::using_directive_symbol.parse(self, input), ProductionKind::UsingDirectiveSymbolsList => { Self::using_directive_symbols_list.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 2d0f793da6..ea08a08ceb 100644 --- a/crates/solidity/outputs/npm/package/src/generated/index.d.ts +++ b/crates/solidity/outputs/npm/package/src/generated/index.d.ts @@ -123,7 +123,6 @@ export namespace kinds { UserDefinedValueTypeDefinition = "UserDefinedValueTypeDefinition", UsingDirective = "UsingDirective", UsingDirectiveDeconstruction = "UsingDirectiveDeconstruction", - UsingDirectivePath = "UsingDirectivePath", UsingDirectiveSymbol = "UsingDirectiveSymbol", UsingDirectiveSymbolsList = "UsingDirectiveSymbolsList", VariableDeclaration = "VariableDeclaration", @@ -274,7 +273,6 @@ export namespace kinds { UserDefinedValueTypeDefinition = "UserDefinedValueTypeDefinition", UsingDirective = "UsingDirective", UsingDirectiveDeconstruction = "UsingDirectiveDeconstruction", - UsingDirectivePath = "UsingDirectivePath", UsingDirectiveSymbol = "UsingDirectiveSymbol", UsingDirectiveSymbolsList = "UsingDirectiveSymbolsList", VariableDeclaration = "VariableDeclaration", diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md index e96aac0233..2201d6c85d 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive/0.4.11.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #UsingDirective } -UsingDirective = USING_KEYWORD UsingDirectivePath FOR_KEYWORD (ASTERISK | TypeName) SEMICOLON; +UsingDirective = USING_KEYWORD IdentifierPath FOR_KEYWORD (ASTERISK | TypeName) SEMICOLON; ``` 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 c175e6eeaa..138c41fd7c 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 (UsingDirectivePath | UsingDirectiveDeconstruction) FOR_KEYWORD (ASTERISK | TypeName) GLOBAL_KEYWORD? SEMICOLON; +UsingDirective = USING_KEYWORD (IdentifierPath | UsingDirectiveDeconstruction) FOR_KEYWORD (ASTERISK | TypeName) GLOBAL_KEYWORD? SEMICOLON; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md index a9258168c4..440bbdde95 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #VariableDeclarationStatement } -VariableDeclarationStatement = VariableDeclaration (EQUAL Expression)? SEMICOLON; +VariableDeclarationStatement = «VariableDeclarationType» «DataLocation»? IDENTIFIER (EQUAL Expression)? SEMICOLON; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md new file mode 100644 index 0000000000..19c3378283 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #VariableDeclarationType } +«VariableDeclarationType» = VAR_KEYWORD | TypeName; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md similarity index 53% rename from crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md rename to crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md index c44b7e4ca7..cb639085eb 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md @@ -1,5 +1,5 @@ -```{ .ebnf .slang-ebnf #UsingDirectivePath } -UsingDirectivePath = IdentifierPath; +```{ .ebnf .slang-ebnf #VariableDeclarationType } +«VariableDeclarationType» = TypeName; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.4.11.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.4.11.md deleted file mode 100644 index fa67b4c739..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.4.11.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #VariableDeclaration } -VariableDeclaration = (VAR_KEYWORD | TypeName) «DataLocation»? IDENTIFIER; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md deleted file mode 100644 index db64d0dd38..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #VariableDeclaration } -VariableDeclaration = TypeName «DataLocation»? IDENTIFIER; -``` 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 8b4438ed52..a40054ea0e 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md" ### 1.5. Trivia @@ -276,7 +275,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.4.11.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.4.11.md" ### 4.3. Control Statements 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 241595cea0..7d34ed0bba 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md" ### 1.5. Trivia @@ -277,7 +276,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.4.11.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.4.11.md" ### 4.3. Control Statements 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 e49026840a..2eb20eea6e 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md" ### 1.5. Trivia @@ -281,7 +280,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.4.11.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.4.11.md" ### 4.3. Control Statements 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 d992fb3670..785ff2ea5b 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md" ### 1.5. Trivia @@ -279,7 +278,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements 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 7ad073d643..ee62644955 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md" ### 1.5. Trivia @@ -280,7 +279,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements 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 bf59df9831..3b938f5ffb 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md" ### 1.5. Trivia @@ -288,7 +287,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements 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 72553b031a..73069e0636 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md" ### 1.5. Trivia @@ -290,7 +289,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements 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 ce322bc9d2..d9f5a9d8d5 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md" ### 1.5. Trivia @@ -288,7 +287,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements 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 19c2a166a3..bf95f4acb4 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md" ### 1.5. Trivia @@ -289,7 +288,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements 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 a7837a750f..ef40192e5c 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md" ### 1.5. Trivia @@ -288,7 +287,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements 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 47c602f270..ebd93bcc37 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md" ### 1.5. Trivia @@ -288,7 +287,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements 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 0f6beaade4..3e11a49229 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md" ### 1.5. Trivia @@ -292,7 +291,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements 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 faa76ddf35..d0b33770ab 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md" ### 1.5. Trivia @@ -293,7 +292,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements 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 8e78d6c022..0f9b72f178 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.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-list/0.8.13.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.13.md" @@ -310,7 +309,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements 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 ec48238014..a14c6ec90d 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.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-list/0.8.13.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.13.md" @@ -310,7 +309,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements 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 454fa972d6..bb3c49ceac 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.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-list/0.8.13.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.19.md" @@ -311,7 +310,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements 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 6db1521640..97ac274167 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.8.13.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.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-list/0.8.13.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbol/0.8.19.md" @@ -311,7 +310,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements 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 3026fb4682..3c8ff21e10 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md" ### 1.5. Trivia @@ -302,7 +301,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements 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 e543651f3d..a106d0b93d 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 @@ -33,7 +33,6 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/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/using-directive/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-path/unversioned.md" ### 1.5. Trivia @@ -306,7 +305,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration/0.5.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/data-location/0.5.0.md" ### 4.3. Control Statements diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml index 157803ac80..37687b71fd 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml @@ -15,9 +15,8 @@ Tree: - ContractMembersList (Rule): # 18..35 " using x for *;\n" - UsingDirective (Rule): # 18..35 " using x for *;\n" - UsingKeyword (Token): "using" # 20..25 - - UsingDirectivePath (Rule): # 25..27 " x" - - IdentifierPath (Rule): # 25..27 " x" - - Identifier (Token): "x" # 26..27 + - IdentifierPath (Rule): # 25..27 " x" + - Identifier (Token): "x" # 26..27 - ForKeyword (Token): "for" # 28..31 - Asterisk (Token): "*" # 32..33 - Semicolon (Token): ";" # 33..34 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml index 24a7c853a4..0262b08709 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml @@ -60,9 +60,8 @@ Tree: - Semicolon (Token): ";" # 40..41 - UsingDirective (Rule): # 42..58 "\nusing A for B;\n" - UsingKeyword (Token): "using" # 43..48 - - UsingDirectivePath (Rule): # 48..50 " A" - - IdentifierPath (Rule): # 48..50 " A" - - Identifier (Token): "A" # 49..50 + - IdentifierPath (Rule): # 48..50 " A" + - Identifier (Token): "A" # 49..50 - ForKeyword (Token): "for" # 51..54 - TypeName (Rule): # 54..56 " B" - IdentifierPath (Rule): # 54..56 " B" diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml index 666ca12442..01121b182a 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml @@ -52,9 +52,8 @@ Tree: - Semicolon (Token): ";" # 40..41 - UsingDirective (Rule): # 42..58 "\nusing A for B;\n" - UsingKeyword (Token): "using" # 43..48 - - UsingDirectivePath (Rule): # 48..50 " A" - - IdentifierPath (Rule): # 48..50 " A" - - Identifier (Token): "A" # 49..50 + - IdentifierPath (Rule): # 48..50 " A" + - Identifier (Token): "A" # 49..50 - ForKeyword (Token): "for" # 51..54 - TypeName (Rule): # 54..56 " B" - IdentifierPath (Rule): # 54..56 " B" diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml index 29a05d2130..c7dd8b6d9b 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml @@ -50,9 +50,8 @@ Tree: - Semicolon (Token): ";" # 54..55 - UsingDirective (Rule): # 56..98 "\nusing EnvelopeUtils for Envelope global;\n" - UsingKeyword (Token): "using" # 57..62 - - UsingDirectivePath (Rule): # 62..76 " EnvelopeUtils" - - IdentifierPath (Rule): # 62..76 " EnvelopeUtils" - - Identifier (Token): "EnvelopeUtils" # 63..76 + - IdentifierPath (Rule): # 62..76 " EnvelopeUtils" + - Identifier (Token): "EnvelopeUtils" # 63..76 - ForKeyword (Token): "for" # 77..80 - TypeName (Rule): # 80..89 " Envelope" - IdentifierPath (Rule): # 80..89 " Envelope" @@ -61,9 +60,8 @@ Tree: - Semicolon (Token): ";" # 96..97 - UsingDirective (Rule): # 98..145 "using TransactionUtils for Transaction global;\n" - UsingKeyword (Token): "using" # 98..103 - - UsingDirectivePath (Rule): # 103..120 " TransactionUtils" - - IdentifierPath (Rule): # 103..120 " TransactionUtils" - - Identifier (Token): "TransactionUtils" # 104..120 + - IdentifierPath (Rule): # 103..120 " TransactionUtils" + - Identifier (Token): "TransactionUtils" # 104..120 - ForKeyword (Token): "for" # 121..124 - TypeName (Rule): # 124..136 " Transaction" - IdentifierPath (Rule): # 124..136 " Transaction" diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml index d4a79bcd2d..018c4d3271 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.4.11-failure.yml @@ -16,9 +16,8 @@ Errors: # 1 total Tree: - UsingDirective (Rule): # 0..25 "using foo for bar global;" - UsingKeyword (Token): "using" # 0..5 - - UsingDirectivePath (Rule): # 5..9 " foo" - - IdentifierPath (Rule): # 5..9 " foo" - - Identifier (Token): "foo" # 6..9 + - IdentifierPath (Rule): # 5..9 " foo" + - Identifier (Token): "foo" # 6..9 - ForKeyword (Token): "for" # 10..13 - TypeName (Rule): # 13..17 " bar" - IdentifierPath (Rule): # 13..17 " bar" diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.8.13-success.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.8.13-success.yml index 2bfac291a4..89d625eca2 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.8.13-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_named/generated/0.8.13-success.yml @@ -8,9 +8,8 @@ Errors: [] Tree: - UsingDirective (Rule): # 0..25 "using foo for bar global;" - UsingKeyword (Token): "using" # 0..5 - - UsingDirectivePath (Rule): # 5..9 " foo" - - IdentifierPath (Rule): # 5..9 " foo" - - Identifier (Token): "foo" # 6..9 + - IdentifierPath (Rule): # 5..9 " foo" + - Identifier (Token): "foo" # 6..9 - ForKeyword (Token): "for" # 10..13 - TypeName (Rule): # 13..17 " bar" - IdentifierPath (Rule): # 13..17 " bar" diff --git a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_unnamed/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_unnamed/generated/0.4.11-success.yml index c94ba36a51..87bf1887eb 100644 --- a/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_unnamed/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UsingDirective/path_unnamed/generated/0.4.11-success.yml @@ -8,9 +8,8 @@ Errors: [] Tree: - UsingDirective (Rule): # 0..16 "using foo for *;" - UsingKeyword (Token): "using" # 0..5 - - UsingDirectivePath (Rule): # 5..9 " foo" - - IdentifierPath (Rule): # 5..9 " foo" - - Identifier (Token): "foo" # 6..9 + - IdentifierPath (Rule): # 5..9 " foo" + - Identifier (Token): "foo" # 6..9 - ForKeyword (Token): "for" # 10..13 - Asterisk (Token): "*" # 14..15 - Semicolon (Token): ";" # 15..16 From 9702899164f0540a49f2e0f7f19d82fbd04b1d1b Mon Sep 17 00:00:00 2001 From: Igor Matuszewski Date: Mon, 20 Nov 2023 20:01:51 +0100 Subject: [PATCH 2/4] Drop List suffix from some repeated nodes in v0/v1 (#660) Part of #652 --- .changeset/little-berries-approve.md | 5 + .../02-source-unit/productions.yml | 4 +- .../03-pragmas/productions.yml | 4 +- .../04-imports/productions.yml | 8 +- .../01-contracts/productions.yml | 10 +- .../02-interfaces/productions.yml | 4 +- .../03-libraries/productions.yml | 4 +- .../02-definitions/04-structs/productions.yml | 4 +- .../02-definitions/05-enums/productions.yml | 11 +- .../07-state-variables/productions.yml | 4 +- .../08-functions/productions.yml | 35 +- .../09-modifiers/productions.yml | 4 +- .../02-definitions/10-events/productions.yml | 4 +- .../02-definitions/12-errors/productions.yml | 4 +- .../01-advanced-types/productions.yml | 4 +- .../04-statements/01-blocks/productions.yml | 4 +- .../02-declaration-statements/productions.yml | 4 +- .../04-error-handling/productions.yml | 4 +- .../02-function-calls/productions.yml | 8 +- .../03-primary-expressions/productions.yml | 8 +- .../05-expressions/05-strings/productions.yml | 18 +- .../06-identifiers/productions.yml | 18 - .../06-yul/01-assembly-block/productions.yml | 4 +- .../06-yul/02-yul-statements/productions.yml | 16 +- .../06-yul/03-yul-expressions/productions.yml | 24 +- crates/solidity/inputs/language/src/dsl.rs | 152 ++--- .../cargo/crate/src/generated/kinds.rs | 152 ++--- .../cargo/crate/src/generated/language.rs | 570 +++++++++--------- ...LiteralsList.rs => AsciiStringLiterals.rs} | 6 +- ...tractMembersList.rs => ContractMembers.rs} | 8 +- ...ngLiteralsList.rs => HexStringLiterals.rs} | 23 +- .../{StatementsList.rs => Statements.rs} | 2 +- ...teralsList.rs => UnicodeStringLiterals.rs} | 6 +- .../tests/src/cst_output/generated/mod.rs | 10 +- .../outputs/npm/crate/src/generated/kinds.rs | 152 ++--- .../npm/crate/src/generated/language.rs | 570 +++++++++--------- .../npm/package/src/generated/index.d.ts | 152 ++--- .../outputs/npm/tests/src/tests/cst-cursor.ts | 2 +- .../outputs/npm/tests/src/tests/cst-output.ts | 6 +- .../source-unit-members}/unversioned.md | 4 +- .../02-source-unit/source-unit/unversioned.md | 2 +- .../version-pragma-expressions/unversioned.md | 5 + .../03-pragmas/version-pragma/unversioned.md | 2 +- .../unversioned.md | 5 - .../unversioned.md | 5 + .../deconstruction-import/unversioned.md | 2 +- .../using-directive-deconstruction/0.8.13.md | 2 +- .../using-directive-symbols-list/0.8.13.md | 5 - .../using-directive-symbols/0.8.13.md} | 4 +- .../contract-definition/0.4.11.md | 2 +- .../01-contracts/contract-definition/0.6.0.md | 2 +- .../contract-members}/unversioned.md | 4 +- .../inheritance-specifier/unversioned.md | 2 +- .../inheritance-types-list/unversioned.md | 5 - .../inheritance-types/unversioned.md | 5 + .../interface-definition/unversioned.md | 2 +- .../interface-members}/unversioned.md | 4 +- .../library-definition/unversioned.md | 2 +- .../library-members}/unversioned.md | 4 +- .../struct-definition/unversioned.md | 2 +- .../04-structs/struct-members}/unversioned.md | 4 +- .../05-enums/enum-definition/unversioned.md | 2 +- .../05-enums/enum-members/unversioned.md | 5 + .../unversioned.md | 5 - .../state-variable-attributes/unversioned.md | 5 + .../state-variable-definition/unversioned.md | 2 +- .../constructor-attributes-list/0.4.22.md | 5 - .../constructor-attributes/0.4.22.md | 5 + .../constructor-definition/0.4.22.md | 2 +- .../0.6.0.md | 5 - .../fallback-function-attributes/0.6.0.md | 5 + .../fallback-function-definition/0.6.0.md | 2 +- .../function-attributes-list/unversioned.md | 5 - .../function-attributes}/unversioned.md | 4 +- .../function-definition/unversioned.md | 2 +- .../override-paths}/unversioned.md | 4 +- .../override-specifier/unversioned.md | 2 +- .../parameters-declaration/unversioned.md | 2 +- .../08-functions/parameters/unversioned.md | 5 + .../receive-function-attributes-list/0.6.0.md | 5 - .../receive-function-attributes/0.6.0.md | 5 + .../receive-function-definition/0.6.0.md | 2 +- .../0.4.11.md | 5 - .../unnamed-function-attributes/0.4.11.md | 5 + .../unnamed-function-definition/0.4.11.md | 2 +- .../modifier-attributes-list/unversioned.md | 5 - .../modifier-attributes/unversioned.md | 5 + .../modifier-definition/unversioned.md | 2 +- .../unversioned.md | 2 +- .../event-parameters-list/unversioned.md | 5 - .../10-events/event-parameters/unversioned.md | 5 + .../error-parameters-declaration/0.8.4.md | 2 +- .../12-errors/error-parameters-list/0.8.4.md | 5 - .../12-errors/error-parameters/0.8.4.md | 5 + .../unversioned.md | 5 - .../function-type-attributes/unversioned.md | 5 + .../function-type/unversioned.md | 2 +- .../01-blocks/block/unversioned.md | 2 +- .../01-blocks/statements/unversioned.md | 5 + .../unversioned.md | 2 +- .../tuple-members-list/unversioned.md | 5 - .../tuple-members}/unversioned.md | 4 +- .../0.6.0.md | 4 +- .../04-error-handling/try-statement/0.6.0.md | 2 +- .../arguments-declaration/unversioned.md | 2 +- .../unversioned.md | 2 +- .../named-arguments-list/unversioned.md | 5 - .../named-arguments/unversioned.md | 5 + .../positional-arguments-list/unversioned.md | 5 - .../positional-arguments/unversioned.md | 5 + .../array-expression/unversioned.md | 2 +- .../array-values-list/unversioned.md | 5 - .../array-values/unversioned.md | 5 + .../tuple-expression/unversioned.md | 2 +- .../tuple-values-list/unversioned.md | 5 - .../tuple-values/unversioned.md | 5 + .../ascii-string-literals-list/unversioned.md | 5 - .../ascii-string-literals}/unversioned.md | 4 +- .../hex-string-literals-list/unversioned.md | 5 - .../hex-string-literals/unversioned.md | 5 + .../05-strings/string-expression/0.4.11.md | 2 +- .../05-strings/string-expression/0.7.0.md | 6 +- .../unicode-string-literals-list/0.7.0.md | 5 - .../unicode-string-literals/0.7.0.md | 5 + .../identifier-paths-list/unversioned.md | 5 - .../identifiers-list/unversioned.md | 5 - .../assembly-flags-declaration/unversioned.md | 2 +- .../assembly-flags-list/unversioned.md | 5 - .../assembly-flags/unversioned.md | 5 + .../yul-assignment-statement/unversioned.md | 2 +- .../yul-block/unversioned.md | 2 +- .../yul-declaration-statement/unversioned.md | 2 +- .../yul-parameters-declaration/unversioned.md | 2 +- .../yul-returns-declaration/unversioned.md | 2 +- .../yul-statements/unversioned.md | 5 + .../yul-switch-cases/unversioned.md | 5 + .../yul-switch-statement/unversioned.md | 2 +- .../yul-arguments/unversioned.md | 5 + .../yul-expressions-list/unversioned.md | 5 - .../yul-function-call-operator/unversioned.md | 2 +- .../yul-identifier-paths-list/unversioned.md | 5 - .../yul-identifier-paths/unversioned.md | 5 + .../yul-identifiers-list/unversioned.md | 5 - .../yul-identifiers/unversioned.md | 5 + .../generated/public/grammar/v0.4.11/index.md | 62 +- .../generated/public/grammar/v0.4.21/index.md | 62 +- .../generated/public/grammar/v0.4.22/index.md | 64 +- .../generated/public/grammar/v0.5.0/index.md | 64 +- .../generated/public/grammar/v0.5.3/index.md | 64 +- .../generated/public/grammar/v0.6.0/index.md | 68 +-- .../generated/public/grammar/v0.6.11/index.md | 68 +-- .../generated/public/grammar/v0.6.2/index.md | 68 +-- .../generated/public/grammar/v0.6.5/index.md | 68 +-- .../generated/public/grammar/v0.7.0/index.md | 70 +-- .../generated/public/grammar/v0.7.1/index.md | 70 +-- .../generated/public/grammar/v0.7.4/index.md | 70 +-- .../generated/public/grammar/v0.8.0/index.md | 70 +-- .../generated/public/grammar/v0.8.13/index.md | 74 +-- .../generated/public/grammar/v0.8.18/index.md | 74 +-- .../generated/public/grammar/v0.8.19/index.md | 74 +-- .../generated/public/grammar/v0.8.22/index.md | 74 +-- .../generated/public/grammar/v0.8.4/index.md | 72 +-- .../generated/public/grammar/v0.8.8/index.md | 72 +-- .../multiple/generated/0.4.11-success.yml | 2 +- .../multiple/input.sol | 0 .../single/generated/0.4.11-success.yml | 2 +- .../single/input.sol | 0 .../generated/0.4.11-failure.yml | 4 +- .../single_trailing_ident/input.sol | 0 .../simple/generated/0.4.11-success.yml | 2 +- .../unchecked/generated/0.4.11-failure.yml | 2 +- .../unchecked/generated/0.8.0-success.yml | 4 +- .../generated/0.4.11-failure.yml | 20 +- .../generated/0.6.2-success.yml | 26 +- .../generated/0.4.11-success.yml | 4 +- .../generated/0.4.11-failure.yml | 2 +- .../generated/0.4.22-success.yml | 4 +- .../generated/0.4.11-success.yml | 4 +- .../generated/0.4.11-failure.yml | 2 +- .../generated/0.8.4-success.yml | 2 +- .../generated/0.4.11-success.yml | 4 +- .../generated/0.4.11-failure.yml | 2 +- .../generated/0.6.0-success.yml | 2 +- .../generated/0.4.11-success.yml | 6 +- .../generated/0.4.11-success.yml | 4 +- .../generated/0.4.11-failure.yml | 2 +- .../generated/0.6.0-success.yml | 2 +- .../generated/0.4.11-success.yml | 4 +- .../generated/0.4.11-success.yml | 4 +- .../generated/0.4.11-success.yml | 2 +- .../generated/0.6.0-failure.yml | 2 +- .../generated/0.6.5-failure.yml | 2 +- .../generated/0.4.11-success.yml | 4 +- .../generated/0.6.0-failure.yml | 4 +- .../generated/0.6.5-failure.yml | 4 +- .../generated/0.8.8-success.yml | 2 +- .../generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-failure.yml | 2 +- .../generated/0.6.5-failure.yml | 2 +- .../generated/0.4.11-failure.yml | 12 +- .../generated/0.5.0-failure.yml | 12 +- .../generated/0.5.3-failure.yml | 12 +- .../generated/0.6.0-failure.yml | 12 +- .../generated/0.7.0-failure.yml | 12 +- .../generated/0.8.0-failure.yml | 14 +- .../constructor/generated/0.4.11-failure.yml | 4 +- .../constructor/generated/0.4.22-success.yml | 4 +- .../constructor/input.sol | 0 .../generated/0.4.11-success.yml | 4 +- .../local_expression/input.sol | 0 .../generated/0.4.11-failure.yml | 14 +- .../generated/0.4.21-failure.yml | 14 +- .../generated/0.5.0-failure.yml | 14 +- .../generated/0.5.3-failure.yml | 14 +- .../generated/0.6.0-failure.yml | 14 +- .../generated/0.7.0-failure.yml | 14 +- .../generated/0.8.0-failure.yml | 14 +- .../generated/0.8.4-failure.yml | 14 +- .../mismatched_delimiter/input.sol | 0 .../generated/0.4.11-failure.yml | 40 +- .../generated/0.5.0-failure.yml | 40 +- .../generated/0.6.2-failure.yml | 48 +- .../generated/0.7.0-failure.yml | 48 +- .../generated/0.8.0-failure.yml | 48 +- .../separated_recovery/input.sol | 0 .../generated/0.4.11-success.yml | 2 +- .../transfer/generated/0.4.11-failure.yml | 2 +- .../address_call/generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-success.yml | 4 +- .../generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-success.yml | 2 +- .../generated/0.6.2-success.yml | 6 +- .../generated/0.6.2-success.yml | 8 +- .../generated/0.4.11-success.yml | 2 +- .../payable_call/generated/0.4.11-success.yml | 2 +- .../generated/0.7.0-success.yml | 2 +- .../generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-failure.yml | 6 +- .../generated/0.4.11-success.yml | 2 +- .../all_separated_pairs/input.sol | 0 .../generated/0.4.11-failure.yml | 2 +- .../invalid_consecutive_separators/input.sol | 0 .../generated/0.4.11-failure.yml | 2 +- .../invalid_leading_separator/input.sol | 0 .../generated/0.4.11-failure.yml | 2 +- .../input.sol | 0 .../generated/0.4.11-failure.yml | 2 +- .../invalid_trailing_separator/input.sol | 0 .../multiple/generated/0.4.11-success.yml | 2 +- .../multiple/input.sol | 0 .../generated/0.4.11-success.yml | 2 +- .../no_separators/input.sol | 0 .../single/generated/0.4.11-success.yml | 2 +- .../single/input.sol | 0 .../generated/0.4.11-failure.yml | 4 +- .../single_trailing_ident/input.sol | 0 .../generated/0.4.11-success.yml | 2 +- .../some_separated_pairs/input.sol | 0 .../generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-success.yml | 8 +- .../version/generated/0.4.11-success.yml | 2 +- .../SafeMath/generated/0.4.11-failure.yml | 12 +- .../SafeMath/generated/0.5.0-failure.yml | 10 +- .../SafeMath/generated/0.5.3-failure.yml | 10 +- .../SafeMath/generated/0.6.0-failure.yml | 10 +- .../SafeMath/generated/0.7.0-failure.yml | 10 +- .../SafeMath/generated/0.8.0-success.yml | 18 +- .../generated/0.4.11-success.yml | 2 +- .../everything/generated/0.4.11-failure.yml | 4 +- .../everything/generated/0.8.13-failure.yml | 8 +- .../everything/generated/0.8.22-success.yml | 10 +- .../generated/0.4.11-failure.yml | 4 +- .../generated/0.8.22-success.yml | 4 +- .../generated/0.7.1-success.yml | 2 +- .../generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-failure.yml | 4 +- .../generated/0.8.13-success.yml | 6 +- .../generated/0.4.11-failure.yml | 8 +- .../generated/0.5.0-failure.yml | 2 +- .../generated/0.5.3-failure.yml | 2 +- .../generated/0.6.0-failure.yml | 2 +- .../generated/0.7.0-failure.yml | 2 +- .../generated/0.8.0-failure.yml | 2 +- .../generated/0.8.4-failure.yml | 2 +- .../invalid_termination/input.sol | 0 .../try_catch/generated/0.6.0-success.yml | 2 +- .../generated/0.4.11-success.yml | 6 +- .../generated/0.4.11-success.yml | 6 +- .../generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-failure.yml | 4 +- .../generated/0.6.2-failure.yml | 4 +- .../generated/0.4.11-success.yml | 2 +- .../with_type/generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-success.yml | 2 +- .../empty/generated/0.4.11-success.yml | 2 +- .../full/generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-success.yml | 2 +- .../multiple/generated/0.4.11-failure.yml | 2 +- .../multiple/generated/0.7.0-success.yml | 2 +- .../multiple/input.sol | 0 .../single/generated/0.4.11-failure.yml | 2 +- .../single/generated/0.7.0-success.yml | 2 +- .../single/input.sol | 0 .../generated/0.4.11-failure.yml | 2 +- .../generated/0.7.0-failure.yml | 4 +- .../single_trailing_ident/input.sol | 0 .../generated/0.8.13-failure.yml | 2 +- .../generated/0.8.19-success.yml | 2 +- .../generated/0.8.13-success.yml | 2 +- .../generated/0.8.13-failure.yml | 2 +- .../generated/0.8.19-success.yml | 2 +- .../alternatives/generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-success.yml | 2 +- .../generated/0.4.11-success.yml | 2 +- .../ranges/generated/0.4.11-success.yml | 2 +- .../with_trivia/generated/0.4.11-success.yml | 2 +- .../function_def/generated/0.4.11-success.yml | 12 +- .../generated/0.4.11-failure.yml | 12 +- .../generated/0.6.0-failure.yml | 12 +- .../generated/0.4.11-success.yml | 2 +- 326 files changed, 2293 insertions(+), 2331 deletions(-) create mode 100644 .changeset/little-berries-approve.md rename crates/solidity/outputs/cargo/tests/src/cst_output/generated/{AsciiStringLiteralsList.rs => AsciiStringLiterals.rs} (61%) rename crates/solidity/outputs/cargo/tests/src/cst_output/generated/{ContractMembersList.rs => ContractMembers.rs} (59%) rename crates/solidity/outputs/cargo/tests/src/cst_output/generated/{HexStringLiteralsList.rs => HexStringLiterals.rs} (50%) rename crates/solidity/outputs/cargo/tests/src/cst_output/generated/{StatementsList.rs => Statements.rs} (78%) rename crates/solidity/outputs/cargo/tests/src/cst_output/generated/{UnicodeStringLiteralsList.rs => UnicodeStringLiterals.rs} (61%) rename crates/solidity/outputs/spec/generated/ebnf/{02-definitions/03-libraries/library-members-list => 01-file-structure/02-source-unit/source-unit-members}/unversioned.md (54%) create mode 100644 crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/0.8.13.md rename crates/solidity/outputs/spec/generated/ebnf/01-file-structure/{03-pragmas/version-pragma-expressions-list/unversioned.md => 04-imports/using-directive-symbols/0.8.13.md} (51%) rename crates/solidity/outputs/spec/generated/ebnf/{06-yul/02-yul-statements/yul-switch-cases-list => 02-definitions/01-contracts/contract-members}/unversioned.md (56%) delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md rename crates/solidity/outputs/spec/generated/ebnf/{06-yul/02-yul-statements/yul-statements-list => 02-definitions/02-interfaces/interface-members}/unversioned.md (55%) rename crates/solidity/outputs/spec/generated/ebnf/02-definitions/{04-structs/struct-members-list => 03-libraries/library-members}/unversioned.md (57%) rename crates/solidity/outputs/spec/generated/ebnf/{04-statements/01-blocks/statements-list => 02-definitions/04-structs/struct-members}/unversioned.md (58%) create mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md rename crates/solidity/outputs/spec/generated/ebnf/02-definitions/{01-contracts/contract-members-list => 08-functions/function-attributes}/unversioned.md (53%) rename crates/solidity/outputs/spec/generated/ebnf/{01-file-structure/02-source-unit/source-unit-members-list => 02-definitions/08-functions/override-paths}/unversioned.md (52%) create mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes-list/0.4.11.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes/0.4.11.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-list/0.8.4.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters/0.8.4.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md rename crates/solidity/outputs/spec/generated/ebnf/{02-definitions/08-functions/parameters-list => 04-statements/02-declaration-statements/tuple-members}/unversioned.md (54%) rename crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/{catch-clauses-list => catch-clauses}/0.6.0.md (58%) delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md rename crates/solidity/outputs/spec/generated/ebnf/{02-definitions/02-interfaces/interface-members-list => 05-expressions/05-strings/ascii-string-literals}/unversioned.md (53%) delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals-list/0.7.0.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals/0.7.0.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md delete mode 100644 crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md create mode 100644 crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md rename crates/solidity/testing/snapshots/cst_output/{AsciiStringLiteralsList => AsciiStringLiterals}/multiple/generated/0.4.11-success.yml (84%) rename crates/solidity/testing/snapshots/cst_output/{AsciiStringLiteralsList => AsciiStringLiterals}/multiple/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{AsciiStringLiteralsList => AsciiStringLiterals}/single/generated/0.4.11-success.yml (84%) rename crates/solidity/testing/snapshots/cst_output/{AsciiStringLiteralsList => AsciiStringLiterals}/single/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{AsciiStringLiteralsList => AsciiStringLiterals}/single_trailing_ident/generated/0.4.11-failure.yml (83%) rename crates/solidity/testing/snapshots/cst_output/{AsciiStringLiteralsList => AsciiStringLiterals}/single_trailing_ident/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/constructor/generated/0.4.11-failure.yml (89%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/constructor/generated/0.4.22-success.yml (84%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/constructor/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/local_expression/generated/0.4.11-success.yml (94%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/local_expression/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/mismatched_delimiter/generated/0.4.11-failure.yml (88%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/mismatched_delimiter/generated/0.4.21-failure.yml (88%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/mismatched_delimiter/generated/0.5.0-failure.yml (88%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/mismatched_delimiter/generated/0.5.3-failure.yml (88%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/mismatched_delimiter/generated/0.6.0-failure.yml (88%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/mismatched_delimiter/generated/0.7.0-failure.yml (88%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/mismatched_delimiter/generated/0.8.0-failure.yml (88%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/mismatched_delimiter/generated/0.8.4-failure.yml (89%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/mismatched_delimiter/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/separated_recovery/generated/0.4.11-failure.yml (92%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/separated_recovery/generated/0.5.0-failure.yml (91%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/separated_recovery/generated/0.6.2-failure.yml (92%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/separated_recovery/generated/0.7.0-failure.yml (92%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/separated_recovery/generated/0.8.0-failure.yml (92%) rename crates/solidity/testing/snapshots/cst_output/{ContractMembersList => ContractMembers}/separated_recovery/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/all_separated_pairs/generated/0.4.11-success.yml (80%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/all_separated_pairs/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/invalid_consecutive_separators/generated/0.4.11-failure.yml (89%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/invalid_consecutive_separators/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/invalid_leading_separator/generated/0.4.11-failure.yml (90%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/invalid_leading_separator/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/invalid_separator_after_single_char/generated/0.4.11-failure.yml (88%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/invalid_separator_after_single_char/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/invalid_trailing_separator/generated/0.4.11-failure.yml (90%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/invalid_trailing_separator/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/multiple/generated/0.4.11-success.yml (84%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/multiple/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/no_separators/generated/0.4.11-success.yml (81%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/no_separators/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/single/generated/0.4.11-success.yml (83%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/single/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/single_trailing_ident/generated/0.4.11-failure.yml (83%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/single_trailing_ident/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/some_separated_pairs/generated/0.4.11-success.yml (80%) rename crates/solidity/testing/snapshots/cst_output/{HexStringLiteralsList => HexStringLiterals}/some_separated_pairs/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{StatementsList => Statements}/invalid_termination/generated/0.4.11-failure.yml (91%) rename crates/solidity/testing/snapshots/cst_output/{StatementsList => Statements}/invalid_termination/generated/0.5.0-failure.yml (96%) rename crates/solidity/testing/snapshots/cst_output/{StatementsList => Statements}/invalid_termination/generated/0.5.3-failure.yml (97%) rename crates/solidity/testing/snapshots/cst_output/{StatementsList => Statements}/invalid_termination/generated/0.6.0-failure.yml (97%) rename crates/solidity/testing/snapshots/cst_output/{StatementsList => Statements}/invalid_termination/generated/0.7.0-failure.yml (97%) rename crates/solidity/testing/snapshots/cst_output/{StatementsList => Statements}/invalid_termination/generated/0.8.0-failure.yml (97%) rename crates/solidity/testing/snapshots/cst_output/{StatementsList => Statements}/invalid_termination/generated/0.8.4-failure.yml (97%) rename crates/solidity/testing/snapshots/cst_output/{StatementsList => Statements}/invalid_termination/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{UnicodeStringLiteralsList => UnicodeStringLiterals}/multiple/generated/0.4.11-failure.yml (91%) rename crates/solidity/testing/snapshots/cst_output/{UnicodeStringLiteralsList => UnicodeStringLiterals}/multiple/generated/0.7.0-success.yml (80%) rename crates/solidity/testing/snapshots/cst_output/{UnicodeStringLiteralsList => UnicodeStringLiterals}/multiple/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{UnicodeStringLiteralsList => UnicodeStringLiterals}/single/generated/0.4.11-failure.yml (91%) rename crates/solidity/testing/snapshots/cst_output/{UnicodeStringLiteralsList => UnicodeStringLiterals}/single/generated/0.7.0-success.yml (81%) rename crates/solidity/testing/snapshots/cst_output/{UnicodeStringLiteralsList => UnicodeStringLiterals}/single/input.sol (100%) rename crates/solidity/testing/snapshots/cst_output/{UnicodeStringLiteralsList => UnicodeStringLiterals}/single_trailing_ident/generated/0.4.11-failure.yml (88%) rename crates/solidity/testing/snapshots/cst_output/{UnicodeStringLiteralsList => UnicodeStringLiterals}/single_trailing_ident/generated/0.7.0-failure.yml (79%) rename crates/solidity/testing/snapshots/cst_output/{UnicodeStringLiteralsList => UnicodeStringLiterals}/single_trailing_ident/input.sol (100%) diff --git a/.changeset/little-berries-approve.md b/.changeset/little-berries-approve.md new file mode 100644 index 0000000000..67849a7d32 --- /dev/null +++ b/.changeset/little-berries-approve.md @@ -0,0 +1,5 @@ +--- +"@nomicfoundation/slang": patch +--- + +Drop List suffix from collection grammar rule names diff --git a/crates/solidity/inputs/language/definition/01-file-structure/02-source-unit/productions.yml b/crates/solidity/inputs/language/definition/01-file-structure/02-source-unit/productions.yml index 4d4c95fae2..a62a984530 100644 --- a/crates/solidity/inputs/language/definition/01-file-structure/02-source-unit/productions.yml +++ b/crates/solidity/inputs/language/definition/01-file-structure/02-source-unit/productions.yml @@ -5,11 +5,11 @@ unversioned: sequence: - optional: - reference: "SourceUnitMembersList" + reference: "SourceUnitMembers" - optional: reference: "EndOfFileTrivia" -- name: "SourceUnitMembersList" +- name: "SourceUnitMembers" kind: "Parser" unversioned: oneOrMore: diff --git a/crates/solidity/inputs/language/definition/01-file-structure/03-pragmas/productions.yml b/crates/solidity/inputs/language/definition/01-file-structure/03-pragmas/productions.yml index 4ee799d307..5184414b7a 100644 --- a/crates/solidity/inputs/language/definition/01-file-structure/03-pragmas/productions.yml +++ b/crates/solidity/inputs/language/definition/01-file-structure/03-pragmas/productions.yml @@ -36,9 +36,9 @@ unversioned: sequence: - reference: "SolidityKeyword" - - reference: "VersionPragmaExpressionsList" + - reference: "VersionPragmaExpressions" -- name: "VersionPragmaExpressionsList" +- name: "VersionPragmaExpressions" kind: "Parser" unversioned: oneOrMore: 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 755603087f..d9cc15d7f9 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 @@ -42,13 +42,13 @@ open: reference: "OpenBrace" parser: - reference: "DeconstructionImportSymbolsList" + reference: "DeconstructionImportSymbols" close: reference: "CloseBrace" - reference: "FromKeyword" - reference: "AsciiStringLiteral" -- name: "DeconstructionImportSymbolsList" +- name: "DeconstructionImportSymbols" kind: "Parser" unversioned: separatedBy: @@ -108,11 +108,11 @@ open: reference: "OpenBrace" parser: - reference: "UsingDirectiveSymbolsList" + reference: "UsingDirectiveSymbols" close: reference: "CloseBrace" -- name: "UsingDirectiveSymbolsList" +- name: "UsingDirectiveSymbols" kind: "Parser" versioned: 0.8.13: diff --git a/crates/solidity/inputs/language/definition/02-definitions/01-contracts/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/01-contracts/productions.yml index 0e00a9eb8c..35624b3d04 100644 --- a/crates/solidity/inputs/language/definition/02-definitions/01-contracts/productions.yml +++ b/crates/solidity/inputs/language/definition/02-definitions/01-contracts/productions.yml @@ -14,7 +14,7 @@ reference: "OpenBrace" parser: optional: - reference: "ContractMembersList" + reference: "ContractMembers" close: reference: "CloseBrace" 0.6.0: @@ -31,7 +31,7 @@ reference: "OpenBrace" parser: optional: - reference: "ContractMembersList" + reference: "ContractMembers" close: reference: "CloseBrace" @@ -40,9 +40,9 @@ unversioned: sequence: - reference: "IsKeyword" - - reference: "InheritanceTypesList" + - reference: "InheritanceTypes" -- name: "InheritanceTypesList" +- name: "InheritanceTypes" kind: "Parser" unversioned: separatedBy: @@ -59,7 +59,7 @@ - optional: reference: "ArgumentsDeclaration" -- name: "ContractMembersList" +- name: "ContractMembers" kind: "Parser" unversioned: oneOrMore: diff --git a/crates/solidity/inputs/language/definition/02-definitions/02-interfaces/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/02-interfaces/productions.yml index c9b87bb133..195c07fab8 100644 --- a/crates/solidity/inputs/language/definition/02-definitions/02-interfaces/productions.yml +++ b/crates/solidity/inputs/language/definition/02-definitions/02-interfaces/productions.yml @@ -13,11 +13,11 @@ reference: "OpenBrace" parser: optional: - reference: "InterfaceMembersList" + reference: "InterfaceMembers" close: reference: "CloseBrace" -- name: "InterfaceMembersList" +- name: "InterfaceMembers" kind: "Parser" unversioned: oneOrMore: diff --git a/crates/solidity/inputs/language/definition/02-definitions/03-libraries/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/03-libraries/productions.yml index 9d4d66935e..bc6568efdc 100644 --- a/crates/solidity/inputs/language/definition/02-definitions/03-libraries/productions.yml +++ b/crates/solidity/inputs/language/definition/02-definitions/03-libraries/productions.yml @@ -11,11 +11,11 @@ reference: "OpenBrace" parser: optional: - reference: "LibraryMembersList" + reference: "LibraryMembers" close: reference: "CloseBrace" -- name: "LibraryMembersList" +- name: "LibraryMembers" kind: "Parser" unversioned: oneOrMore: diff --git a/crates/solidity/inputs/language/definition/02-definitions/04-structs/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/04-structs/productions.yml index 2d713f62b2..0ef5c42dd8 100644 --- a/crates/solidity/inputs/language/definition/02-definitions/04-structs/productions.yml +++ b/crates/solidity/inputs/language/definition/02-definitions/04-structs/productions.yml @@ -11,11 +11,11 @@ reference: "OpenBrace" parser: optional: - reference: "StructMembersList" + reference: "StructMembers" close: reference: "CloseBrace" -- name: "StructMembersList" +- name: "StructMembers" kind: "Parser" unversioned: oneOrMore: diff --git a/crates/solidity/inputs/language/definition/02-definitions/05-enums/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/05-enums/productions.yml index 306e9097d3..7133f6612f 100644 --- a/crates/solidity/inputs/language/definition/02-definitions/05-enums/productions.yml +++ b/crates/solidity/inputs/language/definition/02-definitions/05-enums/productions.yml @@ -11,6 +11,15 @@ reference: "OpenBrace" parser: optional: - reference: "IdentifiersList" + reference: "EnumMembers" close: reference: "CloseBrace" + +- name: "EnumMembers" + kind: "Parser" + unversioned: + separatedBy: + separator: + reference: "Comma" + parser: + reference: "Identifier" diff --git a/crates/solidity/inputs/language/definition/02-definitions/07-state-variables/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/07-state-variables/productions.yml index ea38d96901..f455078076 100644 --- a/crates/solidity/inputs/language/definition/02-definitions/07-state-variables/productions.yml +++ b/crates/solidity/inputs/language/definition/02-definitions/07-state-variables/productions.yml @@ -8,7 +8,7 @@ sequence: - reference: "TypeName" - optional: - reference: "StateVariableAttributesList" + reference: "StateVariableAttributes" - reference: "Identifier" - optional: sequence: @@ -17,7 +17,7 @@ terminator: reference: "Semicolon" -- name: "StateVariableAttributesList" +- name: "StateVariableAttributes" kind: "Parser" unversioned: oneOrMore: diff --git a/crates/solidity/inputs/language/definition/02-definitions/08-functions/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/08-functions/productions.yml index 71e4b76b5d..7a45d4f1a4 100644 --- a/crates/solidity/inputs/language/definition/02-definitions/08-functions/productions.yml +++ b/crates/solidity/inputs/language/definition/02-definitions/08-functions/productions.yml @@ -11,7 +11,7 @@ - reference: "ReceiveKeyword" - reference: "ParametersDeclaration" - optional: - reference: "FunctionAttributesList" + reference: "FunctionAttributes" - optional: reference: "ReturnsDeclaration" - choice: @@ -25,7 +25,7 @@ - reference: "ReturnsKeyword" - reference: "ParametersDeclaration" -- name: "FunctionAttributesList" +- name: "FunctionAttributes" kind: "Parser" unversioned: oneOrMore: @@ -84,10 +84,19 @@ reference: "OpenParen" parser: optional: - reference: "IdentifierPathsList" + reference: "OverridePaths" close: reference: "CloseParen" +- name: "OverridePaths" + kind: "Parser" + unversioned: + separatedBy: + separator: + reference: "Comma" + parser: + reference: "IdentifierPath" + - name: "ParametersDeclaration" kind: "Parser" unversioned: @@ -96,11 +105,11 @@ reference: "OpenParen" parser: optional: - reference: "ParametersList" + reference: "Parameters" close: reference: "CloseParen" -- name: "ParametersList" +- name: "Parameters" kind: "Parser" unversioned: separatedBy: @@ -127,10 +136,10 @@ - reference: "ConstructorKeyword" - reference: "ParametersDeclaration" - optional: - reference: "ConstructorAttributesList" + reference: "ConstructorAttributes" - reference: "Block" -- name: "ConstructorAttributesList" +- name: "ConstructorAttributes" kind: "Parser" versioned: 0.4.22: @@ -156,13 +165,13 @@ - reference: "FunctionKeyword" - reference: "ParametersDeclaration" - optional: - reference: "UnnamedFunctionAttributesList" + reference: "UnnamedFunctionAttributes" - choice: - reference: "Semicolon" - reference: "Block" 0.6.0: null -- name: "UnnamedFunctionAttributesList" +- name: "UnnamedFunctionAttributes" kind: "Parser" versioned: 0.4.11: @@ -192,14 +201,14 @@ - reference: "FallbackKeyword" - reference: "ParametersDeclaration" - optional: - reference: "FallbackFunctionAttributesList" + reference: "FallbackFunctionAttributes" - optional: reference: "ReturnsDeclaration" - choice: - reference: "Semicolon" - reference: "Block" -- name: "FallbackFunctionAttributesList" +- name: "FallbackFunctionAttributes" kind: "Parser" versioned: 0.6.0: @@ -228,12 +237,12 @@ - reference: "ReceiveKeyword" - reference: "ParametersDeclaration" - optional: - reference: "ReceiveFunctionAttributesList" + reference: "ReceiveFunctionAttributes" - choice: - reference: "Semicolon" - reference: "Block" -- name: "ReceiveFunctionAttributesList" +- name: "ReceiveFunctionAttributes" kind: "Parser" versioned: 0.6.0: diff --git a/crates/solidity/inputs/language/definition/02-definitions/09-modifiers/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/09-modifiers/productions.yml index a7d982b904..3c5256534a 100644 --- a/crates/solidity/inputs/language/definition/02-definitions/09-modifiers/productions.yml +++ b/crates/solidity/inputs/language/definition/02-definitions/09-modifiers/productions.yml @@ -9,12 +9,12 @@ - optional: reference: "ParametersDeclaration" - optional: - reference: "ModifierAttributesList" + reference: "ModifierAttributes" - choice: - reference: "Semicolon" - reference: "Block" -- name: "ModifierAttributesList" +- name: "ModifierAttributes" kind: "Parser" unversioned: oneOrMore: diff --git a/crates/solidity/inputs/language/definition/02-definitions/10-events/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/10-events/productions.yml index 5d8f74e8cd..45021ad69a 100644 --- a/crates/solidity/inputs/language/definition/02-definitions/10-events/productions.yml +++ b/crates/solidity/inputs/language/definition/02-definitions/10-events/productions.yml @@ -22,11 +22,11 @@ reference: "OpenParen" parser: optional: - reference: "EventParametersList" + reference: "EventParameters" close: reference: "CloseParen" -- name: "EventParametersList" +- name: "EventParameters" kind: "Parser" unversioned: separatedBy: diff --git a/crates/solidity/inputs/language/definition/02-definitions/12-errors/productions.yml b/crates/solidity/inputs/language/definition/02-definitions/12-errors/productions.yml index 5aae375852..de14a8594f 100644 --- a/crates/solidity/inputs/language/definition/02-definitions/12-errors/productions.yml +++ b/crates/solidity/inputs/language/definition/02-definitions/12-errors/productions.yml @@ -22,11 +22,11 @@ reference: "OpenParen" parser: optional: - reference: "ErrorParametersList" + reference: "ErrorParameters" close: reference: "CloseParen" -- name: "ErrorParametersList" +- name: "ErrorParameters" kind: "Parser" versioned: 0.8.4: diff --git a/crates/solidity/inputs/language/definition/03-types/01-advanced-types/productions.yml b/crates/solidity/inputs/language/definition/03-types/01-advanced-types/productions.yml index ef05cd1b50..590101a907 100644 --- a/crates/solidity/inputs/language/definition/03-types/01-advanced-types/productions.yml +++ b/crates/solidity/inputs/language/definition/03-types/01-advanced-types/productions.yml @@ -36,11 +36,11 @@ - reference: "FunctionKeyword" - reference: "ParametersDeclaration" - optional: - reference: "FunctionTypeAttributesList" + reference: "FunctionTypeAttributes" - optional: reference: "ReturnsDeclaration" -- name: "FunctionTypeAttributesList" +- name: "FunctionTypeAttributes" kind: "Parser" unversioned: oneOrMore: diff --git a/crates/solidity/inputs/language/definition/04-statements/01-blocks/productions.yml b/crates/solidity/inputs/language/definition/04-statements/01-blocks/productions.yml index 82b7dda99a..8ab0ca19cc 100644 --- a/crates/solidity/inputs/language/definition/04-statements/01-blocks/productions.yml +++ b/crates/solidity/inputs/language/definition/04-statements/01-blocks/productions.yml @@ -8,11 +8,11 @@ reference: "OpenBrace" parser: optional: - reference: "StatementsList" + reference: "Statements" close: reference: "CloseBrace" -- name: "StatementsList" +- name: "Statements" kind: "Parser" unversioned: oneOrMore: diff --git a/crates/solidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml b/crates/solidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml index 2371ffc86b..b591762453 100644 --- a/crates/solidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml +++ b/crates/solidity/inputs/language/definition/04-statements/02-declaration-statements/productions.yml @@ -11,7 +11,7 @@ reference: "OpenParen" parser: optional: - reference: "TupleMembersList" + reference: "TupleMembers" close: reference: "CloseParen" - reference: "Equal" @@ -19,7 +19,7 @@ terminator: reference: "Semicolon" -- name: "TupleMembersList" +- name: "TupleMembers" kind: "Parser" unversioned: separatedBy: diff --git a/crates/solidity/inputs/language/definition/04-statements/04-error-handling/productions.yml b/crates/solidity/inputs/language/definition/04-statements/04-error-handling/productions.yml index 3b352691c5..4a20e60638 100644 --- a/crates/solidity/inputs/language/definition/04-statements/04-error-handling/productions.yml +++ b/crates/solidity/inputs/language/definition/04-statements/04-error-handling/productions.yml @@ -10,9 +10,9 @@ - optional: reference: "ReturnsDeclaration" - reference: "Block" - - reference: "CatchClausesList" + - reference: "CatchClauses" -- name: "CatchClausesList" +- name: "CatchClauses" kind: "Parser" versioned: 0.6.0: diff --git a/crates/solidity/inputs/language/definition/05-expressions/02-function-calls/productions.yml b/crates/solidity/inputs/language/definition/05-expressions/02-function-calls/productions.yml index 4ad239daf8..d84435c09d 100644 --- a/crates/solidity/inputs/language/definition/05-expressions/02-function-calls/productions.yml +++ b/crates/solidity/inputs/language/definition/05-expressions/02-function-calls/productions.yml @@ -9,12 +9,12 @@ parser: optional: choice: - - reference: "PositionalArgumentsList" + - reference: "PositionalArguments" - reference: "NamedArgumentsDeclaration" close: reference: "CloseParen" -- name: "PositionalArgumentsList" +- name: "PositionalArguments" kind: "Parser" unversioned: separatedBy: @@ -40,11 +40,11 @@ reference: "OpenBrace" parser: optional: - reference: "NamedArgumentsList" + reference: "NamedArguments" close: reference: "CloseBrace" -- name: "NamedArgumentsList" +- name: "NamedArguments" kind: "Parser" unversioned: separatedBy: diff --git a/crates/solidity/inputs/language/definition/05-expressions/03-primary-expressions/productions.yml b/crates/solidity/inputs/language/definition/05-expressions/03-primary-expressions/productions.yml index 258fef4606..09235b09da 100644 --- a/crates/solidity/inputs/language/definition/05-expressions/03-primary-expressions/productions.yml +++ b/crates/solidity/inputs/language/definition/05-expressions/03-primary-expressions/productions.yml @@ -55,11 +55,11 @@ open: reference: "OpenParen" parser: - reference: "TupleValuesList" + reference: "TupleValues" close: reference: "CloseParen" -- name: "TupleValuesList" +- name: "TupleValues" kind: "Parser" unversioned: separatedBy: @@ -76,11 +76,11 @@ open: reference: "OpenBracket" parser: - reference: "ArrayValuesList" + reference: "ArrayValues" close: reference: "CloseBracket" -- name: "ArrayValuesList" +- name: "ArrayValues" kind: "Parser" unversioned: separatedBy: diff --git a/crates/solidity/inputs/language/definition/05-expressions/05-strings/productions.yml b/crates/solidity/inputs/language/definition/05-expressions/05-strings/productions.yml index 6c0786bf17..8afaffe33e 100644 --- a/crates/solidity/inputs/language/definition/05-expressions/05-strings/productions.yml +++ b/crates/solidity/inputs/language/definition/05-expressions/05-strings/productions.yml @@ -6,16 +6,16 @@ versioned: 0.4.11: choice: - - reference: "HexStringLiteralsList" - - reference: "AsciiStringLiteralsList" + - reference: "HexStringLiterals" + - reference: "AsciiStringLiterals" 0.7.0: - # added "UnicodeStringLiteralsList" + # added "UnicodeStringLiterals" choice: - - reference: "HexStringLiteralsList" - - reference: "AsciiStringLiteralsList" - - reference: "UnicodeStringLiteralsList" + - reference: "HexStringLiterals" + - reference: "AsciiStringLiterals" + - reference: "UnicodeStringLiterals" -- name: "HexStringLiteralsList" +- name: "HexStringLiterals" kind: "Parser" unversioned: oneOrMore: @@ -79,7 +79,7 @@ from: "A" to: "F" -- name: "AsciiStringLiteralsList" +- name: "AsciiStringLiterals" kind: "Parser" unversioned: oneOrMore: @@ -132,7 +132,7 @@ - terminal: "\\" - terminal: '"' -- name: "UnicodeStringLiteralsList" +- name: "UnicodeStringLiterals" kind: "Parser" versioned: 0.7.0: diff --git a/crates/solidity/inputs/language/definition/05-expressions/06-identifiers/productions.yml b/crates/solidity/inputs/language/definition/05-expressions/06-identifiers/productions.yml index d8986674b1..de686234fb 100644 --- a/crates/solidity/inputs/language/definition/05-expressions/06-identifiers/productions.yml +++ b/crates/solidity/inputs/language/definition/05-expressions/06-identifiers/productions.yml @@ -1,14 +1,5 @@ # yaml-language-server: $schema=../../../generated/productions.schema.json -- name: "IdentifierPathsList" - kind: "Parser" - unversioned: - separatedBy: - separator: - reference: "Comma" - parser: - reference: "IdentifierPath" - - name: "IdentifierPath" kind: "Parser" unversioned: @@ -18,15 +9,6 @@ separator: reference: "Period" -- name: "IdentifiersList" - kind: "Parser" - unversioned: - separatedBy: - separator: - reference: "Comma" - parser: - reference: "Identifier" - - name: "Identifier" kind: "Scanner" versioned: diff --git a/crates/solidity/inputs/language/definition/06-yul/01-assembly-block/productions.yml b/crates/solidity/inputs/language/definition/06-yul/01-assembly-block/productions.yml index 14897679cb..2afc52d403 100644 --- a/crates/solidity/inputs/language/definition/06-yul/01-assembly-block/productions.yml +++ b/crates/solidity/inputs/language/definition/06-yul/01-assembly-block/productions.yml @@ -18,11 +18,11 @@ open: reference: "OpenParen" parser: - reference: "AssemblyFlagsList" + reference: "AssemblyFlags" close: reference: "CloseParen" -- name: "AssemblyFlagsList" +- name: "AssemblyFlags" kind: "Parser" unversioned: separatedBy: diff --git a/crates/solidity/inputs/language/definition/06-yul/02-yul-statements/productions.yml b/crates/solidity/inputs/language/definition/06-yul/02-yul-statements/productions.yml index d789f1a556..d705ad669c 100644 --- a/crates/solidity/inputs/language/definition/06-yul/02-yul-statements/productions.yml +++ b/crates/solidity/inputs/language/definition/06-yul/02-yul-statements/productions.yml @@ -8,11 +8,11 @@ reference: "OpenBrace" parser: optional: - reference: "YulStatementsList" + reference: "YulStatements" close: reference: "CloseBrace" -- name: "YulStatementsList" +- name: "YulStatements" kind: "Parser" unversioned: oneOrMore: @@ -54,7 +54,7 @@ unversioned: sequence: - reference: "LetKeyword" - - reference: "YulIdentifierPathsList" + - reference: "YulIdentifierPaths" - optional: sequence: - reference: "ColonEqual" @@ -79,7 +79,7 @@ reference: "OpenParen" parser: optional: - reference: "YulIdentifiersList" + reference: "YulIdentifiers" close: reference: "CloseParen" @@ -88,13 +88,13 @@ unversioned: sequence: - reference: "MinusGreaterThan" - - reference: "YulIdentifiersList" + - reference: "YulIdentifiers" - name: "YulAssignmentStatement" kind: "Parser" unversioned: sequence: - - reference: "YulIdentifierPathsList" + - reference: "YulIdentifierPaths" - reference: "ColonEqual" - reference: "YulExpression" @@ -138,9 +138,9 @@ sequence: - reference: "SwitchKeyword" - reference: "YulExpression" - - reference: "YulSwitchCasesList" + - reference: "YulSwitchCases" -- name: "YulSwitchCasesList" +- name: "YulSwitchCases" kind: "Parser" unversioned: oneOrMore: diff --git a/crates/solidity/inputs/language/definition/06-yul/03-yul-expressions/productions.yml b/crates/solidity/inputs/language/definition/06-yul/03-yul-expressions/productions.yml index 80231c5ec9..f0e2bba815 100644 --- a/crates/solidity/inputs/language/definition/06-yul/03-yul-expressions/productions.yml +++ b/crates/solidity/inputs/language/definition/06-yul/03-yul-expressions/productions.yml @@ -1,14 +1,5 @@ # yaml-language-server: $schema=../../../generated/productions.schema.json -- name: "YulExpressionsList" - kind: "Parser" - unversioned: - separatedBy: - separator: - reference: "Comma" - parser: - reference: "YulExpression" - - name: "YulExpression" kind: "PrecedenceParser" unversioned: @@ -32,11 +23,20 @@ reference: "OpenParen" parser: optional: - reference: "YulExpressionsList" + reference: "YulArguments" close: reference: "CloseParen" -- name: "YulIdentifierPathsList" +- name: "YulArguments" + kind: "Parser" + unversioned: + separatedBy: + separator: + reference: "Comma" + parser: + reference: "YulExpression" + +- name: "YulIdentifierPaths" kind: "Parser" unversioned: separatedBy: @@ -54,7 +54,7 @@ parser: reference: "YulIdentifier" -- name: "YulIdentifiersList" +- name: "YulIdentifiers" kind: "Parser" unversioned: separatedBy: diff --git a/crates/solidity/inputs/language/src/dsl.rs b/crates/solidity/inputs/language/src/dsl.rs index 302b13573f..3f5d9ed033 100644 --- a/crates/solidity/inputs/language/src/dsl.rs +++ b/crates/solidity/inputs/language/src/dsl.rs @@ -173,21 +173,21 @@ slang_grammar! { inline parser AndOperator = AmpersandAmpersand ; - parser ArgumentsDeclaration = (((PositionalArgumentsList | NamedArgumentsDeclaration) ?) delimited by OpenParen and CloseParen) ; + parser ArgumentsDeclaration = (((PositionalArguments | NamedArgumentsDeclaration) ?) delimited by OpenParen and CloseParen) ; - parser ArrayExpression = (ArrayValuesList delimited by OpenBracket and CloseBracket) ; + parser ArrayExpression = (ArrayValues delimited by OpenBracket and CloseBracket) ; inline parser ArrayTypeNameOperator = ((Expression ?) delimited by OpenBracket and CloseBracket) ; - parser ArrayValuesList = (Expression separated by Comma) ; + parser ArrayValues = (Expression separated by Comma) ; - parser AsciiStringLiteralsList = (AsciiStringLiteral +) ; + parser AsciiStringLiterals = (AsciiStringLiteral +) ; - parser AssemblyFlagsList = (AsciiStringLiteral separated by Comma) ; + parser AssemblyFlags = (AsciiStringLiteral separated by Comma) ; parser AssemblyStatement = (AssemblyKeyword (AsciiStringLiteral ?) (AssemblyFlagsDeclaration ?) YulBlock) ; - parser AssemblyFlagsDeclaration = (AssemblyFlagsList delimited by OpenParen and CloseParen) ; + parser AssemblyFlagsDeclaration = (AssemblyFlags delimited by OpenParen and CloseParen) ; inline parser AssignmentOperator = ( Equal | BarEqual | PlusEqual | MinusEqual | CaretEqual | SlashEqual | PercentEqual | AsteriskEqual | AmpersandEqual | @@ -200,7 +200,7 @@ slang_grammar! { inline parser BitwiseXOrOperator = Caret ; - parser Block = ((StatementsList ?) delimited by OpenBrace and CloseBrace) ; + parser Block = ((Statements ?) delimited by OpenBrace and CloseBrace) ; inline parser BooleanExpression = (TrueKeyword | FalseKeyword) ; @@ -210,7 +210,7 @@ slang_grammar! { parser CatchClauseError = { introduced in "0.6.0" ((Identifier ?) ParametersDeclaration) } ; - parser CatchClausesList = { introduced in "0.6.0" (CatchClause +) } ; + parser CatchClauses = { introduced in "0.6.0" (CatchClause +) } ; inline parser ConditionalOperator = (QuestionMark Expression Colon Expression) ; @@ -218,14 +218,14 @@ slang_grammar! { inline parser ConstructorAttribute = { introduced in "0.4.22" (ModifierInvocation | InternalKeyword | PayableKeyword | PublicKeyword) } ; - parser ConstructorAttributesList = { introduced in "0.4.22" (ConstructorAttribute +) } ; + parser ConstructorAttributes = { introduced in "0.4.22" (ConstructorAttribute +) } ; - parser ConstructorDefinition = { introduced in "0.4.22" (ConstructorKeyword ParametersDeclaration (ConstructorAttributesList ?) Block) } ; + parser ConstructorDefinition = { introduced in "0.4.22" (ConstructorKeyword ParametersDeclaration (ConstructorAttributes ?) Block) } ; parser ContinueStatement = (ContinueKeyword terminated by Semicolon) ; parser ContractDefinition = ( - { introduced in "0.6.0" (AbstractKeyword ?) } ContractKeyword Identifier (InheritanceSpecifier ?) ((ContractMembersList ?) delimited by OpenBrace and CloseBrace) + { introduced in "0.6.0" (AbstractKeyword ?) } ContractKeyword Identifier (InheritanceSpecifier ?) ((ContractMembers ?) delimited by OpenBrace and CloseBrace) ) ; inline parser ContractMember = ( @@ -237,7 +237,7 @@ slang_grammar! { { introduced in "0.8.8" UserDefinedValueTypeDefinition } ) ; - parser ContractMembersList = (ContractMember +) ; + parser ContractMembers = (ContractMember +) ; inline parser ControlStatement = ( IfStatement | ForStatement | WhileStatement | DoWhileStatement | ContinueStatement | BreakStatement | DeleteStatement | ReturnStatement | @@ -252,11 +252,11 @@ slang_grammar! { { introduced in "0.5.0" CalldataKeyword} ) ; - parser DeconstructionImport = ((DeconstructionImportSymbolsList delimited by OpenBrace and CloseBrace) FromKeyword AsciiStringLiteral) ; + parser DeconstructionImport = ((DeconstructionImportSymbols delimited by OpenBrace and CloseBrace) FromKeyword AsciiStringLiteral) ; parser DeconstructionImportSymbol = (Identifier ((AsKeyword Identifier) ?)) ; - parser DeconstructionImportSymbolsList = (DeconstructionImportSymbol separated by Comma) ; + parser DeconstructionImportSymbols = (DeconstructionImportSymbol separated by Comma) ; parser DeleteStatement = ((DeleteKeyword Expression) terminated by Semicolon) ; @@ -269,25 +269,25 @@ slang_grammar! { parser EmitStatement = { introduced in "0.4.21" ((EmitKeyword IdentifierPath ArgumentsDeclaration) terminated by Semicolon) } ; - parser EnumDefinition = (EnumKeyword Identifier ((IdentifiersList ?) delimited by OpenBrace and CloseBrace)) ; + parser EnumDefinition = (EnumKeyword Identifier ((EnumMembers ?) delimited by OpenBrace and CloseBrace)) ; inline parser EqualityComparisonOperator = (EqualEqual | BangEqual) ; parser ErrorDefinition = { introduced in "0.8.4" ((ErrorKeyword Identifier ErrorParametersDeclaration) terminated by Semicolon) } ; - parser ErrorParametersDeclaration = { introduced in "0.8.4" ((ErrorParametersList ?) delimited by OpenParen and CloseParen) } ; + parser ErrorParametersDeclaration = { introduced in "0.8.4" ((ErrorParameters ?) delimited by OpenParen and CloseParen) } ; parser ErrorParameter = { introduced in "0.8.4" (TypeName (Identifier ?)) } ; - parser ErrorParametersList = { introduced in "0.8.4" (ErrorParameter separated by Comma) } ; + parser ErrorParameters = { introduced in "0.8.4" (ErrorParameter separated by Comma) } ; parser EventDefinition = ((EventKeyword Identifier EventParametersDeclaration (AnonymousKeyword ?)) terminated by Semicolon) ; - parser EventParametersDeclaration = ((EventParametersList ?) delimited by OpenParen and CloseParen); + parser EventParametersDeclaration = ((EventParameters ?) delimited by OpenParen and CloseParen); parser EventParameter = (TypeName (IndexedKeyword ?) (Identifier ?)) ; - parser EventParametersList = (EventParameter separated by Comma) ; + parser EventParameters = (EventParameter separated by Comma) ; parser ExperimentalPragma = (ExperimentalKeyword (AsciiStringLiteral | Identifier)) ; @@ -322,9 +322,9 @@ slang_grammar! { inline parser FallbackFunctionAttribute = { introduced in "0.6.0" (ModifierInvocation | OverrideSpecifier | ExternalKeyword | PayableKeyword | PureKeyword | ViewKeyword | VirtualKeyword) } ; - parser FallbackFunctionAttributesList = { introduced in "0.6.0" (FallbackFunctionAttribute +) } ; + parser FallbackFunctionAttributes = { introduced in "0.6.0" (FallbackFunctionAttribute +) } ; - parser FallbackFunctionDefinition = { introduced in "0.6.0" (FallbackKeyword ParametersDeclaration (FallbackFunctionAttributesList ?) (ReturnsDeclaration ?) (Semicolon | Block)) } ; + parser FallbackFunctionDefinition = { introduced in "0.6.0" (FallbackKeyword ParametersDeclaration (FallbackFunctionAttributes ?) (ReturnsDeclaration ?) (Semicolon | Block)) } ; parser ForStatement = (ForKeyword (((SimpleStatement | Semicolon) (ExpressionStatement | Semicolon) (Expression ?)) delimited by OpenParen and CloseParen) Statement) ; @@ -334,7 +334,7 @@ slang_grammar! { { introduced in "0.6.0" VirtualKeyword } ) ; - parser FunctionAttributesList = (FunctionAttribute +) ; + parser FunctionAttributes = (FunctionAttribute +) ; inline parser FunctionCallOperator = ( { introduced in "0.6.2" (FunctionCallOptions ?) } @@ -346,21 +346,21 @@ slang_grammar! { { introduced in "0.8.0" NamedArgumentsDeclaration } ) ; - parser FunctionDefinition = (FunctionKeyword (Identifier | FallbackKeyword | ReceiveKeyword) ParametersDeclaration (FunctionAttributesList ?) (ReturnsDeclaration ?) (Semicolon | Block)) ; + parser FunctionDefinition = (FunctionKeyword (Identifier | FallbackKeyword | ReceiveKeyword) ParametersDeclaration (FunctionAttributes ?) (ReturnsDeclaration ?) (Semicolon | Block)) ; - parser FunctionType = (FunctionKeyword ParametersDeclaration (FunctionTypeAttributesList ?) (ReturnsDeclaration ?)) ; + parser FunctionType = (FunctionKeyword ParametersDeclaration (FunctionTypeAttributes ?) (ReturnsDeclaration ?)) ; inline parser FunctionTypeAttribute = (InternalKeyword | ExternalKeyword | PrivateKeyword | PublicKeyword | PureKeyword | ViewKeyword | PayableKeyword) ; - parser FunctionTypeAttributesList = (FunctionTypeAttribute +) ; + parser FunctionTypeAttributes = (FunctionTypeAttribute +) ; - parser HexStringLiteralsList = (HexStringLiteral +) ; + parser HexStringLiterals = (HexStringLiteral +) ; parser IdentifierPath = (Identifier separated by Period) ; - parser IdentifierPathsList = (IdentifierPath separated by Comma) ; + parser OverridePaths = (IdentifierPath separated by Comma) ; - parser IdentifiersList = (Identifier separated by Comma) ; + parser EnumMembers = (Identifier separated by Comma) ; parser IfStatement = (IfKeyword (Expression delimited by OpenParen and CloseParen) Statement ((ElseKeyword Statement) ?)) ; @@ -368,19 +368,19 @@ slang_grammar! { inline parser IndexAccessOperator = (((Expression ?) ((Colon (Expression ?)) ?)) delimited by OpenBracket and CloseBracket) ; - parser InheritanceSpecifier = (IsKeyword InheritanceTypesList) ; + parser InheritanceSpecifier = (IsKeyword InheritanceTypes) ; parser InheritanceType = (IdentifierPath (ArgumentsDeclaration ?)) ; - parser InheritanceTypesList = (InheritanceType separated by Comma) ; + parser InheritanceTypes = (InheritanceType separated by Comma) ; - parser InterfaceDefinition = (InterfaceKeyword Identifier (InheritanceSpecifier ?) ((InterfaceMembersList ?) delimited by OpenBrace and CloseBrace)) ; + parser InterfaceDefinition = (InterfaceKeyword Identifier (InheritanceSpecifier ?) ((InterfaceMembers ?) delimited by OpenBrace and CloseBrace)) ; - parser InterfaceMembersList = (ContractMember +) ; + parser InterfaceMembers = (ContractMember +) ; - parser LibraryDefinition = (LibraryKeyword Identifier ((LibraryMembersList ?) delimited by OpenBrace and CloseBrace)) ; + parser LibraryDefinition = (LibraryKeyword Identifier ((LibraryMembers ?) delimited by OpenBrace and CloseBrace)) ; - parser LibraryMembersList = (ContractMember +) ; + parser LibraryMembers = (ContractMember +) ; parser MappingKeyType = ( (ElementaryType | IdentifierPath) @@ -401,9 +401,9 @@ slang_grammar! { { introduced in "0.6.0" VirtualKeyword } ) ; - parser ModifierAttributesList = (ModifierAttribute +) ; + parser ModifierAttributes = (ModifierAttribute +) ; - parser ModifierDefinition = (ModifierKeyword Identifier (ParametersDeclaration ?) (ModifierAttributesList ?) (Semicolon | Block)) ; + parser ModifierDefinition = (ModifierKeyword Identifier (ParametersDeclaration ?) (ModifierAttributes ?) (Semicolon | Block)) ; parser ModifierInvocation = (IdentifierPath (ArgumentsDeclaration ?)) ; @@ -411,9 +411,9 @@ slang_grammar! { parser NamedArgument = (Identifier Colon Expression) ; - parser NamedArgumentsDeclaration = ((NamedArgumentsList ?) delimited by OpenBrace and CloseBrace) ; + parser NamedArgumentsDeclaration = ((NamedArguments ?) delimited by OpenBrace and CloseBrace) ; - parser NamedArgumentsList = (NamedArgument separated by Comma) ; + parser NamedArguments = (NamedArgument separated by Comma) ; parser NamedImport = (Asterisk AsKeyword Identifier FromKeyword AsciiStringLiteral) ; @@ -435,17 +435,17 @@ slang_grammar! { inline parser OrderComparisonOperator = (LessThan | GreaterThan | LessThanEqual | GreaterThanEqual) ; - parser OverrideSpecifier = (OverrideKeyword (((IdentifierPathsList ?) delimited by OpenParen and CloseParen) ?)) ; + parser OverrideSpecifier = (OverrideKeyword (((OverridePaths ?) delimited by OpenParen and CloseParen) ?)) ; parser Parameter = (TypeName (DataLocation ?) (Identifier ?)) ; - parser ParametersDeclaration = ((ParametersList ?) delimited by OpenParen and CloseParen) ; + parser ParametersDeclaration = ((Parameters ?) delimited by OpenParen and CloseParen) ; - parser ParametersList = (Parameter separated by Comma) ; + parser Parameters = (Parameter separated by Comma) ; parser PathImport = (AsciiStringLiteral ((AsKeyword Identifier) ?)) ; - parser PositionalArgumentsList = (Expression separated by Comma) ; + parser PositionalArguments = (Expression separated by Comma) ; parser PragmaDirective = ((PragmaKeyword (ABICoderPragma | ExperimentalPragma | VersionPragma)) terminated by Semicolon) ; @@ -456,9 +456,9 @@ slang_grammar! { inline parser ReceiveFunctionAttribute = { introduced in "0.6.0" (ModifierInvocation | OverrideSpecifier | ExternalKeyword | PayableKeyword | VirtualKeyword) } ; - parser ReceiveFunctionAttributesList = { introduced in "0.6.0" (ReceiveFunctionAttribute +) } ; + parser ReceiveFunctionAttributes = { introduced in "0.6.0" (ReceiveFunctionAttribute +) } ; - parser ReceiveFunctionDefinition = { introduced in "0.6.0" (ReceiveKeyword ParametersDeclaration (ReceiveFunctionAttributesList ?) (Semicolon | Block)) } ; + parser ReceiveFunctionDefinition = { introduced in "0.6.0" (ReceiveKeyword ParametersDeclaration (ReceiveFunctionAttributes ?) (Semicolon | Block)) } ; parser ReturnStatement = ((ReturnKeyword (Expression ?)) terminated by Semicolon) ; @@ -470,7 +470,7 @@ slang_grammar! { inline parser SimpleStatement = (ExpressionStatement | VariableDeclarationStatement | TupleDeconstructionStatement) ; - parser SourceUnit = ((SourceUnitMembersList ?) (EndOfFileTrivia ?)) ; + parser SourceUnit = ((SourceUnitMembers ?) (EndOfFileTrivia ?)) ; inline parser SourceUnitMember = ( PragmaDirective | ImportDirective | ContractDefinition | InterfaceDefinition | LibraryDefinition | @@ -483,45 +483,45 @@ slang_grammar! { { introduced in "0.8.22" EventDefinition } ) ; - parser SourceUnitMembersList = (SourceUnitMember +) ; + parser SourceUnitMembers = (SourceUnitMember +) ; inline parser StateVariableAttribute = ( OverrideSpecifier | ConstantKeyword | InternalKeyword | PrivateKeyword | PublicKeyword| { introduced in "0.6.5" ImmutableKeyword } ) ; - parser StateVariableAttributesList = (StateVariableAttribute +) ; + parser StateVariableAttributes = (StateVariableAttribute +) ; - parser StateVariableDefinition = ((TypeName (StateVariableAttributesList ?) Identifier ((Equal Expression) ?)) terminated by Semicolon) ; + parser StateVariableDefinition = ((TypeName (StateVariableAttributes ?) Identifier ((Equal Expression) ?)) terminated by Semicolon) ; inline parser Statement = ( SimpleStatement | ControlStatement | AssemblyStatement | Block | { introduced in "0.8.0" UncheckedBlock } ) ; - parser StatementsList = (Statement +) ; + parser Statements = (Statement +) ; inline parser StringExpression = ( - HexStringLiteralsList | AsciiStringLiteralsList | { introduced in "0.7.0" UnicodeStringLiteralsList } + HexStringLiterals | AsciiStringLiterals | { introduced in "0.7.0" UnicodeStringLiterals } ) ; - parser StructDefinition = (StructKeyword Identifier ((StructMembersList ?) delimited by OpenBrace and CloseBrace)) ; + parser StructDefinition = (StructKeyword Identifier ((StructMembers ?) delimited by OpenBrace and CloseBrace)) ; parser StructMember = ((TypeName Identifier) terminated by Semicolon) ; - parser StructMembersList = (StructMember +) ; + parser StructMembers = (StructMember +) ; parser ThrowStatement = { removed in "0.5.0" (ThrowKeyword terminated by Semicolon) } ; - parser TryStatement = { introduced in "0.6.0" (TryKeyword Expression (ReturnsDeclaration ?) Block CatchClausesList) } ; + parser TryStatement = { introduced in "0.6.0" (TryKeyword Expression (ReturnsDeclaration ?) Block CatchClauses) } ; - parser TupleDeconstructionStatement = ((((TupleMembersList ?) delimited by OpenParen and CloseParen) Equal Expression) terminated by Semicolon) ; + parser TupleDeconstructionStatement = ((((TupleMembers ?) delimited by OpenParen and CloseParen) Equal Expression) terminated by Semicolon) ; - parser TupleExpression = (TupleValuesList delimited by OpenParen and CloseParen) ; + parser TupleExpression = (TupleValues delimited by OpenParen and CloseParen) ; parser TupleMember = (((TypeName (DataLocation ?) Identifier) | ((DataLocation ?) Identifier)) ?) ; - parser TupleMembersList = (TupleMember separated by Comma) ; + parser TupleMembers = (TupleMember separated by Comma) ; - parser TupleValuesList = ((Expression ?) separated by Comma) ; + parser TupleValues = ((Expression ?) separated by Comma) ; parser TypeExpression = { introduced in "0.5.3" (TypeKeyword (TypeName delimited by OpenParen and CloseParen)) } ; @@ -540,19 +540,19 @@ slang_grammar! { parser UncheckedBlock = { introduced in "0.8.0" (UncheckedKeyword Block) } ; - parser UnicodeStringLiteralsList = { introduced in "0.7.0" (UnicodeStringLiteral +) } ; + parser UnicodeStringLiterals = { introduced in "0.7.0" (UnicodeStringLiteral +) } ; inline parser UnnamedFunctionAttribute = { removed in "0.6.0" (ModifierInvocation | OverrideSpecifier | ExternalKeyword | PayableKeyword | PureKeyword | ViewKeyword) } ; - parser UnnamedFunctionAttributesList = { removed in "0.6.0" (UnnamedFunctionAttribute +) } ; + parser UnnamedFunctionAttributes = { removed in "0.6.0" (UnnamedFunctionAttribute +) } ; - parser UnnamedFunctionDefinition = { removed in "0.6.0" (FunctionKeyword ParametersDeclaration (UnnamedFunctionAttributesList ?) (Semicolon | Block)) } ; + parser UnnamedFunctionDefinition = { removed in "0.6.0" (FunctionKeyword ParametersDeclaration (UnnamedFunctionAttributes ?) (Semicolon | Block)) } ; 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 UsingDirectiveDeconstruction = { introduced in "0.8.13" (UsingDirectiveSymbolsList delimited by OpenBrace and CloseBrace) }; + parser UsingDirectiveDeconstruction = { introduced in "0.8.13" (UsingDirectiveSymbols 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) @@ -562,7 +562,7 @@ slang_grammar! { introduced in "0.8.13" (IdentifierPath { introduced in "0.8.19" ((AsKeyword UsingDirectiveOperator) ?) } ) } ; - parser UsingDirectiveSymbolsList = (UsingDirectiveSymbol separated by Comma) ; + parser UsingDirectiveSymbols = (UsingDirectiveSymbol separated by Comma) ; parser VariableDeclaration = (VariableDeclarationType (DataLocation ?) Identifier) ; @@ -582,7 +582,7 @@ slang_grammar! { lexical context VersionPragma = { - parser VersionPragma = (SolidityKeyword VersionPragmaExpressionsList) ; + parser VersionPragma = (SolidityKeyword VersionPragmaExpressions) ; precedence parser VersionPragmaExpression = ( [ @@ -593,7 +593,7 @@ slang_grammar! { with primary expression VersionPragmaSpecifier ) ; - parser VersionPragmaExpressionsList = (VersionPragmaExpression +) ; + parser VersionPragmaExpressions = (VersionPragmaExpression +) ; inline parser VersionPragmaOrOperator = BarBar ; @@ -625,15 +625,15 @@ slang_grammar! { | LeaveKeyword ) ; - parser YulAssignmentStatement = (YulIdentifierPathsList ColonEqual YulExpression) ; + parser YulAssignmentStatement = (YulIdentifierPaths ColonEqual YulExpression) ; - parser YulBlock = ((YulStatementsList ?) delimited by OpenBrace and CloseBrace) ; + parser YulBlock = ((YulStatements ?) delimited by OpenBrace and CloseBrace) ; parser YulBreakStatement = BreakKeyword ; parser YulContinueStatement = ContinueKeyword ; - parser YulDeclarationStatement = (LetKeyword YulIdentifierPathsList ((ColonEqual YulExpression) ?)) ; + parser YulDeclarationStatement = (LetKeyword YulIdentifierPaths ((ColonEqual YulExpression) ?)) ; precedence parser YulExpression = ( [ @@ -642,19 +642,19 @@ slang_grammar! { with primary expression (YulLiteral | YulIdentifierPath) ) ; - parser YulExpressionsList = (YulExpression separated by Comma) ; + parser YulArguments = (YulExpression separated by Comma) ; parser YulForStatement = (ForKeyword YulBlock YulExpression YulBlock YulBlock) ; - inline parser YulFunctionCallOperator = ((YulExpressionsList ?) delimited by OpenParen and CloseParen) ; + inline parser YulFunctionCallOperator = ((YulArguments ?) delimited by OpenParen and CloseParen) ; parser YulFunctionDefinition = (FunctionKeyword YulIdentifier YulParametersDeclaration (YulReturnsDeclaration ?) YulBlock) ; parser YulIdentifierPath = (YulIdentifier separated by Period) ; - parser YulIdentifierPathsList = (YulIdentifierPath separated by Comma) ; + parser YulIdentifierPaths = (YulIdentifierPath separated by Comma) ; - parser YulIdentifiersList = (YulIdentifier separated by Comma) ; + parser YulIdentifiers = (YulIdentifier separated by Comma) ; parser YulIfStatement = (IfKeyword YulExpression YulBlock) ; @@ -662,9 +662,9 @@ slang_grammar! { inline parser YulLiteral = (TrueKeyword | FalseKeyword | YulHexLiteral | YulDecimalLiteral | HexStringLiteral | AsciiStringLiteral) ; - parser YulParametersDeclaration = ((YulIdentifiersList ?) delimited by OpenParen and CloseParen) ; + parser YulParametersDeclaration = ((YulIdentifiers ?) delimited by OpenParen and CloseParen) ; - parser YulReturnsDeclaration = (MinusGreaterThan YulIdentifiersList) ; + parser YulReturnsDeclaration = (MinusGreaterThan YulIdentifiers) ; inline parser YulStatement = ( YulBlock | YulFunctionDefinition | YulDeclarationStatement | YulAssignmentStatement | YulIfStatement | @@ -672,13 +672,13 @@ slang_grammar! { YulBreakStatement | YulContinueStatement | YulExpression ) ; - parser YulStatementsList = (YulStatement +) ; + parser YulStatements = (YulStatement +) ; parser YulSwitchCase = ((DefaultKeyword | (CaseKeyword YulLiteral)) YulBlock) ; - parser YulSwitchCasesList = (YulSwitchCase +) ; + parser YulSwitchCases = (YulSwitchCase +) ; - parser YulSwitchStatement = (SwitchKeyword YulExpression YulSwitchCasesList) ; + parser YulSwitchStatement = (SwitchKeyword YulExpression YulSwitchCases) ; } ; diff --git a/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs b/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs index 3eab6c6c27..c1f9ee1e01 100644 --- a/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs +++ b/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs @@ -21,141 +21,141 @@ pub enum ProductionKind { AddressType, ArgumentsDeclaration, ArrayExpression, - ArrayValuesList, - AsciiStringLiteralsList, + ArrayValues, + AsciiStringLiterals, + AssemblyFlags, AssemblyFlagsDeclaration, - AssemblyFlagsList, AssemblyStatement, Block, BreakStatement, CatchClause, CatchClauseError, - CatchClausesList, + CatchClauses, ConstantDefinition, - ConstructorAttributesList, + ConstructorAttributes, ConstructorDefinition, ContinueStatement, ContractDefinition, - ContractMembersList, + ContractMembers, DecimalNumberExpression, DeconstructionImport, DeconstructionImportSymbol, - DeconstructionImportSymbolsList, + DeconstructionImportSymbols, DeleteStatement, DoWhileStatement, EmitStatement, EndOfFileTrivia, EnumDefinition, + EnumMembers, ErrorDefinition, ErrorParameter, + ErrorParameters, ErrorParametersDeclaration, - ErrorParametersList, EventDefinition, EventParameter, + EventParameters, EventParametersDeclaration, - EventParametersList, ExperimentalPragma, Expression, ExpressionStatement, - FallbackFunctionAttributesList, + FallbackFunctionAttributes, FallbackFunctionDefinition, ForStatement, - FunctionAttributesList, + FunctionAttributes, FunctionCallOptions, FunctionDefinition, FunctionType, - FunctionTypeAttributesList, + FunctionTypeAttributes, HexNumberExpression, - HexStringLiteralsList, + HexStringLiterals, IdentifierPath, - IdentifierPathsList, - IdentifiersList, IfStatement, ImportDirective, InheritanceSpecifier, InheritanceType, - InheritanceTypesList, + InheritanceTypes, InterfaceDefinition, - InterfaceMembersList, + InterfaceMembers, LeadingTrivia, LibraryDefinition, - LibraryMembersList, + LibraryMembers, MappingKeyType, MappingType, MappingValueType, - ModifierAttributesList, + ModifierAttributes, ModifierDefinition, ModifierInvocation, NamedArgument, + NamedArguments, NamedArgumentsDeclaration, - NamedArgumentsList, NamedImport, NewExpression, + OverridePaths, OverrideSpecifier, Parameter, + Parameters, ParametersDeclaration, - ParametersList, PathImport, - PositionalArgumentsList, + PositionalArguments, PragmaDirective, - ReceiveFunctionAttributesList, + ReceiveFunctionAttributes, ReceiveFunctionDefinition, ReturnStatement, ReturnsDeclaration, RevertStatement, SourceUnit, - SourceUnitMembersList, - StateVariableAttributesList, + SourceUnitMembers, + StateVariableAttributes, StateVariableDefinition, - StatementsList, + Statements, StructDefinition, StructMember, - StructMembersList, + StructMembers, ThrowStatement, TrailingTrivia, TryStatement, TupleDeconstructionStatement, TupleExpression, TupleMember, - TupleMembersList, - TupleValuesList, + TupleMembers, + TupleValues, TypeExpression, TypeName, UncheckedBlock, - UnicodeStringLiteralsList, - UnnamedFunctionAttributesList, + UnicodeStringLiterals, + UnnamedFunctionAttributes, UnnamedFunctionDefinition, UserDefinedValueTypeDefinition, UsingDirective, UsingDirectiveDeconstruction, UsingDirectiveSymbol, - UsingDirectiveSymbolsList, + UsingDirectiveSymbols, VariableDeclaration, VariableDeclarationStatement, VersionPragma, VersionPragmaExpression, - VersionPragmaExpressionsList, + VersionPragmaExpressions, VersionPragmaSpecifier, WhileStatement, + YulArguments, YulAssignmentStatement, YulBlock, YulBreakStatement, YulContinueStatement, YulDeclarationStatement, YulExpression, - YulExpressionsList, YulForStatement, YulFunctionDefinition, YulIdentifierPath, - YulIdentifierPathsList, - YulIdentifiersList, + YulIdentifierPaths, + YulIdentifiers, YulIfStatement, YulLeaveStatement, YulParametersDeclaration, YulReturnsDeclaration, - YulStatementsList, + YulStatements, YulSwitchCase, - YulSwitchCasesList, + YulSwitchCases, YulSwitchStatement, } @@ -178,151 +178,151 @@ pub enum RuleKind { ArgumentsDeclaration, ArrayExpression, ArrayTypeName, - ArrayValuesList, - AsciiStringLiteralsList, + ArrayValues, + AsciiStringLiterals, + AssemblyFlags, AssemblyFlagsDeclaration, - AssemblyFlagsList, AssemblyStatement, BinaryExpression, Block, BreakStatement, CatchClause, CatchClauseError, - CatchClausesList, + CatchClauses, ConditionalExpression, ConstantDefinition, - ConstructorAttributesList, + ConstructorAttributes, ConstructorDefinition, ContinueStatement, ContractDefinition, - ContractMembersList, + ContractMembers, DecimalNumberExpression, DeconstructionImport, DeconstructionImportSymbol, - DeconstructionImportSymbolsList, + DeconstructionImportSymbols, DeleteStatement, DoWhileStatement, EmitStatement, EndOfFileTrivia, EnumDefinition, + EnumMembers, ErrorDefinition, ErrorParameter, + ErrorParameters, ErrorParametersDeclaration, - ErrorParametersList, EventDefinition, EventParameter, + EventParameters, EventParametersDeclaration, - EventParametersList, ExperimentalPragma, Expression, ExpressionStatement, - FallbackFunctionAttributesList, + FallbackFunctionAttributes, FallbackFunctionDefinition, ForStatement, - FunctionAttributesList, + FunctionAttributes, FunctionCallExpression, FunctionCallOptions, FunctionDefinition, FunctionType, - FunctionTypeAttributesList, + FunctionTypeAttributes, HexNumberExpression, - HexStringLiteralsList, + HexStringLiterals, IdentifierPath, - IdentifierPathsList, - IdentifiersList, IfStatement, ImportDirective, IndexAccessExpression, InheritanceSpecifier, InheritanceType, - InheritanceTypesList, + InheritanceTypes, InterfaceDefinition, - InterfaceMembersList, + InterfaceMembers, LeadingTrivia, LibraryDefinition, - LibraryMembersList, + LibraryMembers, MappingKeyType, MappingType, MappingValueType, MemberAccessExpression, - ModifierAttributesList, + ModifierAttributes, ModifierDefinition, ModifierInvocation, NamedArgument, + NamedArguments, NamedArgumentsDeclaration, - NamedArgumentsList, NamedImport, NewExpression, + OverridePaths, OverrideSpecifier, Parameter, + Parameters, ParametersDeclaration, - ParametersList, PathImport, - PositionalArgumentsList, + PositionalArguments, PragmaDirective, - ReceiveFunctionAttributesList, + ReceiveFunctionAttributes, ReceiveFunctionDefinition, ReturnStatement, ReturnsDeclaration, RevertStatement, SourceUnit, - SourceUnitMembersList, - StateVariableAttributesList, + SourceUnitMembers, + StateVariableAttributes, StateVariableDefinition, - StatementsList, + Statements, StructDefinition, StructMember, - StructMembersList, + StructMembers, ThrowStatement, TrailingTrivia, TryStatement, TupleDeconstructionStatement, TupleExpression, TupleMember, - TupleMembersList, - TupleValuesList, + TupleMembers, + TupleValues, TypeExpression, TypeName, UnaryPostfixExpression, UnaryPrefixExpression, UncheckedBlock, - UnicodeStringLiteralsList, - UnnamedFunctionAttributesList, + UnicodeStringLiterals, + UnnamedFunctionAttributes, UnnamedFunctionDefinition, UserDefinedValueTypeDefinition, UsingDirective, UsingDirectiveDeconstruction, UsingDirectiveSymbol, - UsingDirectiveSymbolsList, + UsingDirectiveSymbols, VariableDeclaration, VariableDeclarationStatement, VersionPragma, VersionPragmaBinaryExpression, VersionPragmaExpression, - VersionPragmaExpressionsList, + VersionPragmaExpressions, VersionPragmaSpecifier, VersionPragmaUnaryExpression, WhileStatement, + YulArguments, YulAssignmentStatement, YulBlock, YulBreakStatement, YulContinueStatement, YulDeclarationStatement, YulExpression, - YulExpressionsList, YulForStatement, YulFunctionCallExpression, YulFunctionDefinition, YulIdentifierPath, - YulIdentifierPathsList, - YulIdentifiersList, + YulIdentifierPaths, + YulIdentifiers, YulIfStatement, YulLeaveStatement, YulParametersDeclaration, YulReturnsDeclaration, - YulStatementsList, + YulStatements, YulSwitchCase, - YulSwitchCasesList, + YulSwitchCases, YulSwitchStatement, } diff --git a/crates/solidity/outputs/cargo/crate/src/generated/language.rs b/crates/solidity/outputs/cargo/crate/src/generated/language.rs index 3740bf1e1d..f7cb7a0d23 100644 --- a/crates/solidity/outputs/cargo/crate/src/generated/language.rs +++ b/crates/solidity/outputs/cargo/crate/src/generated/language.rs @@ -229,7 +229,7 @@ impl Language { ))?; seq.elem( OptionalHelper::transform(ChoiceHelper::run(input, |mut choice, input| { - let result = self.positional_arguments_list(input); + let result = self.positional_arguments(input); choice.consider(input, result)?; let result = self.named_arguments_declaration(input); choice.consider(input, result)?; @@ -261,7 +261,7 @@ impl Language { TokenKind::OpenBracket, ))?; seq.elem( - self.array_values_list(input) + self.array_values(input) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -279,25 +279,41 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn array_values_list(&self, input: &mut ParserContext) -> ParserResult { + fn array_values(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::Default>( input, self, |input| self.expression(input), TokenKind::Comma, ) - .with_kind(RuleKind::ArrayValuesList) + .with_kind(RuleKind::ArrayValues) } #[allow(unused_assignments, unused_parens)] - fn ascii_string_literals_list(&self, input: &mut ParserContext) -> ParserResult { + fn ascii_string_literals(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { self.parse_token_with_trivia::( input, TokenKind::AsciiStringLiteral, ) }) - .with_kind(RuleKind::AsciiStringLiteralsList) + .with_kind(RuleKind::AsciiStringLiterals) + } + + #[allow(unused_assignments, unused_parens)] + fn assembly_flags(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| { + self.parse_token_with_trivia::( + input, + TokenKind::AsciiStringLiteral, + ) + }, + TokenKind::Comma, + ) + .with_kind(RuleKind::AssemblyFlags) } #[allow(unused_assignments, unused_parens)] @@ -310,7 +326,7 @@ impl Language { TokenKind::OpenParen, ))?; seq.elem( - self.assembly_flags_list(input) + self.assembly_flags(input) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -327,22 +343,6 @@ impl Language { .with_kind(RuleKind::AssemblyFlagsDeclaration) } - #[allow(unused_assignments, unused_parens)] - fn assembly_flags_list(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| { - self.parse_token_with_trivia::( - input, - TokenKind::AsciiStringLiteral, - ) - }, - TokenKind::Comma, - ) - .with_kind(RuleKind::AssemblyFlagsList) - } - #[allow(unused_assignments, unused_parens)] fn assembly_statement(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -375,7 +375,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - OptionalHelper::transform(self.statements_list(input)) + OptionalHelper::transform(self.statements(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -454,13 +454,13 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn catch_clauses_list(&self, input: &mut ParserContext) -> ParserResult { + fn catch_clauses(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_6_0 { OneOrMoreHelper::run(input, |input| self.catch_clause(input)) } else { ParserResult::disabled() } - .with_kind(RuleKind::CatchClausesList) + .with_kind(RuleKind::CatchClauses) } #[allow(unused_assignments, unused_parens)] @@ -505,7 +505,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn constructor_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn constructor_attributes(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_4_22 { OneOrMoreHelper::run(input, |input| { if self.version_is_at_least_0_4_22 { @@ -536,7 +536,7 @@ impl Language { } else { ParserResult::disabled() } - .with_kind(RuleKind::ConstructorAttributesList) + .with_kind(RuleKind::ConstructorAttributes) } #[allow(unused_assignments, unused_parens)] @@ -549,7 +549,7 @@ impl Language { ))?; seq.elem(self.parameters_declaration(input))?; seq.elem(OptionalHelper::transform( - self.constructor_attributes_list(input), + self.constructor_attributes(input), ))?; seq.elem(self.block(input))?; seq.finish() @@ -612,7 +612,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - OptionalHelper::transform(self.contract_members_list(input)) + OptionalHelper::transform(self.contract_members(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -632,7 +632,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn contract_members_list(&self, input: &mut ParserContext) -> ParserResult { + fn contract_members(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.using_directive(input); @@ -678,7 +678,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::ContractMembersList) + .with_kind(RuleKind::ContractMembers) } #[allow(unused_assignments, unused_parens)] @@ -777,7 +777,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - self.deconstruction_import_symbols_list(input) + self.deconstruction_import_symbols(input) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -828,14 +828,14 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn deconstruction_import_symbols_list(&self, input: &mut ParserContext) -> ParserResult { + 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::DeconstructionImportSymbolsList) + .with_kind(RuleKind::DeconstructionImportSymbols) } #[allow(unused_assignments, unused_parens)] @@ -1052,13 +1052,13 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - OptionalHelper::transform(self.identifiers_list(input)) + OptionalHelper::transform(self.enum_members(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( - input, - self, - TokenKind::CloseBrace, - RecoverFromNoMatch::Yes, - ), + input, + self, + TokenKind::CloseBrace, + RecoverFromNoMatch::Yes, + ), )?; seq.elem(self.parse_token_with_trivia::( input, @@ -1071,6 +1071,22 @@ impl Language { .with_kind(RuleKind::EnumDefinition) } + #[allow(unused_assignments, unused_parens)] + fn enum_members(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| { + self.parse_token_with_trivia::( + input, + TokenKind::Identifier, + ) + }, + TokenKind::Comma, + ) + .with_kind(RuleKind::EnumMembers) + } + #[allow(unused_assignments, unused_parens)] fn error_definition(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_8_4 { @@ -1126,6 +1142,21 @@ impl Language { .with_kind(RuleKind::ErrorParameter) } + #[allow(unused_assignments, unused_parens)] + fn error_parameters(&self, input: &mut ParserContext) -> ParserResult { + if self.version_is_at_least_0_8_4 { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| self.error_parameter(input), + TokenKind::Comma, + ) + } else { + ParserResult::disabled() + } + .with_kind(RuleKind::ErrorParameters) + } + #[allow(unused_assignments, unused_parens)] fn error_parameters_declaration(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_8_4 { @@ -1137,7 +1168,7 @@ impl Language { TokenKind::OpenParen, ))?; seq.elem( - OptionalHelper::transform(self.error_parameters_list(input)) + OptionalHelper::transform(self.error_parameters(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -1157,21 +1188,6 @@ impl Language { .with_kind(RuleKind::ErrorParametersDeclaration) } - #[allow(unused_assignments, unused_parens)] - fn error_parameters_list(&self, input: &mut ParserContext) -> ParserResult { - if self.version_is_at_least_0_8_4 { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| self.error_parameter(input), - TokenKind::Comma, - ) - } else { - ParserResult::disabled() - } - .with_kind(RuleKind::ErrorParametersList) - } - #[allow(unused_assignments, unused_parens)] fn event_definition(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -1231,6 +1247,17 @@ impl Language { .with_kind(RuleKind::EventParameter) } + #[allow(unused_assignments, unused_parens)] + fn event_parameters(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| self.event_parameter(input), + TokenKind::Comma, + ) + .with_kind(RuleKind::EventParameters) + } + #[allow(unused_assignments, unused_parens)] fn event_parameters_declaration(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -1241,13 +1268,13 @@ impl Language { TokenKind::OpenParen, ))?; seq.elem( - OptionalHelper::transform(self.event_parameters_list(input)) + OptionalHelper::transform(self.event_parameters(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( - input, - self, - TokenKind::CloseParen, - RecoverFromNoMatch::Yes, - ), + input, + self, + TokenKind::CloseParen, + RecoverFromNoMatch::Yes, + ), )?; seq.elem(self.parse_token_with_trivia::( input, @@ -1258,17 +1285,6 @@ impl Language { .with_kind(RuleKind::EventParametersDeclaration) } - #[allow(unused_assignments, unused_parens)] - fn event_parameters_list(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| self.event_parameter(input), - TokenKind::Comma, - ) - .with_kind(RuleKind::EventParametersList) - } - #[allow(unused_assignments, unused_parens)] fn experimental_pragma(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -1757,12 +1773,12 @@ impl Language { }); choice.consider(input, result)?; let result = ChoiceHelper::run(input, |mut choice, input| { - let result = self.hex_string_literals_list(input); + let result = self.hex_string_literals(input); choice.consider(input, result)?; - let result = self.ascii_string_literals_list(input); + let result = self.ascii_string_literals(input); choice.consider(input, result)?; if self.version_is_at_least_0_7_0 { - let result = self.unicode_string_literals_list(input); + let result = self.unicode_string_literals(input); choice.consider(input, result)?; } choice.finish(input) @@ -1932,7 +1948,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn fallback_function_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn fallback_function_attributes(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_6_0 { OneOrMoreHelper::run(input, |input| { if self.version_is_at_least_0_6_0 { @@ -1975,7 +1991,7 @@ impl Language { } else { ParserResult::disabled() } - .with_kind(RuleKind::FallbackFunctionAttributesList) + .with_kind(RuleKind::FallbackFunctionAttributes) } #[allow(unused_assignments, unused_parens)] @@ -1988,7 +2004,7 @@ impl Language { ))?; seq.elem(self.parameters_declaration(input))?; seq.elem(OptionalHelper::transform( - self.fallback_function_attributes_list(input), + self.fallback_function_attributes(input), ))?; seq.elem(OptionalHelper::transform(self.returns_declaration(input)))?; seq.elem(ChoiceHelper::run(input, |mut choice, input| { @@ -2134,7 +2150,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn function_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn function_attributes(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.modifier_invocation(input); @@ -2193,7 +2209,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::FunctionAttributesList) + .with_kind(RuleKind::FunctionAttributes) } #[allow(unused_assignments, unused_parens)] @@ -2239,9 +2255,7 @@ impl Language { choice.finish(input) }))?; seq.elem(self.parameters_declaration(input))?; - seq.elem(OptionalHelper::transform( - self.function_attributes_list(input), - ))?; + seq.elem(OptionalHelper::transform(self.function_attributes(input)))?; seq.elem(OptionalHelper::transform(self.returns_declaration(input)))?; seq.elem(ChoiceHelper::run(input, |mut choice, input| { let result = self.parse_token_with_trivia::( @@ -2267,7 +2281,7 @@ impl Language { ))?; seq.elem(self.parameters_declaration(input))?; seq.elem(OptionalHelper::transform( - self.function_type_attributes_list(input), + self.function_type_attributes(input), ))?; seq.elem(OptionalHelper::transform(self.returns_declaration(input)))?; seq.finish() @@ -2276,7 +2290,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn function_type_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn function_type_attributes(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.parse_token_with_trivia::( @@ -2317,7 +2331,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::FunctionTypeAttributesList) + .with_kind(RuleKind::FunctionTypeAttributes) } #[allow(unused_assignments, unused_parens)] @@ -2410,14 +2424,14 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn hex_string_literals_list(&self, input: &mut ParserContext) -> ParserResult { + fn hex_string_literals(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { self.parse_token_with_trivia::( input, TokenKind::HexStringLiteral, ) }) - .with_kind(RuleKind::HexStringLiteralsList) + .with_kind(RuleKind::HexStringLiterals) } #[allow(unused_assignments, unused_parens)] @@ -2436,33 +2450,6 @@ impl Language { .with_kind(RuleKind::IdentifierPath) } - #[allow(unused_assignments, unused_parens)] - fn identifier_paths_list(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| self.identifier_path(input), - TokenKind::Comma, - ) - .with_kind(RuleKind::IdentifierPathsList) - } - - #[allow(unused_assignments, unused_parens)] - fn identifiers_list(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| { - self.parse_token_with_trivia::( - input, - TokenKind::Identifier, - ) - }, - TokenKind::Comma, - ) - .with_kind(RuleKind::IdentifiersList) - } - #[allow(unused_assignments, unused_parens)] fn if_statement(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -2661,7 +2648,7 @@ impl Language { input, TokenKind::IsKeyword, ))?; - seq.elem(self.inheritance_types_list(input))?; + seq.elem(self.inheritance_types(input))?; seq.finish() }) .with_kind(RuleKind::InheritanceSpecifier) @@ -2678,14 +2665,14 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn inheritance_types_list(&self, input: &mut ParserContext) -> ParserResult { + fn inheritance_types(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::Default>( input, self, |input| self.inheritance_type(input), TokenKind::Comma, ) - .with_kind(RuleKind::InheritanceTypesList) + .with_kind(RuleKind::InheritanceTypes) } #[allow(unused_assignments, unused_parens)] @@ -2708,7 +2695,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - OptionalHelper::transform(self.interface_members_list(input)) + OptionalHelper::transform(self.interface_members(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -2728,7 +2715,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn interface_members_list(&self, input: &mut ParserContext) -> ParserResult { + fn interface_members(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.using_directive(input); @@ -2774,7 +2761,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::InterfaceMembersList) + .with_kind(RuleKind::InterfaceMembers) } #[allow(unused_assignments, unused_parens)] @@ -2820,7 +2807,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - OptionalHelper::transform(self.library_members_list(input)) + OptionalHelper::transform(self.library_members(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -2840,7 +2827,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn library_members_list(&self, input: &mut ParserContext) -> ParserResult { + fn library_members(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.using_directive(input); @@ -2886,7 +2873,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::LibraryMembersList) + .with_kind(RuleKind::LibraryMembers) } #[allow(unused_assignments, unused_parens)] @@ -3018,7 +3005,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn modifier_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn modifier_attributes(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.override_specifier(input); @@ -3033,7 +3020,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::ModifierAttributesList) + .with_kind(RuleKind::ModifierAttributes) } #[allow(unused_assignments, unused_parens)] @@ -3050,9 +3037,7 @@ impl Language { seq.elem(OptionalHelper::transform( self.parameters_declaration(input), ))?; - seq.elem(OptionalHelper::transform( - self.modifier_attributes_list(input), - ))?; + seq.elem(OptionalHelper::transform(self.modifier_attributes(input)))?; seq.elem(ChoiceHelper::run(input, |mut choice, input| { let result = self.parse_token_with_trivia::( input, @@ -3097,6 +3082,17 @@ impl Language { .with_kind(RuleKind::NamedArgument) } + #[allow(unused_assignments, unused_parens)] + fn named_arguments(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| self.named_argument(input), + TokenKind::Comma, + ) + .with_kind(RuleKind::NamedArguments) + } + #[allow(unused_assignments, unused_parens)] fn named_arguments_declaration(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -3107,13 +3103,13 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - OptionalHelper::transform(self.named_arguments_list(input)) + OptionalHelper::transform(self.named_arguments(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( - input, - self, - TokenKind::CloseBrace, - RecoverFromNoMatch::Yes, - ), + input, + self, + TokenKind::CloseBrace, + RecoverFromNoMatch::Yes, + ), )?; seq.elem(self.parse_token_with_trivia::( input, @@ -3124,17 +3120,6 @@ impl Language { .with_kind(RuleKind::NamedArgumentsDeclaration) } - #[allow(unused_assignments, unused_parens)] - fn named_arguments_list(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| self.named_argument(input), - TokenKind::Comma, - ) - .with_kind(RuleKind::NamedArgumentsList) - } - #[allow(unused_assignments, unused_parens)] fn named_import(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -3176,6 +3161,17 @@ impl Language { .with_kind(RuleKind::NewExpression) } + #[allow(unused_assignments, unused_parens)] + fn override_paths(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| self.identifier_path(input), + TokenKind::Comma, + ) + .with_kind(RuleKind::OverridePaths) + } + #[allow(unused_assignments, unused_parens)] fn override_specifier(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -3191,7 +3187,7 @@ impl Language { TokenKind::OpenParen, ))?; seq.elem( - OptionalHelper::transform(self.identifier_paths_list(input)) + OptionalHelper::transform(self.override_paths(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -3248,6 +3244,17 @@ impl Language { .with_kind(RuleKind::Parameter) } + #[allow(unused_assignments, unused_parens)] + fn parameters(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| self.parameter(input), + TokenKind::Comma, + ) + .with_kind(RuleKind::Parameters) + } + #[allow(unused_assignments, unused_parens)] fn parameters_declaration(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -3258,7 +3265,7 @@ impl Language { TokenKind::OpenParen, ))?; seq.elem( - OptionalHelper::transform(self.parameters_list(input)) + OptionalHelper::transform(self.parameters(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -3275,17 +3282,6 @@ impl Language { .with_kind(RuleKind::ParametersDeclaration) } - #[allow(unused_assignments, unused_parens)] - fn parameters_list(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| self.parameter(input), - TokenKind::Comma, - ) - .with_kind(RuleKind::ParametersList) - } - #[allow(unused_assignments, unused_parens)] fn path_import(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -3310,14 +3306,14 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn positional_arguments_list(&self, input: &mut ParserContext) -> ParserResult { + fn positional_arguments(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::Default>( input, self, |input| self.expression(input), TokenKind::Comma, ) - .with_kind(RuleKind::PositionalArgumentsList) + .with_kind(RuleKind::PositionalArguments) } #[allow(unused_assignments, unused_parens)] @@ -3357,7 +3353,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn receive_function_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn receive_function_attributes(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_6_0 { OneOrMoreHelper::run(input, |input| { if self.version_is_at_least_0_6_0 { @@ -3390,7 +3386,7 @@ impl Language { } else { ParserResult::disabled() } - .with_kind(RuleKind::ReceiveFunctionAttributesList) + .with_kind(RuleKind::ReceiveFunctionAttributes) } #[allow(unused_assignments, unused_parens)] @@ -3403,7 +3399,7 @@ impl Language { ))?; seq.elem(self.parameters_declaration(input))?; seq.elem(OptionalHelper::transform( - self.receive_function_attributes_list(input), + self.receive_function_attributes(input), ))?; seq.elem(ChoiceHelper::run(input, |mut choice, input| { let result = self.parse_token_with_trivia::( @@ -3496,9 +3492,7 @@ impl Language { #[allow(unused_assignments, unused_parens)] fn source_unit(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { - seq.elem(OptionalHelper::transform( - self.source_unit_members_list(input), - ))?; + seq.elem(OptionalHelper::transform(self.source_unit_members(input)))?; seq.elem(OptionalHelper::transform(self.end_of_file_trivia(input)))?; seq.finish() }) @@ -3506,7 +3500,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn source_unit_members_list(&self, input: &mut ParserContext) -> ParserResult { + fn source_unit_members(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.pragma_directive(input); @@ -3556,11 +3550,11 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::SourceUnitMembersList) + .with_kind(RuleKind::SourceUnitMembers) } #[allow(unused_assignments, unused_parens)] - fn state_variable_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn state_variable_attributes(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.override_specifier(input); @@ -3595,7 +3589,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::StateVariableAttributesList) + .with_kind(RuleKind::StateVariableAttributes) } #[allow(unused_assignments, unused_parens)] @@ -3605,7 +3599,7 @@ impl Language { SequenceHelper::run(|mut seq| { seq.elem(self.type_name(input))?; seq.elem(OptionalHelper::transform( - self.state_variable_attributes_list(input), + self.state_variable_attributes(input), ))?; seq.elem(self.parse_token_with_trivia::( input, @@ -3638,7 +3632,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn statements_list(&self, input: &mut ParserContext) -> ParserResult { + fn statements(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = ChoiceHelper::run(input, |mut choice, input| { @@ -3698,7 +3692,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::StatementsList) + .with_kind(RuleKind::Statements) } #[allow(unused_assignments, unused_parens)] @@ -3720,7 +3714,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - OptionalHelper::transform(self.struct_members_list(input)) + OptionalHelper::transform(self.struct_members(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -3768,9 +3762,9 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn struct_members_list(&self, input: &mut ParserContext) -> ParserResult { + fn struct_members(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| self.struct_member(input)) - .with_kind(RuleKind::StructMembersList) + .with_kind(RuleKind::StructMembers) } #[allow(unused_assignments, unused_parens)] @@ -3830,7 +3824,7 @@ impl Language { seq.elem(self.expression(input))?; seq.elem(OptionalHelper::transform(self.returns_declaration(input)))?; seq.elem(self.block(input))?; - seq.elem(self.catch_clauses_list(input))?; + seq.elem(self.catch_clauses(input))?; seq.finish() }) } else { @@ -3852,7 +3846,7 @@ impl Language { TokenKind::OpenParen, ))?; seq.elem( - OptionalHelper::transform(self.tuple_members_list(input)) + OptionalHelper::transform(self.tuple_members(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -3899,7 +3893,7 @@ impl Language { TokenKind::OpenParen, ))?; seq.elem( - self.tuple_values_list(input) + self.tuple_values(input) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -3990,25 +3984,25 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn tuple_members_list(&self, input: &mut ParserContext) -> ParserResult { + fn tuple_members(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::Default>( input, self, |input| self.tuple_member(input), TokenKind::Comma, ) - .with_kind(RuleKind::TupleMembersList) + .with_kind(RuleKind::TupleMembers) } #[allow(unused_assignments, unused_parens)] - fn tuple_values_list(&self, input: &mut ParserContext) -> ParserResult { + fn tuple_values(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::Default>( input, self, |input| OptionalHelper::transform(self.expression(input)), TokenKind::Comma, ) - .with_kind(RuleKind::TupleValuesList) + .with_kind(RuleKind::TupleValues) } #[allow(unused_assignments, unused_parens)] @@ -4179,7 +4173,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn unicode_string_literals_list(&self, input: &mut ParserContext) -> ParserResult { + fn unicode_string_literals(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_7_0 { OneOrMoreHelper::run(input, |input| { self.parse_token_with_trivia::( @@ -4190,11 +4184,11 @@ impl Language { } else { ParserResult::disabled() } - .with_kind(RuleKind::UnicodeStringLiteralsList) + .with_kind(RuleKind::UnicodeStringLiterals) } #[allow(unused_assignments, unused_parens)] - fn unnamed_function_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn unnamed_function_attributes(&self, input: &mut ParserContext) -> ParserResult { if !self.version_is_at_least_0_6_0 { OneOrMoreHelper::run(input, |input| { if !self.version_is_at_least_0_6_0 { @@ -4232,7 +4226,7 @@ impl Language { } else { ParserResult::disabled() } - .with_kind(RuleKind::UnnamedFunctionAttributesList) + .with_kind(RuleKind::UnnamedFunctionAttributes) } #[allow(unused_assignments, unused_parens)] @@ -4245,7 +4239,7 @@ impl Language { ))?; seq.elem(self.parameters_declaration(input))?; seq.elem(OptionalHelper::transform( - self.unnamed_function_attributes_list(input), + self.unnamed_function_attributes(input), ))?; seq.elem(ChoiceHelper::run(input, |mut choice, input| { let result = self.parse_token_with_trivia::( @@ -4426,7 +4420,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - self.using_directive_symbols_list(input) + self.using_directive_symbols(input) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -4566,14 +4560,14 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn using_directive_symbols_list(&self, input: &mut ParserContext) -> ParserResult { + fn using_directive_symbols(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::Default>( input, self, |input| self.using_directive_symbol(input), TokenKind::Comma, ) - .with_kind(RuleKind::UsingDirectiveSymbolsList) + .with_kind(RuleKind::UsingDirectiveSymbols) } #[allow(unused_assignments, unused_parens)] @@ -4664,7 +4658,7 @@ impl Language { TokenKind::SolidityKeyword, ), )?; - seq.elem(self.version_pragma_expressions_list(input))?; + seq.elem(self.version_pragma_expressions(input))?; seq.finish() }) .with_kind(RuleKind::VersionPragma) @@ -4786,9 +4780,9 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn version_pragma_expressions_list(&self, input: &mut ParserContext) -> ParserResult { + fn version_pragma_expressions(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| self.version_pragma_expression(input)) - .with_kind(RuleKind::VersionPragmaExpressionsList) + .with_kind(RuleKind::VersionPragmaExpressions) } #[allow(unused_assignments, unused_parens)] @@ -4898,10 +4892,21 @@ impl Language { .with_kind(RuleKind::WhileStatement) } + #[allow(unused_assignments, unused_parens)] + fn yul_arguments(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::YulBlock>( + input, + self, + |input| self.yul_expression(input), + TokenKind::Comma, + ) + .with_kind(RuleKind::YulArguments) + } + #[allow(unused_assignments, unused_parens)] fn yul_assignment_statement(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { - seq.elem(self.yul_identifier_paths_list(input))?; + seq.elem(self.yul_identifier_paths(input))?; seq.elem( self.parse_token_with_trivia::( input, @@ -4926,13 +4931,13 @@ impl Language { ), )?; seq.elem( - OptionalHelper::transform(self.yul_statements_list(input)) + OptionalHelper::transform(self.yul_statements(input)) .recover_until_with_nested_delims::<_, LexicalContextType::YulBlock>( - input, - self, - TokenKind::CloseBrace, - RecoverFromNoMatch::Yes, - ), + input, + self, + TokenKind::CloseBrace, + RecoverFromNoMatch::Yes, + ), )?; seq.elem( self.parse_token_with_trivia::( @@ -4969,7 +4974,7 @@ impl Language { TokenKind::LetKeyword, ), )?; - seq.elem(self.yul_identifier_paths_list(input))?; + seq.elem(self.yul_identifier_paths(input))?; seq.elem(OptionalHelper::transform(SequenceHelper::run(|mut seq| { seq.elem( self.parse_token_with_trivia::( @@ -5001,7 +5006,7 @@ impl Language { ), )?; seq.elem( - OptionalHelper::transform(self.yul_expressions_list(input)) + OptionalHelper::transform(self.yul_arguments(input)) .recover_until_with_nested_delims::<_, LexicalContextType::YulBlock>( input, self, @@ -5083,17 +5088,6 @@ impl Language { .with_kind(RuleKind::YulExpression) } - #[allow(unused_assignments, unused_parens)] - fn yul_expressions_list(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::YulBlock>( - input, - self, - |input| self.yul_expression(input), - TokenKind::Comma, - ) - .with_kind(RuleKind::YulExpressionsList) - } - #[allow(unused_assignments, unused_parens)] fn yul_for_statement(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -5154,18 +5148,18 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn yul_identifier_paths_list(&self, input: &mut ParserContext) -> ParserResult { + fn yul_identifier_paths(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::YulBlock>( input, self, |input| self.yul_identifier_path(input), TokenKind::Comma, ) - .with_kind(RuleKind::YulIdentifierPathsList) + .with_kind(RuleKind::YulIdentifierPaths) } #[allow(unused_assignments, unused_parens)] - fn yul_identifiers_list(&self, input: &mut ParserContext) -> ParserResult { + fn yul_identifiers(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::YulBlock>( input, self, @@ -5177,7 +5171,7 @@ impl Language { }, TokenKind::Comma, ) - .with_kind(RuleKind::YulIdentifiersList) + .with_kind(RuleKind::YulIdentifiers) } #[allow(unused_assignments, unused_parens)] @@ -5221,13 +5215,13 @@ impl Language { ), )?; seq.elem( - OptionalHelper::transform(self.yul_identifiers_list(input)) + OptionalHelper::transform(self.yul_identifiers(input)) .recover_until_with_nested_delims::<_, LexicalContextType::YulBlock>( - input, - self, - TokenKind::CloseParen, - RecoverFromNoMatch::Yes, - ), + input, + self, + TokenKind::CloseParen, + RecoverFromNoMatch::Yes, + ), )?; seq.elem( self.parse_token_with_trivia::( @@ -5249,14 +5243,14 @@ impl Language { TokenKind::MinusGreaterThan, ), )?; - seq.elem(self.yul_identifiers_list(input))?; + seq.elem(self.yul_identifiers(input))?; seq.finish() }) .with_kind(RuleKind::YulReturnsDeclaration) } #[allow(unused_assignments, unused_parens)] - fn yul_statements_list(&self, input: &mut ParserContext) -> ParserResult { + fn yul_statements(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.yul_block(input); @@ -5286,7 +5280,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::YulStatementsList) + .with_kind(RuleKind::YulStatements) } #[allow(unused_assignments, unused_parens)] @@ -5350,9 +5344,9 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn yul_switch_cases_list(&self, input: &mut ParserContext) -> ParserResult { + fn yul_switch_cases(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| self.yul_switch_case(input)) - .with_kind(RuleKind::YulSwitchCasesList) + .with_kind(RuleKind::YulSwitchCases) } #[allow(unused_assignments, unused_parens)] @@ -5365,7 +5359,7 @@ impl Language { ), )?; seq.elem(self.yul_expression(input))?; - seq.elem(self.yul_switch_cases_list(input))?; + seq.elem(self.yul_switch_cases(input))?; seq.finish() }) .with_kind(RuleKind::YulSwitchStatement) @@ -5949,30 +5943,28 @@ impl Language { ProductionKind::AddressType => Self::address_type.parse(self, input), ProductionKind::ArgumentsDeclaration => Self::arguments_declaration.parse(self, input), ProductionKind::ArrayExpression => Self::array_expression.parse(self, input), - ProductionKind::ArrayValuesList => Self::array_values_list.parse(self, input), - ProductionKind::AsciiStringLiteralsList => { - Self::ascii_string_literals_list.parse(self, input) - } + ProductionKind::ArrayValues => Self::array_values.parse(self, input), + ProductionKind::AsciiStringLiterals => Self::ascii_string_literals.parse(self, input), + ProductionKind::AssemblyFlags => Self::assembly_flags.parse(self, input), ProductionKind::AssemblyFlagsDeclaration => { Self::assembly_flags_declaration.parse(self, input) } - ProductionKind::AssemblyFlagsList => Self::assembly_flags_list.parse(self, input), ProductionKind::AssemblyStatement => Self::assembly_statement.parse(self, input), ProductionKind::Block => Self::block.parse(self, input), ProductionKind::BreakStatement => Self::break_statement.parse(self, input), ProductionKind::CatchClause => Self::catch_clause.parse(self, input), ProductionKind::CatchClauseError => Self::catch_clause_error.parse(self, input), - ProductionKind::CatchClausesList => Self::catch_clauses_list.parse(self, input), + ProductionKind::CatchClauses => Self::catch_clauses.parse(self, input), ProductionKind::ConstantDefinition => Self::constant_definition.parse(self, input), - ProductionKind::ConstructorAttributesList => { - Self::constructor_attributes_list.parse(self, input) + ProductionKind::ConstructorAttributes => { + Self::constructor_attributes.parse(self, input) } ProductionKind::ConstructorDefinition => { Self::constructor_definition.parse(self, input) } ProductionKind::ContinueStatement => Self::continue_statement.parse(self, input), ProductionKind::ContractDefinition => Self::contract_definition.parse(self, input), - ProductionKind::ContractMembersList => Self::contract_members_list.parse(self, input), + ProductionKind::ContractMembers => Self::contract_members.parse(self, input), ProductionKind::DecimalNumberExpression => { Self::decimal_number_expression.parse(self, input) } @@ -5980,90 +5972,82 @@ impl Language { ProductionKind::DeconstructionImportSymbol => { Self::deconstruction_import_symbol.parse(self, input) } - ProductionKind::DeconstructionImportSymbolsList => { - Self::deconstruction_import_symbols_list.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), ProductionKind::EndOfFileTrivia => Self::end_of_file_trivia.parse(self, input), ProductionKind::EnumDefinition => Self::enum_definition.parse(self, input), + ProductionKind::EnumMembers => Self::enum_members.parse(self, input), ProductionKind::ErrorDefinition => Self::error_definition.parse(self, input), ProductionKind::ErrorParameter => Self::error_parameter.parse(self, input), + ProductionKind::ErrorParameters => Self::error_parameters.parse(self, input), ProductionKind::ErrorParametersDeclaration => { Self::error_parameters_declaration.parse(self, input) } - ProductionKind::ErrorParametersList => Self::error_parameters_list.parse(self, input), ProductionKind::EventDefinition => Self::event_definition.parse(self, input), ProductionKind::EventParameter => Self::event_parameter.parse(self, input), + ProductionKind::EventParameters => Self::event_parameters.parse(self, input), ProductionKind::EventParametersDeclaration => { Self::event_parameters_declaration.parse(self, input) } - ProductionKind::EventParametersList => Self::event_parameters_list.parse(self, input), ProductionKind::ExperimentalPragma => Self::experimental_pragma.parse(self, input), ProductionKind::Expression => Self::expression.parse(self, input), ProductionKind::ExpressionStatement => Self::expression_statement.parse(self, input), - ProductionKind::FallbackFunctionAttributesList => { - Self::fallback_function_attributes_list.parse(self, input) + ProductionKind::FallbackFunctionAttributes => { + Self::fallback_function_attributes.parse(self, input) } ProductionKind::FallbackFunctionDefinition => { Self::fallback_function_definition.parse(self, input) } ProductionKind::ForStatement => Self::for_statement.parse(self, input), - ProductionKind::FunctionAttributesList => { - Self::function_attributes_list.parse(self, input) - } + ProductionKind::FunctionAttributes => Self::function_attributes.parse(self, input), ProductionKind::FunctionCallOptions => Self::function_call_options.parse(self, input), ProductionKind::FunctionDefinition => Self::function_definition.parse(self, input), ProductionKind::FunctionType => Self::function_type.parse(self, input), - ProductionKind::FunctionTypeAttributesList => { - Self::function_type_attributes_list.parse(self, input) + ProductionKind::FunctionTypeAttributes => { + Self::function_type_attributes.parse(self, input) } ProductionKind::HexNumberExpression => Self::hex_number_expression.parse(self, input), - ProductionKind::HexStringLiteralsList => { - Self::hex_string_literals_list.parse(self, input) - } + ProductionKind::HexStringLiterals => Self::hex_string_literals.parse(self, input), ProductionKind::IdentifierPath => Self::identifier_path.parse(self, input), - ProductionKind::IdentifierPathsList => Self::identifier_paths_list.parse(self, input), - ProductionKind::IdentifiersList => Self::identifiers_list.parse(self, input), ProductionKind::IfStatement => Self::if_statement.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), - ProductionKind::InheritanceTypesList => Self::inheritance_types_list.parse(self, input), + ProductionKind::InheritanceTypes => Self::inheritance_types.parse(self, input), ProductionKind::InterfaceDefinition => Self::interface_definition.parse(self, input), - ProductionKind::InterfaceMembersList => Self::interface_members_list.parse(self, input), + ProductionKind::InterfaceMembers => Self::interface_members.parse(self, input), ProductionKind::LeadingTrivia => Self::leading_trivia.parse(self, input), ProductionKind::LibraryDefinition => Self::library_definition.parse(self, input), - ProductionKind::LibraryMembersList => Self::library_members_list.parse(self, input), + ProductionKind::LibraryMembers => Self::library_members.parse(self, input), ProductionKind::MappingKeyType => Self::mapping_key_type.parse(self, input), ProductionKind::MappingType => Self::mapping_type.parse(self, input), ProductionKind::MappingValueType => Self::mapping_value_type.parse(self, input), - ProductionKind::ModifierAttributesList => { - Self::modifier_attributes_list.parse(self, input) - } + ProductionKind::ModifierAttributes => Self::modifier_attributes.parse(self, input), ProductionKind::ModifierDefinition => Self::modifier_definition.parse(self, input), ProductionKind::ModifierInvocation => Self::modifier_invocation.parse(self, input), ProductionKind::NamedArgument => Self::named_argument.parse(self, input), + ProductionKind::NamedArguments => Self::named_arguments.parse(self, input), ProductionKind::NamedArgumentsDeclaration => { Self::named_arguments_declaration.parse(self, input) } - ProductionKind::NamedArgumentsList => Self::named_arguments_list.parse(self, input), ProductionKind::NamedImport => Self::named_import.parse(self, input), ProductionKind::NewExpression => Self::new_expression.parse(self, input), + ProductionKind::OverridePaths => Self::override_paths.parse(self, input), ProductionKind::OverrideSpecifier => Self::override_specifier.parse(self, input), ProductionKind::Parameter => Self::parameter.parse(self, input), + ProductionKind::Parameters => Self::parameters.parse(self, input), ProductionKind::ParametersDeclaration => { Self::parameters_declaration.parse(self, input) } - ProductionKind::ParametersList => Self::parameters_list.parse(self, input), ProductionKind::PathImport => Self::path_import.parse(self, input), - ProductionKind::PositionalArgumentsList => { - Self::positional_arguments_list.parse(self, input) - } + ProductionKind::PositionalArguments => Self::positional_arguments.parse(self, input), ProductionKind::PragmaDirective => Self::pragma_directive.parse(self, input), - ProductionKind::ReceiveFunctionAttributesList => { - Self::receive_function_attributes_list.parse(self, input) + ProductionKind::ReceiveFunctionAttributes => { + Self::receive_function_attributes.parse(self, input) } ProductionKind::ReceiveFunctionDefinition => { Self::receive_function_definition.parse(self, input) @@ -6072,19 +6056,17 @@ impl Language { ProductionKind::ReturnsDeclaration => Self::returns_declaration.parse(self, input), ProductionKind::RevertStatement => Self::revert_statement.parse(self, input), ProductionKind::SourceUnit => Self::source_unit.parse(self, input), - ProductionKind::SourceUnitMembersList => { - Self::source_unit_members_list.parse(self, input) - } - ProductionKind::StateVariableAttributesList => { - Self::state_variable_attributes_list.parse(self, input) + ProductionKind::SourceUnitMembers => Self::source_unit_members.parse(self, input), + ProductionKind::StateVariableAttributes => { + Self::state_variable_attributes.parse(self, input) } ProductionKind::StateVariableDefinition => { Self::state_variable_definition.parse(self, input) } - ProductionKind::StatementsList => Self::statements_list.parse(self, input), + ProductionKind::Statements => Self::statements.parse(self, input), ProductionKind::StructDefinition => Self::struct_definition.parse(self, input), ProductionKind::StructMember => Self::struct_member.parse(self, input), - ProductionKind::StructMembersList => Self::struct_members_list.parse(self, input), + ProductionKind::StructMembers => Self::struct_members.parse(self, input), ProductionKind::ThrowStatement => Self::throw_statement.parse(self, input), ProductionKind::TrailingTrivia => Self::trailing_trivia.parse(self, input), ProductionKind::TryStatement => Self::try_statement.parse(self, input), @@ -6093,16 +6075,16 @@ impl Language { } ProductionKind::TupleExpression => Self::tuple_expression.parse(self, input), ProductionKind::TupleMember => Self::tuple_member.parse(self, input), - ProductionKind::TupleMembersList => Self::tuple_members_list.parse(self, input), - ProductionKind::TupleValuesList => Self::tuple_values_list.parse(self, input), + ProductionKind::TupleMembers => Self::tuple_members.parse(self, input), + ProductionKind::TupleValues => Self::tuple_values.parse(self, input), ProductionKind::TypeExpression => Self::type_expression.parse(self, input), ProductionKind::TypeName => Self::type_name.parse(self, input), ProductionKind::UncheckedBlock => Self::unchecked_block.parse(self, input), - ProductionKind::UnicodeStringLiteralsList => { - Self::unicode_string_literals_list.parse(self, input) + ProductionKind::UnicodeStringLiterals => { + Self::unicode_string_literals.parse(self, input) } - ProductionKind::UnnamedFunctionAttributesList => { - Self::unnamed_function_attributes_list.parse(self, input) + ProductionKind::UnnamedFunctionAttributes => { + Self::unnamed_function_attributes.parse(self, input) } ProductionKind::UnnamedFunctionDefinition => { Self::unnamed_function_definition.parse(self, input) @@ -6115,8 +6097,8 @@ impl Language { Self::using_directive_deconstruction.parse(self, input) } ProductionKind::UsingDirectiveSymbol => Self::using_directive_symbol.parse(self, input), - ProductionKind::UsingDirectiveSymbolsList => { - Self::using_directive_symbols_list.parse(self, input) + ProductionKind::UsingDirectiveSymbols => { + Self::using_directive_symbols.parse(self, input) } ProductionKind::VariableDeclaration => Self::variable_declaration.parse(self, input), ProductionKind::VariableDeclarationStatement => { @@ -6126,13 +6108,14 @@ impl Language { ProductionKind::VersionPragmaExpression => { Self::version_pragma_expression.parse(self, input) } - ProductionKind::VersionPragmaExpressionsList => { - Self::version_pragma_expressions_list.parse(self, input) + ProductionKind::VersionPragmaExpressions => { + Self::version_pragma_expressions.parse(self, input) } ProductionKind::VersionPragmaSpecifier => { Self::version_pragma_specifier.parse(self, input) } ProductionKind::WhileStatement => Self::while_statement.parse(self, input), + ProductionKind::YulArguments => Self::yul_arguments.parse(self, input), ProductionKind::YulAssignmentStatement => { Self::yul_assignment_statement.parse(self, input) } @@ -6143,16 +6126,13 @@ impl Language { Self::yul_declaration_statement.parse(self, input) } ProductionKind::YulExpression => Self::yul_expression.parse(self, input), - ProductionKind::YulExpressionsList => Self::yul_expressions_list.parse(self, input), ProductionKind::YulForStatement => Self::yul_for_statement.parse(self, input), ProductionKind::YulFunctionDefinition => { Self::yul_function_definition.parse(self, input) } ProductionKind::YulIdentifierPath => Self::yul_identifier_path.parse(self, input), - ProductionKind::YulIdentifierPathsList => { - Self::yul_identifier_paths_list.parse(self, input) - } - ProductionKind::YulIdentifiersList => Self::yul_identifiers_list.parse(self, input), + ProductionKind::YulIdentifierPaths => Self::yul_identifier_paths.parse(self, input), + ProductionKind::YulIdentifiers => Self::yul_identifiers.parse(self, input), ProductionKind::YulIfStatement => Self::yul_if_statement.parse(self, input), ProductionKind::YulLeaveStatement => Self::yul_leave_statement.parse(self, input), ProductionKind::YulParametersDeclaration => { @@ -6161,9 +6141,9 @@ impl Language { ProductionKind::YulReturnsDeclaration => { Self::yul_returns_declaration.parse(self, input) } - ProductionKind::YulStatementsList => Self::yul_statements_list.parse(self, input), + ProductionKind::YulStatements => Self::yul_statements.parse(self, input), ProductionKind::YulSwitchCase => Self::yul_switch_case.parse(self, input), - ProductionKind::YulSwitchCasesList => Self::yul_switch_cases_list.parse(self, input), + ProductionKind::YulSwitchCases => Self::yul_switch_cases.parse(self, input), ProductionKind::YulSwitchStatement => Self::yul_switch_statement.parse(self, input), } } diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/AsciiStringLiteralsList.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/AsciiStringLiterals.rs similarity index 61% rename from crates/solidity/outputs/cargo/tests/src/cst_output/generated/AsciiStringLiteralsList.rs rename to crates/solidity/outputs/cargo/tests/src/cst_output/generated/AsciiStringLiterals.rs index 8ab09aeebf..cd0a0da564 100644 --- a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/AsciiStringLiteralsList.rs +++ b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/AsciiStringLiterals.rs @@ -5,15 +5,15 @@ use anyhow::Result; #[test] fn multiple() -> Result<()> { - return run("AsciiStringLiteralsList", "multiple"); + return run("AsciiStringLiterals", "multiple"); } #[test] fn single() -> Result<()> { - return run("AsciiStringLiteralsList", "single"); + return run("AsciiStringLiterals", "single"); } #[test] fn single_trailing_ident() -> Result<()> { - return run("AsciiStringLiteralsList", "single_trailing_ident"); + return run("AsciiStringLiterals", "single_trailing_ident"); } diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/ContractMembersList.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/ContractMembers.rs similarity index 59% rename from crates/solidity/outputs/cargo/tests/src/cst_output/generated/ContractMembersList.rs rename to crates/solidity/outputs/cargo/tests/src/cst_output/generated/ContractMembers.rs index ab7d1b7be7..5b5364eaae 100644 --- a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/ContractMembersList.rs +++ b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/ContractMembers.rs @@ -5,20 +5,20 @@ use anyhow::Result; #[test] fn constructor() -> Result<()> { - return run("ContractMembersList", "constructor"); + return run("ContractMembers", "constructor"); } #[test] fn local_expression() -> Result<()> { - return run("ContractMembersList", "local_expression"); + return run("ContractMembers", "local_expression"); } #[test] fn mismatched_delimiter() -> Result<()> { - return run("ContractMembersList", "mismatched_delimiter"); + return run("ContractMembers", "mismatched_delimiter"); } #[test] fn separated_recovery() -> Result<()> { - return run("ContractMembersList", "separated_recovery"); + return run("ContractMembers", "separated_recovery"); } diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/HexStringLiteralsList.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/HexStringLiterals.rs similarity index 50% rename from crates/solidity/outputs/cargo/tests/src/cst_output/generated/HexStringLiteralsList.rs rename to crates/solidity/outputs/cargo/tests/src/cst_output/generated/HexStringLiterals.rs index a566218547..8a40f39d24 100644 --- a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/HexStringLiteralsList.rs +++ b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/HexStringLiterals.rs @@ -5,53 +5,50 @@ use anyhow::Result; #[test] fn all_separated_pairs() -> Result<()> { - return run("HexStringLiteralsList", "all_separated_pairs"); + return run("HexStringLiterals", "all_separated_pairs"); } #[test] fn invalid_consecutive_separators() -> Result<()> { - return run("HexStringLiteralsList", "invalid_consecutive_separators"); + return run("HexStringLiterals", "invalid_consecutive_separators"); } #[test] fn invalid_leading_separator() -> Result<()> { - return run("HexStringLiteralsList", "invalid_leading_separator"); + return run("HexStringLiterals", "invalid_leading_separator"); } #[test] fn invalid_separator_after_single_char() -> Result<()> { - return run( - "HexStringLiteralsList", - "invalid_separator_after_single_char", - ); + return run("HexStringLiterals", "invalid_separator_after_single_char"); } #[test] fn invalid_trailing_separator() -> Result<()> { - return run("HexStringLiteralsList", "invalid_trailing_separator"); + return run("HexStringLiterals", "invalid_trailing_separator"); } #[test] fn multiple() -> Result<()> { - return run("HexStringLiteralsList", "multiple"); + return run("HexStringLiterals", "multiple"); } #[test] fn no_separators() -> Result<()> { - return run("HexStringLiteralsList", "no_separators"); + return run("HexStringLiterals", "no_separators"); } #[test] fn single() -> Result<()> { - return run("HexStringLiteralsList", "single"); + return run("HexStringLiterals", "single"); } #[test] fn single_trailing_ident() -> Result<()> { - return run("HexStringLiteralsList", "single_trailing_ident"); + return run("HexStringLiterals", "single_trailing_ident"); } #[test] fn some_separated_pairs() -> Result<()> { - return run("HexStringLiteralsList", "some_separated_pairs"); + return run("HexStringLiterals", "some_separated_pairs"); } diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/StatementsList.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/Statements.rs similarity index 78% rename from crates/solidity/outputs/cargo/tests/src/cst_output/generated/StatementsList.rs rename to crates/solidity/outputs/cargo/tests/src/cst_output/generated/Statements.rs index 551f1b10e9..d89681b76b 100644 --- a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/StatementsList.rs +++ b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/Statements.rs @@ -5,5 +5,5 @@ use anyhow::Result; #[test] fn invalid_termination() -> Result<()> { - return run("StatementsList", "invalid_termination"); + return run("Statements", "invalid_termination"); } diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/UnicodeStringLiteralsList.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/UnicodeStringLiterals.rs similarity index 61% rename from crates/solidity/outputs/cargo/tests/src/cst_output/generated/UnicodeStringLiteralsList.rs rename to crates/solidity/outputs/cargo/tests/src/cst_output/generated/UnicodeStringLiterals.rs index 3db3178af5..0973bc438e 100644 --- a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/UnicodeStringLiteralsList.rs +++ b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/UnicodeStringLiterals.rs @@ -5,15 +5,15 @@ use anyhow::Result; #[test] fn multiple() -> Result<()> { - return run("UnicodeStringLiteralsList", "multiple"); + return run("UnicodeStringLiterals", "multiple"); } #[test] fn single() -> Result<()> { - return run("UnicodeStringLiteralsList", "single"); + return run("UnicodeStringLiterals", "single"); } #[test] fn single_trailing_ident() -> Result<()> { - return run("UnicodeStringLiteralsList", "single_trailing_ident"); + return run("UnicodeStringLiterals", "single_trailing_ident"); } 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 2a639df963..30de55b323 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 @@ -2,7 +2,7 @@ use semver::Version; #[allow(non_snake_case)] -mod AsciiStringLiteralsList; +mod AsciiStringLiterals; #[allow(non_snake_case)] mod AssemblyStatement; #[allow(non_snake_case)] @@ -16,7 +16,7 @@ mod ConstructorDefinition; #[allow(non_snake_case)] mod ContractDefinition; #[allow(non_snake_case)] -mod ContractMembersList; +mod ContractMembers; #[allow(non_snake_case)] mod DecimalNumberExpression; #[allow(non_snake_case)] @@ -36,7 +36,7 @@ mod FunctionDefinition; #[allow(non_snake_case)] mod HexNumberExpression; #[allow(non_snake_case)] -mod HexStringLiteralsList; +mod HexStringLiterals; #[allow(non_snake_case)] mod ImportDirective; #[allow(non_snake_case)] @@ -54,7 +54,7 @@ mod ReturnStatement; #[allow(non_snake_case)] mod SourceUnit; #[allow(non_snake_case)] -mod StatementsList; +mod Statements; #[allow(non_snake_case)] mod StructDefinition; #[allow(non_snake_case)] @@ -68,7 +68,7 @@ mod TupleExpression; #[allow(non_snake_case)] mod TypeName; #[allow(non_snake_case)] -mod UnicodeStringLiteralsList; +mod UnicodeStringLiterals; #[allow(non_snake_case)] mod UserDefinedValueTypeDefinition; #[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 3eab6c6c27..c1f9ee1e01 100644 --- a/crates/solidity/outputs/npm/crate/src/generated/kinds.rs +++ b/crates/solidity/outputs/npm/crate/src/generated/kinds.rs @@ -21,141 +21,141 @@ pub enum ProductionKind { AddressType, ArgumentsDeclaration, ArrayExpression, - ArrayValuesList, - AsciiStringLiteralsList, + ArrayValues, + AsciiStringLiterals, + AssemblyFlags, AssemblyFlagsDeclaration, - AssemblyFlagsList, AssemblyStatement, Block, BreakStatement, CatchClause, CatchClauseError, - CatchClausesList, + CatchClauses, ConstantDefinition, - ConstructorAttributesList, + ConstructorAttributes, ConstructorDefinition, ContinueStatement, ContractDefinition, - ContractMembersList, + ContractMembers, DecimalNumberExpression, DeconstructionImport, DeconstructionImportSymbol, - DeconstructionImportSymbolsList, + DeconstructionImportSymbols, DeleteStatement, DoWhileStatement, EmitStatement, EndOfFileTrivia, EnumDefinition, + EnumMembers, ErrorDefinition, ErrorParameter, + ErrorParameters, ErrorParametersDeclaration, - ErrorParametersList, EventDefinition, EventParameter, + EventParameters, EventParametersDeclaration, - EventParametersList, ExperimentalPragma, Expression, ExpressionStatement, - FallbackFunctionAttributesList, + FallbackFunctionAttributes, FallbackFunctionDefinition, ForStatement, - FunctionAttributesList, + FunctionAttributes, FunctionCallOptions, FunctionDefinition, FunctionType, - FunctionTypeAttributesList, + FunctionTypeAttributes, HexNumberExpression, - HexStringLiteralsList, + HexStringLiterals, IdentifierPath, - IdentifierPathsList, - IdentifiersList, IfStatement, ImportDirective, InheritanceSpecifier, InheritanceType, - InheritanceTypesList, + InheritanceTypes, InterfaceDefinition, - InterfaceMembersList, + InterfaceMembers, LeadingTrivia, LibraryDefinition, - LibraryMembersList, + LibraryMembers, MappingKeyType, MappingType, MappingValueType, - ModifierAttributesList, + ModifierAttributes, ModifierDefinition, ModifierInvocation, NamedArgument, + NamedArguments, NamedArgumentsDeclaration, - NamedArgumentsList, NamedImport, NewExpression, + OverridePaths, OverrideSpecifier, Parameter, + Parameters, ParametersDeclaration, - ParametersList, PathImport, - PositionalArgumentsList, + PositionalArguments, PragmaDirective, - ReceiveFunctionAttributesList, + ReceiveFunctionAttributes, ReceiveFunctionDefinition, ReturnStatement, ReturnsDeclaration, RevertStatement, SourceUnit, - SourceUnitMembersList, - StateVariableAttributesList, + SourceUnitMembers, + StateVariableAttributes, StateVariableDefinition, - StatementsList, + Statements, StructDefinition, StructMember, - StructMembersList, + StructMembers, ThrowStatement, TrailingTrivia, TryStatement, TupleDeconstructionStatement, TupleExpression, TupleMember, - TupleMembersList, - TupleValuesList, + TupleMembers, + TupleValues, TypeExpression, TypeName, UncheckedBlock, - UnicodeStringLiteralsList, - UnnamedFunctionAttributesList, + UnicodeStringLiterals, + UnnamedFunctionAttributes, UnnamedFunctionDefinition, UserDefinedValueTypeDefinition, UsingDirective, UsingDirectiveDeconstruction, UsingDirectiveSymbol, - UsingDirectiveSymbolsList, + UsingDirectiveSymbols, VariableDeclaration, VariableDeclarationStatement, VersionPragma, VersionPragmaExpression, - VersionPragmaExpressionsList, + VersionPragmaExpressions, VersionPragmaSpecifier, WhileStatement, + YulArguments, YulAssignmentStatement, YulBlock, YulBreakStatement, YulContinueStatement, YulDeclarationStatement, YulExpression, - YulExpressionsList, YulForStatement, YulFunctionDefinition, YulIdentifierPath, - YulIdentifierPathsList, - YulIdentifiersList, + YulIdentifierPaths, + YulIdentifiers, YulIfStatement, YulLeaveStatement, YulParametersDeclaration, YulReturnsDeclaration, - YulStatementsList, + YulStatements, YulSwitchCase, - YulSwitchCasesList, + YulSwitchCases, YulSwitchStatement, } @@ -178,151 +178,151 @@ pub enum RuleKind { ArgumentsDeclaration, ArrayExpression, ArrayTypeName, - ArrayValuesList, - AsciiStringLiteralsList, + ArrayValues, + AsciiStringLiterals, + AssemblyFlags, AssemblyFlagsDeclaration, - AssemblyFlagsList, AssemblyStatement, BinaryExpression, Block, BreakStatement, CatchClause, CatchClauseError, - CatchClausesList, + CatchClauses, ConditionalExpression, ConstantDefinition, - ConstructorAttributesList, + ConstructorAttributes, ConstructorDefinition, ContinueStatement, ContractDefinition, - ContractMembersList, + ContractMembers, DecimalNumberExpression, DeconstructionImport, DeconstructionImportSymbol, - DeconstructionImportSymbolsList, + DeconstructionImportSymbols, DeleteStatement, DoWhileStatement, EmitStatement, EndOfFileTrivia, EnumDefinition, + EnumMembers, ErrorDefinition, ErrorParameter, + ErrorParameters, ErrorParametersDeclaration, - ErrorParametersList, EventDefinition, EventParameter, + EventParameters, EventParametersDeclaration, - EventParametersList, ExperimentalPragma, Expression, ExpressionStatement, - FallbackFunctionAttributesList, + FallbackFunctionAttributes, FallbackFunctionDefinition, ForStatement, - FunctionAttributesList, + FunctionAttributes, FunctionCallExpression, FunctionCallOptions, FunctionDefinition, FunctionType, - FunctionTypeAttributesList, + FunctionTypeAttributes, HexNumberExpression, - HexStringLiteralsList, + HexStringLiterals, IdentifierPath, - IdentifierPathsList, - IdentifiersList, IfStatement, ImportDirective, IndexAccessExpression, InheritanceSpecifier, InheritanceType, - InheritanceTypesList, + InheritanceTypes, InterfaceDefinition, - InterfaceMembersList, + InterfaceMembers, LeadingTrivia, LibraryDefinition, - LibraryMembersList, + LibraryMembers, MappingKeyType, MappingType, MappingValueType, MemberAccessExpression, - ModifierAttributesList, + ModifierAttributes, ModifierDefinition, ModifierInvocation, NamedArgument, + NamedArguments, NamedArgumentsDeclaration, - NamedArgumentsList, NamedImport, NewExpression, + OverridePaths, OverrideSpecifier, Parameter, + Parameters, ParametersDeclaration, - ParametersList, PathImport, - PositionalArgumentsList, + PositionalArguments, PragmaDirective, - ReceiveFunctionAttributesList, + ReceiveFunctionAttributes, ReceiveFunctionDefinition, ReturnStatement, ReturnsDeclaration, RevertStatement, SourceUnit, - SourceUnitMembersList, - StateVariableAttributesList, + SourceUnitMembers, + StateVariableAttributes, StateVariableDefinition, - StatementsList, + Statements, StructDefinition, StructMember, - StructMembersList, + StructMembers, ThrowStatement, TrailingTrivia, TryStatement, TupleDeconstructionStatement, TupleExpression, TupleMember, - TupleMembersList, - TupleValuesList, + TupleMembers, + TupleValues, TypeExpression, TypeName, UnaryPostfixExpression, UnaryPrefixExpression, UncheckedBlock, - UnicodeStringLiteralsList, - UnnamedFunctionAttributesList, + UnicodeStringLiterals, + UnnamedFunctionAttributes, UnnamedFunctionDefinition, UserDefinedValueTypeDefinition, UsingDirective, UsingDirectiveDeconstruction, UsingDirectiveSymbol, - UsingDirectiveSymbolsList, + UsingDirectiveSymbols, VariableDeclaration, VariableDeclarationStatement, VersionPragma, VersionPragmaBinaryExpression, VersionPragmaExpression, - VersionPragmaExpressionsList, + VersionPragmaExpressions, VersionPragmaSpecifier, VersionPragmaUnaryExpression, WhileStatement, + YulArguments, YulAssignmentStatement, YulBlock, YulBreakStatement, YulContinueStatement, YulDeclarationStatement, YulExpression, - YulExpressionsList, YulForStatement, YulFunctionCallExpression, YulFunctionDefinition, YulIdentifierPath, - YulIdentifierPathsList, - YulIdentifiersList, + YulIdentifierPaths, + YulIdentifiers, YulIfStatement, YulLeaveStatement, YulParametersDeclaration, YulReturnsDeclaration, - YulStatementsList, + YulStatements, YulSwitchCase, - YulSwitchCasesList, + YulSwitchCases, YulSwitchStatement, } diff --git a/crates/solidity/outputs/npm/crate/src/generated/language.rs b/crates/solidity/outputs/npm/crate/src/generated/language.rs index 3740bf1e1d..f7cb7a0d23 100644 --- a/crates/solidity/outputs/npm/crate/src/generated/language.rs +++ b/crates/solidity/outputs/npm/crate/src/generated/language.rs @@ -229,7 +229,7 @@ impl Language { ))?; seq.elem( OptionalHelper::transform(ChoiceHelper::run(input, |mut choice, input| { - let result = self.positional_arguments_list(input); + let result = self.positional_arguments(input); choice.consider(input, result)?; let result = self.named_arguments_declaration(input); choice.consider(input, result)?; @@ -261,7 +261,7 @@ impl Language { TokenKind::OpenBracket, ))?; seq.elem( - self.array_values_list(input) + self.array_values(input) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -279,25 +279,41 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn array_values_list(&self, input: &mut ParserContext) -> ParserResult { + fn array_values(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::Default>( input, self, |input| self.expression(input), TokenKind::Comma, ) - .with_kind(RuleKind::ArrayValuesList) + .with_kind(RuleKind::ArrayValues) } #[allow(unused_assignments, unused_parens)] - fn ascii_string_literals_list(&self, input: &mut ParserContext) -> ParserResult { + fn ascii_string_literals(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { self.parse_token_with_trivia::( input, TokenKind::AsciiStringLiteral, ) }) - .with_kind(RuleKind::AsciiStringLiteralsList) + .with_kind(RuleKind::AsciiStringLiterals) + } + + #[allow(unused_assignments, unused_parens)] + fn assembly_flags(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| { + self.parse_token_with_trivia::( + input, + TokenKind::AsciiStringLiteral, + ) + }, + TokenKind::Comma, + ) + .with_kind(RuleKind::AssemblyFlags) } #[allow(unused_assignments, unused_parens)] @@ -310,7 +326,7 @@ impl Language { TokenKind::OpenParen, ))?; seq.elem( - self.assembly_flags_list(input) + self.assembly_flags(input) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -327,22 +343,6 @@ impl Language { .with_kind(RuleKind::AssemblyFlagsDeclaration) } - #[allow(unused_assignments, unused_parens)] - fn assembly_flags_list(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| { - self.parse_token_with_trivia::( - input, - TokenKind::AsciiStringLiteral, - ) - }, - TokenKind::Comma, - ) - .with_kind(RuleKind::AssemblyFlagsList) - } - #[allow(unused_assignments, unused_parens)] fn assembly_statement(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -375,7 +375,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - OptionalHelper::transform(self.statements_list(input)) + OptionalHelper::transform(self.statements(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -454,13 +454,13 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn catch_clauses_list(&self, input: &mut ParserContext) -> ParserResult { + fn catch_clauses(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_6_0 { OneOrMoreHelper::run(input, |input| self.catch_clause(input)) } else { ParserResult::disabled() } - .with_kind(RuleKind::CatchClausesList) + .with_kind(RuleKind::CatchClauses) } #[allow(unused_assignments, unused_parens)] @@ -505,7 +505,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn constructor_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn constructor_attributes(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_4_22 { OneOrMoreHelper::run(input, |input| { if self.version_is_at_least_0_4_22 { @@ -536,7 +536,7 @@ impl Language { } else { ParserResult::disabled() } - .with_kind(RuleKind::ConstructorAttributesList) + .with_kind(RuleKind::ConstructorAttributes) } #[allow(unused_assignments, unused_parens)] @@ -549,7 +549,7 @@ impl Language { ))?; seq.elem(self.parameters_declaration(input))?; seq.elem(OptionalHelper::transform( - self.constructor_attributes_list(input), + self.constructor_attributes(input), ))?; seq.elem(self.block(input))?; seq.finish() @@ -612,7 +612,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - OptionalHelper::transform(self.contract_members_list(input)) + OptionalHelper::transform(self.contract_members(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -632,7 +632,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn contract_members_list(&self, input: &mut ParserContext) -> ParserResult { + fn contract_members(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.using_directive(input); @@ -678,7 +678,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::ContractMembersList) + .with_kind(RuleKind::ContractMembers) } #[allow(unused_assignments, unused_parens)] @@ -777,7 +777,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - self.deconstruction_import_symbols_list(input) + self.deconstruction_import_symbols(input) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -828,14 +828,14 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn deconstruction_import_symbols_list(&self, input: &mut ParserContext) -> ParserResult { + 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::DeconstructionImportSymbolsList) + .with_kind(RuleKind::DeconstructionImportSymbols) } #[allow(unused_assignments, unused_parens)] @@ -1052,13 +1052,13 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - OptionalHelper::transform(self.identifiers_list(input)) + OptionalHelper::transform(self.enum_members(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( - input, - self, - TokenKind::CloseBrace, - RecoverFromNoMatch::Yes, - ), + input, + self, + TokenKind::CloseBrace, + RecoverFromNoMatch::Yes, + ), )?; seq.elem(self.parse_token_with_trivia::( input, @@ -1071,6 +1071,22 @@ impl Language { .with_kind(RuleKind::EnumDefinition) } + #[allow(unused_assignments, unused_parens)] + fn enum_members(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| { + self.parse_token_with_trivia::( + input, + TokenKind::Identifier, + ) + }, + TokenKind::Comma, + ) + .with_kind(RuleKind::EnumMembers) + } + #[allow(unused_assignments, unused_parens)] fn error_definition(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_8_4 { @@ -1126,6 +1142,21 @@ impl Language { .with_kind(RuleKind::ErrorParameter) } + #[allow(unused_assignments, unused_parens)] + fn error_parameters(&self, input: &mut ParserContext) -> ParserResult { + if self.version_is_at_least_0_8_4 { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| self.error_parameter(input), + TokenKind::Comma, + ) + } else { + ParserResult::disabled() + } + .with_kind(RuleKind::ErrorParameters) + } + #[allow(unused_assignments, unused_parens)] fn error_parameters_declaration(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_8_4 { @@ -1137,7 +1168,7 @@ impl Language { TokenKind::OpenParen, ))?; seq.elem( - OptionalHelper::transform(self.error_parameters_list(input)) + OptionalHelper::transform(self.error_parameters(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -1157,21 +1188,6 @@ impl Language { .with_kind(RuleKind::ErrorParametersDeclaration) } - #[allow(unused_assignments, unused_parens)] - fn error_parameters_list(&self, input: &mut ParserContext) -> ParserResult { - if self.version_is_at_least_0_8_4 { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| self.error_parameter(input), - TokenKind::Comma, - ) - } else { - ParserResult::disabled() - } - .with_kind(RuleKind::ErrorParametersList) - } - #[allow(unused_assignments, unused_parens)] fn event_definition(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -1231,6 +1247,17 @@ impl Language { .with_kind(RuleKind::EventParameter) } + #[allow(unused_assignments, unused_parens)] + fn event_parameters(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| self.event_parameter(input), + TokenKind::Comma, + ) + .with_kind(RuleKind::EventParameters) + } + #[allow(unused_assignments, unused_parens)] fn event_parameters_declaration(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -1241,13 +1268,13 @@ impl Language { TokenKind::OpenParen, ))?; seq.elem( - OptionalHelper::transform(self.event_parameters_list(input)) + OptionalHelper::transform(self.event_parameters(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( - input, - self, - TokenKind::CloseParen, - RecoverFromNoMatch::Yes, - ), + input, + self, + TokenKind::CloseParen, + RecoverFromNoMatch::Yes, + ), )?; seq.elem(self.parse_token_with_trivia::( input, @@ -1258,17 +1285,6 @@ impl Language { .with_kind(RuleKind::EventParametersDeclaration) } - #[allow(unused_assignments, unused_parens)] - fn event_parameters_list(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| self.event_parameter(input), - TokenKind::Comma, - ) - .with_kind(RuleKind::EventParametersList) - } - #[allow(unused_assignments, unused_parens)] fn experimental_pragma(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -1757,12 +1773,12 @@ impl Language { }); choice.consider(input, result)?; let result = ChoiceHelper::run(input, |mut choice, input| { - let result = self.hex_string_literals_list(input); + let result = self.hex_string_literals(input); choice.consider(input, result)?; - let result = self.ascii_string_literals_list(input); + let result = self.ascii_string_literals(input); choice.consider(input, result)?; if self.version_is_at_least_0_7_0 { - let result = self.unicode_string_literals_list(input); + let result = self.unicode_string_literals(input); choice.consider(input, result)?; } choice.finish(input) @@ -1932,7 +1948,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn fallback_function_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn fallback_function_attributes(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_6_0 { OneOrMoreHelper::run(input, |input| { if self.version_is_at_least_0_6_0 { @@ -1975,7 +1991,7 @@ impl Language { } else { ParserResult::disabled() } - .with_kind(RuleKind::FallbackFunctionAttributesList) + .with_kind(RuleKind::FallbackFunctionAttributes) } #[allow(unused_assignments, unused_parens)] @@ -1988,7 +2004,7 @@ impl Language { ))?; seq.elem(self.parameters_declaration(input))?; seq.elem(OptionalHelper::transform( - self.fallback_function_attributes_list(input), + self.fallback_function_attributes(input), ))?; seq.elem(OptionalHelper::transform(self.returns_declaration(input)))?; seq.elem(ChoiceHelper::run(input, |mut choice, input| { @@ -2134,7 +2150,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn function_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn function_attributes(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.modifier_invocation(input); @@ -2193,7 +2209,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::FunctionAttributesList) + .with_kind(RuleKind::FunctionAttributes) } #[allow(unused_assignments, unused_parens)] @@ -2239,9 +2255,7 @@ impl Language { choice.finish(input) }))?; seq.elem(self.parameters_declaration(input))?; - seq.elem(OptionalHelper::transform( - self.function_attributes_list(input), - ))?; + seq.elem(OptionalHelper::transform(self.function_attributes(input)))?; seq.elem(OptionalHelper::transform(self.returns_declaration(input)))?; seq.elem(ChoiceHelper::run(input, |mut choice, input| { let result = self.parse_token_with_trivia::( @@ -2267,7 +2281,7 @@ impl Language { ))?; seq.elem(self.parameters_declaration(input))?; seq.elem(OptionalHelper::transform( - self.function_type_attributes_list(input), + self.function_type_attributes(input), ))?; seq.elem(OptionalHelper::transform(self.returns_declaration(input)))?; seq.finish() @@ -2276,7 +2290,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn function_type_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn function_type_attributes(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.parse_token_with_trivia::( @@ -2317,7 +2331,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::FunctionTypeAttributesList) + .with_kind(RuleKind::FunctionTypeAttributes) } #[allow(unused_assignments, unused_parens)] @@ -2410,14 +2424,14 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn hex_string_literals_list(&self, input: &mut ParserContext) -> ParserResult { + fn hex_string_literals(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { self.parse_token_with_trivia::( input, TokenKind::HexStringLiteral, ) }) - .with_kind(RuleKind::HexStringLiteralsList) + .with_kind(RuleKind::HexStringLiterals) } #[allow(unused_assignments, unused_parens)] @@ -2436,33 +2450,6 @@ impl Language { .with_kind(RuleKind::IdentifierPath) } - #[allow(unused_assignments, unused_parens)] - fn identifier_paths_list(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| self.identifier_path(input), - TokenKind::Comma, - ) - .with_kind(RuleKind::IdentifierPathsList) - } - - #[allow(unused_assignments, unused_parens)] - fn identifiers_list(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| { - self.parse_token_with_trivia::( - input, - TokenKind::Identifier, - ) - }, - TokenKind::Comma, - ) - .with_kind(RuleKind::IdentifiersList) - } - #[allow(unused_assignments, unused_parens)] fn if_statement(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -2661,7 +2648,7 @@ impl Language { input, TokenKind::IsKeyword, ))?; - seq.elem(self.inheritance_types_list(input))?; + seq.elem(self.inheritance_types(input))?; seq.finish() }) .with_kind(RuleKind::InheritanceSpecifier) @@ -2678,14 +2665,14 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn inheritance_types_list(&self, input: &mut ParserContext) -> ParserResult { + fn inheritance_types(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::Default>( input, self, |input| self.inheritance_type(input), TokenKind::Comma, ) - .with_kind(RuleKind::InheritanceTypesList) + .with_kind(RuleKind::InheritanceTypes) } #[allow(unused_assignments, unused_parens)] @@ -2708,7 +2695,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - OptionalHelper::transform(self.interface_members_list(input)) + OptionalHelper::transform(self.interface_members(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -2728,7 +2715,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn interface_members_list(&self, input: &mut ParserContext) -> ParserResult { + fn interface_members(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.using_directive(input); @@ -2774,7 +2761,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::InterfaceMembersList) + .with_kind(RuleKind::InterfaceMembers) } #[allow(unused_assignments, unused_parens)] @@ -2820,7 +2807,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - OptionalHelper::transform(self.library_members_list(input)) + OptionalHelper::transform(self.library_members(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -2840,7 +2827,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn library_members_list(&self, input: &mut ParserContext) -> ParserResult { + fn library_members(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.using_directive(input); @@ -2886,7 +2873,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::LibraryMembersList) + .with_kind(RuleKind::LibraryMembers) } #[allow(unused_assignments, unused_parens)] @@ -3018,7 +3005,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn modifier_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn modifier_attributes(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.override_specifier(input); @@ -3033,7 +3020,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::ModifierAttributesList) + .with_kind(RuleKind::ModifierAttributes) } #[allow(unused_assignments, unused_parens)] @@ -3050,9 +3037,7 @@ impl Language { seq.elem(OptionalHelper::transform( self.parameters_declaration(input), ))?; - seq.elem(OptionalHelper::transform( - self.modifier_attributes_list(input), - ))?; + seq.elem(OptionalHelper::transform(self.modifier_attributes(input)))?; seq.elem(ChoiceHelper::run(input, |mut choice, input| { let result = self.parse_token_with_trivia::( input, @@ -3097,6 +3082,17 @@ impl Language { .with_kind(RuleKind::NamedArgument) } + #[allow(unused_assignments, unused_parens)] + fn named_arguments(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| self.named_argument(input), + TokenKind::Comma, + ) + .with_kind(RuleKind::NamedArguments) + } + #[allow(unused_assignments, unused_parens)] fn named_arguments_declaration(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -3107,13 +3103,13 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - OptionalHelper::transform(self.named_arguments_list(input)) + OptionalHelper::transform(self.named_arguments(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( - input, - self, - TokenKind::CloseBrace, - RecoverFromNoMatch::Yes, - ), + input, + self, + TokenKind::CloseBrace, + RecoverFromNoMatch::Yes, + ), )?; seq.elem(self.parse_token_with_trivia::( input, @@ -3124,17 +3120,6 @@ impl Language { .with_kind(RuleKind::NamedArgumentsDeclaration) } - #[allow(unused_assignments, unused_parens)] - fn named_arguments_list(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| self.named_argument(input), - TokenKind::Comma, - ) - .with_kind(RuleKind::NamedArgumentsList) - } - #[allow(unused_assignments, unused_parens)] fn named_import(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -3176,6 +3161,17 @@ impl Language { .with_kind(RuleKind::NewExpression) } + #[allow(unused_assignments, unused_parens)] + fn override_paths(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| self.identifier_path(input), + TokenKind::Comma, + ) + .with_kind(RuleKind::OverridePaths) + } + #[allow(unused_assignments, unused_parens)] fn override_specifier(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -3191,7 +3187,7 @@ impl Language { TokenKind::OpenParen, ))?; seq.elem( - OptionalHelper::transform(self.identifier_paths_list(input)) + OptionalHelper::transform(self.override_paths(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -3248,6 +3244,17 @@ impl Language { .with_kind(RuleKind::Parameter) } + #[allow(unused_assignments, unused_parens)] + fn parameters(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::Default>( + input, + self, + |input| self.parameter(input), + TokenKind::Comma, + ) + .with_kind(RuleKind::Parameters) + } + #[allow(unused_assignments, unused_parens)] fn parameters_declaration(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -3258,7 +3265,7 @@ impl Language { TokenKind::OpenParen, ))?; seq.elem( - OptionalHelper::transform(self.parameters_list(input)) + OptionalHelper::transform(self.parameters(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -3275,17 +3282,6 @@ impl Language { .with_kind(RuleKind::ParametersDeclaration) } - #[allow(unused_assignments, unused_parens)] - fn parameters_list(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::Default>( - input, - self, - |input| self.parameter(input), - TokenKind::Comma, - ) - .with_kind(RuleKind::ParametersList) - } - #[allow(unused_assignments, unused_parens)] fn path_import(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -3310,14 +3306,14 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn positional_arguments_list(&self, input: &mut ParserContext) -> ParserResult { + fn positional_arguments(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::Default>( input, self, |input| self.expression(input), TokenKind::Comma, ) - .with_kind(RuleKind::PositionalArgumentsList) + .with_kind(RuleKind::PositionalArguments) } #[allow(unused_assignments, unused_parens)] @@ -3357,7 +3353,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn receive_function_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn receive_function_attributes(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_6_0 { OneOrMoreHelper::run(input, |input| { if self.version_is_at_least_0_6_0 { @@ -3390,7 +3386,7 @@ impl Language { } else { ParserResult::disabled() } - .with_kind(RuleKind::ReceiveFunctionAttributesList) + .with_kind(RuleKind::ReceiveFunctionAttributes) } #[allow(unused_assignments, unused_parens)] @@ -3403,7 +3399,7 @@ impl Language { ))?; seq.elem(self.parameters_declaration(input))?; seq.elem(OptionalHelper::transform( - self.receive_function_attributes_list(input), + self.receive_function_attributes(input), ))?; seq.elem(ChoiceHelper::run(input, |mut choice, input| { let result = self.parse_token_with_trivia::( @@ -3496,9 +3492,7 @@ impl Language { #[allow(unused_assignments, unused_parens)] fn source_unit(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { - seq.elem(OptionalHelper::transform( - self.source_unit_members_list(input), - ))?; + seq.elem(OptionalHelper::transform(self.source_unit_members(input)))?; seq.elem(OptionalHelper::transform(self.end_of_file_trivia(input)))?; seq.finish() }) @@ -3506,7 +3500,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn source_unit_members_list(&self, input: &mut ParserContext) -> ParserResult { + fn source_unit_members(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.pragma_directive(input); @@ -3556,11 +3550,11 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::SourceUnitMembersList) + .with_kind(RuleKind::SourceUnitMembers) } #[allow(unused_assignments, unused_parens)] - fn state_variable_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn state_variable_attributes(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.override_specifier(input); @@ -3595,7 +3589,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::StateVariableAttributesList) + .with_kind(RuleKind::StateVariableAttributes) } #[allow(unused_assignments, unused_parens)] @@ -3605,7 +3599,7 @@ impl Language { SequenceHelper::run(|mut seq| { seq.elem(self.type_name(input))?; seq.elem(OptionalHelper::transform( - self.state_variable_attributes_list(input), + self.state_variable_attributes(input), ))?; seq.elem(self.parse_token_with_trivia::( input, @@ -3638,7 +3632,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn statements_list(&self, input: &mut ParserContext) -> ParserResult { + fn statements(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = ChoiceHelper::run(input, |mut choice, input| { @@ -3698,7 +3692,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::StatementsList) + .with_kind(RuleKind::Statements) } #[allow(unused_assignments, unused_parens)] @@ -3720,7 +3714,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - OptionalHelper::transform(self.struct_members_list(input)) + OptionalHelper::transform(self.struct_members(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -3768,9 +3762,9 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn struct_members_list(&self, input: &mut ParserContext) -> ParserResult { + fn struct_members(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| self.struct_member(input)) - .with_kind(RuleKind::StructMembersList) + .with_kind(RuleKind::StructMembers) } #[allow(unused_assignments, unused_parens)] @@ -3830,7 +3824,7 @@ impl Language { seq.elem(self.expression(input))?; seq.elem(OptionalHelper::transform(self.returns_declaration(input)))?; seq.elem(self.block(input))?; - seq.elem(self.catch_clauses_list(input))?; + seq.elem(self.catch_clauses(input))?; seq.finish() }) } else { @@ -3852,7 +3846,7 @@ impl Language { TokenKind::OpenParen, ))?; seq.elem( - OptionalHelper::transform(self.tuple_members_list(input)) + OptionalHelper::transform(self.tuple_members(input)) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -3899,7 +3893,7 @@ impl Language { TokenKind::OpenParen, ))?; seq.elem( - self.tuple_values_list(input) + self.tuple_values(input) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -3990,25 +3984,25 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn tuple_members_list(&self, input: &mut ParserContext) -> ParserResult { + fn tuple_members(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::Default>( input, self, |input| self.tuple_member(input), TokenKind::Comma, ) - .with_kind(RuleKind::TupleMembersList) + .with_kind(RuleKind::TupleMembers) } #[allow(unused_assignments, unused_parens)] - fn tuple_values_list(&self, input: &mut ParserContext) -> ParserResult { + fn tuple_values(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::Default>( input, self, |input| OptionalHelper::transform(self.expression(input)), TokenKind::Comma, ) - .with_kind(RuleKind::TupleValuesList) + .with_kind(RuleKind::TupleValues) } #[allow(unused_assignments, unused_parens)] @@ -4179,7 +4173,7 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn unicode_string_literals_list(&self, input: &mut ParserContext) -> ParserResult { + fn unicode_string_literals(&self, input: &mut ParserContext) -> ParserResult { if self.version_is_at_least_0_7_0 { OneOrMoreHelper::run(input, |input| { self.parse_token_with_trivia::( @@ -4190,11 +4184,11 @@ impl Language { } else { ParserResult::disabled() } - .with_kind(RuleKind::UnicodeStringLiteralsList) + .with_kind(RuleKind::UnicodeStringLiterals) } #[allow(unused_assignments, unused_parens)] - fn unnamed_function_attributes_list(&self, input: &mut ParserContext) -> ParserResult { + fn unnamed_function_attributes(&self, input: &mut ParserContext) -> ParserResult { if !self.version_is_at_least_0_6_0 { OneOrMoreHelper::run(input, |input| { if !self.version_is_at_least_0_6_0 { @@ -4232,7 +4226,7 @@ impl Language { } else { ParserResult::disabled() } - .with_kind(RuleKind::UnnamedFunctionAttributesList) + .with_kind(RuleKind::UnnamedFunctionAttributes) } #[allow(unused_assignments, unused_parens)] @@ -4245,7 +4239,7 @@ impl Language { ))?; seq.elem(self.parameters_declaration(input))?; seq.elem(OptionalHelper::transform( - self.unnamed_function_attributes_list(input), + self.unnamed_function_attributes(input), ))?; seq.elem(ChoiceHelper::run(input, |mut choice, input| { let result = self.parse_token_with_trivia::( @@ -4426,7 +4420,7 @@ impl Language { TokenKind::OpenBrace, ))?; seq.elem( - self.using_directive_symbols_list(input) + self.using_directive_symbols(input) .recover_until_with_nested_delims::<_, LexicalContextType::Default>( input, self, @@ -4566,14 +4560,14 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn using_directive_symbols_list(&self, input: &mut ParserContext) -> ParserResult { + fn using_directive_symbols(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::Default>( input, self, |input| self.using_directive_symbol(input), TokenKind::Comma, ) - .with_kind(RuleKind::UsingDirectiveSymbolsList) + .with_kind(RuleKind::UsingDirectiveSymbols) } #[allow(unused_assignments, unused_parens)] @@ -4664,7 +4658,7 @@ impl Language { TokenKind::SolidityKeyword, ), )?; - seq.elem(self.version_pragma_expressions_list(input))?; + seq.elem(self.version_pragma_expressions(input))?; seq.finish() }) .with_kind(RuleKind::VersionPragma) @@ -4786,9 +4780,9 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn version_pragma_expressions_list(&self, input: &mut ParserContext) -> ParserResult { + fn version_pragma_expressions(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| self.version_pragma_expression(input)) - .with_kind(RuleKind::VersionPragmaExpressionsList) + .with_kind(RuleKind::VersionPragmaExpressions) } #[allow(unused_assignments, unused_parens)] @@ -4898,10 +4892,21 @@ impl Language { .with_kind(RuleKind::WhileStatement) } + #[allow(unused_assignments, unused_parens)] + fn yul_arguments(&self, input: &mut ParserContext) -> ParserResult { + SeparatedHelper::run::<_, LexicalContextType::YulBlock>( + input, + self, + |input| self.yul_expression(input), + TokenKind::Comma, + ) + .with_kind(RuleKind::YulArguments) + } + #[allow(unused_assignments, unused_parens)] fn yul_assignment_statement(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { - seq.elem(self.yul_identifier_paths_list(input))?; + seq.elem(self.yul_identifier_paths(input))?; seq.elem( self.parse_token_with_trivia::( input, @@ -4926,13 +4931,13 @@ impl Language { ), )?; seq.elem( - OptionalHelper::transform(self.yul_statements_list(input)) + OptionalHelper::transform(self.yul_statements(input)) .recover_until_with_nested_delims::<_, LexicalContextType::YulBlock>( - input, - self, - TokenKind::CloseBrace, - RecoverFromNoMatch::Yes, - ), + input, + self, + TokenKind::CloseBrace, + RecoverFromNoMatch::Yes, + ), )?; seq.elem( self.parse_token_with_trivia::( @@ -4969,7 +4974,7 @@ impl Language { TokenKind::LetKeyword, ), )?; - seq.elem(self.yul_identifier_paths_list(input))?; + seq.elem(self.yul_identifier_paths(input))?; seq.elem(OptionalHelper::transform(SequenceHelper::run(|mut seq| { seq.elem( self.parse_token_with_trivia::( @@ -5001,7 +5006,7 @@ impl Language { ), )?; seq.elem( - OptionalHelper::transform(self.yul_expressions_list(input)) + OptionalHelper::transform(self.yul_arguments(input)) .recover_until_with_nested_delims::<_, LexicalContextType::YulBlock>( input, self, @@ -5083,17 +5088,6 @@ impl Language { .with_kind(RuleKind::YulExpression) } - #[allow(unused_assignments, unused_parens)] - fn yul_expressions_list(&self, input: &mut ParserContext) -> ParserResult { - SeparatedHelper::run::<_, LexicalContextType::YulBlock>( - input, - self, - |input| self.yul_expression(input), - TokenKind::Comma, - ) - .with_kind(RuleKind::YulExpressionsList) - } - #[allow(unused_assignments, unused_parens)] fn yul_for_statement(&self, input: &mut ParserContext) -> ParserResult { SequenceHelper::run(|mut seq| { @@ -5154,18 +5148,18 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn yul_identifier_paths_list(&self, input: &mut ParserContext) -> ParserResult { + fn yul_identifier_paths(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::YulBlock>( input, self, |input| self.yul_identifier_path(input), TokenKind::Comma, ) - .with_kind(RuleKind::YulIdentifierPathsList) + .with_kind(RuleKind::YulIdentifierPaths) } #[allow(unused_assignments, unused_parens)] - fn yul_identifiers_list(&self, input: &mut ParserContext) -> ParserResult { + fn yul_identifiers(&self, input: &mut ParserContext) -> ParserResult { SeparatedHelper::run::<_, LexicalContextType::YulBlock>( input, self, @@ -5177,7 +5171,7 @@ impl Language { }, TokenKind::Comma, ) - .with_kind(RuleKind::YulIdentifiersList) + .with_kind(RuleKind::YulIdentifiers) } #[allow(unused_assignments, unused_parens)] @@ -5221,13 +5215,13 @@ impl Language { ), )?; seq.elem( - OptionalHelper::transform(self.yul_identifiers_list(input)) + OptionalHelper::transform(self.yul_identifiers(input)) .recover_until_with_nested_delims::<_, LexicalContextType::YulBlock>( - input, - self, - TokenKind::CloseParen, - RecoverFromNoMatch::Yes, - ), + input, + self, + TokenKind::CloseParen, + RecoverFromNoMatch::Yes, + ), )?; seq.elem( self.parse_token_with_trivia::( @@ -5249,14 +5243,14 @@ impl Language { TokenKind::MinusGreaterThan, ), )?; - seq.elem(self.yul_identifiers_list(input))?; + seq.elem(self.yul_identifiers(input))?; seq.finish() }) .with_kind(RuleKind::YulReturnsDeclaration) } #[allow(unused_assignments, unused_parens)] - fn yul_statements_list(&self, input: &mut ParserContext) -> ParserResult { + fn yul_statements(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| { ChoiceHelper::run(input, |mut choice, input| { let result = self.yul_block(input); @@ -5286,7 +5280,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::YulStatementsList) + .with_kind(RuleKind::YulStatements) } #[allow(unused_assignments, unused_parens)] @@ -5350,9 +5344,9 @@ impl Language { } #[allow(unused_assignments, unused_parens)] - fn yul_switch_cases_list(&self, input: &mut ParserContext) -> ParserResult { + fn yul_switch_cases(&self, input: &mut ParserContext) -> ParserResult { OneOrMoreHelper::run(input, |input| self.yul_switch_case(input)) - .with_kind(RuleKind::YulSwitchCasesList) + .with_kind(RuleKind::YulSwitchCases) } #[allow(unused_assignments, unused_parens)] @@ -5365,7 +5359,7 @@ impl Language { ), )?; seq.elem(self.yul_expression(input))?; - seq.elem(self.yul_switch_cases_list(input))?; + seq.elem(self.yul_switch_cases(input))?; seq.finish() }) .with_kind(RuleKind::YulSwitchStatement) @@ -5949,30 +5943,28 @@ impl Language { ProductionKind::AddressType => Self::address_type.parse(self, input), ProductionKind::ArgumentsDeclaration => Self::arguments_declaration.parse(self, input), ProductionKind::ArrayExpression => Self::array_expression.parse(self, input), - ProductionKind::ArrayValuesList => Self::array_values_list.parse(self, input), - ProductionKind::AsciiStringLiteralsList => { - Self::ascii_string_literals_list.parse(self, input) - } + ProductionKind::ArrayValues => Self::array_values.parse(self, input), + ProductionKind::AsciiStringLiterals => Self::ascii_string_literals.parse(self, input), + ProductionKind::AssemblyFlags => Self::assembly_flags.parse(self, input), ProductionKind::AssemblyFlagsDeclaration => { Self::assembly_flags_declaration.parse(self, input) } - ProductionKind::AssemblyFlagsList => Self::assembly_flags_list.parse(self, input), ProductionKind::AssemblyStatement => Self::assembly_statement.parse(self, input), ProductionKind::Block => Self::block.parse(self, input), ProductionKind::BreakStatement => Self::break_statement.parse(self, input), ProductionKind::CatchClause => Self::catch_clause.parse(self, input), ProductionKind::CatchClauseError => Self::catch_clause_error.parse(self, input), - ProductionKind::CatchClausesList => Self::catch_clauses_list.parse(self, input), + ProductionKind::CatchClauses => Self::catch_clauses.parse(self, input), ProductionKind::ConstantDefinition => Self::constant_definition.parse(self, input), - ProductionKind::ConstructorAttributesList => { - Self::constructor_attributes_list.parse(self, input) + ProductionKind::ConstructorAttributes => { + Self::constructor_attributes.parse(self, input) } ProductionKind::ConstructorDefinition => { Self::constructor_definition.parse(self, input) } ProductionKind::ContinueStatement => Self::continue_statement.parse(self, input), ProductionKind::ContractDefinition => Self::contract_definition.parse(self, input), - ProductionKind::ContractMembersList => Self::contract_members_list.parse(self, input), + ProductionKind::ContractMembers => Self::contract_members.parse(self, input), ProductionKind::DecimalNumberExpression => { Self::decimal_number_expression.parse(self, input) } @@ -5980,90 +5972,82 @@ impl Language { ProductionKind::DeconstructionImportSymbol => { Self::deconstruction_import_symbol.parse(self, input) } - ProductionKind::DeconstructionImportSymbolsList => { - Self::deconstruction_import_symbols_list.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), ProductionKind::EndOfFileTrivia => Self::end_of_file_trivia.parse(self, input), ProductionKind::EnumDefinition => Self::enum_definition.parse(self, input), + ProductionKind::EnumMembers => Self::enum_members.parse(self, input), ProductionKind::ErrorDefinition => Self::error_definition.parse(self, input), ProductionKind::ErrorParameter => Self::error_parameter.parse(self, input), + ProductionKind::ErrorParameters => Self::error_parameters.parse(self, input), ProductionKind::ErrorParametersDeclaration => { Self::error_parameters_declaration.parse(self, input) } - ProductionKind::ErrorParametersList => Self::error_parameters_list.parse(self, input), ProductionKind::EventDefinition => Self::event_definition.parse(self, input), ProductionKind::EventParameter => Self::event_parameter.parse(self, input), + ProductionKind::EventParameters => Self::event_parameters.parse(self, input), ProductionKind::EventParametersDeclaration => { Self::event_parameters_declaration.parse(self, input) } - ProductionKind::EventParametersList => Self::event_parameters_list.parse(self, input), ProductionKind::ExperimentalPragma => Self::experimental_pragma.parse(self, input), ProductionKind::Expression => Self::expression.parse(self, input), ProductionKind::ExpressionStatement => Self::expression_statement.parse(self, input), - ProductionKind::FallbackFunctionAttributesList => { - Self::fallback_function_attributes_list.parse(self, input) + ProductionKind::FallbackFunctionAttributes => { + Self::fallback_function_attributes.parse(self, input) } ProductionKind::FallbackFunctionDefinition => { Self::fallback_function_definition.parse(self, input) } ProductionKind::ForStatement => Self::for_statement.parse(self, input), - ProductionKind::FunctionAttributesList => { - Self::function_attributes_list.parse(self, input) - } + ProductionKind::FunctionAttributes => Self::function_attributes.parse(self, input), ProductionKind::FunctionCallOptions => Self::function_call_options.parse(self, input), ProductionKind::FunctionDefinition => Self::function_definition.parse(self, input), ProductionKind::FunctionType => Self::function_type.parse(self, input), - ProductionKind::FunctionTypeAttributesList => { - Self::function_type_attributes_list.parse(self, input) + ProductionKind::FunctionTypeAttributes => { + Self::function_type_attributes.parse(self, input) } ProductionKind::HexNumberExpression => Self::hex_number_expression.parse(self, input), - ProductionKind::HexStringLiteralsList => { - Self::hex_string_literals_list.parse(self, input) - } + ProductionKind::HexStringLiterals => Self::hex_string_literals.parse(self, input), ProductionKind::IdentifierPath => Self::identifier_path.parse(self, input), - ProductionKind::IdentifierPathsList => Self::identifier_paths_list.parse(self, input), - ProductionKind::IdentifiersList => Self::identifiers_list.parse(self, input), ProductionKind::IfStatement => Self::if_statement.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), - ProductionKind::InheritanceTypesList => Self::inheritance_types_list.parse(self, input), + ProductionKind::InheritanceTypes => Self::inheritance_types.parse(self, input), ProductionKind::InterfaceDefinition => Self::interface_definition.parse(self, input), - ProductionKind::InterfaceMembersList => Self::interface_members_list.parse(self, input), + ProductionKind::InterfaceMembers => Self::interface_members.parse(self, input), ProductionKind::LeadingTrivia => Self::leading_trivia.parse(self, input), ProductionKind::LibraryDefinition => Self::library_definition.parse(self, input), - ProductionKind::LibraryMembersList => Self::library_members_list.parse(self, input), + ProductionKind::LibraryMembers => Self::library_members.parse(self, input), ProductionKind::MappingKeyType => Self::mapping_key_type.parse(self, input), ProductionKind::MappingType => Self::mapping_type.parse(self, input), ProductionKind::MappingValueType => Self::mapping_value_type.parse(self, input), - ProductionKind::ModifierAttributesList => { - Self::modifier_attributes_list.parse(self, input) - } + ProductionKind::ModifierAttributes => Self::modifier_attributes.parse(self, input), ProductionKind::ModifierDefinition => Self::modifier_definition.parse(self, input), ProductionKind::ModifierInvocation => Self::modifier_invocation.parse(self, input), ProductionKind::NamedArgument => Self::named_argument.parse(self, input), + ProductionKind::NamedArguments => Self::named_arguments.parse(self, input), ProductionKind::NamedArgumentsDeclaration => { Self::named_arguments_declaration.parse(self, input) } - ProductionKind::NamedArgumentsList => Self::named_arguments_list.parse(self, input), ProductionKind::NamedImport => Self::named_import.parse(self, input), ProductionKind::NewExpression => Self::new_expression.parse(self, input), + ProductionKind::OverridePaths => Self::override_paths.parse(self, input), ProductionKind::OverrideSpecifier => Self::override_specifier.parse(self, input), ProductionKind::Parameter => Self::parameter.parse(self, input), + ProductionKind::Parameters => Self::parameters.parse(self, input), ProductionKind::ParametersDeclaration => { Self::parameters_declaration.parse(self, input) } - ProductionKind::ParametersList => Self::parameters_list.parse(self, input), ProductionKind::PathImport => Self::path_import.parse(self, input), - ProductionKind::PositionalArgumentsList => { - Self::positional_arguments_list.parse(self, input) - } + ProductionKind::PositionalArguments => Self::positional_arguments.parse(self, input), ProductionKind::PragmaDirective => Self::pragma_directive.parse(self, input), - ProductionKind::ReceiveFunctionAttributesList => { - Self::receive_function_attributes_list.parse(self, input) + ProductionKind::ReceiveFunctionAttributes => { + Self::receive_function_attributes.parse(self, input) } ProductionKind::ReceiveFunctionDefinition => { Self::receive_function_definition.parse(self, input) @@ -6072,19 +6056,17 @@ impl Language { ProductionKind::ReturnsDeclaration => Self::returns_declaration.parse(self, input), ProductionKind::RevertStatement => Self::revert_statement.parse(self, input), ProductionKind::SourceUnit => Self::source_unit.parse(self, input), - ProductionKind::SourceUnitMembersList => { - Self::source_unit_members_list.parse(self, input) - } - ProductionKind::StateVariableAttributesList => { - Self::state_variable_attributes_list.parse(self, input) + ProductionKind::SourceUnitMembers => Self::source_unit_members.parse(self, input), + ProductionKind::StateVariableAttributes => { + Self::state_variable_attributes.parse(self, input) } ProductionKind::StateVariableDefinition => { Self::state_variable_definition.parse(self, input) } - ProductionKind::StatementsList => Self::statements_list.parse(self, input), + ProductionKind::Statements => Self::statements.parse(self, input), ProductionKind::StructDefinition => Self::struct_definition.parse(self, input), ProductionKind::StructMember => Self::struct_member.parse(self, input), - ProductionKind::StructMembersList => Self::struct_members_list.parse(self, input), + ProductionKind::StructMembers => Self::struct_members.parse(self, input), ProductionKind::ThrowStatement => Self::throw_statement.parse(self, input), ProductionKind::TrailingTrivia => Self::trailing_trivia.parse(self, input), ProductionKind::TryStatement => Self::try_statement.parse(self, input), @@ -6093,16 +6075,16 @@ impl Language { } ProductionKind::TupleExpression => Self::tuple_expression.parse(self, input), ProductionKind::TupleMember => Self::tuple_member.parse(self, input), - ProductionKind::TupleMembersList => Self::tuple_members_list.parse(self, input), - ProductionKind::TupleValuesList => Self::tuple_values_list.parse(self, input), + ProductionKind::TupleMembers => Self::tuple_members.parse(self, input), + ProductionKind::TupleValues => Self::tuple_values.parse(self, input), ProductionKind::TypeExpression => Self::type_expression.parse(self, input), ProductionKind::TypeName => Self::type_name.parse(self, input), ProductionKind::UncheckedBlock => Self::unchecked_block.parse(self, input), - ProductionKind::UnicodeStringLiteralsList => { - Self::unicode_string_literals_list.parse(self, input) + ProductionKind::UnicodeStringLiterals => { + Self::unicode_string_literals.parse(self, input) } - ProductionKind::UnnamedFunctionAttributesList => { - Self::unnamed_function_attributes_list.parse(self, input) + ProductionKind::UnnamedFunctionAttributes => { + Self::unnamed_function_attributes.parse(self, input) } ProductionKind::UnnamedFunctionDefinition => { Self::unnamed_function_definition.parse(self, input) @@ -6115,8 +6097,8 @@ impl Language { Self::using_directive_deconstruction.parse(self, input) } ProductionKind::UsingDirectiveSymbol => Self::using_directive_symbol.parse(self, input), - ProductionKind::UsingDirectiveSymbolsList => { - Self::using_directive_symbols_list.parse(self, input) + ProductionKind::UsingDirectiveSymbols => { + Self::using_directive_symbols.parse(self, input) } ProductionKind::VariableDeclaration => Self::variable_declaration.parse(self, input), ProductionKind::VariableDeclarationStatement => { @@ -6126,13 +6108,14 @@ impl Language { ProductionKind::VersionPragmaExpression => { Self::version_pragma_expression.parse(self, input) } - ProductionKind::VersionPragmaExpressionsList => { - Self::version_pragma_expressions_list.parse(self, input) + ProductionKind::VersionPragmaExpressions => { + Self::version_pragma_expressions.parse(self, input) } ProductionKind::VersionPragmaSpecifier => { Self::version_pragma_specifier.parse(self, input) } ProductionKind::WhileStatement => Self::while_statement.parse(self, input), + ProductionKind::YulArguments => Self::yul_arguments.parse(self, input), ProductionKind::YulAssignmentStatement => { Self::yul_assignment_statement.parse(self, input) } @@ -6143,16 +6126,13 @@ impl Language { Self::yul_declaration_statement.parse(self, input) } ProductionKind::YulExpression => Self::yul_expression.parse(self, input), - ProductionKind::YulExpressionsList => Self::yul_expressions_list.parse(self, input), ProductionKind::YulForStatement => Self::yul_for_statement.parse(self, input), ProductionKind::YulFunctionDefinition => { Self::yul_function_definition.parse(self, input) } ProductionKind::YulIdentifierPath => Self::yul_identifier_path.parse(self, input), - ProductionKind::YulIdentifierPathsList => { - Self::yul_identifier_paths_list.parse(self, input) - } - ProductionKind::YulIdentifiersList => Self::yul_identifiers_list.parse(self, input), + ProductionKind::YulIdentifierPaths => Self::yul_identifier_paths.parse(self, input), + ProductionKind::YulIdentifiers => Self::yul_identifiers.parse(self, input), ProductionKind::YulIfStatement => Self::yul_if_statement.parse(self, input), ProductionKind::YulLeaveStatement => Self::yul_leave_statement.parse(self, input), ProductionKind::YulParametersDeclaration => { @@ -6161,9 +6141,9 @@ impl Language { ProductionKind::YulReturnsDeclaration => { Self::yul_returns_declaration.parse(self, input) } - ProductionKind::YulStatementsList => Self::yul_statements_list.parse(self, input), + ProductionKind::YulStatements => Self::yul_statements.parse(self, input), ProductionKind::YulSwitchCase => Self::yul_switch_case.parse(self, input), - ProductionKind::YulSwitchCasesList => Self::yul_switch_cases_list.parse(self, input), + ProductionKind::YulSwitchCases => Self::yul_switch_cases.parse(self, input), ProductionKind::YulSwitchStatement => Self::yul_switch_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 ea08a08ceb..6a419c0343 100644 --- a/crates/solidity/outputs/npm/package/src/generated/index.d.ts +++ b/crates/solidity/outputs/npm/package/src/generated/index.d.ts @@ -16,141 +16,141 @@ export namespace kinds { AddressType = "AddressType", ArgumentsDeclaration = "ArgumentsDeclaration", ArrayExpression = "ArrayExpression", - ArrayValuesList = "ArrayValuesList", - AsciiStringLiteralsList = "AsciiStringLiteralsList", + ArrayValues = "ArrayValues", + AsciiStringLiterals = "AsciiStringLiterals", + AssemblyFlags = "AssemblyFlags", AssemblyFlagsDeclaration = "AssemblyFlagsDeclaration", - AssemblyFlagsList = "AssemblyFlagsList", AssemblyStatement = "AssemblyStatement", Block = "Block", BreakStatement = "BreakStatement", CatchClause = "CatchClause", CatchClauseError = "CatchClauseError", - CatchClausesList = "CatchClausesList", + CatchClauses = "CatchClauses", ConstantDefinition = "ConstantDefinition", - ConstructorAttributesList = "ConstructorAttributesList", + ConstructorAttributes = "ConstructorAttributes", ConstructorDefinition = "ConstructorDefinition", ContinueStatement = "ContinueStatement", ContractDefinition = "ContractDefinition", - ContractMembersList = "ContractMembersList", + ContractMembers = "ContractMembers", DecimalNumberExpression = "DecimalNumberExpression", DeconstructionImport = "DeconstructionImport", DeconstructionImportSymbol = "DeconstructionImportSymbol", - DeconstructionImportSymbolsList = "DeconstructionImportSymbolsList", + DeconstructionImportSymbols = "DeconstructionImportSymbols", DeleteStatement = "DeleteStatement", DoWhileStatement = "DoWhileStatement", EmitStatement = "EmitStatement", EndOfFileTrivia = "EndOfFileTrivia", EnumDefinition = "EnumDefinition", + EnumMembers = "EnumMembers", ErrorDefinition = "ErrorDefinition", ErrorParameter = "ErrorParameter", + ErrorParameters = "ErrorParameters", ErrorParametersDeclaration = "ErrorParametersDeclaration", - ErrorParametersList = "ErrorParametersList", EventDefinition = "EventDefinition", EventParameter = "EventParameter", + EventParameters = "EventParameters", EventParametersDeclaration = "EventParametersDeclaration", - EventParametersList = "EventParametersList", ExperimentalPragma = "ExperimentalPragma", Expression = "Expression", ExpressionStatement = "ExpressionStatement", - FallbackFunctionAttributesList = "FallbackFunctionAttributesList", + FallbackFunctionAttributes = "FallbackFunctionAttributes", FallbackFunctionDefinition = "FallbackFunctionDefinition", ForStatement = "ForStatement", - FunctionAttributesList = "FunctionAttributesList", + FunctionAttributes = "FunctionAttributes", FunctionCallOptions = "FunctionCallOptions", FunctionDefinition = "FunctionDefinition", FunctionType = "FunctionType", - FunctionTypeAttributesList = "FunctionTypeAttributesList", + FunctionTypeAttributes = "FunctionTypeAttributes", HexNumberExpression = "HexNumberExpression", - HexStringLiteralsList = "HexStringLiteralsList", + HexStringLiterals = "HexStringLiterals", IdentifierPath = "IdentifierPath", - IdentifierPathsList = "IdentifierPathsList", - IdentifiersList = "IdentifiersList", IfStatement = "IfStatement", ImportDirective = "ImportDirective", InheritanceSpecifier = "InheritanceSpecifier", InheritanceType = "InheritanceType", - InheritanceTypesList = "InheritanceTypesList", + InheritanceTypes = "InheritanceTypes", InterfaceDefinition = "InterfaceDefinition", - InterfaceMembersList = "InterfaceMembersList", + InterfaceMembers = "InterfaceMembers", LeadingTrivia = "LeadingTrivia", LibraryDefinition = "LibraryDefinition", - LibraryMembersList = "LibraryMembersList", + LibraryMembers = "LibraryMembers", MappingKeyType = "MappingKeyType", MappingType = "MappingType", MappingValueType = "MappingValueType", - ModifierAttributesList = "ModifierAttributesList", + ModifierAttributes = "ModifierAttributes", ModifierDefinition = "ModifierDefinition", ModifierInvocation = "ModifierInvocation", NamedArgument = "NamedArgument", + NamedArguments = "NamedArguments", NamedArgumentsDeclaration = "NamedArgumentsDeclaration", - NamedArgumentsList = "NamedArgumentsList", NamedImport = "NamedImport", NewExpression = "NewExpression", + OverridePaths = "OverridePaths", OverrideSpecifier = "OverrideSpecifier", Parameter = "Parameter", + Parameters = "Parameters", ParametersDeclaration = "ParametersDeclaration", - ParametersList = "ParametersList", PathImport = "PathImport", - PositionalArgumentsList = "PositionalArgumentsList", + PositionalArguments = "PositionalArguments", PragmaDirective = "PragmaDirective", - ReceiveFunctionAttributesList = "ReceiveFunctionAttributesList", + ReceiveFunctionAttributes = "ReceiveFunctionAttributes", ReceiveFunctionDefinition = "ReceiveFunctionDefinition", ReturnStatement = "ReturnStatement", ReturnsDeclaration = "ReturnsDeclaration", RevertStatement = "RevertStatement", SourceUnit = "SourceUnit", - SourceUnitMembersList = "SourceUnitMembersList", - StateVariableAttributesList = "StateVariableAttributesList", + SourceUnitMembers = "SourceUnitMembers", + StateVariableAttributes = "StateVariableAttributes", StateVariableDefinition = "StateVariableDefinition", - StatementsList = "StatementsList", + Statements = "Statements", StructDefinition = "StructDefinition", StructMember = "StructMember", - StructMembersList = "StructMembersList", + StructMembers = "StructMembers", ThrowStatement = "ThrowStatement", TrailingTrivia = "TrailingTrivia", TryStatement = "TryStatement", TupleDeconstructionStatement = "TupleDeconstructionStatement", TupleExpression = "TupleExpression", TupleMember = "TupleMember", - TupleMembersList = "TupleMembersList", - TupleValuesList = "TupleValuesList", + TupleMembers = "TupleMembers", + TupleValues = "TupleValues", TypeExpression = "TypeExpression", TypeName = "TypeName", UncheckedBlock = "UncheckedBlock", - UnicodeStringLiteralsList = "UnicodeStringLiteralsList", - UnnamedFunctionAttributesList = "UnnamedFunctionAttributesList", + UnicodeStringLiterals = "UnicodeStringLiterals", + UnnamedFunctionAttributes = "UnnamedFunctionAttributes", UnnamedFunctionDefinition = "UnnamedFunctionDefinition", UserDefinedValueTypeDefinition = "UserDefinedValueTypeDefinition", UsingDirective = "UsingDirective", UsingDirectiveDeconstruction = "UsingDirectiveDeconstruction", UsingDirectiveSymbol = "UsingDirectiveSymbol", - UsingDirectiveSymbolsList = "UsingDirectiveSymbolsList", + UsingDirectiveSymbols = "UsingDirectiveSymbols", VariableDeclaration = "VariableDeclaration", VariableDeclarationStatement = "VariableDeclarationStatement", VersionPragma = "VersionPragma", VersionPragmaExpression = "VersionPragmaExpression", - VersionPragmaExpressionsList = "VersionPragmaExpressionsList", + VersionPragmaExpressions = "VersionPragmaExpressions", VersionPragmaSpecifier = "VersionPragmaSpecifier", WhileStatement = "WhileStatement", + YulArguments = "YulArguments", YulAssignmentStatement = "YulAssignmentStatement", YulBlock = "YulBlock", YulBreakStatement = "YulBreakStatement", YulContinueStatement = "YulContinueStatement", YulDeclarationStatement = "YulDeclarationStatement", YulExpression = "YulExpression", - YulExpressionsList = "YulExpressionsList", YulForStatement = "YulForStatement", YulFunctionDefinition = "YulFunctionDefinition", YulIdentifierPath = "YulIdentifierPath", - YulIdentifierPathsList = "YulIdentifierPathsList", - YulIdentifiersList = "YulIdentifiersList", + YulIdentifierPaths = "YulIdentifierPaths", + YulIdentifiers = "YulIdentifiers", YulIfStatement = "YulIfStatement", YulLeaveStatement = "YulLeaveStatement", YulParametersDeclaration = "YulParametersDeclaration", YulReturnsDeclaration = "YulReturnsDeclaration", - YulStatementsList = "YulStatementsList", + YulStatements = "YulStatements", YulSwitchCase = "YulSwitchCase", - YulSwitchCasesList = "YulSwitchCasesList", + YulSwitchCases = "YulSwitchCases", YulSwitchStatement = "YulSwitchStatement", } export enum RuleKind { @@ -159,151 +159,151 @@ export namespace kinds { ArgumentsDeclaration = "ArgumentsDeclaration", ArrayExpression = "ArrayExpression", ArrayTypeName = "ArrayTypeName", - ArrayValuesList = "ArrayValuesList", - AsciiStringLiteralsList = "AsciiStringLiteralsList", + ArrayValues = "ArrayValues", + AsciiStringLiterals = "AsciiStringLiterals", + AssemblyFlags = "AssemblyFlags", AssemblyFlagsDeclaration = "AssemblyFlagsDeclaration", - AssemblyFlagsList = "AssemblyFlagsList", AssemblyStatement = "AssemblyStatement", BinaryExpression = "BinaryExpression", Block = "Block", BreakStatement = "BreakStatement", CatchClause = "CatchClause", CatchClauseError = "CatchClauseError", - CatchClausesList = "CatchClausesList", + CatchClauses = "CatchClauses", ConditionalExpression = "ConditionalExpression", ConstantDefinition = "ConstantDefinition", - ConstructorAttributesList = "ConstructorAttributesList", + ConstructorAttributes = "ConstructorAttributes", ConstructorDefinition = "ConstructorDefinition", ContinueStatement = "ContinueStatement", ContractDefinition = "ContractDefinition", - ContractMembersList = "ContractMembersList", + ContractMembers = "ContractMembers", DecimalNumberExpression = "DecimalNumberExpression", DeconstructionImport = "DeconstructionImport", DeconstructionImportSymbol = "DeconstructionImportSymbol", - DeconstructionImportSymbolsList = "DeconstructionImportSymbolsList", + DeconstructionImportSymbols = "DeconstructionImportSymbols", DeleteStatement = "DeleteStatement", DoWhileStatement = "DoWhileStatement", EmitStatement = "EmitStatement", EndOfFileTrivia = "EndOfFileTrivia", EnumDefinition = "EnumDefinition", + EnumMembers = "EnumMembers", ErrorDefinition = "ErrorDefinition", ErrorParameter = "ErrorParameter", + ErrorParameters = "ErrorParameters", ErrorParametersDeclaration = "ErrorParametersDeclaration", - ErrorParametersList = "ErrorParametersList", EventDefinition = "EventDefinition", EventParameter = "EventParameter", + EventParameters = "EventParameters", EventParametersDeclaration = "EventParametersDeclaration", - EventParametersList = "EventParametersList", ExperimentalPragma = "ExperimentalPragma", Expression = "Expression", ExpressionStatement = "ExpressionStatement", - FallbackFunctionAttributesList = "FallbackFunctionAttributesList", + FallbackFunctionAttributes = "FallbackFunctionAttributes", FallbackFunctionDefinition = "FallbackFunctionDefinition", ForStatement = "ForStatement", - FunctionAttributesList = "FunctionAttributesList", + FunctionAttributes = "FunctionAttributes", FunctionCallExpression = "FunctionCallExpression", FunctionCallOptions = "FunctionCallOptions", FunctionDefinition = "FunctionDefinition", FunctionType = "FunctionType", - FunctionTypeAttributesList = "FunctionTypeAttributesList", + FunctionTypeAttributes = "FunctionTypeAttributes", HexNumberExpression = "HexNumberExpression", - HexStringLiteralsList = "HexStringLiteralsList", + HexStringLiterals = "HexStringLiterals", IdentifierPath = "IdentifierPath", - IdentifierPathsList = "IdentifierPathsList", - IdentifiersList = "IdentifiersList", IfStatement = "IfStatement", ImportDirective = "ImportDirective", IndexAccessExpression = "IndexAccessExpression", InheritanceSpecifier = "InheritanceSpecifier", InheritanceType = "InheritanceType", - InheritanceTypesList = "InheritanceTypesList", + InheritanceTypes = "InheritanceTypes", InterfaceDefinition = "InterfaceDefinition", - InterfaceMembersList = "InterfaceMembersList", + InterfaceMembers = "InterfaceMembers", LeadingTrivia = "LeadingTrivia", LibraryDefinition = "LibraryDefinition", - LibraryMembersList = "LibraryMembersList", + LibraryMembers = "LibraryMembers", MappingKeyType = "MappingKeyType", MappingType = "MappingType", MappingValueType = "MappingValueType", MemberAccessExpression = "MemberAccessExpression", - ModifierAttributesList = "ModifierAttributesList", + ModifierAttributes = "ModifierAttributes", ModifierDefinition = "ModifierDefinition", ModifierInvocation = "ModifierInvocation", NamedArgument = "NamedArgument", + NamedArguments = "NamedArguments", NamedArgumentsDeclaration = "NamedArgumentsDeclaration", - NamedArgumentsList = "NamedArgumentsList", NamedImport = "NamedImport", NewExpression = "NewExpression", + OverridePaths = "OverridePaths", OverrideSpecifier = "OverrideSpecifier", Parameter = "Parameter", + Parameters = "Parameters", ParametersDeclaration = "ParametersDeclaration", - ParametersList = "ParametersList", PathImport = "PathImport", - PositionalArgumentsList = "PositionalArgumentsList", + PositionalArguments = "PositionalArguments", PragmaDirective = "PragmaDirective", - ReceiveFunctionAttributesList = "ReceiveFunctionAttributesList", + ReceiveFunctionAttributes = "ReceiveFunctionAttributes", ReceiveFunctionDefinition = "ReceiveFunctionDefinition", ReturnStatement = "ReturnStatement", ReturnsDeclaration = "ReturnsDeclaration", RevertStatement = "RevertStatement", SourceUnit = "SourceUnit", - SourceUnitMembersList = "SourceUnitMembersList", - StateVariableAttributesList = "StateVariableAttributesList", + SourceUnitMembers = "SourceUnitMembers", + StateVariableAttributes = "StateVariableAttributes", StateVariableDefinition = "StateVariableDefinition", - StatementsList = "StatementsList", + Statements = "Statements", StructDefinition = "StructDefinition", StructMember = "StructMember", - StructMembersList = "StructMembersList", + StructMembers = "StructMembers", ThrowStatement = "ThrowStatement", TrailingTrivia = "TrailingTrivia", TryStatement = "TryStatement", TupleDeconstructionStatement = "TupleDeconstructionStatement", TupleExpression = "TupleExpression", TupleMember = "TupleMember", - TupleMembersList = "TupleMembersList", - TupleValuesList = "TupleValuesList", + TupleMembers = "TupleMembers", + TupleValues = "TupleValues", TypeExpression = "TypeExpression", TypeName = "TypeName", UnaryPostfixExpression = "UnaryPostfixExpression", UnaryPrefixExpression = "UnaryPrefixExpression", UncheckedBlock = "UncheckedBlock", - UnicodeStringLiteralsList = "UnicodeStringLiteralsList", - UnnamedFunctionAttributesList = "UnnamedFunctionAttributesList", + UnicodeStringLiterals = "UnicodeStringLiterals", + UnnamedFunctionAttributes = "UnnamedFunctionAttributes", UnnamedFunctionDefinition = "UnnamedFunctionDefinition", UserDefinedValueTypeDefinition = "UserDefinedValueTypeDefinition", UsingDirective = "UsingDirective", UsingDirectiveDeconstruction = "UsingDirectiveDeconstruction", UsingDirectiveSymbol = "UsingDirectiveSymbol", - UsingDirectiveSymbolsList = "UsingDirectiveSymbolsList", + UsingDirectiveSymbols = "UsingDirectiveSymbols", VariableDeclaration = "VariableDeclaration", VariableDeclarationStatement = "VariableDeclarationStatement", VersionPragma = "VersionPragma", VersionPragmaBinaryExpression = "VersionPragmaBinaryExpression", VersionPragmaExpression = "VersionPragmaExpression", - VersionPragmaExpressionsList = "VersionPragmaExpressionsList", + VersionPragmaExpressions = "VersionPragmaExpressions", VersionPragmaSpecifier = "VersionPragmaSpecifier", VersionPragmaUnaryExpression = "VersionPragmaUnaryExpression", WhileStatement = "WhileStatement", + YulArguments = "YulArguments", YulAssignmentStatement = "YulAssignmentStatement", YulBlock = "YulBlock", YulBreakStatement = "YulBreakStatement", YulContinueStatement = "YulContinueStatement", YulDeclarationStatement = "YulDeclarationStatement", YulExpression = "YulExpression", - YulExpressionsList = "YulExpressionsList", YulForStatement = "YulForStatement", YulFunctionCallExpression = "YulFunctionCallExpression", YulFunctionDefinition = "YulFunctionDefinition", YulIdentifierPath = "YulIdentifierPath", - YulIdentifierPathsList = "YulIdentifierPathsList", - YulIdentifiersList = "YulIdentifiersList", + YulIdentifierPaths = "YulIdentifierPaths", + YulIdentifiers = "YulIdentifiers", YulIfStatement = "YulIfStatement", YulLeaveStatement = "YulLeaveStatement", YulParametersDeclaration = "YulParametersDeclaration", YulReturnsDeclaration = "YulReturnsDeclaration", - YulStatementsList = "YulStatementsList", + YulStatements = "YulStatements", YulSwitchCase = "YulSwitchCase", - YulSwitchCasesList = "YulSwitchCasesList", + YulSwitchCases = "YulSwitchCases", YulSwitchStatement = "YulSwitchStatement", } export enum TokenKind { diff --git a/crates/solidity/outputs/npm/tests/src/tests/cst-cursor.ts b/crates/solidity/outputs/npm/tests/src/tests/cst-cursor.ts index bc16516c96..b09cf418ca 100644 --- a/crates/solidity/outputs/npm/tests/src/tests/cst-cursor.ts +++ b/crates/solidity/outputs/npm/tests/src/tests/cst-cursor.ts @@ -13,7 +13,7 @@ test("use cursor", () => { expectRule(cursor.node(), RuleKind.SourceUnit); expect(cursor.goToNext()).toBe(true); - expectRule(cursor.node(), RuleKind.SourceUnitMembersList); + expectRule(cursor.node(), RuleKind.SourceUnitMembers); expect(cursor.goToNext()).toBe(true); expectRule(cursor.node(), RuleKind.ConstantDefinition); diff --git a/crates/solidity/outputs/npm/tests/src/tests/cst-output.ts b/crates/solidity/outputs/npm/tests/src/tests/cst-output.ts index d367ea393b..9c65995592 100644 --- a/crates/solidity/outputs/npm/tests/src/tests/cst-output.ts +++ b/crates/solidity/outputs/npm/tests/src/tests/cst-output.ts @@ -25,7 +25,7 @@ test("parse rule", () => { const children = parseTree.children(); expect(children).toHaveLength(1); - expectRule(children[0]!, RuleKind.SourceUnitMembersList); + expectRule(children[0]!, RuleKind.SourceUnitMembers); }); test("trivial cursor access", () => { @@ -44,8 +44,8 @@ test("calculate unicode characters text length", () => { const source = `unicode"some 😁 emoji"`; const language = new Language("0.8.1"); - const parseTree = language.parse(ProductionKind.UnicodeStringLiteralsList, source).tree(); - expectRule(parseTree, RuleKind.UnicodeStringLiteralsList); + const parseTree = language.parse(ProductionKind.UnicodeStringLiterals, source).tree(); + expectRule(parseTree, RuleKind.UnicodeStringLiterals); expect(parseTree.textLength).toEqual({ char: 21, diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md similarity index 54% rename from crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md rename to crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md index 2add3f85a5..eb73e0566f 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md @@ -1,5 +1,5 @@ -```{ .ebnf .slang-ebnf #LibraryMembersList } -LibraryMembersList = «ContractMember»+; +```{ .ebnf .slang-ebnf #SourceUnitMembers } +SourceUnitMembers = «SourceUnitMember»+; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md index daf931c9a8..0fb9b75907 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #SourceUnit } -SourceUnit = SourceUnitMembersList? EndOfFileTrivia?; +SourceUnit = SourceUnitMembers? EndOfFileTrivia?; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md new file mode 100644 index 0000000000..5803dcc669 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #VersionPragmaExpressions } +VersionPragmaExpressions = VersionPragmaExpression+; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md index 382148b6c5..c2020a0ee5 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #VersionPragma } -VersionPragma = SOLIDITY_KEYWORD VersionPragmaExpressionsList; +VersionPragma = SOLIDITY_KEYWORD VersionPragmaExpressions; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md deleted file mode 100644 index ffdb5f0c38..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #DeconstructionImportSymbolsList } -DeconstructionImportSymbolsList = DeconstructionImportSymbol (COMMA DeconstructionImportSymbol)*; -``` 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 new file mode 100644 index 0000000000..525ced5cfc --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/deconstruction-import-symbols/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #DeconstructionImportSymbols } +DeconstructionImportSymbols = DeconstructionImportSymbol (COMMA DeconstructionImportSymbol)*; +``` 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/deconstruction-import/unversioned.md index d944acc1ef..bc28e4c063 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/deconstruction-import/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #DeconstructionImport } -DeconstructionImport = OPEN_BRACE DeconstructionImportSymbolsList CLOSE_BRACE FROM_KEYWORD ASCII_STRING_LITERAL; +DeconstructionImport = OPEN_BRACE DeconstructionImportSymbols CLOSE_BRACE FROM_KEYWORD ASCII_STRING_LITERAL; ``` 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 index 9cc1590112..8a44bc7b1d 100644 --- 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 @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #UsingDirectiveDeconstruction } -UsingDirectiveDeconstruction = OPEN_BRACE UsingDirectiveSymbolsList CLOSE_BRACE; +UsingDirectiveDeconstruction = OPEN_BRACE UsingDirectiveSymbols CLOSE_BRACE; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/0.8.13.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/0.8.13.md deleted file mode 100644 index 6623fe5885..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols-list/0.8.13.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #UsingDirectiveSymbolsList } -UsingDirectiveSymbolsList = UsingDirectiveSymbol (COMMA UsingDirectiveSymbol)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols/0.8.13.md similarity index 51% rename from crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md rename to crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols/0.8.13.md index 846c8af5e7..3882298d85 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/04-imports/using-directive-symbols/0.8.13.md @@ -1,5 +1,5 @@ -```{ .ebnf .slang-ebnf #VersionPragmaExpressionsList } -VersionPragmaExpressionsList = VersionPragmaExpression+; +```{ .ebnf .slang-ebnf #UsingDirectiveSymbols } +UsingDirectiveSymbols = UsingDirectiveSymbol (COMMA UsingDirectiveSymbol)*; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.4.11.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.4.11.md index 36494d8513..4f2e35ab12 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.4.11.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.4.11.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #ContractDefinition } -ContractDefinition = CONTRACT_KEYWORD IDENTIFIER InheritanceSpecifier? OPEN_BRACE ContractMembersList? CLOSE_BRACE; +ContractDefinition = CONTRACT_KEYWORD IDENTIFIER InheritanceSpecifier? OPEN_BRACE ContractMembers? CLOSE_BRACE; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md index 2c3645dfe3..fa227fbc42 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #ContractDefinition } -ContractDefinition = ABSTRACT_KEYWORD? CONTRACT_KEYWORD IDENTIFIER InheritanceSpecifier? OPEN_BRACE ContractMembersList? CLOSE_BRACE; +ContractDefinition = ABSTRACT_KEYWORD? CONTRACT_KEYWORD IDENTIFIER InheritanceSpecifier? OPEN_BRACE ContractMembers? CLOSE_BRACE; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md similarity index 56% rename from crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md rename to crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md index 95788c6af9..fa169dcfde 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md @@ -1,5 +1,5 @@ -```{ .ebnf .slang-ebnf #YulSwitchCasesList } -YulSwitchCasesList = YulSwitchCase+; +```{ .ebnf .slang-ebnf #ContractMembers } +ContractMembers = «ContractMember»+; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md index eca61dd057..f001f073f4 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #InheritanceSpecifier } -InheritanceSpecifier = IS_KEYWORD InheritanceTypesList; +InheritanceSpecifier = IS_KEYWORD InheritanceTypes; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md deleted file mode 100644 index 366d144762..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #InheritanceTypesList } -InheritanceTypesList = InheritanceType (COMMA InheritanceType)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md new file mode 100644 index 0000000000..2d5782c807 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #InheritanceTypes } +InheritanceTypes = InheritanceType (COMMA InheritanceType)*; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md index f97bdad274..05b688b7fa 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #InterfaceDefinition } -InterfaceDefinition = INTERFACE_KEYWORD IDENTIFIER InheritanceSpecifier? OPEN_BRACE InterfaceMembersList? CLOSE_BRACE; +InterfaceDefinition = INTERFACE_KEYWORD IDENTIFIER InheritanceSpecifier? OPEN_BRACE InterfaceMembers? CLOSE_BRACE; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md similarity index 55% rename from crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md rename to crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md index 74b16283f9..936bc69f90 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md @@ -1,5 +1,5 @@ -```{ .ebnf .slang-ebnf #YulStatementsList } -YulStatementsList = «YulStatement»+; +```{ .ebnf .slang-ebnf #InterfaceMembers } +InterfaceMembers = «ContractMember»+; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md index b0280f73f3..54bd21001f 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #LibraryDefinition } -LibraryDefinition = LIBRARY_KEYWORD IDENTIFIER OPEN_BRACE LibraryMembersList? CLOSE_BRACE; +LibraryDefinition = LIBRARY_KEYWORD IDENTIFIER OPEN_BRACE LibraryMembers? CLOSE_BRACE; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md similarity index 57% rename from crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md rename to crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md index bba1261bad..aec0f8f609 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md @@ -1,5 +1,5 @@ -```{ .ebnf .slang-ebnf #StructMembersList } -StructMembersList = StructMember+; +```{ .ebnf .slang-ebnf #LibraryMembers } +LibraryMembers = «ContractMember»+; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md index 89de48210f..525d4512b1 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #StructDefinition } -StructDefinition = STRUCT_KEYWORD IDENTIFIER OPEN_BRACE StructMembersList? CLOSE_BRACE; +StructDefinition = STRUCT_KEYWORD IDENTIFIER OPEN_BRACE StructMembers? CLOSE_BRACE; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md similarity index 58% rename from crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md rename to crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md index 881236998a..30857aa886 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md @@ -1,5 +1,5 @@ -```{ .ebnf .slang-ebnf #StatementsList } -StatementsList = «Statement»+; +```{ .ebnf .slang-ebnf #StructMembers } +StructMembers = StructMember+; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md index 5fefc7818a..1ed05ec04b 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #EnumDefinition } -EnumDefinition = ENUM_KEYWORD IDENTIFIER OPEN_BRACE IdentifiersList? CLOSE_BRACE; +EnumDefinition = ENUM_KEYWORD IDENTIFIER OPEN_BRACE EnumMembers? CLOSE_BRACE; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md new file mode 100644 index 0000000000..536f7f973a --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #EnumMembers } +EnumMembers = IDENTIFIER (COMMA IDENTIFIER)*; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md deleted file mode 100644 index 0d23ea904a..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #StateVariableAttributesList } -StateVariableAttributesList = «StateVariableAttribute»+; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md new file mode 100644 index 0000000000..90d0df797d --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #StateVariableAttributes } +StateVariableAttributes = «StateVariableAttribute»+; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md index 562cc74183..22ae2cf256 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #StateVariableDefinition } -StateVariableDefinition = TypeName StateVariableAttributesList? IDENTIFIER (EQUAL Expression)? SEMICOLON; +StateVariableDefinition = TypeName StateVariableAttributes? IDENTIFIER (EQUAL Expression)? SEMICOLON; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md deleted file mode 100644 index 166723c022..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #ConstructorAttributesList } -ConstructorAttributesList = «ConstructorAttribute»+; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md new file mode 100644 index 0000000000..97d563a1f7 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #ConstructorAttributes } +ConstructorAttributes = «ConstructorAttribute»+; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md index 07cf8dd605..6edb00a33c 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #ConstructorDefinition } -ConstructorDefinition = CONSTRUCTOR_KEYWORD ParametersDeclaration ConstructorAttributesList? Block; +ConstructorDefinition = CONSTRUCTOR_KEYWORD ParametersDeclaration ConstructorAttributes? Block; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md deleted file mode 100644 index f6ec1f7e4b..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #FallbackFunctionAttributesList } -FallbackFunctionAttributesList = «FallbackFunctionAttribute»+; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md new file mode 100644 index 0000000000..503126fa8e --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #FallbackFunctionAttributes } +FallbackFunctionAttributes = «FallbackFunctionAttribute»+; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md index a3bb6ec4f5..91f87806cb 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #FallbackFunctionDefinition } -FallbackFunctionDefinition = FALLBACK_KEYWORD ParametersDeclaration FallbackFunctionAttributesList? ReturnsDeclaration? (SEMICOLON | Block); +FallbackFunctionDefinition = FALLBACK_KEYWORD ParametersDeclaration FallbackFunctionAttributes? ReturnsDeclaration? (SEMICOLON | Block); ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md deleted file mode 100644 index 32c2c09924..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #FunctionAttributesList } -FunctionAttributesList = «FunctionAttribute»+; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md similarity index 53% rename from crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md rename to crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md index 5fa934cbff..fede153a05 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md @@ -1,5 +1,5 @@ -```{ .ebnf .slang-ebnf #ContractMembersList } -ContractMembersList = «ContractMember»+; +```{ .ebnf .slang-ebnf #FunctionAttributes } +FunctionAttributes = «FunctionAttribute»+; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md index 2f9c07ef12..305b7154c9 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #FunctionDefinition } -FunctionDefinition = FUNCTION_KEYWORD (IDENTIFIER | FALLBACK_KEYWORD | RECEIVE_KEYWORD) ParametersDeclaration FunctionAttributesList? ReturnsDeclaration? (SEMICOLON | Block); +FunctionDefinition = FUNCTION_KEYWORD (IDENTIFIER | FALLBACK_KEYWORD | RECEIVE_KEYWORD) ParametersDeclaration FunctionAttributes? ReturnsDeclaration? (SEMICOLON | Block); ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md similarity index 52% rename from crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md rename to crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md index ed8acf487e..3261b41e78 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md @@ -1,5 +1,5 @@ -```{ .ebnf .slang-ebnf #SourceUnitMembersList } -SourceUnitMembersList = «SourceUnitMember»+; +```{ .ebnf .slang-ebnf #OverridePaths } +OverridePaths = IdentifierPath (COMMA IdentifierPath)*; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md index 83f8d859c9..3d044a923d 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #OverrideSpecifier } -OverrideSpecifier = OVERRIDE_KEYWORD (OPEN_PAREN IdentifierPathsList? CLOSE_PAREN)?; +OverrideSpecifier = OVERRIDE_KEYWORD (OPEN_PAREN OverridePaths? CLOSE_PAREN)?; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md index 5aef464758..37486a4bff 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #ParametersDeclaration } -ParametersDeclaration = OPEN_PAREN ParametersList? CLOSE_PAREN; +ParametersDeclaration = OPEN_PAREN Parameters? CLOSE_PAREN; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md new file mode 100644 index 0000000000..7a6d1a9bac --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #Parameters } +Parameters = Parameter (COMMA Parameter)*; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md deleted file mode 100644 index 4b098d8617..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #ReceiveFunctionAttributesList } -ReceiveFunctionAttributesList = «ReceiveFunctionAttribute»+; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md new file mode 100644 index 0000000000..6e64e4ce69 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #ReceiveFunctionAttributes } +ReceiveFunctionAttributes = «ReceiveFunctionAttribute»+; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md index 3b352d14f4..7dcfc46c8c 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #ReceiveFunctionDefinition } -ReceiveFunctionDefinition = RECEIVE_KEYWORD ParametersDeclaration ReceiveFunctionAttributesList? (SEMICOLON | Block); +ReceiveFunctionDefinition = RECEIVE_KEYWORD ParametersDeclaration ReceiveFunctionAttributes? (SEMICOLON | Block); ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes-list/0.4.11.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes-list/0.4.11.md deleted file mode 100644 index 2bcf4060ba..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes-list/0.4.11.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #UnnamedFunctionAttributesList } -UnnamedFunctionAttributesList = «UnnamedFunctionAttribute»+; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes/0.4.11.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes/0.4.11.md new file mode 100644 index 0000000000..29fc444315 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes/0.4.11.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #UnnamedFunctionAttributes } +UnnamedFunctionAttributes = «UnnamedFunctionAttribute»+; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-definition/0.4.11.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-definition/0.4.11.md index eac20f3708..55e996c300 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-definition/0.4.11.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-definition/0.4.11.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #UnnamedFunctionDefinition } -UnnamedFunctionDefinition = FUNCTION_KEYWORD ParametersDeclaration UnnamedFunctionAttributesList? (SEMICOLON | Block); +UnnamedFunctionDefinition = FUNCTION_KEYWORD ParametersDeclaration UnnamedFunctionAttributes? (SEMICOLON | Block); ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md deleted file mode 100644 index f1cd31892a..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #ModifierAttributesList } -ModifierAttributesList = «ModifierAttribute»+; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md new file mode 100644 index 0000000000..786fe84f84 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #ModifierAttributes } +ModifierAttributes = «ModifierAttribute»+; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md index 26c5652e88..64ffaf41e8 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #ModifierDefinition } -ModifierDefinition = MODIFIER_KEYWORD IDENTIFIER ParametersDeclaration? ModifierAttributesList? (SEMICOLON | Block); +ModifierDefinition = MODIFIER_KEYWORD IDENTIFIER ParametersDeclaration? ModifierAttributes? (SEMICOLON | Block); ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md index 382b8cc5c6..50e7f67115 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #EventParametersDeclaration } -EventParametersDeclaration = OPEN_PAREN EventParametersList? CLOSE_PAREN; +EventParametersDeclaration = OPEN_PAREN EventParameters? CLOSE_PAREN; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md deleted file mode 100644 index 7a862519a1..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #EventParametersList } -EventParametersList = EventParameter (COMMA EventParameter)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md new file mode 100644 index 0000000000..df5ad8d05f --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #EventParameters } +EventParameters = EventParameter (COMMA EventParameter)*; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-declaration/0.8.4.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-declaration/0.8.4.md index 8787f4a1aa..c21c460dc1 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-declaration/0.8.4.md +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-declaration/0.8.4.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #ErrorParametersDeclaration } -ErrorParametersDeclaration = OPEN_PAREN ErrorParametersList? CLOSE_PAREN; +ErrorParametersDeclaration = OPEN_PAREN ErrorParameters? CLOSE_PAREN; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-list/0.8.4.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-list/0.8.4.md deleted file mode 100644 index 001d5cbfd7..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-list/0.8.4.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #ErrorParametersList } -ErrorParametersList = ErrorParameter (COMMA ErrorParameter)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters/0.8.4.md b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters/0.8.4.md new file mode 100644 index 0000000000..820f03203e --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters/0.8.4.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #ErrorParameters } +ErrorParameters = ErrorParameter (COMMA ErrorParameter)*; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md deleted file mode 100644 index d53a11348e..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #FunctionTypeAttributesList } -FunctionTypeAttributesList = «FunctionTypeAttribute»+; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md new file mode 100644 index 0000000000..ac1ec33540 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #FunctionTypeAttributes } +FunctionTypeAttributes = «FunctionTypeAttribute»+; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md index cb9f65b001..8f6df0f028 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #FunctionType } -FunctionType = FUNCTION_KEYWORD ParametersDeclaration FunctionTypeAttributesList? ReturnsDeclaration?; +FunctionType = FUNCTION_KEYWORD ParametersDeclaration FunctionTypeAttributes? ReturnsDeclaration?; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md index c726be4e40..f504b97986 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #Block } -Block = OPEN_BRACE StatementsList? CLOSE_BRACE; +Block = OPEN_BRACE Statements? CLOSE_BRACE; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md new file mode 100644 index 0000000000..0eba3ac59f --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #Statements } +Statements = «Statement»+; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md index e7a597a207..17e817c22b 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #TupleDeconstructionStatement } -TupleDeconstructionStatement = OPEN_PAREN TupleMembersList? CLOSE_PAREN EQUAL Expression SEMICOLON; +TupleDeconstructionStatement = OPEN_PAREN TupleMembers? CLOSE_PAREN EQUAL Expression SEMICOLON; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md deleted file mode 100644 index 11aeeef25a..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #TupleMembersList } -TupleMembersList = TupleMember (COMMA TupleMember)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md similarity index 54% rename from crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md rename to crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md index d93c4cbbb8..e2cfcd109d 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md @@ -1,5 +1,5 @@ -```{ .ebnf .slang-ebnf #ParametersList } -ParametersList = Parameter (COMMA Parameter)*; +```{ .ebnf .slang-ebnf #TupleMembers } +TupleMembers = TupleMember (COMMA TupleMember)*; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md similarity index 58% rename from crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md rename to crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md index 68dc10a173..61d3d8cfbc 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md +++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md @@ -1,5 +1,5 @@ -```{ .ebnf .slang-ebnf #CatchClausesList } -CatchClausesList = CatchClause+; +```{ .ebnf .slang-ebnf #CatchClauses } +CatchClauses = CatchClause+; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md index 0cfa7c751d..e968bfacd3 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md +++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #TryStatement } -TryStatement = TRY_KEYWORD Expression ReturnsDeclaration? Block CatchClausesList; +TryStatement = TRY_KEYWORD Expression ReturnsDeclaration? Block CatchClauses; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md index 7949a078a8..071102247d 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #ArgumentsDeclaration } -ArgumentsDeclaration = OPEN_PAREN (PositionalArgumentsList | NamedArgumentsDeclaration)? CLOSE_PAREN; +ArgumentsDeclaration = OPEN_PAREN (PositionalArguments | NamedArgumentsDeclaration)? CLOSE_PAREN; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md index e4660b3338..f2a4767ebd 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #NamedArgumentsDeclaration } -NamedArgumentsDeclaration = OPEN_BRACE NamedArgumentsList? CLOSE_BRACE; +NamedArgumentsDeclaration = OPEN_BRACE NamedArguments? CLOSE_BRACE; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md deleted file mode 100644 index 8a682daf40..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #NamedArgumentsList } -NamedArgumentsList = NamedArgument (COMMA NamedArgument)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md new file mode 100644 index 0000000000..376cb8a77a --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #NamedArguments } +NamedArguments = NamedArgument (COMMA NamedArgument)*; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md deleted file mode 100644 index 4401811cec..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #PositionalArgumentsList } -PositionalArgumentsList = Expression (COMMA Expression)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md new file mode 100644 index 0000000000..6ad09385c8 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #PositionalArguments } +PositionalArguments = Expression (COMMA Expression)*; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md index 2a16d18250..6a8ca8a93c 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #ArrayExpression } -ArrayExpression = OPEN_BRACKET ArrayValuesList CLOSE_BRACKET; +ArrayExpression = OPEN_BRACKET ArrayValues CLOSE_BRACKET; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md deleted file mode 100644 index aa21e98e9e..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #ArrayValuesList } -ArrayValuesList = Expression (COMMA Expression)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md new file mode 100644 index 0000000000..84460efd53 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #ArrayValues } +ArrayValues = Expression (COMMA Expression)*; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md index 1573c89ff5..bcf3edd355 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #TupleExpression } -TupleExpression = OPEN_PAREN TupleValuesList CLOSE_PAREN; +TupleExpression = OPEN_PAREN TupleValues CLOSE_PAREN; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md deleted file mode 100644 index ec4be8e731..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #TupleValuesList } -TupleValuesList = Expression? (COMMA Expression?)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md new file mode 100644 index 0000000000..72e00c45a4 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #TupleValues } +TupleValues = Expression? (COMMA Expression?)*; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md deleted file mode 100644 index 6f98a30ae5..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #AsciiStringLiteralsList } -AsciiStringLiteralsList = ASCII_STRING_LITERAL+; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md similarity index 53% rename from crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md rename to crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md index 7eec167139..dbbe6127fa 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md @@ -1,5 +1,5 @@ -```{ .ebnf .slang-ebnf #InterfaceMembersList } -InterfaceMembersList = «ContractMember»+; +```{ .ebnf .slang-ebnf #AsciiStringLiterals } +AsciiStringLiterals = ASCII_STRING_LITERAL+; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md deleted file mode 100644 index 952c673b1c..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #HexStringLiteralsList } -HexStringLiteralsList = HEX_STRING_LITERAL+; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md new file mode 100644 index 0000000000..435b326f83 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #HexStringLiterals } +HexStringLiterals = HEX_STRING_LITERAL+; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.4.11.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.4.11.md index 2575fb1e1b..3ca43144b7 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.4.11.md +++ b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.4.11.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #StringExpression } -«StringExpression» = HexStringLiteralsList | AsciiStringLiteralsList; +«StringExpression» = HexStringLiterals | AsciiStringLiterals; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.7.0.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.7.0.md index f17e366b14..34624ff516 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.7.0.md +++ b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.7.0.md @@ -1,7 +1,7 @@ ```{ .ebnf .slang-ebnf #StringExpression } -«StringExpression» = HexStringLiteralsList - | AsciiStringLiteralsList - | UnicodeStringLiteralsList; +«StringExpression» = HexStringLiterals + | AsciiStringLiterals + | UnicodeStringLiterals; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals-list/0.7.0.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals-list/0.7.0.md deleted file mode 100644 index 7e8e02b04c..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals-list/0.7.0.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #UnicodeStringLiteralsList } -UnicodeStringLiteralsList = UNICODE_STRING_LITERAL+; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals/0.7.0.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals/0.7.0.md new file mode 100644 index 0000000000..b6da08816c --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals/0.7.0.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #UnicodeStringLiterals } +UnicodeStringLiterals = UNICODE_STRING_LITERAL+; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md deleted file mode 100644 index 9f75273877..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #IdentifierPathsList } -IdentifierPathsList = IdentifierPath (COMMA IdentifierPath)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md deleted file mode 100644 index 991b451193..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #IdentifiersList } -IdentifiersList = IDENTIFIER (COMMA IDENTIFIER)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md index de99be49a9..2ad1b20706 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #AssemblyFlagsDeclaration } -AssemblyFlagsDeclaration = OPEN_PAREN AssemblyFlagsList CLOSE_PAREN; +AssemblyFlagsDeclaration = OPEN_PAREN AssemblyFlags CLOSE_PAREN; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md deleted file mode 100644 index cf88014be6..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #AssemblyFlagsList } -AssemblyFlagsList = ASCII_STRING_LITERAL (COMMA ASCII_STRING_LITERAL)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md new file mode 100644 index 0000000000..cec61d7f8c --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #AssemblyFlags } +AssemblyFlags = ASCII_STRING_LITERAL (COMMA ASCII_STRING_LITERAL)*; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-assignment-statement/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-assignment-statement/unversioned.md index 9b7cded517..c16ef49f13 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-assignment-statement/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-assignment-statement/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #YulAssignmentStatement } -YulAssignmentStatement = YulIdentifierPathsList COLON_EQUAL YulExpression; +YulAssignmentStatement = YulIdentifierPaths COLON_EQUAL YulExpression; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md index 0c68d15808..65fafdf9ad 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #YulBlock } -YulBlock = OPEN_BRACE YulStatementsList? CLOSE_BRACE; +YulBlock = OPEN_BRACE YulStatements? CLOSE_BRACE; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md index 40601c9423..187606d33a 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #YulDeclarationStatement } -YulDeclarationStatement = LET_KEYWORD YulIdentifierPathsList (COLON_EQUAL YulExpression)?; +YulDeclarationStatement = LET_KEYWORD YulIdentifierPaths (COLON_EQUAL YulExpression)?; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-parameters-declaration/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-parameters-declaration/unversioned.md index c71083489e..971753b21c 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-parameters-declaration/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-parameters-declaration/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #YulParametersDeclaration } -YulParametersDeclaration = OPEN_PAREN YulIdentifiersList? CLOSE_PAREN; +YulParametersDeclaration = OPEN_PAREN YulIdentifiers? CLOSE_PAREN; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-returns-declaration/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-returns-declaration/unversioned.md index 0bd933d45d..676a7552bd 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-returns-declaration/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-returns-declaration/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #YulReturnsDeclaration } -YulReturnsDeclaration = MINUS_GREATER_THAN YulIdentifiersList; +YulReturnsDeclaration = MINUS_GREATER_THAN YulIdentifiers; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md new file mode 100644 index 0000000000..88e7f1db91 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #YulStatements } +YulStatements = «YulStatement»+; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md new file mode 100644 index 0000000000..4b9445357d --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #YulSwitchCases } +YulSwitchCases = YulSwitchCase+; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md index 26788d6f69..084c3644e2 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #YulSwitchStatement } -YulSwitchStatement = SWITCH_KEYWORD YulExpression YulSwitchCasesList; +YulSwitchStatement = SWITCH_KEYWORD YulExpression YulSwitchCases; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md new file mode 100644 index 0000000000..270c0d4e86 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #YulArguments } +YulArguments = YulExpression (COMMA YulExpression)*; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md deleted file mode 100644 index 71332c73f6..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #YulExpressionsList } -YulExpressionsList = YulExpression (COMMA YulExpression)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md index 05e65b73c6..4273f0446a 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md @@ -1,5 +1,5 @@ ```{ .ebnf .slang-ebnf #YulFunctionCallOperator } -«YulFunctionCallOperator» = OPEN_PAREN YulExpressionsList? CLOSE_PAREN; +«YulFunctionCallOperator» = OPEN_PAREN YulArguments? CLOSE_PAREN; ``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md deleted file mode 100644 index 807015bdff..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #YulIdentifierPathsList } -YulIdentifierPathsList = YulIdentifierPath (COMMA YulIdentifierPath)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md new file mode 100644 index 0000000000..3ff47ff2c9 --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #YulIdentifierPaths } +YulIdentifierPaths = YulIdentifierPath (COMMA YulIdentifierPath)*; +``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md deleted file mode 100644 index eabcb4f59c..0000000000 --- a/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md +++ /dev/null @@ -1,5 +0,0 @@ - - -```{ .ebnf .slang-ebnf #YulIdentifiersList } -YulIdentifiersList = YUL_IDENTIFIER (COMMA YUL_IDENTIFIER)*; -``` diff --git a/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md new file mode 100644 index 0000000000..0319cf272a --- /dev/null +++ b/crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md @@ -0,0 +1,5 @@ + + +```{ .ebnf .slang-ebnf #YulIdentifiers } +YulIdentifiers = YUL_IDENTIFIER (COMMA YUL_IDENTIFIER)*; +``` 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 a40054ea0e..b06d0a8ddb 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.4.11.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,7 +30,7 @@ --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-list/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/using-directive/0.4.11.md" @@ -173,55 +173,57 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.4.11.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.4.11.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-definition/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes-list/0.4.11.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attribute/0.4.11.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -229,7 +231,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ## 3. Types @@ -239,7 +241,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -263,7 +265,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -272,7 +274,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md" @@ -320,9 +322,9 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -330,9 +332,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/primary-expression/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -349,13 +351,13 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" @@ -366,9 +368,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.4.11.md" @@ -383,12 +383,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -400,17 +400,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 7d34ed0bba..a0dbcd1799 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.4.11.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,7 +30,7 @@ --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-list/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/using-directive/0.4.11.md" @@ -174,55 +174,57 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.4.11.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.4.11.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-definition/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes-list/0.4.11.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attribute/0.4.11.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -230,7 +232,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ## 3. Types @@ -240,7 +242,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -264,7 +266,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.4.21.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -273,7 +275,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md" @@ -322,9 +324,9 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -332,9 +334,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/primary-expression/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -351,13 +353,13 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" @@ -368,9 +370,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.4.11.md" @@ -385,12 +385,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -402,17 +402,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 2eb20eea6e..d8884914fb 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.4.11.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,7 +30,7 @@ --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-list/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/using-directive/0.4.11.md" @@ -175,58 +175,60 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.4.22.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.4.11.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-definition/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes-list/0.4.11.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attribute/0.4.11.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -234,7 +236,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ## 3. Types @@ -244,7 +246,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -268,7 +270,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.4.21.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -277,7 +279,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.4.11.md" @@ -326,9 +328,9 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -336,9 +338,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/primary-expression/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -355,13 +357,13 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" @@ -372,9 +374,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.4.11.md" @@ -389,12 +389,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -406,17 +406,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 785ff2ea5b..ee4fc28e5f 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.4.11.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,7 +30,7 @@ --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-list/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/using-directive/0.4.11.md" @@ -173,58 +173,60 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.4.22.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.4.11.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-definition/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes-list/0.4.11.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attribute/0.4.11.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -232,7 +234,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ## 3. Types @@ -242,7 +244,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -266,7 +268,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -275,7 +277,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -320,9 +322,9 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -330,9 +332,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/primary-expression/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -349,13 +351,13 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" @@ -366,9 +368,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.5.0.md" @@ -384,12 +384,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -401,17 +401,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 ee62644955..c532a2ad96 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.4.11.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,7 +30,7 @@ --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-list/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/using-directive/0.4.11.md" @@ -174,58 +174,60 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.4.22.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.4.11.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-definition/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes-list/0.4.11.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attributes/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/unnamed-function-attribute/0.4.11.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -233,7 +235,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ## 3. Types @@ -243,7 +245,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -267,7 +269,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -276,7 +278,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -321,9 +323,9 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -332,9 +334,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/type-expression/0.5.3.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -351,13 +353,13 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" @@ -368,9 +370,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.5.3.md" @@ -386,12 +386,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -403,17 +403,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 3b938f5ffb..af8f16997c 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.6.0.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,7 +30,7 @@ --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-list/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/using-directive/0.4.11.md" @@ -179,61 +179,63 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.6.0.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.4.11.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attribute/0.6.0.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -241,7 +243,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ## 3. Types @@ -251,7 +253,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -275,7 +277,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -284,7 +286,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -305,7 +307,7 @@ ### 4.4. Error Handling --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md" @@ -336,9 +338,9 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -347,9 +349,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/type-expression/0.5.3.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -366,13 +368,13 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" @@ -383,9 +385,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.6.0.md" @@ -401,12 +401,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -419,17 +419,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 73069e0636..01affc025a 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.6.0.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,7 +30,7 @@ --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-list/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/using-directive/0.4.11.md" @@ -181,61 +181,63 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.6.0.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.6.5.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attribute/0.6.0.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -243,7 +245,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ## 3. Types @@ -253,7 +255,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -277,7 +279,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -286,7 +288,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -307,7 +309,7 @@ ### 4.4. Error Handling --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md" @@ -338,10 +340,10 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/function-call-options/0.6.2.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -350,9 +352,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/type-expression/0.5.3.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -369,13 +371,13 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" @@ -386,9 +388,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.6.5.md" @@ -404,12 +404,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -422,17 +422,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 d9f5a9d8d5..2e8204634f 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.6.0.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,7 +30,7 @@ --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-list/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/using-directive/0.4.11.md" @@ -179,61 +179,63 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.6.0.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.4.11.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attribute/0.6.0.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -241,7 +243,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ## 3. Types @@ -251,7 +253,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -275,7 +277,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -284,7 +286,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -305,7 +307,7 @@ ### 4.4. Error Handling --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md" @@ -336,10 +338,10 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/function-call-options/0.6.2.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -348,9 +350,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/type-expression/0.5.3.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -367,13 +369,13 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" @@ -384,9 +386,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.6.0.md" @@ -402,12 +402,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -420,17 +420,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 bf95f4acb4..033e0b5423 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.6.0.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,7 +30,7 @@ --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-list/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/using-directive/0.4.11.md" @@ -180,61 +180,63 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.6.0.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.6.5.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attribute/0.6.0.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -242,7 +244,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ## 3. Types @@ -252,7 +254,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -276,7 +278,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -285,7 +287,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -306,7 +308,7 @@ ### 4.4. Error Handling --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md" @@ -337,10 +339,10 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/function-call-options/0.6.2.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -349,9 +351,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/type-expression/0.5.3.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -368,13 +370,13 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.4.11.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" @@ -385,9 +387,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.6.5.md" @@ -403,12 +403,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -421,17 +421,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 ef40192e5c..dbebf18cfd 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.6.0.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,7 +30,7 @@ --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-list/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/using-directive/0.4.11.md" @@ -179,61 +179,63 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.6.0.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.6.5.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attribute/0.6.0.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -241,7 +243,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ## 3. Types @@ -251,7 +253,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -275,7 +277,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -284,7 +286,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -305,7 +307,7 @@ ### 4.4. Error Handling --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md" @@ -336,10 +338,10 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/function-call-options/0.6.2.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -348,9 +350,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/type-expression/0.5.3.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -367,17 +369,17 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.7.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals-list/0.7.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-unicode-string-literal/0.7.0.md" @@ -388,9 +390,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.7.0.md" @@ -406,12 +406,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -424,17 +424,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 ebd93bcc37..9e4974bada 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.7.1.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,7 +30,7 @@ --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-list/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/using-directive/0.4.11.md" @@ -179,61 +179,63 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.6.0.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.6.5.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attribute/0.6.0.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -241,7 +243,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ## 3. Types @@ -251,7 +253,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -275,7 +277,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -284,7 +286,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -305,7 +307,7 @@ ### 4.4. Error Handling --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md" @@ -336,10 +338,10 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/function-call-options/0.6.2.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -348,9 +350,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/type-expression/0.5.3.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -367,17 +369,17 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.7.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals-list/0.7.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-unicode-string-literal/0.7.0.md" @@ -388,9 +390,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.7.0.md" @@ -406,12 +406,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -424,17 +424,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 3e11a49229..6550119c9a 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.7.4.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,7 +30,7 @@ --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-list/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/using-directive/0.4.11.md" @@ -179,30 +179,31 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.6.0.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.6. Constants @@ -211,33 +212,34 @@ ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.6.5.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attribute/0.6.0.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -245,7 +247,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ## 3. Types @@ -255,7 +257,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -279,7 +281,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.4.11.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -288,7 +290,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -309,7 +311,7 @@ ### 4.4. Error Handling --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md" @@ -340,10 +342,10 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/function-call-options/0.6.2.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -352,9 +354,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/type-expression/0.5.3.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -371,17 +373,17 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.7.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals-list/0.7.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-unicode-string-literal/0.7.0.md" @@ -392,9 +394,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.7.0.md" @@ -410,12 +410,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -428,17 +428,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 d0b33770ab..b2cbb8641f 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.7.4.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,7 +30,7 @@ --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-list/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/using-directive/0.4.11.md" @@ -179,30 +179,31 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.6.0.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.6. Constants @@ -211,33 +212,34 @@ ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.6.5.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attribute/0.6.0.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -245,7 +247,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ## 3. Types @@ -255,7 +257,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -279,7 +281,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.8.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -289,7 +291,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -310,7 +312,7 @@ ### 4.4. Error Handling --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md" @@ -341,10 +343,10 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/function-call-options/0.8.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -353,9 +355,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/type-expression/0.5.3.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -372,17 +374,17 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.7.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals-list/0.7.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-unicode-string-literal/0.7.0.md" @@ -393,9 +395,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.8.0.md" @@ -411,12 +411,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -429,17 +429,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 0f9b72f178..87004f7b97 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.8.13.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,11 +30,11 @@ --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-list/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/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-list/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" ### 1.5. Trivia @@ -185,30 +185,31 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.8.8.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.6. Constants @@ -217,33 +218,34 @@ ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.6.5.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attribute/0.6.0.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -251,7 +253,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ### 2.11. User Defined Value Types @@ -262,7 +264,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-definition/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-declaration/0.8.4.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-list/0.8.4.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameter/0.8.4.md" ## 3. Types @@ -272,7 +274,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -296,7 +298,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.8.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -306,7 +308,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -327,7 +329,7 @@ ### 4.4. Error Handling --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/0.8.4.md" @@ -359,10 +361,10 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/function-call-options/0.8.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -371,9 +373,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/type-expression/0.5.3.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -390,17 +392,17 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.7.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals-list/0.7.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-unicode-string-literal/0.7.0.md" @@ -411,9 +413,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.8.0.md" @@ -429,12 +429,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -447,17 +447,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 a14c6ec90d..cb0e69ca8a 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.8.13.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,11 +30,11 @@ --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-list/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/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-list/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" ### 1.5. Trivia @@ -185,30 +185,31 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.8.8.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.6. Constants @@ -217,33 +218,34 @@ ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.6.5.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attribute/0.6.0.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -251,7 +253,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ### 2.11. User Defined Value Types @@ -262,7 +264,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-definition/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-declaration/0.8.4.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-list/0.8.4.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameter/0.8.4.md" ## 3. Types @@ -272,7 +274,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.8.18.md" @@ -296,7 +298,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.8.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -306,7 +308,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -327,7 +329,7 @@ ### 4.4. Error Handling --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/0.8.4.md" @@ -359,10 +361,10 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/function-call-options/0.8.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -371,9 +373,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/type-expression/0.5.3.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -390,17 +392,17 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.7.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals-list/0.7.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-unicode-string-literal/0.7.0.md" @@ -411,9 +413,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.8.0.md" @@ -429,12 +429,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -447,17 +447,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 bb3c49ceac..9e0129d94a 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.8.13.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,11 +30,11 @@ --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-list/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/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-list/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-directive-operator/0.8.19.md" @@ -186,30 +186,31 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.8.8.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.6. Constants @@ -218,33 +219,34 @@ ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.6.5.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attribute/0.6.0.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -252,7 +254,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ### 2.11. User Defined Value Types @@ -263,7 +265,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-definition/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-declaration/0.8.4.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-list/0.8.4.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameter/0.8.4.md" ## 3. Types @@ -273,7 +275,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.8.18.md" @@ -297,7 +299,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.8.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -307,7 +309,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -328,7 +330,7 @@ ### 4.4. Error Handling --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/0.8.4.md" @@ -360,10 +362,10 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/function-call-options/0.8.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -372,9 +374,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/type-expression/0.5.3.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -391,17 +393,17 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.7.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals-list/0.7.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-unicode-string-literal/0.7.0.md" @@ -412,9 +414,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.8.0.md" @@ -430,12 +430,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -448,17 +448,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 97ac274167..5b5d497427 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.8.22.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,11 +30,11 @@ --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-list/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/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-list/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-directive-operator/0.8.19.md" @@ -186,30 +186,31 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.8.8.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.6. Constants @@ -218,33 +219,34 @@ ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.6.5.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attribute/0.6.0.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -252,7 +254,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ### 2.11. User Defined Value Types @@ -263,7 +265,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-definition/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-declaration/0.8.4.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-list/0.8.4.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameter/0.8.4.md" ## 3. Types @@ -273,7 +275,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.8.18.md" @@ -297,7 +299,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.8.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -307,7 +309,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -328,7 +330,7 @@ ### 4.4. Error Handling --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/0.8.4.md" @@ -360,10 +362,10 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/function-call-options/0.8.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -372,9 +374,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/type-expression/0.5.3.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -391,17 +393,17 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.7.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals-list/0.7.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-unicode-string-literal/0.7.0.md" @@ -412,9 +414,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.8.0.md" @@ -430,12 +430,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -448,17 +448,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 3c8ff21e10..81bd0a02aa 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.8.4.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,7 +30,7 @@ --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-list/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/using-directive/0.4.11.md" @@ -181,30 +181,31 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.8.4.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.6. Constants @@ -213,33 +214,34 @@ ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.6.5.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attribute/0.6.0.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -247,14 +249,14 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ### 2.12. Errors --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-definition/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-declaration/0.8.4.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-list/0.8.4.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameter/0.8.4.md" ## 3. Types @@ -264,7 +266,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -288,7 +290,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.8.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -298,7 +300,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -319,7 +321,7 @@ ### 4.4. Error Handling --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/0.8.4.md" @@ -351,10 +353,10 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/function-call-options/0.8.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -363,9 +365,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/type-expression/0.5.3.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -382,17 +384,17 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.7.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals-list/0.7.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-unicode-string-literal/0.7.0.md" @@ -403,9 +405,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.8.0.md" @@ -421,12 +421,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -439,17 +439,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" 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 a106d0b93d..d3372eae51 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 @@ -7,7 +7,7 @@ ### 1.2. Source Unit --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/02-source-unit/source-unit-member/0.8.8.md" ### 1.3. Pragmas @@ -16,7 +16,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/abi-coder-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/experimental-pragma/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expressions/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-or-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/01-file-structure/03-pragmas/version-pragma-range-operator/unversioned.md" @@ -30,7 +30,7 @@ --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-list/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/using-directive/0.4.11.md" @@ -181,30 +181,31 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-definition/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-specifier/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-types/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/inheritance-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/01-contracts/contract-member/0.8.8.md" ### 2.2. Interfaces --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/02-interfaces/interface-members/unversioned.md" ### 2.3. Libraries --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/03-libraries/library-members/unversioned.md" ### 2.4. Structs --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/04-structs/struct-member/unversioned.md" ### 2.5. Enums --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-definition/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/05-enums/enum-members/unversioned.md" ### 2.6. Constants @@ -213,33 +214,34 @@ ### 2.7. State Variables --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/07-state-variables/state-variable-attribute/0.6.5.md" ### 2.8. Functions --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/returns-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-specifier/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/override-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/parameter/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-definition/0.4.22.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes-list/0.4.22.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attributes/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/constructor-attribute/0.4.22.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/fallback-function-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-definition/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attributes/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/08-functions/receive-function-attribute/0.6.0.md" ### 2.9. Modifiers --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-definition/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-attribute/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/09-modifiers/modifier-invocation/unversioned.md" @@ -247,7 +249,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-definition/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameters/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/10-events/event-parameter/unversioned.md" ### 2.11. User Defined Value Types @@ -258,7 +260,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-definition/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-declaration/0.8.4.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters-list/0.8.4.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameters/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/02-definitions/12-errors/error-parameter/0.8.4.md" ## 3. Types @@ -268,7 +270,7 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/type-name/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/array-type-name-operator/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attributes/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/function-type-attribute/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-type/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/03-types/01-advanced-types/mapping-key-type/0.4.11.md" @@ -292,7 +294,7 @@ ### 4.1. Blocks --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statement/0.8.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/control-statement/0.8.4.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/unversioned.md" @@ -302,7 +304,7 @@ ### 4.2. Declaration Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-deconstruction-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-members/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/tuple-member/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/02-declaration-statements/variable-declaration-type/0.5.0.md" @@ -323,7 +325,7 @@ ### 4.4. Error Handling --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/try-statement/0.6.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses-list/0.6.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clauses/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/catch-clause-error/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/04-error-handling/revert-statement/0.8.4.md" @@ -355,10 +357,10 @@ ### 5.2. Function Calls --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/positional-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/function-call-options/0.8.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-arguments/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/02-function-calls/named-argument/unversioned.md" ### 5.3. Primary Expressions @@ -367,9 +369,9 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/type-expression/0.5.3.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/new-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/tuple-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-expression/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/array-values/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/03-primary-expressions/boolean-expression/unversioned.md" ### 5.4. Numbers @@ -386,17 +388,17 @@ ### 5.5. Strings --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/string-expression/0.7.0.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-hex-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-string-contents/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/hex-character/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literals/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-ascii-string-literal/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-ascii-string-literal/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals-list/0.7.0.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literals/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/single-quoted-unicode-string-literal/0.7.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/05-strings/double-quoted-unicode-string-literal/0.7.0.md" @@ -407,9 +409,7 @@ ### 5.6. Identifiers ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-paths-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifiers-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/identifier/0.5.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-any-version/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/05-expressions/06-identifiers/keyword-in-some-version/0.8.0.md" @@ -425,12 +425,12 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-declaration/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/01-assembly-block/assembly-flags/unversioned.md" ### 6.2. Yul Statements --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-block/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statements/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-statement/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-declaration-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-function-definition/unversioned.md" @@ -443,17 +443,17 @@ --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-continue-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-for-statement/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-statement/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-cases/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/02-yul-statements/yul-switch-case/unversioned.md" ### 6.3. Yul Expressions ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expressions-list/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-expression/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-function-call-operator/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-arguments/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-paths/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier-path/unversioned.md" ---8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers-list/unversioned.md" +--8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifiers/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-identifier/unversioned.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-keyword/0.6.0.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/06-yul/03-yul-expressions/yul-reserved-word/unversioned.md" diff --git a/crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/multiple/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/multiple/generated/0.4.11-success.yml similarity index 84% rename from crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/multiple/generated/0.4.11-success.yml rename to crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/multiple/generated/0.4.11-success.yml index 0043a357a5..251b833083 100644 --- a/crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/multiple/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/multiple/generated/0.4.11-success.yml @@ -6,6 +6,6 @@ Source: > Errors: [] Tree: - - AsciiStringLiteralsList (Rule): # 0..11 '"foo" ''bar''' + - AsciiStringLiterals (Rule): # 0..11 '"foo" ''bar''' - AsciiStringLiteral (Token): '"foo"' # 0..5 - AsciiStringLiteral (Token): "'bar'" # 6..11 diff --git a/crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/multiple/input.sol b/crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/multiple/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/multiple/input.sol rename to crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/multiple/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/single/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/single/generated/0.4.11-success.yml similarity index 84% rename from crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/single/generated/0.4.11-success.yml rename to crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/single/generated/0.4.11-success.yml index 4fb0ede882..5f9bd91ae9 100644 --- a/crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/single/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/single/generated/0.4.11-success.yml @@ -6,5 +6,5 @@ Source: > Errors: [] Tree: - - AsciiStringLiteralsList (Rule): # 0..5 '"foo"' + - AsciiStringLiterals (Rule): # 0..5 '"foo"' - AsciiStringLiteral (Token): '"foo"' # 0..5 diff --git a/crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/single/input.sol b/crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/single/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/single/input.sol rename to crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/single/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/single_trailing_ident/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/single_trailing_ident/generated/0.4.11-failure.yml similarity index 83% rename from crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/single_trailing_ident/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/single_trailing_ident/generated/0.4.11-failure.yml index f249ae7307..6101d4f550 100644 --- a/crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/single_trailing_ident/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/single_trailing_ident/generated/0.4.11-failure.yml @@ -6,7 +6,7 @@ Source: > Errors: # 1 total - > Error: Expected AsciiStringLiteral. - ╭─[crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/single_trailing_ident/input.sol:1:6] + ╭─[crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/single_trailing_ident/input.sol:1:6] │ 1 │ "foo"bar │ ──┬─ @@ -14,6 +14,6 @@ Errors: # 1 total ───╯ Tree: - - AsciiStringLiteralsList (Rule): # 0..9 '"foo"bar\n' + - AsciiStringLiterals (Rule): # 0..9 '"foo"bar\n' - AsciiStringLiteral (Token): '"foo"' # 0..5 - SKIPPED (Token): "bar\n" # 5..9 diff --git a/crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/single_trailing_ident/input.sol b/crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/single_trailing_ident/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/AsciiStringLiteralsList/single_trailing_ident/input.sol rename to crates/solidity/testing/snapshots/cst_output/AsciiStringLiterals/single_trailing_ident/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/AssemblyStatement/simple/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/AssemblyStatement/simple/generated/0.4.11-success.yml index 1b49cd80eb..5f1e7cf10e 100644 --- a/crates/solidity/testing/snapshots/cst_output/AssemblyStatement/simple/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/AssemblyStatement/simple/generated/0.4.11-success.yml @@ -13,7 +13,7 @@ Tree: - AsciiStringLiteral (Token): '"evmasm"' # 9..17 - AssemblyFlagsDeclaration (Rule): # 17..33 ' ("memory-safe")' - OpenParen (Token): "(" # 18..19 - - AssemblyFlagsList (Rule): # 19..32 '"memory-safe"' + - AssemblyFlags (Rule): # 19..32 '"memory-safe"' - AsciiStringLiteral (Token): '"memory-safe"' # 19..32 - CloseParen (Token): ")" # 32..33 - YulBlock (Rule): # 33..39 " {\n\n}\n" diff --git a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.4.11-failure.yml index 854cfc3c88..3f9813e22b 100644 --- a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.4.11-failure.yml @@ -16,7 +16,7 @@ Errors: # 1 total Tree: - Block (Rule): # 0..24 "{ unchecked { x = 1; } }" - OpenBrace (Token): "{" # 0..1 - - StatementsList (Rule): # 1..12 " unchecked " + - Statements (Rule): # 1..12 " unchecked " - ExpressionStatement (Rule): # 1..12 " unchecked " - Expression (Rule): # 1..11 " unchecked" - Identifier (Token): "unchecked" # 2..11 diff --git a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.8.0-success.yml b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.8.0-success.yml index f8726c1598..e820e50894 100644 --- a/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.8.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Block/unchecked/generated/0.8.0-success.yml @@ -8,12 +8,12 @@ Errors: [] Tree: - Block (Rule): # 0..24 "{ unchecked { x = 1; } }" - OpenBrace (Token): "{" # 0..1 - - StatementsList (Rule): # 1..22 " unchecked { x = 1; }" + - Statements (Rule): # 1..22 " unchecked { x = 1; }" - UncheckedBlock (Rule): # 1..22 " unchecked { x = 1; }" - UncheckedKeyword (Token): "unchecked" # 2..11 - Block (Rule): # 11..22 " { x = 1; }" - OpenBrace (Token): "{" # 12..13 - - StatementsList (Rule): # 13..20 " x = 1;" + - Statements (Rule): # 13..20 " x = 1;" - ExpressionStatement (Rule): # 13..20 " x = 1;" - Expression (Rule): # 13..19 " x = 1" - BinaryExpression (Rule): # 13..19 " x = 1" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.4.11-failure.yml index adf274106f..8c8938c2b6 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.4.11-failure.yml @@ -28,13 +28,13 @@ Tree: - ContractKeyword (Token): "contract" # 32..40 - Identifier (Token): "ABC" # 41..44 - OpenBrace (Token): "{" # 45..46 - - ContractMembersList (Rule): # 47..350 " function sendValue(address payable recipient, ui..." + - ContractMembers (Rule): # 47..350 " function sendValue(address payable recipient, ui..." - FunctionDefinition (Rule): # 47..350 " function sendValue(address payable recipient, ui..." - FunctionKeyword (Token): "function" # 49..57 - Identifier (Token): "sendValue" # 58..67 - ParametersDeclaration (Rule): # 67..110 "(address payable recipient, uint256 amount)" - OpenParen (Token): "(" # 67..68 - - ParametersList (Rule): # 68..109 "address payable recipient, uint256 amount" + - Parameters (Rule): # 68..109 "address payable recipient, uint256 amount" - Parameter (Rule): # 68..93 "address payable recipient" - TypeName (Rule): # 68..83 "address payable" - AddressType (Rule): # 68..83 "address payable" @@ -47,11 +47,11 @@ Tree: - UnsignedIntegerType (Token): "uint256" # 95..102 - Identifier (Token): "amount" # 103..109 - CloseParen (Token): ")" # 109..110 - - FunctionAttributesList (Rule): # 110..119 " internal" + - FunctionAttributes (Rule): # 110..119 " internal" - InternalKeyword (Token): "internal" # 111..119 - Block (Rule): # 119..350 ' {\n require(address(this).balance >= amount, "A...' - OpenBrace (Token): "{" # 120..121 - - StatementsList (Rule): # 122..346 ' require(address(this).balance >= amount, "Addr...' + - Statements (Rule): # 122..346 ' require(address(this).balance >= amount, "Addr...' - ExpressionStatement (Rule): # 122..201 ' require(address(this).balance >= amount, "Addr...' - Expression (Rule): # 122..199 ' require(address(this).balance >= amount, "Addr...' - FunctionCallExpression (Rule): # 122..199 ' require(address(this).balance >= amount, "Addr...' @@ -59,7 +59,7 @@ Tree: - Identifier (Token): "require" # 126..133 - ArgumentsDeclaration (Rule): # 133..199 '(address(this).balance >= amount, "Address: insuff...' - OpenParen (Token): "(" # 133..134 - - PositionalArgumentsList (Rule): # 134..198 'address(this).balance >= amount, "Address: insuffi...' + - PositionalArguments (Rule): # 134..198 'address(this).balance >= amount, "Address: insuffi...' - Expression (Rule): # 134..165 "address(this).balance >= amount" - BinaryExpression (Rule): # 134..165 "address(this).balance >= amount" - Expression (Rule): # 134..155 "address(this).balance" @@ -71,7 +71,7 @@ Tree: - AddressKeyword (Token): "address" # 134..141 - ArgumentsDeclaration (Rule): # 141..147 "(this)" - OpenParen (Token): "(" # 141..142 - - PositionalArgumentsList (Rule): # 142..146 "this" + - PositionalArguments (Rule): # 142..146 "this" - Expression (Rule): # 142..146 "this" - Identifier (Token): "this" # 142..146 - CloseParen (Token): ")" # 146..147 @@ -82,13 +82,13 @@ Tree: - Identifier (Token): "amount" # 159..165 - Comma (Token): "," # 165..166 - Expression (Rule): # 166..198 ' "Address: insufficient balance"' - - AsciiStringLiteralsList (Rule): # 166..198 ' "Address: insufficient balance"' + - AsciiStringLiterals (Rule): # 166..198 ' "Address: insufficient balance"' - AsciiStringLiteral (Token): '"Address: insufficient balance"' # 167..198 - CloseParen (Token): ")" # 198..199 - Semicolon (Token): ";" # 199..200 - TupleDeconstructionStatement (Rule): # 201..262 "\n (bool success, ) = recipient.call{ value: amo..." - OpenParen (Token): "(" # 206..207 - - TupleMembersList (Rule): # 207..220 "bool success," + - TupleMembers (Rule): # 207..220 "bool success," - TupleMember (Rule): # 207..219 "bool success" - TypeName (Rule): # 207..211 "bool" - BoolKeyword (Token): "bool" # 207..211 @@ -112,12 +112,12 @@ Tree: - Identifier (Token): "require" # 266..273 - ArgumentsDeclaration (Rule): # 273..344 '(success, "Address: unable to send value, recipien...' - OpenParen (Token): "(" # 273..274 - - PositionalArgumentsList (Rule): # 274..343 'success, "Address: unable to send value, recipient...' + - PositionalArguments (Rule): # 274..343 'success, "Address: unable to send value, recipient...' - Expression (Rule): # 274..281 "success" - Identifier (Token): "success" # 274..281 - Comma (Token): "," # 281..282 - Expression (Rule): # 282..343 ' "Address: unable to send value, recipient may hav...' - - AsciiStringLiteralsList (Rule): # 282..343 ' "Address: unable to send value, recipient may hav...' + - AsciiStringLiterals (Rule): # 282..343 ' "Address: unable to send value, recipient may hav...' - AsciiStringLiteral (Token): '"Address: unable to send value, recipient may have...' # 283..343 - CloseParen (Token): ")" # 343..344 - Semicolon (Token): ";" # 344..345 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.6.2-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.6.2-success.yml index 7bfa11ec52..3589cdd042 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.6.2-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/function_multiple_delimiters/generated/0.6.2-success.yml @@ -20,13 +20,13 @@ Tree: - ContractKeyword (Token): "contract" # 32..40 - Identifier (Token): "ABC" # 41..44 - OpenBrace (Token): "{" # 45..46 - - ContractMembersList (Rule): # 47..350 " function sendValue(address payable recipient, ui..." + - ContractMembers (Rule): # 47..350 " function sendValue(address payable recipient, ui..." - FunctionDefinition (Rule): # 47..350 " function sendValue(address payable recipient, ui..." - FunctionKeyword (Token): "function" # 49..57 - Identifier (Token): "sendValue" # 58..67 - ParametersDeclaration (Rule): # 67..110 "(address payable recipient, uint256 amount)" - OpenParen (Token): "(" # 67..68 - - ParametersList (Rule): # 68..109 "address payable recipient, uint256 amount" + - Parameters (Rule): # 68..109 "address payable recipient, uint256 amount" - Parameter (Rule): # 68..93 "address payable recipient" - TypeName (Rule): # 68..83 "address payable" - AddressType (Rule): # 68..83 "address payable" @@ -39,11 +39,11 @@ Tree: - UnsignedIntegerType (Token): "uint256" # 95..102 - Identifier (Token): "amount" # 103..109 - CloseParen (Token): ")" # 109..110 - - FunctionAttributesList (Rule): # 110..119 " internal" + - FunctionAttributes (Rule): # 110..119 " internal" - InternalKeyword (Token): "internal" # 111..119 - Block (Rule): # 119..350 ' {\n require(address(this).balance >= amount, "A...' - OpenBrace (Token): "{" # 120..121 - - StatementsList (Rule): # 122..346 ' require(address(this).balance >= amount, "Addr...' + - Statements (Rule): # 122..346 ' require(address(this).balance >= amount, "Addr...' - ExpressionStatement (Rule): # 122..201 ' require(address(this).balance >= amount, "Addr...' - Expression (Rule): # 122..199 ' require(address(this).balance >= amount, "Addr...' - FunctionCallExpression (Rule): # 122..199 ' require(address(this).balance >= amount, "Addr...' @@ -51,7 +51,7 @@ Tree: - Identifier (Token): "require" # 126..133 - ArgumentsDeclaration (Rule): # 133..199 '(address(this).balance >= amount, "Address: insuff...' - OpenParen (Token): "(" # 133..134 - - PositionalArgumentsList (Rule): # 134..198 'address(this).balance >= amount, "Address: insuffi...' + - PositionalArguments (Rule): # 134..198 'address(this).balance >= amount, "Address: insuffi...' - Expression (Rule): # 134..165 "address(this).balance >= amount" - BinaryExpression (Rule): # 134..165 "address(this).balance >= amount" - Expression (Rule): # 134..155 "address(this).balance" @@ -63,7 +63,7 @@ Tree: - AddressKeyword (Token): "address" # 134..141 - ArgumentsDeclaration (Rule): # 141..147 "(this)" - OpenParen (Token): "(" # 141..142 - - PositionalArgumentsList (Rule): # 142..146 "this" + - PositionalArguments (Rule): # 142..146 "this" - Expression (Rule): # 142..146 "this" - Identifier (Token): "this" # 142..146 - CloseParen (Token): ")" # 146..147 @@ -74,13 +74,13 @@ Tree: - Identifier (Token): "amount" # 159..165 - Comma (Token): "," # 165..166 - Expression (Rule): # 166..198 ' "Address: insufficient balance"' - - AsciiStringLiteralsList (Rule): # 166..198 ' "Address: insufficient balance"' + - AsciiStringLiterals (Rule): # 166..198 ' "Address: insufficient balance"' - AsciiStringLiteral (Token): '"Address: insufficient balance"' # 167..198 - CloseParen (Token): ")" # 198..199 - Semicolon (Token): ";" # 199..200 - TupleDeconstructionStatement (Rule): # 201..262 "\n (bool success, ) = recipient.call{ value: amo..." - OpenParen (Token): "(" # 206..207 - - TupleMembersList (Rule): # 207..220 "bool success," + - TupleMembers (Rule): # 207..220 "bool success," - TupleMember (Rule): # 207..219 "bool success" - TypeName (Rule): # 207..211 "bool" - BoolKeyword (Token): "bool" # 207..211 @@ -100,7 +100,7 @@ Tree: - FunctionCallOptions (Rule): # 239..256 "{ value: amount }" - NamedArgumentsDeclaration (Rule): # 239..256 "{ value: amount }" - OpenBrace (Token): "{" # 239..240 - - NamedArgumentsList (Rule): # 240..254 " value: amount" + - NamedArguments (Rule): # 240..254 " value: amount" - NamedArgument (Rule): # 240..254 " value: amount" - Identifier (Token): "value" # 241..246 - Colon (Token): ":" # 246..247 @@ -109,9 +109,9 @@ Tree: - CloseBrace (Token): "}" # 255..256 - ArgumentsDeclaration (Rule): # 256..260 '("")' - OpenParen (Token): "(" # 256..257 - - PositionalArgumentsList (Rule): # 257..259 '""' + - PositionalArguments (Rule): # 257..259 '""' - Expression (Rule): # 257..259 '""' - - AsciiStringLiteralsList (Rule): # 257..259 '""' + - AsciiStringLiterals (Rule): # 257..259 '""' - AsciiStringLiteral (Token): '""' # 257..259 - CloseParen (Token): ")" # 259..260 - Semicolon (Token): ";" # 260..261 @@ -122,12 +122,12 @@ Tree: - Identifier (Token): "require" # 266..273 - ArgumentsDeclaration (Rule): # 273..344 '(success, "Address: unable to send value, recipien...' - OpenParen (Token): "(" # 273..274 - - PositionalArgumentsList (Rule): # 274..343 'success, "Address: unable to send value, recipient...' + - PositionalArguments (Rule): # 274..343 'success, "Address: unable to send value, recipient...' - Expression (Rule): # 274..281 "success" - Identifier (Token): "success" # 274..281 - Comma (Token): "," # 281..282 - Expression (Rule): # 282..343 ' "Address: unable to send value, recipient may hav...' - - AsciiStringLiteralsList (Rule): # 282..343 ' "Address: unable to send value, recipient may hav...' + - AsciiStringLiterals (Rule): # 282..343 ' "Address: unable to send value, recipient may hav...' - AsciiStringLiteral (Token): '"Address: unable to send value, recipient may have...' # 283..343 - CloseParen (Token): ")" # 343..344 - Semicolon (Token): ";" # 344..345 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/inheritence_specifier/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/inheritence_specifier/generated/0.4.11-success.yml index 4fa244002f..c14462d9ed 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/inheritence_specifier/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/inheritence_specifier/generated/0.4.11-success.yml @@ -11,7 +11,7 @@ Tree: - Identifier (Token): "Sample" # 9..15 - InheritanceSpecifier (Rule): # 15..38 " is Foo, Bar(1, 2), Baz" - IsKeyword (Token): "is" # 16..18 - - InheritanceTypesList (Rule): # 18..38 " Foo, Bar(1, 2), Baz" + - InheritanceTypes (Rule): # 18..38 " Foo, Bar(1, 2), Baz" - InheritanceType (Rule): # 18..22 " Foo" - IdentifierPath (Rule): # 18..22 " Foo" - Identifier (Token): "Foo" # 19..22 @@ -21,7 +21,7 @@ Tree: - Identifier (Token): "Bar" # 24..27 - ArgumentsDeclaration (Rule): # 27..33 "(1, 2)" - OpenParen (Token): "(" # 27..28 - - PositionalArgumentsList (Rule): # 28..32 "1, 2" + - PositionalArguments (Rule): # 28..32 "1, 2" - Expression (Rule): # 28..29 "1" - DecimalNumberExpression (Rule): # 28..29 "1" - DecimalLiteral (Token): "1" # 28..29 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.11-failure.yml index 1615c7c2b9..0251fe4ce2 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.11-failure.yml @@ -22,7 +22,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..31 " constructor" + - ContractMembers (Rule): # 18..31 " constructor" - StateVariableDefinition (Rule): # 18..31 " constructor" - TypeName (Rule): # 18..31 " constructor" - IdentifierPath (Rule): # 18..31 " constructor" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.22-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.22-success.yml index e4bfe43846..e715e08127 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.22-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_constructor_definition/generated/0.4.22-success.yml @@ -13,13 +13,13 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..47 " constructor() public {\n }\n" + - ContractMembers (Rule): # 18..47 " constructor() public {\n }\n" - ConstructorDefinition (Rule): # 18..47 " constructor() public {\n }\n" - ConstructorKeyword (Token): "constructor" # 20..31 - ParametersDeclaration (Rule): # 31..33 "()" - OpenParen (Token): "(" # 31..32 - CloseParen (Token): ")" # 32..33 - - ConstructorAttributesList (Rule): # 33..40 " public" + - ConstructorAttributes (Rule): # 33..40 " public" - PublicKeyword (Token): "public" # 34..40 - Block (Rule): # 40..47 " {\n }\n" - OpenBrace (Token): "{" # 41..42 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_enum_definition/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_enum_definition/generated/0.4.11-success.yml index 5f7e784e79..1166acbc75 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_enum_definition/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_enum_definition/generated/0.4.11-success.yml @@ -16,12 +16,12 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..57 " enum State {\n A,\n B,\n C\n }\n" + - ContractMembers (Rule): # 18..57 " enum State {\n A,\n B,\n C\n }\n" - EnumDefinition (Rule): # 18..57 " enum State {\n A,\n B,\n C\n }\n" - EnumKeyword (Token): "enum" # 20..24 - Identifier (Token): "State" # 25..30 - OpenBrace (Token): "{" # 31..32 - - IdentifiersList (Rule): # 33..53 " A,\n B,\n C\n" + - EnumMembers (Rule): # 33..53 " A,\n B,\n C\n" - Identifier (Token): "A" # 37..38 - Comma (Token): "," # 38..39 - Identifier (Token): "B" # 44..45 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.4.11-failure.yml index 545b4d7d83..4555d1efe3 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.4.11-failure.yml @@ -20,7 +20,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..36 " error Error1();\n" + - ContractMembers (Rule): # 18..36 " error Error1();\n" - StateVariableDefinition (Rule): # 18..36 " error Error1();\n" - TypeName (Rule): # 18..25 " error" - IdentifierPath (Rule): # 18..25 " error" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.8.4-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.8.4-success.yml index 721a214d0e..9305723f44 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.8.4-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_error_definition/generated/0.8.4-success.yml @@ -12,7 +12,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..36 " error Error1();\n" + - ContractMembers (Rule): # 18..36 " error Error1();\n" - ErrorDefinition (Rule): # 18..36 " error Error1();\n" - ErrorKeyword (Token): "error" # 20..25 - Identifier (Token): "Error1" # 26..32 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_event_definition/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_event_definition/generated/0.4.11-success.yml index 54bec3dc36..1f401af150 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_event_definition/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_event_definition/generated/0.4.11-success.yml @@ -12,13 +12,13 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..69 " event Log(uint256 indexed a, uint256 indexed b);..." + - ContractMembers (Rule): # 18..69 " event Log(uint256 indexed a, uint256 indexed b);..." - EventDefinition (Rule): # 18..69 " event Log(uint256 indexed a, uint256 indexed b);..." - EventKeyword (Token): "event" # 20..25 - Identifier (Token): "Log" # 26..29 - EventParametersDeclaration (Rule): # 29..67 "(uint256 indexed a, uint256 indexed b)" - OpenParen (Token): "(" # 29..30 - - EventParametersList (Rule): # 30..66 "uint256 indexed a, uint256 indexed b" + - EventParameters (Rule): # 30..66 "uint256 indexed a, uint256 indexed b" - EventParameter (Rule): # 30..47 "uint256 indexed a" - TypeName (Rule): # 30..37 "uint256" - UnsignedIntegerType (Token): "uint256" # 30..37 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.4.11-failure.yml index 03f6a67404..71068f5c7b 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.4.11-failure.yml @@ -22,7 +22,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..28 " fallback" + - ContractMembers (Rule): # 18..28 " fallback" - StateVariableDefinition (Rule): # 18..28 " fallback" - TypeName (Rule): # 18..28 " fallback" - IdentifierPath (Rule): # 18..28 " fallback" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.6.0-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.6.0-success.yml index 0dd32f0544..d367d070a8 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.6.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_fallback_function_definition/generated/0.6.0-success.yml @@ -13,7 +13,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..37 " fallback() {\n }\n" + - ContractMembers (Rule): # 18..37 " fallback() {\n }\n" - FallbackFunctionDefinition (Rule): # 18..37 " fallback() {\n }\n" - FallbackKeyword (Token): "fallback" # 20..28 - ParametersDeclaration (Rule): # 28..30 "()" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_function_definition/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_function_definition/generated/0.4.11-success.yml index 42797d92ee..e46529e4e2 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_function_definition/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_function_definition/generated/0.4.11-success.yml @@ -14,7 +14,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..70 " function foo() returns (uint) {\n return 1;\n ..." + - ContractMembers (Rule): # 18..70 " function foo() returns (uint) {\n return 1;\n ..." - FunctionDefinition (Rule): # 18..70 " function foo() returns (uint) {\n return 1;\n ..." - FunctionKeyword (Token): "function" # 20..28 - Identifier (Token): "foo" # 29..32 @@ -25,14 +25,14 @@ Tree: - ReturnsKeyword (Token): "returns" # 35..42 - ParametersDeclaration (Rule): # 42..49 " (uint)" - OpenParen (Token): "(" # 43..44 - - ParametersList (Rule): # 44..48 "uint" + - Parameters (Rule): # 44..48 "uint" - Parameter (Rule): # 44..48 "uint" - TypeName (Rule): # 44..48 "uint" - UnsignedIntegerType (Token): "uint" # 44..48 - CloseParen (Token): ")" # 48..49 - Block (Rule): # 49..70 " {\n return 1;\n }\n" - OpenBrace (Token): "{" # 50..51 - - StatementsList (Rule): # 52..66 " return 1;\n" + - Statements (Rule): # 52..66 " return 1;\n" - ReturnStatement (Rule): # 52..66 " return 1;\n" - ReturnKeyword (Token): "return" # 56..62 - Expression (Rule): # 62..64 " 1" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_modifier_definition/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_modifier_definition/generated/0.4.11-success.yml index d09c2bbda1..f69127c647 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_modifier_definition/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_modifier_definition/generated/0.4.11-success.yml @@ -14,7 +14,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..48 " modifier foo() {\n _;\n }\n" + - ContractMembers (Rule): # 18..48 " modifier foo() {\n _;\n }\n" - ModifierDefinition (Rule): # 18..48 " modifier foo() {\n _;\n }\n" - ModifierKeyword (Token): "modifier" # 20..28 - Identifier (Token): "foo" # 29..32 @@ -23,7 +23,7 @@ Tree: - CloseParen (Token): ")" # 33..34 - Block (Rule): # 34..48 " {\n _;\n }\n" - OpenBrace (Token): "{" # 35..36 - - StatementsList (Rule): # 37..44 " _;\n" + - Statements (Rule): # 37..44 " _;\n" - ExpressionStatement (Rule): # 37..44 " _;\n" - Expression (Rule): # 37..42 " _" - Identifier (Token): "_" # 41..42 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.4.11-failure.yml index a9825d4413..aabb2a868b 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.4.11-failure.yml @@ -22,7 +22,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..27 " receive" + - ContractMembers (Rule): # 18..27 " receive" - StateVariableDefinition (Rule): # 18..27 " receive" - TypeName (Rule): # 18..27 " receive" - IdentifierPath (Rule): # 18..27 " receive" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.6.0-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.6.0-success.yml index a353388dd3..87c3af8bdd 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.6.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_receive_function_definition/generated/0.6.0-success.yml @@ -13,7 +13,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..36 " receive() {\n }\n" + - ContractMembers (Rule): # 18..36 " receive() {\n }\n" - ReceiveFunctionDefinition (Rule): # 18..36 " receive() {\n }\n" - ReceiveKeyword (Token): "receive" # 20..27 - ParametersDeclaration (Rule): # 27..29 "()" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_state_variable_declaration/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_state_variable_declaration/generated/0.4.11-success.yml index 2b3ed1b0f6..6bb1a2c213 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_state_variable_declaration/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_state_variable_declaration/generated/0.4.11-success.yml @@ -12,11 +12,11 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..35 " uint public a;\n" + - ContractMembers (Rule): # 18..35 " uint public a;\n" - StateVariableDefinition (Rule): # 18..35 " uint public a;\n" - TypeName (Rule): # 18..24 " uint" - UnsignedIntegerType (Token): "uint" # 20..24 - - StateVariableAttributesList (Rule): # 24..31 " public" + - StateVariableAttributes (Rule): # 24..31 " public" - PublicKeyword (Token): "public" # 25..31 - Identifier (Token): "a" # 32..33 - Semicolon (Token): ";" # 33..34 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_struct_definition/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_struct_definition/generated/0.4.11-success.yml index 1b223516ae..3dcca033aa 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_struct_definition/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_struct_definition/generated/0.4.11-success.yml @@ -15,12 +15,12 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..59 " struct S {\n uint a;\n uint b;\n }\n" + - ContractMembers (Rule): # 18..59 " struct S {\n uint a;\n uint b;\n }\n" - StructDefinition (Rule): # 18..59 " struct S {\n uint a;\n uint b;\n }\n" - StructKeyword (Token): "struct" # 20..26 - Identifier (Token): "S" # 27..28 - OpenBrace (Token): "{" # 29..30 - - StructMembersList (Rule): # 31..55 " uint a;\n uint b;\n" + - StructMembers (Rule): # 31..55 " uint a;\n uint b;\n" - StructMember (Rule): # 31..43 " uint a;\n" - TypeName (Rule): # 31..39 " uint" - UnsignedIntegerType (Token): "uint" # 35..39 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.4.11-success.yml index 9cb8efa97c..48120bf2a9 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.4.11-success.yml @@ -13,7 +13,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..38 " function () {\n }\n" + - ContractMembers (Rule): # 18..38 " function () {\n }\n" - UnnamedFunctionDefinition (Rule): # 18..38 " function () {\n }\n" - FunctionKeyword (Token): "function" # 20..28 - ParametersDeclaration (Rule): # 28..31 " ()" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.0-failure.yml index 005f688bd0..93e25e1492 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.0-failure.yml @@ -22,7 +22,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..32 " function () " + - ContractMembers (Rule): # 18..32 " function () " - StateVariableDefinition (Rule): # 18..32 " function () " - TypeName (Rule): # 18..31 " function ()" - FunctionType (Rule): # 18..31 " function ()" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.5-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.5-failure.yml index 643ee0128f..72390bb00b 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.5-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_definition/generated/0.6.5-failure.yml @@ -22,7 +22,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..32 " function () " + - ContractMembers (Rule): # 18..32 " function () " - StateVariableDefinition (Rule): # 18..32 " function () " - TypeName (Rule): # 18..31 " function ()" - FunctionType (Rule): # 18..31 " function ()" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.4.11-success.yml index 6d47d9b4ec..42edcc5d37 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.4.11-success.yml @@ -12,13 +12,13 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..51 " function() external payable {}\n" + - ContractMembers (Rule): # 18..51 " function() external payable {}\n" - UnnamedFunctionDefinition (Rule): # 18..51 " function() external payable {}\n" - FunctionKeyword (Token): "function" # 20..28 - ParametersDeclaration (Rule): # 28..30 "()" - OpenParen (Token): "(" # 28..29 - CloseParen (Token): ")" # 29..30 - - UnnamedFunctionAttributesList (Rule): # 30..47 " external payable" + - UnnamedFunctionAttributes (Rule): # 30..47 " external payable" - ExternalKeyword (Token): "external" # 31..39 - PayableKeyword (Token): "payable" # 40..47 - Block (Rule): # 47..51 " {}\n" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.0-failure.yml index e01e31043a..c8ad17d053 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.0-failure.yml @@ -20,7 +20,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..48 " function() external payable " + - ContractMembers (Rule): # 18..48 " function() external payable " - StateVariableDefinition (Rule): # 18..48 " function() external payable " - TypeName (Rule): # 18..47 " function() external payable" - FunctionType (Rule): # 18..47 " function() external payable" @@ -28,7 +28,7 @@ Tree: - ParametersDeclaration (Rule): # 28..30 "()" - OpenParen (Token): "(" # 28..29 - CloseParen (Token): ")" # 29..30 - - FunctionTypeAttributesList (Rule): # 30..47 " external payable" + - FunctionTypeAttributes (Rule): # 30..47 " external payable" - ExternalKeyword (Token): "external" # 31..39 - PayableKeyword (Token): "payable" # 40..47 - SKIPPED (Token): "{}\n" # 48..51 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.5-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.5-failure.yml index 14a80288b2..01028ffa79 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.5-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_unnamed_function_with_attrs_definition/generated/0.6.5-failure.yml @@ -20,7 +20,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..48 " function() external payable " + - ContractMembers (Rule): # 18..48 " function() external payable " - StateVariableDefinition (Rule): # 18..48 " function() external payable " - TypeName (Rule): # 18..47 " function() external payable" - FunctionType (Rule): # 18..47 " function() external payable" @@ -28,7 +28,7 @@ Tree: - ParametersDeclaration (Rule): # 28..30 "()" - OpenParen (Token): "(" # 28..29 - CloseParen (Token): ")" # 29..30 - - FunctionTypeAttributesList (Rule): # 30..47 " external payable" + - FunctionTypeAttributes (Rule): # 30..47 " external payable" - ExternalKeyword (Token): "external" # 31..39 - PayableKeyword (Token): "payable" # 40..47 - SKIPPED (Token): "{}\n" # 48..51 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.8-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.8-success.yml index 8593cb29ea..e68c1cfdbe 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.8-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_user_defined_value_type_definition/generated/0.8.8-success.yml @@ -12,7 +12,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..38 " type Foo is bool;\n" + - ContractMembers (Rule): # 18..38 " type Foo is bool;\n" - UserDefinedValueTypeDefinition (Rule): # 18..38 " type Foo is bool;\n" - TypeKeyword (Token): "type" # 20..24 - Identifier (Token): "Foo" # 25..28 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml index 37687b71fd..5249d303e6 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/member_using_directive/generated/0.4.11-success.yml @@ -12,7 +12,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..35 " using x for *;\n" + - ContractMembers (Rule): # 18..35 " using x for *;\n" - UsingDirective (Rule): # 18..35 " using x for *;\n" - UsingKeyword (Token): "using" # 20..25 - IdentifierPath (Rule): # 25..27 " x" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.4.11-failure.yml index 3d92aed9b4..3e2bc6893f 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.4.11-failure.yml @@ -20,7 +20,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Test" # 9..13 - OpenBrace (Token): "{" # 14..15 - - ContractMembersList (Rule): # 16..25 " field;\n" + - ContractMembers (Rule): # 16..25 " field;\n" - StateVariableDefinition (Rule): # 16..25 " field;\n" - TypeName (Rule): # 16..23 " field" - IdentifierPath (Rule): # 16..23 " field" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.6.5-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.6.5-failure.yml index bbc9f841d4..2c3ee58344 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.6.5-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.6.5-failure.yml @@ -20,7 +20,7 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Test" # 9..13 - OpenBrace (Token): "{" # 14..15 - - ContractMembersList (Rule): # 16..25 " field;\n" + - ContractMembers (Rule): # 16..25 " field;\n" - StateVariableDefinition (Rule): # 16..25 " field;\n" - TypeName (Rule): # 16..23 " field" - IdentifierPath (Rule): # 16..23 " field" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.4.11-failure.yml index 02c6de14e0..68662117ca 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.4.11-failure.yml @@ -46,24 +46,24 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Contract" # 9..17 - OpenBrace (Token): "{" # 18..19 - - ContractMembersList (Rule): # 20..210 "\tfunction _transfer(address while) private {\n\t\tif(..." + - ContractMembers (Rule): # 20..210 "\tfunction _transfer(address while) private {\n\t\tif(..." - FunctionDefinition (Rule): # 20..138 "\tfunction _transfer(address while) private {\n\t\tif(..." - FunctionKeyword (Token): "function" # 21..29 - Identifier (Token): "_transfer" # 30..39 - ParametersDeclaration (Rule): # 39..54 "(address while)" - OpenParen (Token): "(" # 39..40 - - ParametersList (Rule): # 40..47 "address" + - Parameters (Rule): # 40..47 "address" - Parameter (Rule): # 40..47 "address" - TypeName (Rule): # 40..47 "address" - AddressType (Rule): # 40..47 "address" - AddressKeyword (Token): "address" # 40..47 - SKIPPED (Token): "while" # 48..53 - CloseParen (Token): ")" # 53..54 - - FunctionAttributesList (Rule): # 54..62 " private" + - FunctionAttributes (Rule): # 54..62 " private" - PrivateKeyword (Token): "private" # 55..62 - Block (Rule): # 62..138 " {\n\t\tif(while == pair && !_isExcludedFromFee[to]){..." - OpenBrace (Token): "{" # 63..64 - - StatementsList (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." + - Statements (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." - IfStatement (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." - IfKeyword (Token): "if" # 67..69 - OpenParen (Token): "(" # 69..70 @@ -71,7 +71,7 @@ Tree: - CloseParen (Token): ")" # 110..111 - Block (Rule): # 111..135 "{\n\t\t\tuint256 a = 1;\n\t\t}\n" - OpenBrace (Token): "{" # 111..112 - - StatementsList (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" + - Statements (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" - VariableDeclarationStatement (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" - VariableDeclaration (Rule): # 113..125 "\t\t\tuint256 a" - TypeName (Rule): # 113..123 "\t\t\tuint256" @@ -92,7 +92,7 @@ Tree: - CloseParen (Token): ")" # 153..154 - Block (Rule): # 154..210 " {\n\t\tuint256 x = 0;\n\t\tunchecked { invalid sequence..." - OpenBrace (Token): "{" # 155..156 - - StatementsList (Rule): # 157..186 "\t\tuint256 x = 0;\n\t\tunchecked " + - Statements (Rule): # 157..186 "\t\tuint256 x = 0;\n\t\tunchecked " - VariableDeclarationStatement (Rule): # 157..174 "\t\tuint256 x = 0;\n" - VariableDeclaration (Rule): # 157..168 "\t\tuint256 x" - TypeName (Rule): # 157..166 "\t\tuint256" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.0-failure.yml index 35e57cb3fa..5bd0690bcc 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.0-failure.yml @@ -46,24 +46,24 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Contract" # 9..17 - OpenBrace (Token): "{" # 18..19 - - ContractMembersList (Rule): # 20..210 "\tfunction _transfer(address while) private {\n\t\tif(..." + - ContractMembers (Rule): # 20..210 "\tfunction _transfer(address while) private {\n\t\tif(..." - FunctionDefinition (Rule): # 20..138 "\tfunction _transfer(address while) private {\n\t\tif(..." - FunctionKeyword (Token): "function" # 21..29 - Identifier (Token): "_transfer" # 30..39 - ParametersDeclaration (Rule): # 39..54 "(address while)" - OpenParen (Token): "(" # 39..40 - - ParametersList (Rule): # 40..47 "address" + - Parameters (Rule): # 40..47 "address" - Parameter (Rule): # 40..47 "address" - TypeName (Rule): # 40..47 "address" - AddressType (Rule): # 40..47 "address" - AddressKeyword (Token): "address" # 40..47 - SKIPPED (Token): "while" # 48..53 - CloseParen (Token): ")" # 53..54 - - FunctionAttributesList (Rule): # 54..62 " private" + - FunctionAttributes (Rule): # 54..62 " private" - PrivateKeyword (Token): "private" # 55..62 - Block (Rule): # 62..138 " {\n\t\tif(while == pair && !_isExcludedFromFee[to]){..." - OpenBrace (Token): "{" # 63..64 - - StatementsList (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." + - Statements (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." - IfStatement (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." - IfKeyword (Token): "if" # 67..69 - OpenParen (Token): "(" # 69..70 @@ -71,7 +71,7 @@ Tree: - CloseParen (Token): ")" # 110..111 - Block (Rule): # 111..135 "{\n\t\t\tuint256 a = 1;\n\t\t}\n" - OpenBrace (Token): "{" # 111..112 - - StatementsList (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" + - Statements (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" - VariableDeclarationStatement (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" - VariableDeclaration (Rule): # 113..125 "\t\t\tuint256 a" - TypeName (Rule): # 113..123 "\t\t\tuint256" @@ -92,7 +92,7 @@ Tree: - CloseParen (Token): ")" # 153..154 - Block (Rule): # 154..210 " {\n\t\tuint256 x = 0;\n\t\tunchecked { invalid sequence..." - OpenBrace (Token): "{" # 155..156 - - StatementsList (Rule): # 157..174 "\t\tuint256 x = 0;\n" + - Statements (Rule): # 157..174 "\t\tuint256 x = 0;\n" - VariableDeclarationStatement (Rule): # 157..174 "\t\tuint256 x = 0;\n" - VariableDeclaration (Rule): # 157..168 "\t\tuint256 x" - TypeName (Rule): # 157..166 "\t\tuint256" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.3-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.3-failure.yml index b97e7155d3..300b0c0ee0 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.3-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.5.3-failure.yml @@ -46,24 +46,24 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Contract" # 9..17 - OpenBrace (Token): "{" # 18..19 - - ContractMembersList (Rule): # 20..210 "\tfunction _transfer(address while) private {\n\t\tif(..." + - ContractMembers (Rule): # 20..210 "\tfunction _transfer(address while) private {\n\t\tif(..." - FunctionDefinition (Rule): # 20..138 "\tfunction _transfer(address while) private {\n\t\tif(..." - FunctionKeyword (Token): "function" # 21..29 - Identifier (Token): "_transfer" # 30..39 - ParametersDeclaration (Rule): # 39..54 "(address while)" - OpenParen (Token): "(" # 39..40 - - ParametersList (Rule): # 40..47 "address" + - Parameters (Rule): # 40..47 "address" - Parameter (Rule): # 40..47 "address" - TypeName (Rule): # 40..47 "address" - AddressType (Rule): # 40..47 "address" - AddressKeyword (Token): "address" # 40..47 - SKIPPED (Token): "while" # 48..53 - CloseParen (Token): ")" # 53..54 - - FunctionAttributesList (Rule): # 54..62 " private" + - FunctionAttributes (Rule): # 54..62 " private" - PrivateKeyword (Token): "private" # 55..62 - Block (Rule): # 62..138 " {\n\t\tif(while == pair && !_isExcludedFromFee[to]){..." - OpenBrace (Token): "{" # 63..64 - - StatementsList (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." + - Statements (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." - IfStatement (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." - IfKeyword (Token): "if" # 67..69 - OpenParen (Token): "(" # 69..70 @@ -71,7 +71,7 @@ Tree: - CloseParen (Token): ")" # 110..111 - Block (Rule): # 111..135 "{\n\t\t\tuint256 a = 1;\n\t\t}\n" - OpenBrace (Token): "{" # 111..112 - - StatementsList (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" + - Statements (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" - VariableDeclarationStatement (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" - VariableDeclaration (Rule): # 113..125 "\t\t\tuint256 a" - TypeName (Rule): # 113..123 "\t\t\tuint256" @@ -92,7 +92,7 @@ Tree: - CloseParen (Token): ")" # 153..154 - Block (Rule): # 154..210 " {\n\t\tuint256 x = 0;\n\t\tunchecked { invalid sequence..." - OpenBrace (Token): "{" # 155..156 - - StatementsList (Rule): # 157..174 "\t\tuint256 x = 0;\n" + - Statements (Rule): # 157..174 "\t\tuint256 x = 0;\n" - VariableDeclarationStatement (Rule): # 157..174 "\t\tuint256 x = 0;\n" - VariableDeclaration (Rule): # 157..168 "\t\tuint256 x" - TypeName (Rule): # 157..166 "\t\tuint256" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.6.0-failure.yml index aee8763332..8196b2883f 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.6.0-failure.yml @@ -46,24 +46,24 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Contract" # 9..17 - OpenBrace (Token): "{" # 18..19 - - ContractMembersList (Rule): # 20..210 "\tfunction _transfer(address while) private {\n\t\tif(..." + - ContractMembers (Rule): # 20..210 "\tfunction _transfer(address while) private {\n\t\tif(..." - FunctionDefinition (Rule): # 20..138 "\tfunction _transfer(address while) private {\n\t\tif(..." - FunctionKeyword (Token): "function" # 21..29 - Identifier (Token): "_transfer" # 30..39 - ParametersDeclaration (Rule): # 39..54 "(address while)" - OpenParen (Token): "(" # 39..40 - - ParametersList (Rule): # 40..47 "address" + - Parameters (Rule): # 40..47 "address" - Parameter (Rule): # 40..47 "address" - TypeName (Rule): # 40..47 "address" - AddressType (Rule): # 40..47 "address" - AddressKeyword (Token): "address" # 40..47 - SKIPPED (Token): "while" # 48..53 - CloseParen (Token): ")" # 53..54 - - FunctionAttributesList (Rule): # 54..62 " private" + - FunctionAttributes (Rule): # 54..62 " private" - PrivateKeyword (Token): "private" # 55..62 - Block (Rule): # 62..138 " {\n\t\tif(while == pair && !_isExcludedFromFee[to]){..." - OpenBrace (Token): "{" # 63..64 - - StatementsList (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." + - Statements (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." - IfStatement (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." - IfKeyword (Token): "if" # 67..69 - OpenParen (Token): "(" # 69..70 @@ -71,7 +71,7 @@ Tree: - CloseParen (Token): ")" # 110..111 - Block (Rule): # 111..135 "{\n\t\t\tuint256 a = 1;\n\t\t}\n" - OpenBrace (Token): "{" # 111..112 - - StatementsList (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" + - Statements (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" - VariableDeclarationStatement (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" - VariableDeclaration (Rule): # 113..125 "\t\t\tuint256 a" - TypeName (Rule): # 113..123 "\t\t\tuint256" @@ -92,7 +92,7 @@ Tree: - CloseParen (Token): ")" # 153..154 - Block (Rule): # 154..210 " {\n\t\tuint256 x = 0;\n\t\tunchecked { invalid sequence..." - OpenBrace (Token): "{" # 155..156 - - StatementsList (Rule): # 157..174 "\t\tuint256 x = 0;\n" + - Statements (Rule): # 157..174 "\t\tuint256 x = 0;\n" - VariableDeclarationStatement (Rule): # 157..174 "\t\tuint256 x = 0;\n" - VariableDeclaration (Rule): # 157..168 "\t\tuint256 x" - TypeName (Rule): # 157..166 "\t\tuint256" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.7.0-failure.yml index b60cdb083c..8f8285b70a 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.7.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.7.0-failure.yml @@ -46,24 +46,24 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Contract" # 9..17 - OpenBrace (Token): "{" # 18..19 - - ContractMembersList (Rule): # 20..210 "\tfunction _transfer(address while) private {\n\t\tif(..." + - ContractMembers (Rule): # 20..210 "\tfunction _transfer(address while) private {\n\t\tif(..." - FunctionDefinition (Rule): # 20..138 "\tfunction _transfer(address while) private {\n\t\tif(..." - FunctionKeyword (Token): "function" # 21..29 - Identifier (Token): "_transfer" # 30..39 - ParametersDeclaration (Rule): # 39..54 "(address while)" - OpenParen (Token): "(" # 39..40 - - ParametersList (Rule): # 40..47 "address" + - Parameters (Rule): # 40..47 "address" - Parameter (Rule): # 40..47 "address" - TypeName (Rule): # 40..47 "address" - AddressType (Rule): # 40..47 "address" - AddressKeyword (Token): "address" # 40..47 - SKIPPED (Token): "while" # 48..53 - CloseParen (Token): ")" # 53..54 - - FunctionAttributesList (Rule): # 54..62 " private" + - FunctionAttributes (Rule): # 54..62 " private" - PrivateKeyword (Token): "private" # 55..62 - Block (Rule): # 62..138 " {\n\t\tif(while == pair && !_isExcludedFromFee[to]){..." - OpenBrace (Token): "{" # 63..64 - - StatementsList (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." + - Statements (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." - IfStatement (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." - IfKeyword (Token): "if" # 67..69 - OpenParen (Token): "(" # 69..70 @@ -71,7 +71,7 @@ Tree: - CloseParen (Token): ")" # 110..111 - Block (Rule): # 111..135 "{\n\t\t\tuint256 a = 1;\n\t\t}\n" - OpenBrace (Token): "{" # 111..112 - - StatementsList (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" + - Statements (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" - VariableDeclarationStatement (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" - VariableDeclaration (Rule): # 113..125 "\t\t\tuint256 a" - TypeName (Rule): # 113..123 "\t\t\tuint256" @@ -92,7 +92,7 @@ Tree: - CloseParen (Token): ")" # 153..154 - Block (Rule): # 154..210 " {\n\t\tuint256 x = 0;\n\t\tunchecked { invalid sequence..." - OpenBrace (Token): "{" # 155..156 - - StatementsList (Rule): # 157..174 "\t\tuint256 x = 0;\n" + - Statements (Rule): # 157..174 "\t\tuint256 x = 0;\n" - VariableDeclarationStatement (Rule): # 157..174 "\t\tuint256 x = 0;\n" - VariableDeclaration (Rule): # 157..168 "\t\tuint256 x" - TypeName (Rule): # 157..166 "\t\tuint256" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.8.0-failure.yml index 0e4df520d5..a33f03b609 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.8.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.8.0-failure.yml @@ -45,24 +45,24 @@ Tree: - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Contract" # 9..17 - OpenBrace (Token): "{" # 18..19 - - ContractMembersList (Rule): # 20..210 "\tfunction _transfer(address while) private {\n\t\tif(..." + - ContractMembers (Rule): # 20..210 "\tfunction _transfer(address while) private {\n\t\tif(..." - FunctionDefinition (Rule): # 20..138 "\tfunction _transfer(address while) private {\n\t\tif(..." - FunctionKeyword (Token): "function" # 21..29 - Identifier (Token): "_transfer" # 30..39 - ParametersDeclaration (Rule): # 39..54 "(address while)" - OpenParen (Token): "(" # 39..40 - - ParametersList (Rule): # 40..47 "address" + - Parameters (Rule): # 40..47 "address" - Parameter (Rule): # 40..47 "address" - TypeName (Rule): # 40..47 "address" - AddressType (Rule): # 40..47 "address" - AddressKeyword (Token): "address" # 40..47 - SKIPPED (Token): "while" # 48..53 - CloseParen (Token): ")" # 53..54 - - FunctionAttributesList (Rule): # 54..62 " private" + - FunctionAttributes (Rule): # 54..62 " private" - PrivateKeyword (Token): "private" # 55..62 - Block (Rule): # 62..138 " {\n\t\tif(while == pair && !_isExcludedFromFee[to]){..." - OpenBrace (Token): "{" # 63..64 - - StatementsList (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." + - Statements (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." - IfStatement (Rule): # 65..135 "\t\tif(while == pair && !_isExcludedFromFee[to]){\n\t\t..." - IfKeyword (Token): "if" # 67..69 - OpenParen (Token): "(" # 69..70 @@ -70,7 +70,7 @@ Tree: - CloseParen (Token): ")" # 110..111 - Block (Rule): # 111..135 "{\n\t\t\tuint256 a = 1;\n\t\t}\n" - OpenBrace (Token): "{" # 111..112 - - StatementsList (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" + - Statements (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" - VariableDeclarationStatement (Rule): # 113..131 "\t\t\tuint256 a = 1;\n" - VariableDeclaration (Rule): # 113..125 "\t\t\tuint256 a" - TypeName (Rule): # 113..123 "\t\t\tuint256" @@ -91,7 +91,7 @@ Tree: - CloseParen (Token): ")" # 153..154 - Block (Rule): # 154..210 " {\n\t\tuint256 x = 0;\n\t\tunchecked { invalid sequence..." - OpenBrace (Token): "{" # 155..156 - - StatementsList (Rule): # 157..207 "\t\tuint256 x = 0;\n\t\tunchecked { invalid sequence }\n" + - Statements (Rule): # 157..207 "\t\tuint256 x = 0;\n\t\tunchecked { invalid sequence }\n" - VariableDeclarationStatement (Rule): # 157..174 "\t\tuint256 x = 0;\n" - VariableDeclaration (Rule): # 157..168 "\t\tuint256 x" - TypeName (Rule): # 157..166 "\t\tuint256" @@ -106,7 +106,7 @@ Tree: - UncheckedKeyword (Token): "unchecked" # 176..185 - Block (Rule): # 185..207 " { invalid sequence }\n" - OpenBrace (Token): "{" # 186..187 - - StatementsList (Rule): # 187..205 " invalid sequence " + - Statements (Rule): # 187..205 " invalid sequence " - VariableDeclarationStatement (Rule): # 187..205 " invalid sequence " - VariableDeclaration (Rule): # 187..204 " invalid sequence" - TypeName (Rule): # 187..195 " invalid" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/constructor/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/constructor/generated/0.4.11-failure.yml similarity index 89% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/constructor/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/constructor/generated/0.4.11-failure.yml index 75a5f2eda4..142a85db71 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/constructor/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/constructor/generated/0.4.11-failure.yml @@ -6,7 +6,7 @@ Source: > Errors: # 1 total - > Error: Expected ConstantKeyword or Identifier or InternalKeyword or OverrideKeyword or PrivateKeyword or PublicKeyword. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/constructor/input.sol:1:12] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/constructor/input.sol:1:12] │ 1 │ constructor() public {} │ ──────┬────── @@ -14,7 +14,7 @@ Errors: # 1 total ───╯ Tree: - - ContractMembersList (Rule): # 0..24 "constructor() public {}\n" + - ContractMembers (Rule): # 0..24 "constructor() public {}\n" - StateVariableDefinition (Rule): # 0..11 "constructor" - TypeName (Rule): # 0..11 "constructor" - IdentifierPath (Rule): # 0..11 "constructor" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/constructor/generated/0.4.22-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/constructor/generated/0.4.22-success.yml similarity index 84% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/constructor/generated/0.4.22-success.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/constructor/generated/0.4.22-success.yml index c4e01f9769..997f15149a 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/constructor/generated/0.4.22-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/constructor/generated/0.4.22-success.yml @@ -6,13 +6,13 @@ Source: > Errors: [] Tree: - - ContractMembersList (Rule): # 0..24 "constructor() public {}\n" + - ContractMembers (Rule): # 0..24 "constructor() public {}\n" - ConstructorDefinition (Rule): # 0..24 "constructor() public {}\n" - ConstructorKeyword (Token): "constructor" # 0..11 - ParametersDeclaration (Rule): # 11..13 "()" - OpenParen (Token): "(" # 11..12 - CloseParen (Token): ")" # 12..13 - - ConstructorAttributesList (Rule): # 13..20 " public" + - ConstructorAttributes (Rule): # 13..20 " public" - PublicKeyword (Token): "public" # 14..20 - Block (Rule): # 20..24 " {}\n" - OpenBrace (Token): "{" # 21..22 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/constructor/input.sol b/crates/solidity/testing/snapshots/cst_output/ContractMembers/constructor/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/constructor/input.sol rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/constructor/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/local_expression/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/local_expression/generated/0.4.11-success.yml similarity index 94% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/local_expression/generated/0.4.11-success.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/local_expression/generated/0.4.11-success.yml index 9b7b125b73..4b99ec28c5 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/local_expression/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/local_expression/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Source: > Errors: [] Tree: - - ContractMembersList (Rule): # 0..42 "function func() {\n uint a = 1 + 2 * 3;\n}\n" + - ContractMembers (Rule): # 0..42 "function func() {\n uint a = 1 + 2 * 3;\n}\n" - FunctionDefinition (Rule): # 0..42 "function func() {\n uint a = 1 + 2 * 3;\n}\n" - FunctionKeyword (Token): "function" # 0..8 - Identifier (Token): "func" # 9..13 @@ -17,7 +17,7 @@ Tree: - CloseParen (Token): ")" # 14..15 - Block (Rule): # 15..42 " {\n uint a = 1 + 2 * 3;\n}\n" - OpenBrace (Token): "{" # 16..17 - - StatementsList (Rule): # 18..40 " uint a = 1 + 2 * 3;\n" + - Statements (Rule): # 18..40 " uint a = 1 + 2 * 3;\n" - VariableDeclarationStatement (Rule): # 18..40 " uint a = 1 + 2 * 3;\n" - VariableDeclaration (Rule): # 18..26 " uint a" - TypeName (Rule): # 18..24 " uint" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/local_expression/input.sol b/crates/solidity/testing/snapshots/cst_output/ContractMembers/local_expression/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/local_expression/input.sol rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/local_expression/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.4.11-failure.yml similarity index 88% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.4.11-failure.yml index 92cef4414d..d1059636ef 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.4.11-failure.yml @@ -10,7 +10,7 @@ Source: > Errors: # 2 total - > Error: Expected CloseParen or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:3:29] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:3:29] │ 3 │ ╭─▶ uint256 arg = (1 + 2; 4 │ ├─▶ }) @@ -19,7 +19,7 @@ Errors: # 2 total ───╯ - > Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or ThrowKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType or VarKeyword or WhileKeyword. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:4:6] │ 4 │ }) │ ─┬ @@ -27,21 +27,21 @@ Errors: # 2 total ───╯ Tree: - - ContractMembersList (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." + - ContractMembers (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionDefinition (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionKeyword (Token): "function" # 0..8 - Identifier (Token): "someFunc" # 9..17 - ParametersDeclaration (Rule): # 17..19 "()" - OpenParen (Token): "(" # 17..18 - CloseParen (Token): ")" # 18..19 - - FunctionAttributesList (Rule): # 19..26 " public" + - FunctionAttributes (Rule): # 19..26 " public" - PublicKeyword (Token): "public" # 20..26 - Block (Rule): # 26..74 " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" - OpenBrace (Token): "{" # 27..28 - - StatementsList (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" + - Statements (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - Block (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - OpenBrace (Token): "{" # 33..34 - - StatementsList (Rule): # 35..63 " uint256 arg = (1 + 2" + - Statements (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclarationStatement (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclaration (Rule): # 35..54 " uint256 arg" - TypeName (Rule): # 35..50 " uint256" @@ -51,7 +51,7 @@ Tree: - Expression (Rule): # 56..63 " (1 + 2" - TupleExpression (Rule): # 56..63 " (1 + 2" - OpenParen (Token): "(" # 57..58 - - TupleValuesList (Rule): # 58..63 "1 + 2" + - TupleValues (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..63 "1 + 2" - BinaryExpression (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..59 "1" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.4.21-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.4.21-failure.yml similarity index 88% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.4.21-failure.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.4.21-failure.yml index b41bdbd0d8..322afe58f6 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.4.21-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.4.21-failure.yml @@ -10,7 +10,7 @@ Source: > Errors: # 2 total - > Error: Expected CloseParen or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:3:29] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:3:29] │ 3 │ ╭─▶ uint256 arg = (1 + 2; 4 │ ├─▶ }) @@ -19,7 +19,7 @@ Errors: # 2 total ───╯ - > Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or ThrowKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType or VarKeyword or WhileKeyword. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:4:6] │ 4 │ }) │ ─┬ @@ -27,21 +27,21 @@ Errors: # 2 total ───╯ Tree: - - ContractMembersList (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." + - ContractMembers (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionDefinition (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionKeyword (Token): "function" # 0..8 - Identifier (Token): "someFunc" # 9..17 - ParametersDeclaration (Rule): # 17..19 "()" - OpenParen (Token): "(" # 17..18 - CloseParen (Token): ")" # 18..19 - - FunctionAttributesList (Rule): # 19..26 " public" + - FunctionAttributes (Rule): # 19..26 " public" - PublicKeyword (Token): "public" # 20..26 - Block (Rule): # 26..74 " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" - OpenBrace (Token): "{" # 27..28 - - StatementsList (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" + - Statements (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - Block (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - OpenBrace (Token): "{" # 33..34 - - StatementsList (Rule): # 35..63 " uint256 arg = (1 + 2" + - Statements (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclarationStatement (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclaration (Rule): # 35..54 " uint256 arg" - TypeName (Rule): # 35..50 " uint256" @@ -51,7 +51,7 @@ Tree: - Expression (Rule): # 56..63 " (1 + 2" - TupleExpression (Rule): # 56..63 " (1 + 2" - OpenParen (Token): "(" # 57..58 - - TupleValuesList (Rule): # 58..63 "1 + 2" + - TupleValues (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..63 "1 + 2" - BinaryExpression (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..59 "1" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.5.0-failure.yml similarity index 88% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.5.0-failure.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.5.0-failure.yml index a9a31fc04e..6cd0512f7d 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.5.0-failure.yml @@ -10,7 +10,7 @@ Source: > Errors: # 2 total - > Error: Expected CloseParen or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:3:29] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:3:29] │ 3 │ ╭─▶ uint256 arg = (1 + 2; 4 │ ├─▶ }) @@ -19,7 +19,7 @@ Errors: # 2 total ───╯ - > Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:4:6] │ 4 │ }) │ ─┬ @@ -27,21 +27,21 @@ Errors: # 2 total ───╯ Tree: - - ContractMembersList (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." + - ContractMembers (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionDefinition (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionKeyword (Token): "function" # 0..8 - Identifier (Token): "someFunc" # 9..17 - ParametersDeclaration (Rule): # 17..19 "()" - OpenParen (Token): "(" # 17..18 - CloseParen (Token): ")" # 18..19 - - FunctionAttributesList (Rule): # 19..26 " public" + - FunctionAttributes (Rule): # 19..26 " public" - PublicKeyword (Token): "public" # 20..26 - Block (Rule): # 26..74 " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" - OpenBrace (Token): "{" # 27..28 - - StatementsList (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" + - Statements (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - Block (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - OpenBrace (Token): "{" # 33..34 - - StatementsList (Rule): # 35..63 " uint256 arg = (1 + 2" + - Statements (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclarationStatement (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclaration (Rule): # 35..54 " uint256 arg" - TypeName (Rule): # 35..50 " uint256" @@ -51,7 +51,7 @@ Tree: - Expression (Rule): # 56..63 " (1 + 2" - TupleExpression (Rule): # 56..63 " (1 + 2" - OpenParen (Token): "(" # 57..58 - - TupleValuesList (Rule): # 58..63 "1 + 2" + - TupleValues (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..63 "1 + 2" - BinaryExpression (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..59 "1" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.5.3-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.5.3-failure.yml similarity index 88% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.5.3-failure.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.5.3-failure.yml index 11d5498c20..adb2ffe122 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.5.3-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.5.3-failure.yml @@ -10,7 +10,7 @@ Source: > Errors: # 2 total - > Error: Expected CloseParen or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:3:29] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:3:29] │ 3 │ ╭─▶ uint256 arg = (1 + 2; 4 │ ├─▶ }) @@ -19,7 +19,7 @@ Errors: # 2 total ───╯ - > Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:4:6] │ 4 │ }) │ ─┬ @@ -27,21 +27,21 @@ Errors: # 2 total ───╯ Tree: - - ContractMembersList (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." + - ContractMembers (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionDefinition (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionKeyword (Token): "function" # 0..8 - Identifier (Token): "someFunc" # 9..17 - ParametersDeclaration (Rule): # 17..19 "()" - OpenParen (Token): "(" # 17..18 - CloseParen (Token): ")" # 18..19 - - FunctionAttributesList (Rule): # 19..26 " public" + - FunctionAttributes (Rule): # 19..26 " public" - PublicKeyword (Token): "public" # 20..26 - Block (Rule): # 26..74 " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" - OpenBrace (Token): "{" # 27..28 - - StatementsList (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" + - Statements (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - Block (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - OpenBrace (Token): "{" # 33..34 - - StatementsList (Rule): # 35..63 " uint256 arg = (1 + 2" + - Statements (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclarationStatement (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclaration (Rule): # 35..54 " uint256 arg" - TypeName (Rule): # 35..50 " uint256" @@ -51,7 +51,7 @@ Tree: - Expression (Rule): # 56..63 " (1 + 2" - TupleExpression (Rule): # 56..63 " (1 + 2" - OpenParen (Token): "(" # 57..58 - - TupleValuesList (Rule): # 58..63 "1 + 2" + - TupleValues (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..63 "1 + 2" - BinaryExpression (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..59 "1" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.6.0-failure.yml similarity index 88% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.6.0-failure.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.6.0-failure.yml index e35a432813..6cc3e25b1c 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.6.0-failure.yml @@ -10,7 +10,7 @@ Source: > Errors: # 2 total - > Error: Expected CloseParen or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:3:29] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:3:29] │ 3 │ ╭─▶ uint256 arg = (1 + 2; 4 │ ├─▶ }) @@ -19,7 +19,7 @@ Errors: # 2 total ───╯ - > Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:4:6] │ 4 │ }) │ ─┬ @@ -27,21 +27,21 @@ Errors: # 2 total ───╯ Tree: - - ContractMembersList (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." + - ContractMembers (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionDefinition (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionKeyword (Token): "function" # 0..8 - Identifier (Token): "someFunc" # 9..17 - ParametersDeclaration (Rule): # 17..19 "()" - OpenParen (Token): "(" # 17..18 - CloseParen (Token): ")" # 18..19 - - FunctionAttributesList (Rule): # 19..26 " public" + - FunctionAttributes (Rule): # 19..26 " public" - PublicKeyword (Token): "public" # 20..26 - Block (Rule): # 26..74 " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" - OpenBrace (Token): "{" # 27..28 - - StatementsList (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" + - Statements (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - Block (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - OpenBrace (Token): "{" # 33..34 - - StatementsList (Rule): # 35..63 " uint256 arg = (1 + 2" + - Statements (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclarationStatement (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclaration (Rule): # 35..54 " uint256 arg" - TypeName (Rule): # 35..50 " uint256" @@ -51,7 +51,7 @@ Tree: - Expression (Rule): # 56..63 " (1 + 2" - TupleExpression (Rule): # 56..63 " (1 + 2" - OpenParen (Token): "(" # 57..58 - - TupleValuesList (Rule): # 58..63 "1 + 2" + - TupleValues (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..63 "1 + 2" - BinaryExpression (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..59 "1" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.7.0-failure.yml similarity index 88% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.7.0-failure.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.7.0-failure.yml index f22d6a2590..afadc7ab53 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.7.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.7.0-failure.yml @@ -10,7 +10,7 @@ Source: > Errors: # 2 total - > Error: Expected CloseParen or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:3:29] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:3:29] │ 3 │ ╭─▶ uint256 arg = (1 + 2; 4 │ ├─▶ }) @@ -19,7 +19,7 @@ Errors: # 2 total ───╯ - > Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:4:6] │ 4 │ }) │ ─┬ @@ -27,21 +27,21 @@ Errors: # 2 total ───╯ Tree: - - ContractMembersList (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." + - ContractMembers (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionDefinition (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionKeyword (Token): "function" # 0..8 - Identifier (Token): "someFunc" # 9..17 - ParametersDeclaration (Rule): # 17..19 "()" - OpenParen (Token): "(" # 17..18 - CloseParen (Token): ")" # 18..19 - - FunctionAttributesList (Rule): # 19..26 " public" + - FunctionAttributes (Rule): # 19..26 " public" - PublicKeyword (Token): "public" # 20..26 - Block (Rule): # 26..74 " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" - OpenBrace (Token): "{" # 27..28 - - StatementsList (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" + - Statements (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - Block (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - OpenBrace (Token): "{" # 33..34 - - StatementsList (Rule): # 35..63 " uint256 arg = (1 + 2" + - Statements (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclarationStatement (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclaration (Rule): # 35..54 " uint256 arg" - TypeName (Rule): # 35..50 " uint256" @@ -51,7 +51,7 @@ Tree: - Expression (Rule): # 56..63 " (1 + 2" - TupleExpression (Rule): # 56..63 " (1 + 2" - OpenParen (Token): "(" # 57..58 - - TupleValuesList (Rule): # 58..63 "1 + 2" + - TupleValues (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..63 "1 + 2" - BinaryExpression (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..59 "1" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.8.0-failure.yml similarity index 88% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.8.0-failure.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.8.0-failure.yml index 23458f30e4..5c242b544f 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.8.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.8.0-failure.yml @@ -10,7 +10,7 @@ Source: > Errors: # 2 total - > Error: Expected CloseParen or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:3:29] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:3:29] │ 3 │ ╭─▶ uint256 arg = (1 + 2; 4 │ ├─▶ }) @@ -19,7 +19,7 @@ Errors: # 2 total ───╯ - > Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UncheckedKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:4:6] │ 4 │ }) │ ─┬ @@ -27,21 +27,21 @@ Errors: # 2 total ───╯ Tree: - - ContractMembersList (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." + - ContractMembers (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionDefinition (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionKeyword (Token): "function" # 0..8 - Identifier (Token): "someFunc" # 9..17 - ParametersDeclaration (Rule): # 17..19 "()" - OpenParen (Token): "(" # 17..18 - CloseParen (Token): ")" # 18..19 - - FunctionAttributesList (Rule): # 19..26 " public" + - FunctionAttributes (Rule): # 19..26 " public" - PublicKeyword (Token): "public" # 20..26 - Block (Rule): # 26..74 " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" - OpenBrace (Token): "{" # 27..28 - - StatementsList (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" + - Statements (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - Block (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - OpenBrace (Token): "{" # 33..34 - - StatementsList (Rule): # 35..63 " uint256 arg = (1 + 2" + - Statements (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclarationStatement (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclaration (Rule): # 35..54 " uint256 arg" - TypeName (Rule): # 35..50 " uint256" @@ -51,7 +51,7 @@ Tree: - Expression (Rule): # 56..63 " (1 + 2" - TupleExpression (Rule): # 56..63 " (1 + 2" - OpenParen (Token): "(" # 57..58 - - TupleValuesList (Rule): # 58..63 "1 + 2" + - TupleValues (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..63 "1 + 2" - BinaryExpression (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..59 "1" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.8.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.8.4-failure.yml similarity index 89% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.8.4-failure.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.8.4-failure.yml index 310a27b82c..59a5f6f53a 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/generated/0.8.4-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/generated/0.8.4-failure.yml @@ -10,7 +10,7 @@ Source: > Errors: # 2 total - > Error: Expected CloseParen or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:3:29] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:3:29] │ 3 │ ╭─▶ uint256 arg = (1 + 2; 4 │ ├─▶ }) @@ -19,7 +19,7 @@ Errors: # 2 total ───╯ - > Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UncheckedKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol:4:6] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol:4:6] │ 4 │ }) │ ─┬ @@ -27,21 +27,21 @@ Errors: # 2 total ───╯ Tree: - - ContractMembersList (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." + - ContractMembers (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionDefinition (Rule): # 0..74 "function someFunc() public {\n {\n uint256..." - FunctionKeyword (Token): "function" # 0..8 - Identifier (Token): "someFunc" # 9..17 - ParametersDeclaration (Rule): # 17..19 "()" - OpenParen (Token): "(" # 17..18 - CloseParen (Token): ")" # 18..19 - - FunctionAttributesList (Rule): # 19..26 " public" + - FunctionAttributes (Rule): # 19..26 " public" - PublicKeyword (Token): "public" # 20..26 - Block (Rule): # 26..74 " {\n {\n uint256 arg = (1 + 2;\n })\n}\n" - OpenBrace (Token): "{" # 27..28 - - StatementsList (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" + - Statements (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - Block (Rule): # 29..70 " {\n uint256 arg = (1 + 2;\n }" - OpenBrace (Token): "{" # 33..34 - - StatementsList (Rule): # 35..63 " uint256 arg = (1 + 2" + - Statements (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclarationStatement (Rule): # 35..63 " uint256 arg = (1 + 2" - VariableDeclaration (Rule): # 35..54 " uint256 arg" - TypeName (Rule): # 35..50 " uint256" @@ -51,7 +51,7 @@ Tree: - Expression (Rule): # 56..63 " (1 + 2" - TupleExpression (Rule): # 56..63 " (1 + 2" - OpenParen (Token): "(" # 57..58 - - TupleValuesList (Rule): # 58..63 "1 + 2" + - TupleValues (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..63 "1 + 2" - BinaryExpression (Rule): # 58..63 "1 + 2" - Expression (Rule): # 58..59 "1" diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol b/crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/mismatched_delimiter/input.sol rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/mismatched_delimiter/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.4.11-failure.yml similarity index 92% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.4.11-failure.yml index a4e5232109..037fac449e 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.4.11-failure.yml @@ -17,7 +17,7 @@ Source: > Errors: # 10 total - > Error: Expected CloseParen or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:1:36] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:1:36] │ 1 │ function all() override(some.ident unexpected tokens, ISomeInterface, Other) public { │ ────────────────────┬─────────────────── @@ -25,7 +25,7 @@ Errors: # 10 total ───╯ - > Error: Expected Semicolon. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:2:18] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:2:18] │ 2 │ msg.sender.call{do: 1, arg: 1 }(); │ ─────────┬──────── @@ -33,7 +33,7 @@ Errors: # 10 total ───╯ - > Error: Expected Semicolon. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:3:18] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:3:18] │ 3 │ msg.sender.call{, empty: 1, parse: 2 }(); │ ────────────┬──────────── @@ -41,7 +41,7 @@ Errors: # 10 total ───╯ - > Error: Expected Semicolon. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:4:18] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:4:18] │ 4 │ msg.sender.call{arg: 1, missing_expr: , no_semicolon, , }(); │ ──────────────────────┬───────────────────── @@ -49,7 +49,7 @@ Errors: # 10 total ───╯ - > Error: Expected Semicolon. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:5:18] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:5:18] │ 5 │ msg.sender.call{arg: 1 unexpected tokens, not: 2, recovered, yet: 3, }(); │ ────────────────────────────┬──────────────────────────── @@ -57,7 +57,7 @@ Errors: # 10 total ───╯ - > Error: Expected AddressKeyword or AsciiStringLiteral or BoolKeyword or ByteKeyword or DecimalLiteral or FalseKeyword or FixedBytesType or HexLiteral or HexStringLiteral or Identifier or NewKeyword or OpenBracket or OpenParen or PayableKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:9:50] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:9:50] │ 9 │ function empty() override(some.ident, /* empty */, other.arg.here, and.here); │ ─────────────┬──────────── @@ -65,7 +65,7 @@ Errors: # 10 total ───╯ - > Error: Expected AddressKeyword or Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:11:51] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:11:51] │ 11 │ function nested_lists() override(some.ident, next.do.that, other.while, next.one, final, ultimate); │ ───┬─── @@ -73,7 +73,7 @@ Errors: # 10 total ────╯ - > Error: Expected AddressKeyword or Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:11:66] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:11:66] │ 11 │ function nested_lists() override(some.ident, next.do.that, other.while, next.one, final, ultimate); │ ──┬── @@ -81,7 +81,7 @@ Errors: # 10 total ────╯ - > Error: Expected AddressKeyword or AsciiStringLiteral or BoolKeyword or ByteKeyword or DecimalLiteral or FalseKeyword or FixedBytesType or HexLiteral or HexStringLiteral or Identifier or NewKeyword or OpenBracket or OpenParen or PayableKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:11:83] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:11:83] │ 11 │ function nested_lists() override(some.ident, next.do.that, other.while, next.one, final, ultimate); │ ───────┬─────── @@ -89,7 +89,7 @@ Errors: # 10 total ────╯ - > Error: Expected AddressKeyword or Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:12:39] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:12:39] │ 12 │ function nested_lists() override(some., next.arg, next.one, ultimate); │ │ @@ -97,20 +97,20 @@ Errors: # 10 total ────╯ Tree: - - ContractMembersList (Rule): # 0..560 "function all() override(some.ident unexpected toke..." + - ContractMembers (Rule): # 0..560 "function all() override(some.ident unexpected toke..." - FunctionDefinition (Rule): # 0..309 "function all() override(some.ident unexpected toke..." - FunctionKeyword (Token): "function" # 0..8 - Identifier (Token): "all" # 9..12 - ParametersDeclaration (Rule): # 12..14 "()" - OpenParen (Token): "(" # 12..13 - CloseParen (Token): ")" # 13..14 - - FunctionAttributesList (Rule): # 14..83 " override(some.ident unexpected tokens, ISomeInter..." + - FunctionAttributes (Rule): # 14..83 " override(some.ident unexpected tokens, ISomeInter..." - ModifierInvocation (Rule): # 14..76 " override(some.ident unexpected tokens, ISomeInter..." - IdentifierPath (Rule): # 14..23 " override" - Identifier (Token): "override" # 15..23 - ArgumentsDeclaration (Rule): # 23..76 "(some.ident unexpected tokens, ISomeInterface, Oth..." - OpenParen (Token): "(" # 23..24 - - PositionalArgumentsList (Rule): # 24..34 "some.ident" + - PositionalArguments (Rule): # 24..34 "some.ident" - Expression (Rule): # 24..34 "some.ident" - MemberAccessExpression (Rule): # 24..34 "some.ident" - Expression (Rule): # 24..28 "some" @@ -122,7 +122,7 @@ Tree: - PublicKeyword (Token): "public" # 77..83 - Block (Rule): # 83..309 " {\n msg.sender.call{do: 1, arg: 1 }();\n msg.send..." - OpenBrace (Token): "{" # 84..85 - - StatementsList (Rule): # 86..306 " msg.sender.call{do: 1, arg: 1 }();\n msg.sender...." + - Statements (Rule): # 86..306 " msg.sender.call{do: 1, arg: 1 }();\n msg.sender...." - ExpressionStatement (Rule): # 86..123 " msg.sender.call{do: 1, arg: 1 }();\n" - Expression (Rule): # 86..103 " msg.sender.call" - MemberAccessExpression (Rule): # 86..103 " msg.sender.call" @@ -182,13 +182,13 @@ Tree: - ParametersDeclaration (Rule): # 324..326 "()" - OpenParen (Token): "(" # 324..325 - CloseParen (Token): ")" # 325..326 - - FunctionAttributesList (Rule): # 326..386 " override(some.ident, /* empty */, other.arg.here,..." + - FunctionAttributes (Rule): # 326..386 " override(some.ident, /* empty */, other.arg.here,..." - ModifierInvocation (Rule): # 326..386 " override(some.ident, /* empty */, other.arg.here,..." - IdentifierPath (Rule): # 326..335 " override" - Identifier (Token): "override" # 327..335 - ArgumentsDeclaration (Rule): # 335..386 "(some.ident, /* empty */, other.arg.here, and.here..." - OpenParen (Token): "(" # 335..336 - - PositionalArgumentsList (Rule): # 336..347 "some.ident," + - PositionalArguments (Rule): # 336..347 "some.ident," - Expression (Rule): # 336..346 "some.ident" - MemberAccessExpression (Rule): # 336..346 "some.ident" - Expression (Rule): # 336..340 "some" @@ -207,13 +207,13 @@ Tree: - ParametersDeclaration (Rule): # 410..412 "()" - OpenParen (Token): "(" # 410..411 - CloseParen (Token): ")" # 411..412 - - FunctionAttributesList (Rule): # 412..487 " override(some.ident, next.do.that, other.while, n..." + - FunctionAttributes (Rule): # 412..487 " override(some.ident, next.do.that, other.while, n..." - ModifierInvocation (Rule): # 412..487 " override(some.ident, next.do.that, other.while, n..." - IdentifierPath (Rule): # 412..421 " override" - Identifier (Token): "override" # 413..421 - ArgumentsDeclaration (Rule): # 421..487 "(some.ident, next.do.that, other.while, next.one, ..." - OpenParen (Token): "(" # 421..422 - - PositionalArgumentsList (Rule): # 422..470 "some.ident, next.do.that, other.while, next.one," + - PositionalArguments (Rule): # 422..470 "some.ident, next.do.that, other.while, next.one," - Expression (Rule): # 422..432 "some.ident" - MemberAccessExpression (Rule): # 422..432 "some.ident" - Expression (Rule): # 422..426 "some" @@ -247,13 +247,13 @@ Tree: - ParametersDeclaration (Rule): # 510..512 "()" - OpenParen (Token): "(" # 510..511 - CloseParen (Token): ")" # 511..512 - - FunctionAttributesList (Rule): # 512..558 " override(some., next.arg, next.one, ultimate)" + - FunctionAttributes (Rule): # 512..558 " override(some., next.arg, next.one, ultimate)" - ModifierInvocation (Rule): # 512..558 " override(some., next.arg, next.one, ultimate)" - IdentifierPath (Rule): # 512..521 " override" - Identifier (Token): "override" # 513..521 - ArgumentsDeclaration (Rule): # 521..558 "(some., next.arg, next.one, ultimate)" - OpenParen (Token): "(" # 521..522 - - PositionalArgumentsList (Rule): # 522..557 "some., next.arg, next.one, ultimate" + - PositionalArguments (Rule): # 522..557 "some., next.arg, next.one, ultimate" - Expression (Rule): # 522..527 "some." - Identifier (Token): "some" # 522..526 - Period (Token): "." # 526..527 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.5.0-failure.yml similarity index 91% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/generated/0.5.0-failure.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.5.0-failure.yml index 5f1b9401e6..1613c29997 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.5.0-failure.yml @@ -17,7 +17,7 @@ Source: > Errors: # 10 total - > Error: Expected CloseParen or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:1:36] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:1:36] │ 1 │ function all() override(some.ident unexpected tokens, ISomeInterface, Other) public { │ ────────────────────┬─────────────────── @@ -25,7 +25,7 @@ Errors: # 10 total ───╯ - > Error: Expected Semicolon. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:2:18] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:2:18] │ 2 │ msg.sender.call{do: 1, arg: 1 }(); │ ─────────┬──────── @@ -33,7 +33,7 @@ Errors: # 10 total ───╯ - > Error: Expected Semicolon. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:3:18] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:3:18] │ 3 │ msg.sender.call{, empty: 1, parse: 2 }(); │ ────────────┬──────────── @@ -41,7 +41,7 @@ Errors: # 10 total ───╯ - > Error: Expected Semicolon. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:4:18] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:4:18] │ 4 │ msg.sender.call{arg: 1, missing_expr: , no_semicolon, , }(); │ ──────────────────────┬───────────────────── @@ -49,7 +49,7 @@ Errors: # 10 total ───╯ - > Error: Expected Semicolon. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:5:18] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:5:18] │ 5 │ msg.sender.call{arg: 1 unexpected tokens, not: 2, recovered, yet: 3, }(); │ ────────────────────────────┬──────────────────────────── @@ -57,7 +57,7 @@ Errors: # 10 total ───╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:9:50] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:9:50] │ 9 │ function empty() override(some.ident, /* empty */, other.arg.here, and.here); │ ─────────────┬──────────── @@ -65,7 +65,7 @@ Errors: # 10 total ───╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:11:51] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:11:51] │ 11 │ function nested_lists() override(some.ident, next.do.that, other.while, next.one, final, ultimate); │ ───┬─── @@ -73,7 +73,7 @@ Errors: # 10 total ────╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:11:66] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:11:66] │ 11 │ function nested_lists() override(some.ident, next.do.that, other.while, next.one, final, ultimate); │ ──┬── @@ -81,7 +81,7 @@ Errors: # 10 total ────╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:11:83] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:11:83] │ 11 │ function nested_lists() override(some.ident, next.do.that, other.while, next.one, final, ultimate); │ ───────┬─────── @@ -89,7 +89,7 @@ Errors: # 10 total ────╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:12:39] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:12:39] │ 12 │ function nested_lists() override(some., next.arg, next.one, ultimate); │ │ @@ -97,18 +97,18 @@ Errors: # 10 total ────╯ Tree: - - ContractMembersList (Rule): # 0..560 "function all() override(some.ident unexpected toke..." + - ContractMembers (Rule): # 0..560 "function all() override(some.ident unexpected toke..." - FunctionDefinition (Rule): # 0..309 "function all() override(some.ident unexpected toke..." - FunctionKeyword (Token): "function" # 0..8 - Identifier (Token): "all" # 9..12 - ParametersDeclaration (Rule): # 12..14 "()" - OpenParen (Token): "(" # 12..13 - CloseParen (Token): ")" # 13..14 - - FunctionAttributesList (Rule): # 14..83 " override(some.ident unexpected tokens, ISomeInter..." + - FunctionAttributes (Rule): # 14..83 " override(some.ident unexpected tokens, ISomeInter..." - OverrideSpecifier (Rule): # 14..76 " override(some.ident unexpected tokens, ISomeInter..." - OverrideKeyword (Token): "override" # 15..23 - OpenParen (Token): "(" # 23..24 - - IdentifierPathsList (Rule): # 24..34 "some.ident" + - OverridePaths (Rule): # 24..34 "some.ident" - IdentifierPath (Rule): # 24..34 "some.ident" - Identifier (Token): "some" # 24..28 - Period (Token): "." # 28..29 @@ -118,7 +118,7 @@ Tree: - PublicKeyword (Token): "public" # 77..83 - Block (Rule): # 83..309 " {\n msg.sender.call{do: 1, arg: 1 }();\n msg.send..." - OpenBrace (Token): "{" # 84..85 - - StatementsList (Rule): # 86..306 " msg.sender.call{do: 1, arg: 1 }();\n msg.sender...." + - Statements (Rule): # 86..306 " msg.sender.call{do: 1, arg: 1 }();\n msg.sender...." - ExpressionStatement (Rule): # 86..123 " msg.sender.call{do: 1, arg: 1 }();\n" - Expression (Rule): # 86..103 " msg.sender.call" - MemberAccessExpression (Rule): # 86..103 " msg.sender.call" @@ -178,11 +178,11 @@ Tree: - ParametersDeclaration (Rule): # 324..326 "()" - OpenParen (Token): "(" # 324..325 - CloseParen (Token): ")" # 325..326 - - FunctionAttributesList (Rule): # 326..386 " override(some.ident, /* empty */, other.arg.here,..." + - FunctionAttributes (Rule): # 326..386 " override(some.ident, /* empty */, other.arg.here,..." - OverrideSpecifier (Rule): # 326..386 " override(some.ident, /* empty */, other.arg.here,..." - OverrideKeyword (Token): "override" # 327..335 - OpenParen (Token): "(" # 335..336 - - IdentifierPathsList (Rule): # 336..347 "some.ident," + - OverridePaths (Rule): # 336..347 "some.ident," - IdentifierPath (Rule): # 336..346 "some.ident" - Identifier (Token): "some" # 336..340 - Period (Token): "." # 340..341 @@ -199,11 +199,11 @@ Tree: - ParametersDeclaration (Rule): # 410..412 "()" - OpenParen (Token): "(" # 410..411 - CloseParen (Token): ")" # 411..412 - - FunctionAttributesList (Rule): # 412..487 " override(some.ident, next.do.that, other.while, n..." + - FunctionAttributes (Rule): # 412..487 " override(some.ident, next.do.that, other.while, n..." - OverrideSpecifier (Rule): # 412..487 " override(some.ident, next.do.that, other.while, n..." - OverrideKeyword (Token): "override" # 413..421 - OpenParen (Token): "(" # 421..422 - - IdentifierPathsList (Rule): # 422..470 "some.ident, next.do.that, other.while, next.one," + - OverridePaths (Rule): # 422..470 "some.ident, next.do.that, other.while, next.one," - IdentifierPath (Rule): # 422..432 "some.ident" - Identifier (Token): "some" # 422..426 - Period (Token): "." # 426..427 @@ -233,11 +233,11 @@ Tree: - ParametersDeclaration (Rule): # 510..512 "()" - OpenParen (Token): "(" # 510..511 - CloseParen (Token): ")" # 511..512 - - FunctionAttributesList (Rule): # 512..558 " override(some., next.arg, next.one, ultimate)" + - FunctionAttributes (Rule): # 512..558 " override(some., next.arg, next.one, ultimate)" - OverrideSpecifier (Rule): # 512..558 " override(some., next.arg, next.one, ultimate)" - OverrideKeyword (Token): "override" # 513..521 - OpenParen (Token): "(" # 521..522 - - IdentifierPathsList (Rule): # 522..557 "some., next.arg, next.one, ultimate" + - OverridePaths (Rule): # 522..557 "some., next.arg, next.one, ultimate" - IdentifierPath (Rule): # 522..527 "some." - Identifier (Token): "some" # 522..526 - Period (Token): "." # 526..527 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/generated/0.6.2-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.6.2-failure.yml similarity index 92% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/generated/0.6.2-failure.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.6.2-failure.yml index 40b7fd1a58..3f73b05081 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/generated/0.6.2-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.6.2-failure.yml @@ -17,7 +17,7 @@ Source: > Errors: # 12 total - > Error: Expected CloseParen or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:1:36] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:1:36] │ 1 │ function all() override(some.ident unexpected tokens, ISomeInterface, Other) public { │ ────────────────────┬─────────────────── @@ -25,7 +25,7 @@ Errors: # 12 total ───╯ - > Error: Expected CloseBrace or Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:2:19] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:2:19] │ 2 │ msg.sender.call{do: 1, arg: 1 }(); │ ───────┬────── @@ -33,7 +33,7 @@ Errors: # 12 total ───╯ - > Error: Expected CloseBrace or Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:3:19] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:3:19] │ 3 │ msg.sender.call{, empty: 1, parse: 2 }(); │ ──────────┬────────── @@ -41,7 +41,7 @@ Errors: # 12 total ───╯ - > Error: Expected AddressKeyword or AsciiStringLiteral or BoolKeyword or ByteKeyword or DecimalLiteral or FalseKeyword or FixedBytesType or HexLiteral or HexStringLiteral or Identifier or NewKeyword or OpenBracket or OpenParen or PayableKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:4:40] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:4:40] │ 4 │ msg.sender.call{arg: 1, missing_expr: , no_semicolon, , }(); │ ┬ @@ -49,7 +49,7 @@ Errors: # 12 total ───╯ - > Error: Expected Colon. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:4:55] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:4:55] │ 4 │ msg.sender.call{arg: 1, missing_expr: , no_semicolon, , }(); │ │ @@ -57,7 +57,7 @@ Errors: # 12 total ───╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:4:57] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:4:57] │ 4 │ msg.sender.call{arg: 1, missing_expr: , no_semicolon, , }(); │ ─┬ @@ -65,7 +65,7 @@ Errors: # 12 total ───╯ - > Error: Expected CloseBrace or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:5:26] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:5:26] │ 5 │ msg.sender.call{arg: 1 unexpected tokens, not: 2, recovered, yet: 3, }(); │ ───────────────────────┬────────────────────── @@ -73,7 +73,7 @@ Errors: # 12 total ───╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:9:50] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:9:50] │ 9 │ function empty() override(some.ident, /* empty */, other.arg.here, and.here); │ ─────────────┬──────────── @@ -81,7 +81,7 @@ Errors: # 12 total ───╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:11:51] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:11:51] │ 11 │ function nested_lists() override(some.ident, next.do.that, other.while, next.one, final, ultimate); │ ───┬─── @@ -89,7 +89,7 @@ Errors: # 12 total ────╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:11:66] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:11:66] │ 11 │ function nested_lists() override(some.ident, next.do.that, other.while, next.one, final, ultimate); │ ──┬── @@ -97,7 +97,7 @@ Errors: # 12 total ────╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:11:83] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:11:83] │ 11 │ function nested_lists() override(some.ident, next.do.that, other.while, next.one, final, ultimate); │ ───────┬─────── @@ -105,7 +105,7 @@ Errors: # 12 total ────╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:12:39] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:12:39] │ 12 │ function nested_lists() override(some., next.arg, next.one, ultimate); │ │ @@ -113,18 +113,18 @@ Errors: # 12 total ────╯ Tree: - - ContractMembersList (Rule): # 0..560 "function all() override(some.ident unexpected toke..." + - ContractMembers (Rule): # 0..560 "function all() override(some.ident unexpected toke..." - FunctionDefinition (Rule): # 0..309 "function all() override(some.ident unexpected toke..." - FunctionKeyword (Token): "function" # 0..8 - Identifier (Token): "all" # 9..12 - ParametersDeclaration (Rule): # 12..14 "()" - OpenParen (Token): "(" # 12..13 - CloseParen (Token): ")" # 13..14 - - FunctionAttributesList (Rule): # 14..83 " override(some.ident unexpected tokens, ISomeInter..." + - FunctionAttributes (Rule): # 14..83 " override(some.ident unexpected tokens, ISomeInter..." - OverrideSpecifier (Rule): # 14..76 " override(some.ident unexpected tokens, ISomeInter..." - OverrideKeyword (Token): "override" # 15..23 - OpenParen (Token): "(" # 23..24 - - IdentifierPathsList (Rule): # 24..34 "some.ident" + - OverridePaths (Rule): # 24..34 "some.ident" - IdentifierPath (Rule): # 24..34 "some.ident" - Identifier (Token): "some" # 24..28 - Period (Token): "." # 28..29 @@ -134,7 +134,7 @@ Tree: - PublicKeyword (Token): "public" # 77..83 - Block (Rule): # 83..309 " {\n msg.sender.call{do: 1, arg: 1 }();\n msg.send..." - OpenBrace (Token): "{" # 84..85 - - StatementsList (Rule): # 86..306 " msg.sender.call{do: 1, arg: 1 }();\n msg.sender...." + - Statements (Rule): # 86..306 " msg.sender.call{do: 1, arg: 1 }();\n msg.sender...." - ExpressionStatement (Rule): # 86..123 " msg.sender.call{do: 1, arg: 1 }();\n" - Expression (Rule): # 86..121 " msg.sender.call{do: 1, arg: 1 }()" - FunctionCallExpression (Rule): # 86..121 " msg.sender.call{do: 1, arg: 1 }()" @@ -195,7 +195,7 @@ Tree: - FunctionCallOptions (Rule): # 184..226 "{arg: 1, missing_expr: , no_semicolon, , }" - NamedArgumentsDeclaration (Rule): # 184..226 "{arg: 1, missing_expr: , no_semicolon, , }" - OpenBrace (Token): "{" # 184..185 - - NamedArgumentsList (Rule): # 185..222 "arg: 1, missing_expr: , no_semicolon," + - NamedArguments (Rule): # 185..222 "arg: 1, missing_expr: , no_semicolon," - NamedArgument (Rule): # 185..191 "arg: 1" - Identifier (Token): "arg" # 185..188 - Colon (Token): ":" # 188..189 @@ -234,7 +234,7 @@ Tree: - FunctionCallOptions (Rule): # 247..302 "{arg: 1 unexpected tokens, not: 2, recovered, yet:..." - NamedArgumentsDeclaration (Rule): # 247..302 "{arg: 1 unexpected tokens, not: 2, recovered, yet:..." - OpenBrace (Token): "{" # 247..248 - - NamedArgumentsList (Rule): # 248..254 "arg: 1" + - NamedArguments (Rule): # 248..254 "arg: 1" - NamedArgument (Rule): # 248..254 "arg: 1" - Identifier (Token): "arg" # 248..251 - Colon (Token): ":" # 251..252 @@ -254,11 +254,11 @@ Tree: - ParametersDeclaration (Rule): # 324..326 "()" - OpenParen (Token): "(" # 324..325 - CloseParen (Token): ")" # 325..326 - - FunctionAttributesList (Rule): # 326..386 " override(some.ident, /* empty */, other.arg.here,..." + - FunctionAttributes (Rule): # 326..386 " override(some.ident, /* empty */, other.arg.here,..." - OverrideSpecifier (Rule): # 326..386 " override(some.ident, /* empty */, other.arg.here,..." - OverrideKeyword (Token): "override" # 327..335 - OpenParen (Token): "(" # 335..336 - - IdentifierPathsList (Rule): # 336..347 "some.ident," + - OverridePaths (Rule): # 336..347 "some.ident," - IdentifierPath (Rule): # 336..346 "some.ident" - Identifier (Token): "some" # 336..340 - Period (Token): "." # 340..341 @@ -275,11 +275,11 @@ Tree: - ParametersDeclaration (Rule): # 410..412 "()" - OpenParen (Token): "(" # 410..411 - CloseParen (Token): ")" # 411..412 - - FunctionAttributesList (Rule): # 412..487 " override(some.ident, next.do.that, other.while, n..." + - FunctionAttributes (Rule): # 412..487 " override(some.ident, next.do.that, other.while, n..." - OverrideSpecifier (Rule): # 412..487 " override(some.ident, next.do.that, other.while, n..." - OverrideKeyword (Token): "override" # 413..421 - OpenParen (Token): "(" # 421..422 - - IdentifierPathsList (Rule): # 422..470 "some.ident, next.do.that, other.while, next.one," + - OverridePaths (Rule): # 422..470 "some.ident, next.do.that, other.while, next.one," - IdentifierPath (Rule): # 422..432 "some.ident" - Identifier (Token): "some" # 422..426 - Period (Token): "." # 426..427 @@ -309,11 +309,11 @@ Tree: - ParametersDeclaration (Rule): # 510..512 "()" - OpenParen (Token): "(" # 510..511 - CloseParen (Token): ")" # 511..512 - - FunctionAttributesList (Rule): # 512..558 " override(some., next.arg, next.one, ultimate)" + - FunctionAttributes (Rule): # 512..558 " override(some., next.arg, next.one, ultimate)" - OverrideSpecifier (Rule): # 512..558 " override(some., next.arg, next.one, ultimate)" - OverrideKeyword (Token): "override" # 513..521 - OpenParen (Token): "(" # 521..522 - - IdentifierPathsList (Rule): # 522..557 "some., next.arg, next.one, ultimate" + - OverridePaths (Rule): # 522..557 "some., next.arg, next.one, ultimate" - IdentifierPath (Rule): # 522..527 "some." - Identifier (Token): "some" # 522..526 - Period (Token): "." # 526..527 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.7.0-failure.yml similarity index 92% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/generated/0.7.0-failure.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.7.0-failure.yml index a7fdd781da..d6a21f545d 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/generated/0.7.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.7.0-failure.yml @@ -17,7 +17,7 @@ Source: > Errors: # 12 total - > Error: Expected CloseParen or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:1:36] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:1:36] │ 1 │ function all() override(some.ident unexpected tokens, ISomeInterface, Other) public { │ ────────────────────┬─────────────────── @@ -25,7 +25,7 @@ Errors: # 12 total ───╯ - > Error: Expected CloseBrace or Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:2:19] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:2:19] │ 2 │ msg.sender.call{do: 1, arg: 1 }(); │ ───────┬────── @@ -33,7 +33,7 @@ Errors: # 12 total ───╯ - > Error: Expected CloseBrace or Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:3:19] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:3:19] │ 3 │ msg.sender.call{, empty: 1, parse: 2 }(); │ ──────────┬────────── @@ -41,7 +41,7 @@ Errors: # 12 total ───╯ - > Error: Expected AddressKeyword or AsciiStringLiteral or BoolKeyword or ByteKeyword or DecimalLiteral or FalseKeyword or FixedBytesType or HexLiteral or HexStringLiteral or Identifier or NewKeyword or OpenBracket or OpenParen or PayableKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TypeKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:4:40] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:4:40] │ 4 │ msg.sender.call{arg: 1, missing_expr: , no_semicolon, , }(); │ ┬ @@ -49,7 +49,7 @@ Errors: # 12 total ───╯ - > Error: Expected Colon. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:4:55] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:4:55] │ 4 │ msg.sender.call{arg: 1, missing_expr: , no_semicolon, , }(); │ │ @@ -57,7 +57,7 @@ Errors: # 12 total ───╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:4:57] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:4:57] │ 4 │ msg.sender.call{arg: 1, missing_expr: , no_semicolon, , }(); │ ─┬ @@ -65,7 +65,7 @@ Errors: # 12 total ───╯ - > Error: Expected CloseBrace or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:5:26] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:5:26] │ 5 │ msg.sender.call{arg: 1 unexpected tokens, not: 2, recovered, yet: 3, }(); │ ───────────────────────┬────────────────────── @@ -73,7 +73,7 @@ Errors: # 12 total ───╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:9:50] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:9:50] │ 9 │ function empty() override(some.ident, /* empty */, other.arg.here, and.here); │ ─────────────┬──────────── @@ -81,7 +81,7 @@ Errors: # 12 total ───╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:11:51] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:11:51] │ 11 │ function nested_lists() override(some.ident, next.do.that, other.while, next.one, final, ultimate); │ ───┬─── @@ -89,7 +89,7 @@ Errors: # 12 total ────╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:11:66] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:11:66] │ 11 │ function nested_lists() override(some.ident, next.do.that, other.while, next.one, final, ultimate); │ ──┬── @@ -97,7 +97,7 @@ Errors: # 12 total ────╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:11:83] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:11:83] │ 11 │ function nested_lists() override(some.ident, next.do.that, other.while, next.one, final, ultimate); │ ───────┬─────── @@ -105,7 +105,7 @@ Errors: # 12 total ────╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:12:39] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:12:39] │ 12 │ function nested_lists() override(some., next.arg, next.one, ultimate); │ │ @@ -113,18 +113,18 @@ Errors: # 12 total ────╯ Tree: - - ContractMembersList (Rule): # 0..560 "function all() override(some.ident unexpected toke..." + - ContractMembers (Rule): # 0..560 "function all() override(some.ident unexpected toke..." - FunctionDefinition (Rule): # 0..309 "function all() override(some.ident unexpected toke..." - FunctionKeyword (Token): "function" # 0..8 - Identifier (Token): "all" # 9..12 - ParametersDeclaration (Rule): # 12..14 "()" - OpenParen (Token): "(" # 12..13 - CloseParen (Token): ")" # 13..14 - - FunctionAttributesList (Rule): # 14..83 " override(some.ident unexpected tokens, ISomeInter..." + - FunctionAttributes (Rule): # 14..83 " override(some.ident unexpected tokens, ISomeInter..." - OverrideSpecifier (Rule): # 14..76 " override(some.ident unexpected tokens, ISomeInter..." - OverrideKeyword (Token): "override" # 15..23 - OpenParen (Token): "(" # 23..24 - - IdentifierPathsList (Rule): # 24..34 "some.ident" + - OverridePaths (Rule): # 24..34 "some.ident" - IdentifierPath (Rule): # 24..34 "some.ident" - Identifier (Token): "some" # 24..28 - Period (Token): "." # 28..29 @@ -134,7 +134,7 @@ Tree: - PublicKeyword (Token): "public" # 77..83 - Block (Rule): # 83..309 " {\n msg.sender.call{do: 1, arg: 1 }();\n msg.send..." - OpenBrace (Token): "{" # 84..85 - - StatementsList (Rule): # 86..306 " msg.sender.call{do: 1, arg: 1 }();\n msg.sender...." + - Statements (Rule): # 86..306 " msg.sender.call{do: 1, arg: 1 }();\n msg.sender...." - ExpressionStatement (Rule): # 86..123 " msg.sender.call{do: 1, arg: 1 }();\n" - Expression (Rule): # 86..121 " msg.sender.call{do: 1, arg: 1 }()" - FunctionCallExpression (Rule): # 86..121 " msg.sender.call{do: 1, arg: 1 }()" @@ -195,7 +195,7 @@ Tree: - FunctionCallOptions (Rule): # 184..226 "{arg: 1, missing_expr: , no_semicolon, , }" - NamedArgumentsDeclaration (Rule): # 184..226 "{arg: 1, missing_expr: , no_semicolon, , }" - OpenBrace (Token): "{" # 184..185 - - NamedArgumentsList (Rule): # 185..222 "arg: 1, missing_expr: , no_semicolon," + - NamedArguments (Rule): # 185..222 "arg: 1, missing_expr: , no_semicolon," - NamedArgument (Rule): # 185..191 "arg: 1" - Identifier (Token): "arg" # 185..188 - Colon (Token): ":" # 188..189 @@ -234,7 +234,7 @@ Tree: - FunctionCallOptions (Rule): # 247..302 "{arg: 1 unexpected tokens, not: 2, recovered, yet:..." - NamedArgumentsDeclaration (Rule): # 247..302 "{arg: 1 unexpected tokens, not: 2, recovered, yet:..." - OpenBrace (Token): "{" # 247..248 - - NamedArgumentsList (Rule): # 248..254 "arg: 1" + - NamedArguments (Rule): # 248..254 "arg: 1" - NamedArgument (Rule): # 248..254 "arg: 1" - Identifier (Token): "arg" # 248..251 - Colon (Token): ":" # 251..252 @@ -254,11 +254,11 @@ Tree: - ParametersDeclaration (Rule): # 324..326 "()" - OpenParen (Token): "(" # 324..325 - CloseParen (Token): ")" # 325..326 - - FunctionAttributesList (Rule): # 326..386 " override(some.ident, /* empty */, other.arg.here,..." + - FunctionAttributes (Rule): # 326..386 " override(some.ident, /* empty */, other.arg.here,..." - OverrideSpecifier (Rule): # 326..386 " override(some.ident, /* empty */, other.arg.here,..." - OverrideKeyword (Token): "override" # 327..335 - OpenParen (Token): "(" # 335..336 - - IdentifierPathsList (Rule): # 336..347 "some.ident," + - OverridePaths (Rule): # 336..347 "some.ident," - IdentifierPath (Rule): # 336..346 "some.ident" - Identifier (Token): "some" # 336..340 - Period (Token): "." # 340..341 @@ -275,11 +275,11 @@ Tree: - ParametersDeclaration (Rule): # 410..412 "()" - OpenParen (Token): "(" # 410..411 - CloseParen (Token): ")" # 411..412 - - FunctionAttributesList (Rule): # 412..487 " override(some.ident, next.do.that, other.while, n..." + - FunctionAttributes (Rule): # 412..487 " override(some.ident, next.do.that, other.while, n..." - OverrideSpecifier (Rule): # 412..487 " override(some.ident, next.do.that, other.while, n..." - OverrideKeyword (Token): "override" # 413..421 - OpenParen (Token): "(" # 421..422 - - IdentifierPathsList (Rule): # 422..470 "some.ident, next.do.that, other.while, next.one," + - OverridePaths (Rule): # 422..470 "some.ident, next.do.that, other.while, next.one," - IdentifierPath (Rule): # 422..432 "some.ident" - Identifier (Token): "some" # 422..426 - Period (Token): "." # 426..427 @@ -309,11 +309,11 @@ Tree: - ParametersDeclaration (Rule): # 510..512 "()" - OpenParen (Token): "(" # 510..511 - CloseParen (Token): ")" # 511..512 - - FunctionAttributesList (Rule): # 512..558 " override(some., next.arg, next.one, ultimate)" + - FunctionAttributes (Rule): # 512..558 " override(some., next.arg, next.one, ultimate)" - OverrideSpecifier (Rule): # 512..558 " override(some., next.arg, next.one, ultimate)" - OverrideKeyword (Token): "override" # 513..521 - OpenParen (Token): "(" # 521..522 - - IdentifierPathsList (Rule): # 522..557 "some., next.arg, next.one, ultimate" + - OverridePaths (Rule): # 522..557 "some., next.arg, next.one, ultimate" - IdentifierPath (Rule): # 522..527 "some." - Identifier (Token): "some" # 522..526 - Period (Token): "." # 526..527 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.8.0-failure.yml similarity index 92% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/generated/0.8.0-failure.yml rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.8.0-failure.yml index e8e8c5f0ed..92d862fecf 100644 --- a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/generated/0.8.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.8.0-failure.yml @@ -17,7 +17,7 @@ Source: > Errors: # 12 total - > Error: Expected CloseParen or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:1:36] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:1:36] │ 1 │ function all() override(some.ident unexpected tokens, ISomeInterface, Other) public { │ ────────────────────┬─────────────────── @@ -25,7 +25,7 @@ Errors: # 12 total ───╯ - > Error: Expected CloseBrace or Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:2:19] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:2:19] │ 2 │ msg.sender.call{do: 1, arg: 1 }(); │ ───────┬────── @@ -33,7 +33,7 @@ Errors: # 12 total ───╯ - > Error: Expected CloseBrace or Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:3:19] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:3:19] │ 3 │ msg.sender.call{, empty: 1, parse: 2 }(); │ ──────────┬────────── @@ -41,7 +41,7 @@ Errors: # 12 total ───╯ - > Error: Expected AddressKeyword or AsciiStringLiteral or BoolKeyword or DecimalLiteral or FalseKeyword or FixedBytesType or HexLiteral or HexStringLiteral or Identifier or NewKeyword or OpenBracket or OpenParen or PayableKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TypeKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:4:40] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:4:40] │ 4 │ msg.sender.call{arg: 1, missing_expr: , no_semicolon, , }(); │ ┬ @@ -49,7 +49,7 @@ Errors: # 12 total ───╯ - > Error: Expected Colon. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:4:55] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:4:55] │ 4 │ msg.sender.call{arg: 1, missing_expr: , no_semicolon, , }(); │ │ @@ -57,7 +57,7 @@ Errors: # 12 total ───╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:4:57] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:4:57] │ 4 │ msg.sender.call{arg: 1, missing_expr: , no_semicolon, , }(); │ ─┬ @@ -65,7 +65,7 @@ Errors: # 12 total ───╯ - > Error: Expected CloseBrace or Comma. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:5:26] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:5:26] │ 5 │ msg.sender.call{arg: 1 unexpected tokens, not: 2, recovered, yet: 3, }(); │ ───────────────────────┬────────────────────── @@ -73,7 +73,7 @@ Errors: # 12 total ───╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:9:50] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:9:50] │ 9 │ function empty() override(some.ident, /* empty */, other.arg.here, and.here); │ ─────────────┬──────────── @@ -81,7 +81,7 @@ Errors: # 12 total ───╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:11:51] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:11:51] │ 11 │ function nested_lists() override(some.ident, next.do.that, other.while, next.one, final, ultimate); │ ───┬─── @@ -89,7 +89,7 @@ Errors: # 12 total ────╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:11:66] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:11:66] │ 11 │ function nested_lists() override(some.ident, next.do.that, other.while, next.one, final, ultimate); │ ──┬── @@ -97,7 +97,7 @@ Errors: # 12 total ────╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:11:83] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:11:83] │ 11 │ function nested_lists() override(some.ident, next.do.that, other.while, next.one, final, ultimate); │ ───────┬─────── @@ -105,7 +105,7 @@ Errors: # 12 total ────╯ - > Error: Expected Identifier. - ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol:12:39] + ╭─[crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol:12:39] │ 12 │ function nested_lists() override(some., next.arg, next.one, ultimate); │ │ @@ -113,18 +113,18 @@ Errors: # 12 total ────╯ Tree: - - ContractMembersList (Rule): # 0..560 "function all() override(some.ident unexpected toke..." + - ContractMembers (Rule): # 0..560 "function all() override(some.ident unexpected toke..." - FunctionDefinition (Rule): # 0..309 "function all() override(some.ident unexpected toke..." - FunctionKeyword (Token): "function" # 0..8 - Identifier (Token): "all" # 9..12 - ParametersDeclaration (Rule): # 12..14 "()" - OpenParen (Token): "(" # 12..13 - CloseParen (Token): ")" # 13..14 - - FunctionAttributesList (Rule): # 14..83 " override(some.ident unexpected tokens, ISomeInter..." + - FunctionAttributes (Rule): # 14..83 " override(some.ident unexpected tokens, ISomeInter..." - OverrideSpecifier (Rule): # 14..76 " override(some.ident unexpected tokens, ISomeInter..." - OverrideKeyword (Token): "override" # 15..23 - OpenParen (Token): "(" # 23..24 - - IdentifierPathsList (Rule): # 24..34 "some.ident" + - OverridePaths (Rule): # 24..34 "some.ident" - IdentifierPath (Rule): # 24..34 "some.ident" - Identifier (Token): "some" # 24..28 - Period (Token): "." # 28..29 @@ -134,7 +134,7 @@ Tree: - PublicKeyword (Token): "public" # 77..83 - Block (Rule): # 83..309 " {\n msg.sender.call{do: 1, arg: 1 }();\n msg.send..." - OpenBrace (Token): "{" # 84..85 - - StatementsList (Rule): # 86..306 " msg.sender.call{do: 1, arg: 1 }();\n msg.sender...." + - Statements (Rule): # 86..306 " msg.sender.call{do: 1, arg: 1 }();\n msg.sender...." - ExpressionStatement (Rule): # 86..123 " msg.sender.call{do: 1, arg: 1 }();\n" - Expression (Rule): # 86..121 " msg.sender.call{do: 1, arg: 1 }()" - FunctionCallExpression (Rule): # 86..121 " msg.sender.call{do: 1, arg: 1 }()" @@ -195,7 +195,7 @@ Tree: - FunctionCallOptions (Rule): # 184..226 "{arg: 1, missing_expr: , no_semicolon, , }" - NamedArgumentsDeclaration (Rule): # 184..226 "{arg: 1, missing_expr: , no_semicolon, , }" - OpenBrace (Token): "{" # 184..185 - - NamedArgumentsList (Rule): # 185..222 "arg: 1, missing_expr: , no_semicolon," + - NamedArguments (Rule): # 185..222 "arg: 1, missing_expr: , no_semicolon," - NamedArgument (Rule): # 185..191 "arg: 1" - Identifier (Token): "arg" # 185..188 - Colon (Token): ":" # 188..189 @@ -234,7 +234,7 @@ Tree: - FunctionCallOptions (Rule): # 247..302 "{arg: 1 unexpected tokens, not: 2, recovered, yet:..." - NamedArgumentsDeclaration (Rule): # 247..302 "{arg: 1 unexpected tokens, not: 2, recovered, yet:..." - OpenBrace (Token): "{" # 247..248 - - NamedArgumentsList (Rule): # 248..254 "arg: 1" + - NamedArguments (Rule): # 248..254 "arg: 1" - NamedArgument (Rule): # 248..254 "arg: 1" - Identifier (Token): "arg" # 248..251 - Colon (Token): ":" # 251..252 @@ -254,11 +254,11 @@ Tree: - ParametersDeclaration (Rule): # 324..326 "()" - OpenParen (Token): "(" # 324..325 - CloseParen (Token): ")" # 325..326 - - FunctionAttributesList (Rule): # 326..386 " override(some.ident, /* empty */, other.arg.here,..." + - FunctionAttributes (Rule): # 326..386 " override(some.ident, /* empty */, other.arg.here,..." - OverrideSpecifier (Rule): # 326..386 " override(some.ident, /* empty */, other.arg.here,..." - OverrideKeyword (Token): "override" # 327..335 - OpenParen (Token): "(" # 335..336 - - IdentifierPathsList (Rule): # 336..347 "some.ident," + - OverridePaths (Rule): # 336..347 "some.ident," - IdentifierPath (Rule): # 336..346 "some.ident" - Identifier (Token): "some" # 336..340 - Period (Token): "." # 340..341 @@ -275,11 +275,11 @@ Tree: - ParametersDeclaration (Rule): # 410..412 "()" - OpenParen (Token): "(" # 410..411 - CloseParen (Token): ")" # 411..412 - - FunctionAttributesList (Rule): # 412..487 " override(some.ident, next.do.that, other.while, n..." + - FunctionAttributes (Rule): # 412..487 " override(some.ident, next.do.that, other.while, n..." - OverrideSpecifier (Rule): # 412..487 " override(some.ident, next.do.that, other.while, n..." - OverrideKeyword (Token): "override" # 413..421 - OpenParen (Token): "(" # 421..422 - - IdentifierPathsList (Rule): # 422..470 "some.ident, next.do.that, other.while, next.one," + - OverridePaths (Rule): # 422..470 "some.ident, next.do.that, other.while, next.one," - IdentifierPath (Rule): # 422..432 "some.ident" - Identifier (Token): "some" # 422..426 - Period (Token): "." # 426..427 @@ -309,11 +309,11 @@ Tree: - ParametersDeclaration (Rule): # 510..512 "()" - OpenParen (Token): "(" # 510..511 - CloseParen (Token): ")" # 511..512 - - FunctionAttributesList (Rule): # 512..558 " override(some., next.arg, next.one, ultimate)" + - FunctionAttributes (Rule): # 512..558 " override(some., next.arg, next.one, ultimate)" - OverrideSpecifier (Rule): # 512..558 " override(some., next.arg, next.one, ultimate)" - OverrideKeyword (Token): "override" # 513..521 - OpenParen (Token): "(" # 521..522 - - IdentifierPathsList (Rule): # 522..557 "some., next.arg, next.one, ultimate" + - OverridePaths (Rule): # 522..557 "some., next.arg, next.one, ultimate" - IdentifierPath (Rule): # 522..527 "some." - Identifier (Token): "some" # 522..526 - Period (Token): "." # 526..527 diff --git a/crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol b/crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/ContractMembersList/separated_recovery/input.sol rename to crates/solidity/testing/snapshots/cst_output/ContractMembers/separated_recovery/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/EnumDefinition/multiple_members/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/EnumDefinition/multiple_members/generated/0.4.11-success.yml index e81624bc7d..2ec4c6333a 100644 --- a/crates/solidity/testing/snapshots/cst_output/EnumDefinition/multiple_members/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/EnumDefinition/multiple_members/generated/0.4.11-success.yml @@ -14,7 +14,7 @@ Tree: - EnumKeyword (Token): "enum" # 0..4 - Identifier (Token): "Foo" # 5..8 - OpenBrace (Token): "{" # 9..10 - - IdentifiersList (Rule): # 11..40 " Bar1,\n Bar2,\n Bar3\n" + - EnumMembers (Rule): # 11..40 " Bar1,\n Bar2,\n Bar3\n" - Identifier (Token): "Bar1" # 15..19 - Comma (Token): "," # 19..20 - Identifier (Token): "Bar2" # 25..29 diff --git a/crates/solidity/testing/snapshots/cst_output/EventDefinition/transfer/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/EventDefinition/transfer/generated/0.4.11-failure.yml index a5f92dac8e..8b365413d9 100644 --- a/crates/solidity/testing/snapshots/cst_output/EventDefinition/transfer/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/EventDefinition/transfer/generated/0.4.11-failure.yml @@ -19,7 +19,7 @@ Tree: - Identifier (Token): "Transfer" # 6..14 - EventParametersDeclaration (Rule): # 14..71 "(address indexed from, address indexed to, uint256..." - OpenParen (Token): "(" # 14..15 - - EventParametersList (Rule): # 15..30 "address indexed" + - EventParameters (Rule): # 15..30 "address indexed" - EventParameter (Rule): # 15..30 "address indexed" - TypeName (Rule): # 15..22 "address" - AddressType (Rule): # 15..22 "address" diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/address_call/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/address_call/generated/0.4.11-success.yml index d1474ede65..0f7f820deb 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/address_call/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/address_call/generated/0.4.11-success.yml @@ -13,7 +13,7 @@ Tree: - AddressKeyword (Token): "address" # 0..7 - ArgumentsDeclaration (Rule): # 7..14 "(value)" - OpenParen (Token): "(" # 7..8 - - PositionalArgumentsList (Rule): # 8..13 "value" + - PositionalArguments (Rule): # 8..13 "value" - Expression (Rule): # 8..13 "value" - Identifier (Token): "value" # 8..13 - CloseParen (Token): ")" # 13..14 diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/address_payable_call/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/address_payable_call/generated/0.4.11-success.yml index d49e154919..dfbb82c056 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/address_payable_call/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/address_payable_call/generated/0.4.11-success.yml @@ -14,7 +14,7 @@ Tree: - PayableKeyword (Token): "payable" # 8..15 - ArgumentsDeclaration (Rule): # 15..22 "(value)" - OpenParen (Token): "(" # 15..16 - - PositionalArgumentsList (Rule): # 16..21 "value" + - PositionalArguments (Rule): # 16..21 "value" - Expression (Rule): # 16..21 "value" - Identifier (Token): "value" # 16..21 - CloseParen (Token): ")" # 21..22 diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/conditional_expression_nested_base/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/conditional_expression_nested_base/generated/0.4.11-success.yml index 2791370ebe..2d61701cf9 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/conditional_expression_nested_base/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/conditional_expression_nested_base/generated/0.4.11-success.yml @@ -11,7 +11,7 @@ Tree: - Expression (Rule): # 0..12 "(foo == bar)" - TupleExpression (Rule): # 0..12 "(foo == bar)" - OpenParen (Token): "(" # 0..1 - - TupleValuesList (Rule): # 1..11 "foo == bar" + - TupleValues (Rule): # 1..11 "foo == bar" - Expression (Rule): # 1..11 "foo == bar" - BinaryExpression (Rule): # 1..11 "foo == bar" - Expression (Rule): # 1..4 "foo" diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/conditional_expression_nested_conditions/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/conditional_expression_nested_conditions/generated/0.4.11-success.yml index 88caf9a361..5318082828 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/conditional_expression_nested_conditions/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/conditional_expression_nested_conditions/generated/0.4.11-success.yml @@ -14,7 +14,7 @@ Tree: - Expression (Rule): # 5..13 " (a + b)" - TupleExpression (Rule): # 5..13 " (a + b)" - OpenParen (Token): "(" # 6..7 - - TupleValuesList (Rule): # 7..12 "a + b" + - TupleValues (Rule): # 7..12 "a + b" - Expression (Rule): # 7..12 "a + b" - BinaryExpression (Rule): # 7..12 "a + b" - Expression (Rule): # 7..8 "a" @@ -27,7 +27,7 @@ Tree: - Expression (Rule): # 15..23 " (c + d)" - TupleExpression (Rule): # 15..23 " (c + d)" - OpenParen (Token): "(" # 16..17 - - TupleValuesList (Rule): # 17..22 "c + d" + - TupleValues (Rule): # 17..22 "c + d" - Expression (Rule): # 17..22 "c + d" - BinaryExpression (Rule): # 17..22 "c + d" - Expression (Rule): # 17..18 "c" diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/function_call/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/function_call/generated/0.4.11-success.yml index 8c86bbaf8e..c8e4c7a02a 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/function_call/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/function_call/generated/0.4.11-success.yml @@ -12,7 +12,7 @@ Tree: - Identifier (Token): "x" # 0..1 - ArgumentsDeclaration (Rule): # 1..7 "(1, 2)" - OpenParen (Token): "(" # 1..2 - - PositionalArgumentsList (Rule): # 2..6 "1, 2" + - PositionalArguments (Rule): # 2..6 "1, 2" - Expression (Rule): # 2..3 "1" - DecimalNumberExpression (Rule): # 2..3 "1" - DecimalLiteral (Token): "1" # 2..3 diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/function_call_argument_has_type_name_as_prefix/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/function_call_argument_has_type_name_as_prefix/generated/0.4.11-success.yml index d1f85453f7..96b8d7407b 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/function_call_argument_has_type_name_as_prefix/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/function_call_argument_has_type_name_as_prefix/generated/0.4.11-success.yml @@ -12,7 +12,7 @@ Tree: - Identifier (Token): "x" # 0..1 - ArgumentsDeclaration (Rule): # 1..13 "(interested)" - OpenParen (Token): "(" # 1..2 - - PositionalArgumentsList (Rule): # 2..12 "interested" + - PositionalArguments (Rule): # 2..12 "interested" - Expression (Rule): # 2..12 "interested" - Identifier (Token): "interested" # 2..12 - CloseParen (Token): ")" # 12..13 diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options/generated/0.6.2-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options/generated/0.6.2-success.yml index c6366331fe..3dacad7448 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options/generated/0.6.2-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options/generated/0.6.2-success.yml @@ -17,7 +17,7 @@ Tree: - FunctionCallOptions (Rule): # 3..21 "{value: 0, gas: 1}" - NamedArgumentsDeclaration (Rule): # 3..21 "{value: 0, gas: 1}" - OpenBrace (Token): "{" # 3..4 - - NamedArgumentsList (Rule): # 4..20 "value: 0, gas: 1" + - NamedArguments (Rule): # 4..20 "value: 0, gas: 1" - NamedArgument (Rule): # 4..12 "value: 0" - Identifier (Token): "value" # 4..9 - Colon (Token): ":" # 9..10 @@ -34,8 +34,8 @@ Tree: - CloseBrace (Token): "}" # 20..21 - ArgumentsDeclaration (Rule): # 21..25 '("")' - OpenParen (Token): "(" # 21..22 - - PositionalArgumentsList (Rule): # 22..24 '""' + - PositionalArguments (Rule): # 22..24 '""' - Expression (Rule): # 22..24 '""' - - AsciiStringLiteralsList (Rule): # 22..24 '""' + - AsciiStringLiterals (Rule): # 22..24 '""' - AsciiStringLiteral (Token): '""' # 22..24 - CloseParen (Token): ")" # 24..25 diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options_split/generated/0.6.2-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options_split/generated/0.6.2-success.yml index 2d85cac3ff..3322a55830 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options_split/generated/0.6.2-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/function_call_options_split/generated/0.6.2-success.yml @@ -17,7 +17,7 @@ Tree: - FunctionCallOptions (Rule): # 3..21 "{value: 0}{gas: 1}" - NamedArgumentsDeclaration (Rule): # 3..13 "{value: 0}" - OpenBrace (Token): "{" # 3..4 - - NamedArgumentsList (Rule): # 4..12 "value: 0" + - NamedArguments (Rule): # 4..12 "value: 0" - NamedArgument (Rule): # 4..12 "value: 0" - Identifier (Token): "value" # 4..9 - Colon (Token): ":" # 9..10 @@ -27,7 +27,7 @@ Tree: - CloseBrace (Token): "}" # 12..13 - NamedArgumentsDeclaration (Rule): # 13..21 "{gas: 1}" - OpenBrace (Token): "{" # 13..14 - - NamedArgumentsList (Rule): # 14..20 "gas: 1" + - NamedArguments (Rule): # 14..20 "gas: 1" - NamedArgument (Rule): # 14..20 "gas: 1" - Identifier (Token): "gas" # 14..17 - Colon (Token): ":" # 17..18 @@ -37,8 +37,8 @@ Tree: - CloseBrace (Token): "}" # 20..21 - ArgumentsDeclaration (Rule): # 21..25 '("")' - OpenParen (Token): "(" # 21..22 - - PositionalArgumentsList (Rule): # 22..24 '""' + - PositionalArguments (Rule): # 22..24 '""' - Expression (Rule): # 22..24 '""' - - AsciiStringLiteralsList (Rule): # 22..24 '""' + - AsciiStringLiterals (Rule): # 22..24 '""' - AsciiStringLiteral (Token): '""' # 22..24 - CloseParen (Token): ")" # 24..25 diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/identifier_call/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/identifier_call/generated/0.4.11-success.yml index 9f6c4ac337..1c04e25028 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/identifier_call/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/identifier_call/generated/0.4.11-success.yml @@ -12,7 +12,7 @@ Tree: - Identifier (Token): "function_name" # 0..13 - ArgumentsDeclaration (Rule): # 13..20 "(value)" - OpenParen (Token): "(" # 13..14 - - PositionalArgumentsList (Rule): # 14..19 "value" + - PositionalArguments (Rule): # 14..19 "value" - Expression (Rule): # 14..19 "value" - Identifier (Token): "value" # 14..19 - CloseParen (Token): ")" # 19..20 diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/payable_call/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/payable_call/generated/0.4.11-success.yml index 488cdd6cc9..db8c27986c 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/payable_call/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/payable_call/generated/0.4.11-success.yml @@ -13,7 +13,7 @@ Tree: - PayableKeyword (Token): "payable" # 0..7 - ArgumentsDeclaration (Rule): # 7..14 "(value)" - OpenParen (Token): "(" # 7..8 - - PositionalArgumentsList (Rule): # 8..13 "value" + - PositionalArguments (Rule): # 8..13 "value" - Expression (Rule): # 8..13 "value" - Identifier (Token): "value" # 8..13 - CloseParen (Token): ")" # 13..14 diff --git a/crates/solidity/testing/snapshots/cst_output/Expression/unicode_string_literal/generated/0.7.0-success.yml b/crates/solidity/testing/snapshots/cst_output/Expression/unicode_string_literal/generated/0.7.0-success.yml index 67cb94bfb3..d739846e79 100644 --- a/crates/solidity/testing/snapshots/cst_output/Expression/unicode_string_literal/generated/0.7.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/Expression/unicode_string_literal/generated/0.7.0-success.yml @@ -7,5 +7,5 @@ Errors: [] Tree: - Expression (Rule): # 0..25 'unicode"This Emoji: 😃"' - - UnicodeStringLiteralsList (Rule): # 0..25 'unicode"This Emoji: 😃"' + - UnicodeStringLiterals (Rule): # 0..25 'unicode"This Emoji: 😃"' - UnicodeStringLiteral (Token): 'unicode"This Emoji: 😃"' # 0..25 diff --git a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/constant_state_mutability/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/constant_state_mutability/generated/0.4.11-success.yml index 87bc523ab2..c36f3f21d3 100644 --- a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/constant_state_mutability/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/constant_state_mutability/generated/0.4.11-success.yml @@ -12,7 +12,7 @@ Tree: - ParametersDeclaration (Rule): # 10..12 "()" - OpenParen (Token): "(" # 10..11 - CloseParen (Token): ")" # 11..12 - - FunctionAttributesList (Rule): # 12..21 " constant" + - FunctionAttributes (Rule): # 12..21 " constant" - ConstantKeyword (Token): "constant" # 13..21 - Block (Rule): # 21..24 " {}" - OpenBrace (Token): "{" # 22..23 diff --git a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/from_contextual_keyword/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/from_contextual_keyword/generated/0.4.11-failure.yml index 842c29c973..c7ce64ee1c 100644 --- a/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/from_contextual_keyword/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/FunctionDefinition/from_contextual_keyword/generated/0.4.11-failure.yml @@ -19,20 +19,20 @@ Tree: - Identifier (Token): "transferFrom" # 9..21 - ParametersDeclaration (Rule): # 21..63 "(address from, address to, uint256 amount)" - OpenParen (Token): "(" # 21..22 - - ParametersList (Rule): # 22..29 "address" + - Parameters (Rule): # 22..29 "address" - Parameter (Rule): # 22..29 "address" - TypeName (Rule): # 22..29 "address" - AddressType (Rule): # 22..29 "address" - AddressKeyword (Token): "address" # 22..29 - SKIPPED (Token): "from, address to, uint256 amount" # 30..62 - CloseParen (Token): ")" # 62..63 - - FunctionAttributesList (Rule): # 63..72 " external" + - FunctionAttributes (Rule): # 63..72 " external" - ExternalKeyword (Token): "external" # 64..72 - ReturnsDeclaration (Rule): # 72..87 " returns (bool)" - ReturnsKeyword (Token): "returns" # 73..80 - ParametersDeclaration (Rule): # 80..87 " (bool)" - OpenParen (Token): "(" # 81..82 - - ParametersList (Rule): # 82..86 "bool" + - Parameters (Rule): # 82..86 "bool" - Parameter (Rule): # 82..86 "bool" - TypeName (Rule): # 82..86 "bool" - BoolKeyword (Token): "bool" # 82..86 diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/all_separated_pairs/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/all_separated_pairs/generated/0.4.11-success.yml similarity index 80% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/all_separated_pairs/generated/0.4.11-success.yml rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/all_separated_pairs/generated/0.4.11-success.yml index f252fe7343..9115eb8d31 100644 --- a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/all_separated_pairs/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/all_separated_pairs/generated/0.4.11-success.yml @@ -6,5 +6,5 @@ Source: > Errors: [] Tree: - - HexStringLiteralsList (Rule): # 0..28 'hex"12_34_56_78_90_ab_cd_ef"' + - HexStringLiterals (Rule): # 0..28 'hex"12_34_56_78_90_ab_cd_ef"' - HexStringLiteral (Token): 'hex"12_34_56_78_90_ab_cd_ef"' # 0..28 diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/all_separated_pairs/input.sol b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/all_separated_pairs/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/all_separated_pairs/input.sol rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/all_separated_pairs/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_consecutive_separators/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_consecutive_separators/generated/0.4.11-failure.yml similarity index 89% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_consecutive_separators/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_consecutive_separators/generated/0.4.11-failure.yml index ba606db538..262b5a4964 100644 --- a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_consecutive_separators/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_consecutive_separators/generated/0.4.11-failure.yml @@ -6,7 +6,7 @@ Source: > Errors: # 1 total - > Error: Expected HexStringLiteral. - ╭─[crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_consecutive_separators/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_consecutive_separators/input.sol:1:1] │ 1 │ hex"12__34" │ ─────┬───── diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_consecutive_separators/input.sol b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_consecutive_separators/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_consecutive_separators/input.sol rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_consecutive_separators/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_leading_separator/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_leading_separator/generated/0.4.11-failure.yml similarity index 90% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_leading_separator/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_leading_separator/generated/0.4.11-failure.yml index 8d651a3011..26861abce8 100644 --- a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_leading_separator/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_leading_separator/generated/0.4.11-failure.yml @@ -6,7 +6,7 @@ Source: > Errors: # 1 total - > Error: Expected HexStringLiteral. - ╭─[crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_leading_separator/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_leading_separator/input.sol:1:1] │ 1 │ hex"_1234" │ ─────┬──── diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_leading_separator/input.sol b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_leading_separator/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_leading_separator/input.sol rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_leading_separator/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_separator_after_single_char/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_separator_after_single_char/generated/0.4.11-failure.yml similarity index 88% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_separator_after_single_char/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_separator_after_single_char/generated/0.4.11-failure.yml index 6e40d5b43f..26a39746d2 100644 --- a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_separator_after_single_char/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_separator_after_single_char/generated/0.4.11-failure.yml @@ -6,7 +6,7 @@ Source: > Errors: # 1 total - > Error: Expected HexStringLiteral. - ╭─[crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_separator_after_single_char/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_separator_after_single_char/input.sol:1:1] │ 1 │ hex"1_2" │ ────┬─── diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_separator_after_single_char/input.sol b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_separator_after_single_char/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_separator_after_single_char/input.sol rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_separator_after_single_char/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_trailing_separator/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_trailing_separator/generated/0.4.11-failure.yml similarity index 90% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_trailing_separator/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_trailing_separator/generated/0.4.11-failure.yml index a056972f7f..d1b92cebfa 100644 --- a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_trailing_separator/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_trailing_separator/generated/0.4.11-failure.yml @@ -6,7 +6,7 @@ Source: > Errors: # 1 total - > Error: Expected HexStringLiteral. - ╭─[crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_trailing_separator/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_trailing_separator/input.sol:1:1] │ 1 │ hex"1234_" │ ─────┬──── diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_trailing_separator/input.sol b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_trailing_separator/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/invalid_trailing_separator/input.sol rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/invalid_trailing_separator/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/multiple/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/multiple/generated/0.4.11-success.yml similarity index 84% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/multiple/generated/0.4.11-success.yml rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/multiple/generated/0.4.11-success.yml index b6d578daf4..8e51518275 100644 --- a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/multiple/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/multiple/generated/0.4.11-success.yml @@ -6,6 +6,6 @@ Source: > Errors: [] Tree: - - HexStringLiteralsList (Rule): # 0..15 'hex"ab" hex''cd''' + - HexStringLiterals (Rule): # 0..15 'hex"ab" hex''cd''' - HexStringLiteral (Token): 'hex"ab"' # 0..7 - HexStringLiteral (Token): "hex'cd'" # 8..15 diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/multiple/input.sol b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/multiple/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/multiple/input.sol rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/multiple/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/no_separators/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/no_separators/generated/0.4.11-success.yml similarity index 81% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/no_separators/generated/0.4.11-success.yml rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/no_separators/generated/0.4.11-success.yml index 328fb546e8..584b6f03b8 100644 --- a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/no_separators/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/no_separators/generated/0.4.11-success.yml @@ -6,5 +6,5 @@ Source: > Errors: [] Tree: - - HexStringLiteralsList (Rule): # 0..21 'hex"1234567890abcdef"' + - HexStringLiterals (Rule): # 0..21 'hex"1234567890abcdef"' - HexStringLiteral (Token): 'hex"1234567890abcdef"' # 0..21 diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/no_separators/input.sol b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/no_separators/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/no_separators/input.sol rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/no_separators/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/single/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/single/generated/0.4.11-success.yml similarity index 83% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/single/generated/0.4.11-success.yml rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/single/generated/0.4.11-success.yml index 285eadc4f7..58ec5ae110 100644 --- a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/single/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/single/generated/0.4.11-success.yml @@ -6,5 +6,5 @@ Source: > Errors: [] Tree: - - HexStringLiteralsList (Rule): # 0..11 'hex"abcdef"' + - HexStringLiterals (Rule): # 0..11 'hex"abcdef"' - HexStringLiteral (Token): 'hex"abcdef"' # 0..11 diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/single/input.sol b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/single/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/single/input.sol rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/single/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/single_trailing_ident/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/single_trailing_ident/generated/0.4.11-failure.yml similarity index 83% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/single_trailing_ident/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/single_trailing_ident/generated/0.4.11-failure.yml index 86e5098e27..dc1934bd27 100644 --- a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/single_trailing_ident/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/single_trailing_ident/generated/0.4.11-failure.yml @@ -6,7 +6,7 @@ Source: > Errors: # 1 total - > Error: Expected HexStringLiteral. - ╭─[crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/single_trailing_ident/input.sol:1:8] + ╭─[crates/solidity/testing/snapshots/cst_output/HexStringLiterals/single_trailing_ident/input.sol:1:8] │ 1 │ hex"12"b │ ─┬ @@ -14,6 +14,6 @@ Errors: # 1 total ───╯ Tree: - - HexStringLiteralsList (Rule): # 0..9 'hex"12"b\n' + - HexStringLiterals (Rule): # 0..9 'hex"12"b\n' - HexStringLiteral (Token): 'hex"12"' # 0..7 - SKIPPED (Token): "b\n" # 7..9 diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/single_trailing_ident/input.sol b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/single_trailing_ident/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/single_trailing_ident/input.sol rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/single_trailing_ident/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/some_separated_pairs/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/some_separated_pairs/generated/0.4.11-success.yml similarity index 80% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/some_separated_pairs/generated/0.4.11-success.yml rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/some_separated_pairs/generated/0.4.11-success.yml index d89cf915da..e47d75fef3 100644 --- a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/some_separated_pairs/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/some_separated_pairs/generated/0.4.11-success.yml @@ -6,5 +6,5 @@ Source: > Errors: [] Tree: - - HexStringLiteralsList (Rule): # 0..24 'hex"1234_5678_90ab_cdef"' + - HexStringLiterals (Rule): # 0..24 'hex"1234_5678_90ab_cdef"' - HexStringLiteral (Token): 'hex"1234_5678_90ab_cdef"' # 0..24 diff --git a/crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/some_separated_pairs/input.sol b/crates/solidity/testing/snapshots/cst_output/HexStringLiterals/some_separated_pairs/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/HexStringLiteralsList/some_separated_pairs/input.sol rename to crates/solidity/testing/snapshots/cst_output/HexStringLiterals/some_separated_pairs/input.sol 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 f954111db8..9cd29e1ed5 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 @@ -10,7 +10,7 @@ Tree: - ImportKeyword (Token): "import" # 0..6 - DeconstructionImport (Rule): # 6..44 ' { A1 as A2, B1, C1 as C2 } from "foo"' - OpenBrace (Token): "{" # 7..8 - - DeconstructionImportSymbolsList (Rule): # 8..31 " A1 as A2, B1, C1 as C2" + - DeconstructionImportSymbols (Rule): # 8..31 " A1 as A2, B1, C1 as C2" - DeconstructionImportSymbol (Rule): # 8..17 " A1 as A2" - Identifier (Token): "A1" # 9..11 - AsKeyword (Token): "as" # 12..14 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 d62862b618..177ef3b8b3 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 @@ -10,7 +10,7 @@ Tree: - ImportKeyword (Token): "import" # 0..6 - DeconstructionImport (Rule): # 6..28 ' { x as y } from "foo"' - OpenBrace (Token): "{" # 7..8 - - DeconstructionImportSymbolsList (Rule): # 8..15 " x as y" + - DeconstructionImportSymbols (Rule): # 8..15 " x as y" - DeconstructionImportSymbol (Rule): # 8..15 " x as y" - Identifier (Token): "x" # 9..10 - AsKeyword (Token): "as" # 11..13 diff --git a/crates/solidity/testing/snapshots/cst_output/InterfaceDefinition/sample_counter/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/InterfaceDefinition/sample_counter/generated/0.4.11-success.yml index e96fd9328b..9df4550647 100644 --- a/crates/solidity/testing/snapshots/cst_output/InterfaceDefinition/sample_counter/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/InterfaceDefinition/sample_counter/generated/0.4.11-success.yml @@ -16,7 +16,7 @@ Tree: - InterfaceKeyword (Token): "interface" # 0..9 - Identifier (Token): "ICounter" # 10..18 - OpenBrace (Token): "{" # 19..20 - - InterfaceMembersList (Rule): # 21..171 " // returns the current count\n function coun..." + - InterfaceMembers (Rule): # 21..171 " // returns the current count\n function coun..." - FunctionDefinition (Rule): # 21..105 " // returns the current count\n function coun..." - LeadingTrivia (Rule): # 21..58 " // returns the current count\n " - SingleLineComment (Trivia): "// returns the current count" # 25..53 @@ -25,14 +25,14 @@ Tree: - ParametersDeclaration (Rule): # 72..74 "()" - OpenParen (Token): "(" # 72..73 - CloseParen (Token): ")" # 73..74 - - FunctionAttributesList (Rule): # 74..88 " external view" + - FunctionAttributes (Rule): # 74..88 " external view" - ExternalKeyword (Token): "external" # 75..83 - ViewKeyword (Token): "view" # 84..88 - ReturnsDeclaration (Rule): # 88..103 " returns (uint)" - ReturnsKeyword (Token): "returns" # 89..96 - ParametersDeclaration (Rule): # 96..103 " (uint)" - OpenParen (Token): "(" # 97..98 - - ParametersList (Rule): # 98..102 "uint" + - Parameters (Rule): # 98..102 "uint" - Parameter (Rule): # 98..102 "uint" - TypeName (Rule): # 98..102 "uint" - UnsignedIntegerType (Token): "uint" # 98..102 @@ -46,7 +46,7 @@ Tree: - ParametersDeclaration (Rule): # 158..160 "()" - OpenParen (Token): "(" # 158..159 - CloseParen (Token): ")" # 159..160 - - FunctionAttributesList (Rule): # 160..169 " external" + - FunctionAttributes (Rule): # 160..169 " external" - ExternalKeyword (Token): "external" # 161..169 - Semicolon (Token): ";" # 169..170 - CloseBrace (Token): "}" # 171..172 diff --git a/crates/solidity/testing/snapshots/cst_output/PragmaDirective/version/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/PragmaDirective/version/generated/0.4.11-success.yml index b5742cfc7a..a19426e713 100644 --- a/crates/solidity/testing/snapshots/cst_output/PragmaDirective/version/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/PragmaDirective/version/generated/0.4.11-success.yml @@ -10,7 +10,7 @@ Tree: - PragmaKeyword (Token): "pragma" # 0..6 - VersionPragma (Rule): # 6..21 " solidity 1.0.0" - SolidityKeyword (Token): "solidity" # 7..15 - - VersionPragmaExpressionsList (Rule): # 15..21 " 1.0.0" + - VersionPragmaExpressions (Rule): # 15..21 " 1.0.0" - VersionPragmaExpression (Rule): # 15..21 " 1.0.0" - VersionPragmaSpecifier (Rule): # 15..21 " 1.0.0" - VersionPragmaValue (Token): "1" # 16..17 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.4.11-failure.yml index 0ebf24d1bd..f2630f65d2 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.4.11-failure.yml @@ -25,18 +25,18 @@ Errors: # 1 total Tree: - SourceUnit (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - - SourceUnitMembersList (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." + - SourceUnitMembers (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - LibraryDefinition (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - LibraryKeyword (Token): "library" # 0..7 - Identifier (Token): "SafeMath" # 8..16 - OpenBrace (Token): "{" # 17..18 - - LibraryMembersList (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." + - LibraryMembers (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." - FunctionDefinition (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." - FunctionKeyword (Token): "function" # 21..29 - Identifier (Token): "tryAdd" # 30..36 - ParametersDeclaration (Rule): # 36..58 "(uint256 a, uint256 b)" - OpenParen (Token): "(" # 36..37 - - ParametersList (Rule): # 37..57 "uint256 a, uint256 b" + - Parameters (Rule): # 37..57 "uint256 a, uint256 b" - Parameter (Rule): # 37..46 "uint256 a" - TypeName (Rule): # 37..44 "uint256" - UnsignedIntegerType (Token): "uint256" # 37..44 @@ -47,14 +47,14 @@ Tree: - UnsignedIntegerType (Token): "uint256" # 48..55 - Identifier (Token): "b" # 56..57 - CloseParen (Token): ")" # 57..58 - - FunctionAttributesList (Rule): # 58..72 " internal pure" + - FunctionAttributes (Rule): # 58..72 " internal pure" - InternalKeyword (Token): "internal" # 59..67 - PureKeyword (Token): "pure" # 68..72 - ReturnsDeclaration (Rule): # 72..96 " returns (bool, uint256)" - ReturnsKeyword (Token): "returns" # 73..80 - ParametersDeclaration (Rule): # 80..96 " (bool, uint256)" - OpenParen (Token): "(" # 81..82 - - ParametersList (Rule): # 82..95 "bool, uint256" + - Parameters (Rule): # 82..95 "bool, uint256" - Parameter (Rule): # 82..86 "bool" - TypeName (Rule): # 82..86 "bool" - BoolKeyword (Token): "bool" # 82..86 @@ -65,7 +65,7 @@ Tree: - CloseParen (Token): ")" # 95..96 - Block (Rule): # 96..210 " {\n unchecked {\n uint256 c = a + b;\n ..." - OpenBrace (Token): "{" # 97..98 - - StatementsList (Rule): # 99..113 " unchecked " + - Statements (Rule): # 99..113 " unchecked " - ExpressionStatement (Rule): # 99..113 " unchecked " - Expression (Rule): # 99..112 " unchecked" - Identifier (Token): "unchecked" # 103..112 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.5.0-failure.yml index 4a7edf125f..252a9f95ee 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.5.0-failure.yml @@ -25,18 +25,18 @@ Errors: # 1 total Tree: - SourceUnit (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - - SourceUnitMembersList (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." + - SourceUnitMembers (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - LibraryDefinition (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - LibraryKeyword (Token): "library" # 0..7 - Identifier (Token): "SafeMath" # 8..16 - OpenBrace (Token): "{" # 17..18 - - LibraryMembersList (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." + - LibraryMembers (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." - FunctionDefinition (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." - FunctionKeyword (Token): "function" # 21..29 - Identifier (Token): "tryAdd" # 30..36 - ParametersDeclaration (Rule): # 36..58 "(uint256 a, uint256 b)" - OpenParen (Token): "(" # 36..37 - - ParametersList (Rule): # 37..57 "uint256 a, uint256 b" + - Parameters (Rule): # 37..57 "uint256 a, uint256 b" - Parameter (Rule): # 37..46 "uint256 a" - TypeName (Rule): # 37..44 "uint256" - UnsignedIntegerType (Token): "uint256" # 37..44 @@ -47,14 +47,14 @@ Tree: - UnsignedIntegerType (Token): "uint256" # 48..55 - Identifier (Token): "b" # 56..57 - CloseParen (Token): ")" # 57..58 - - FunctionAttributesList (Rule): # 58..72 " internal pure" + - FunctionAttributes (Rule): # 58..72 " internal pure" - InternalKeyword (Token): "internal" # 59..67 - PureKeyword (Token): "pure" # 68..72 - ReturnsDeclaration (Rule): # 72..96 " returns (bool, uint256)" - ReturnsKeyword (Token): "returns" # 73..80 - ParametersDeclaration (Rule): # 80..96 " (bool, uint256)" - OpenParen (Token): "(" # 81..82 - - ParametersList (Rule): # 82..95 "bool, uint256" + - Parameters (Rule): # 82..95 "bool, uint256" - Parameter (Rule): # 82..86 "bool" - TypeName (Rule): # 82..86 "bool" - BoolKeyword (Token): "bool" # 82..86 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.5.3-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.5.3-failure.yml index a6231d0612..652217465d 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.5.3-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.5.3-failure.yml @@ -25,18 +25,18 @@ Errors: # 1 total Tree: - SourceUnit (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - - SourceUnitMembersList (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." + - SourceUnitMembers (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - LibraryDefinition (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - LibraryKeyword (Token): "library" # 0..7 - Identifier (Token): "SafeMath" # 8..16 - OpenBrace (Token): "{" # 17..18 - - LibraryMembersList (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." + - LibraryMembers (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." - FunctionDefinition (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." - FunctionKeyword (Token): "function" # 21..29 - Identifier (Token): "tryAdd" # 30..36 - ParametersDeclaration (Rule): # 36..58 "(uint256 a, uint256 b)" - OpenParen (Token): "(" # 36..37 - - ParametersList (Rule): # 37..57 "uint256 a, uint256 b" + - Parameters (Rule): # 37..57 "uint256 a, uint256 b" - Parameter (Rule): # 37..46 "uint256 a" - TypeName (Rule): # 37..44 "uint256" - UnsignedIntegerType (Token): "uint256" # 37..44 @@ -47,14 +47,14 @@ Tree: - UnsignedIntegerType (Token): "uint256" # 48..55 - Identifier (Token): "b" # 56..57 - CloseParen (Token): ")" # 57..58 - - FunctionAttributesList (Rule): # 58..72 " internal pure" + - FunctionAttributes (Rule): # 58..72 " internal pure" - InternalKeyword (Token): "internal" # 59..67 - PureKeyword (Token): "pure" # 68..72 - ReturnsDeclaration (Rule): # 72..96 " returns (bool, uint256)" - ReturnsKeyword (Token): "returns" # 73..80 - ParametersDeclaration (Rule): # 80..96 " (bool, uint256)" - OpenParen (Token): "(" # 81..82 - - ParametersList (Rule): # 82..95 "bool, uint256" + - Parameters (Rule): # 82..95 "bool, uint256" - Parameter (Rule): # 82..86 "bool" - TypeName (Rule): # 82..86 "bool" - BoolKeyword (Token): "bool" # 82..86 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.6.0-failure.yml index 4523781b0c..80dae6bfc1 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.6.0-failure.yml @@ -25,18 +25,18 @@ Errors: # 1 total Tree: - SourceUnit (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - - SourceUnitMembersList (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." + - SourceUnitMembers (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - LibraryDefinition (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - LibraryKeyword (Token): "library" # 0..7 - Identifier (Token): "SafeMath" # 8..16 - OpenBrace (Token): "{" # 17..18 - - LibraryMembersList (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." + - LibraryMembers (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." - FunctionDefinition (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." - FunctionKeyword (Token): "function" # 21..29 - Identifier (Token): "tryAdd" # 30..36 - ParametersDeclaration (Rule): # 36..58 "(uint256 a, uint256 b)" - OpenParen (Token): "(" # 36..37 - - ParametersList (Rule): # 37..57 "uint256 a, uint256 b" + - Parameters (Rule): # 37..57 "uint256 a, uint256 b" - Parameter (Rule): # 37..46 "uint256 a" - TypeName (Rule): # 37..44 "uint256" - UnsignedIntegerType (Token): "uint256" # 37..44 @@ -47,14 +47,14 @@ Tree: - UnsignedIntegerType (Token): "uint256" # 48..55 - Identifier (Token): "b" # 56..57 - CloseParen (Token): ")" # 57..58 - - FunctionAttributesList (Rule): # 58..72 " internal pure" + - FunctionAttributes (Rule): # 58..72 " internal pure" - InternalKeyword (Token): "internal" # 59..67 - PureKeyword (Token): "pure" # 68..72 - ReturnsDeclaration (Rule): # 72..96 " returns (bool, uint256)" - ReturnsKeyword (Token): "returns" # 73..80 - ParametersDeclaration (Rule): # 80..96 " (bool, uint256)" - OpenParen (Token): "(" # 81..82 - - ParametersList (Rule): # 82..95 "bool, uint256" + - Parameters (Rule): # 82..95 "bool, uint256" - Parameter (Rule): # 82..86 "bool" - TypeName (Rule): # 82..86 "bool" - BoolKeyword (Token): "bool" # 82..86 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.7.0-failure.yml index 092cfa3712..108ab78673 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.7.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.7.0-failure.yml @@ -25,18 +25,18 @@ Errors: # 1 total Tree: - SourceUnit (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - - SourceUnitMembersList (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." + - SourceUnitMembers (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - LibraryDefinition (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - LibraryKeyword (Token): "library" # 0..7 - Identifier (Token): "SafeMath" # 8..16 - OpenBrace (Token): "{" # 17..18 - - LibraryMembersList (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." + - LibraryMembers (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." - FunctionDefinition (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." - FunctionKeyword (Token): "function" # 21..29 - Identifier (Token): "tryAdd" # 30..36 - ParametersDeclaration (Rule): # 36..58 "(uint256 a, uint256 b)" - OpenParen (Token): "(" # 36..37 - - ParametersList (Rule): # 37..57 "uint256 a, uint256 b" + - Parameters (Rule): # 37..57 "uint256 a, uint256 b" - Parameter (Rule): # 37..46 "uint256 a" - TypeName (Rule): # 37..44 "uint256" - UnsignedIntegerType (Token): "uint256" # 37..44 @@ -47,14 +47,14 @@ Tree: - UnsignedIntegerType (Token): "uint256" # 48..55 - Identifier (Token): "b" # 56..57 - CloseParen (Token): ")" # 57..58 - - FunctionAttributesList (Rule): # 58..72 " internal pure" + - FunctionAttributes (Rule): # 58..72 " internal pure" - InternalKeyword (Token): "internal" # 59..67 - PureKeyword (Token): "pure" # 68..72 - ReturnsDeclaration (Rule): # 72..96 " returns (bool, uint256)" - ReturnsKeyword (Token): "returns" # 73..80 - ParametersDeclaration (Rule): # 80..96 " (bool, uint256)" - OpenParen (Token): "(" # 81..82 - - ParametersList (Rule): # 82..95 "bool, uint256" + - Parameters (Rule): # 82..95 "bool, uint256" - Parameter (Rule): # 82..86 "bool" - TypeName (Rule): # 82..86 "bool" - BoolKeyword (Token): "bool" # 82..86 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.8.0-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.8.0-success.yml index 04c75ca87b..c06af8546c 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.8.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/SafeMath/generated/0.8.0-success.yml @@ -15,18 +15,18 @@ Errors: [] Tree: - SourceUnit (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - - SourceUnitMembersList (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." + - SourceUnitMembers (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - LibraryDefinition (Rule): # 0..212 "library SafeMath {\n function tryAdd(uint256 a, ui..." - LibraryKeyword (Token): "library" # 0..7 - Identifier (Token): "SafeMath" # 8..16 - OpenBrace (Token): "{" # 17..18 - - LibraryMembersList (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." + - LibraryMembers (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." - FunctionDefinition (Rule): # 19..210 " function tryAdd(uint256 a, uint256 b) internal p..." - FunctionKeyword (Token): "function" # 21..29 - Identifier (Token): "tryAdd" # 30..36 - ParametersDeclaration (Rule): # 36..58 "(uint256 a, uint256 b)" - OpenParen (Token): "(" # 36..37 - - ParametersList (Rule): # 37..57 "uint256 a, uint256 b" + - Parameters (Rule): # 37..57 "uint256 a, uint256 b" - Parameter (Rule): # 37..46 "uint256 a" - TypeName (Rule): # 37..44 "uint256" - UnsignedIntegerType (Token): "uint256" # 37..44 @@ -37,14 +37,14 @@ Tree: - UnsignedIntegerType (Token): "uint256" # 48..55 - Identifier (Token): "b" # 56..57 - CloseParen (Token): ")" # 57..58 - - FunctionAttributesList (Rule): # 58..72 " internal pure" + - FunctionAttributes (Rule): # 58..72 " internal pure" - InternalKeyword (Token): "internal" # 59..67 - PureKeyword (Token): "pure" # 68..72 - ReturnsDeclaration (Rule): # 72..96 " returns (bool, uint256)" - ReturnsKeyword (Token): "returns" # 73..80 - ParametersDeclaration (Rule): # 80..96 " (bool, uint256)" - OpenParen (Token): "(" # 81..82 - - ParametersList (Rule): # 82..95 "bool, uint256" + - Parameters (Rule): # 82..95 "bool, uint256" - Parameter (Rule): # 82..86 "bool" - TypeName (Rule): # 82..86 "bool" - BoolKeyword (Token): "bool" # 82..86 @@ -55,12 +55,12 @@ Tree: - CloseParen (Token): ")" # 95..96 - Block (Rule): # 96..210 " {\n unchecked {\n uint256 c = a + b;\n ..." - OpenBrace (Token): "{" # 97..98 - - StatementsList (Rule): # 99..206 " unchecked {\n uint256 c = a + b;\n if ..." + - Statements (Rule): # 99..206 " unchecked {\n uint256 c = a + b;\n if ..." - UncheckedBlock (Rule): # 99..206 " unchecked {\n uint256 c = a + b;\n if ..." - UncheckedKeyword (Token): "unchecked" # 103..112 - Block (Rule): # 112..206 " {\n uint256 c = a + b;\n if (c < a) retur..." - OpenBrace (Token): "{" # 113..114 - - StatementsList (Rule): # 115..200 " uint256 c = a + b;\n if (c < a) return (..." + - Statements (Rule): # 115..200 " uint256 c = a + b;\n if (c < a) return (..." - VariableDeclarationStatement (Rule): # 115..140 " uint256 c = a + b;\n" - VariableDeclaration (Rule): # 115..130 " uint256 c" - TypeName (Rule): # 115..128 " uint256" @@ -91,7 +91,7 @@ Tree: - Expression (Rule): # 163..174 " (false, 0)" - TupleExpression (Rule): # 163..174 " (false, 0)" - OpenParen (Token): "(" # 164..165 - - TupleValuesList (Rule): # 165..173 "false, 0" + - TupleValues (Rule): # 165..173 "false, 0" - Expression (Rule): # 165..170 "false" - FalseKeyword (Token): "false" # 165..170 - Comma (Token): "," # 170..171 @@ -105,7 +105,7 @@ Tree: - Expression (Rule): # 188..198 " (true, c)" - TupleExpression (Rule): # 188..198 " (true, c)" - OpenParen (Token): "(" # 189..190 - - TupleValuesList (Rule): # 190..197 "true, c" + - TupleValues (Rule): # 190..197 "true, c" - Expression (Rule): # 190..194 "true" - TrueKeyword (Token): "true" # 190..194 - Comma (Token): "," # 194..195 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia/generated/0.4.11-success.yml index 20f76a55e1..ef22e77008 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/end_of_file_trivia/generated/0.4.11-success.yml @@ -12,7 +12,7 @@ Errors: [] Tree: - SourceUnit (Rule): # 0..71 "contract X { }\n \n// spaces before this\n\n/* new ..." - - SourceUnitMembersList (Rule): # 0..15 "contract X { }\n" + - SourceUnitMembers (Rule): # 0..15 "contract X { }\n" - ContractDefinition (Rule): # 0..15 "contract X { }\n" - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "X" # 9..10 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.4.11-failure.yml index 1bd97cba98..9a7d2d441b 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.4.11-failure.yml @@ -41,12 +41,12 @@ Errors: # 1 total Tree: - SourceUnit (Rule): # 0..243 'pragma solidity 0.0.0;\n\nimport "foo.sol";\n\nusing A...' - - SourceUnitMembersList (Rule): # 0..42 'pragma solidity 0.0.0;\n\nimport "foo.sol";\n' + - SourceUnitMembers (Rule): # 0..42 'pragma solidity 0.0.0;\n\nimport "foo.sol";\n' - PragmaDirective (Rule): # 0..23 "pragma solidity 0.0.0;\n" - PragmaKeyword (Token): "pragma" # 0..6 - VersionPragma (Rule): # 6..21 " solidity 0.0.0" - SolidityKeyword (Token): "solidity" # 7..15 - - VersionPragmaExpressionsList (Rule): # 15..21 " 0.0.0" + - VersionPragmaExpressions (Rule): # 15..21 " 0.0.0" - VersionPragmaExpression (Rule): # 15..21 " 0.0.0" - VersionPragmaSpecifier (Rule): # 15..21 " 0.0.0" - VersionPragmaValue (Token): "0" # 16..17 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml index 0262b08709..82234f9e86 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml @@ -39,12 +39,12 @@ Errors: # 1 total Tree: - SourceUnit (Rule): # 0..243 'pragma solidity 0.0.0;\n\nimport "foo.sol";\n\nusing A...' - - SourceUnitMembersList (Rule): # 0..217 'pragma solidity 0.0.0;\n\nimport "foo.sol";\n\nusing A...' + - SourceUnitMembers (Rule): # 0..217 'pragma solidity 0.0.0;\n\nimport "foo.sol";\n\nusing A...' - PragmaDirective (Rule): # 0..23 "pragma solidity 0.0.0;\n" - PragmaKeyword (Token): "pragma" # 0..6 - VersionPragma (Rule): # 6..21 " solidity 0.0.0" - SolidityKeyword (Token): "solidity" # 7..15 - - VersionPragmaExpressionsList (Rule): # 15..21 " 0.0.0" + - VersionPragmaExpressions (Rule): # 15..21 " 0.0.0" - VersionPragmaExpression (Rule): # 15..21 " 0.0.0" - VersionPragmaSpecifier (Rule): # 15..21 " 0.0.0" - VersionPragmaValue (Token): "0" # 16..17 @@ -108,7 +108,7 @@ Tree: - ParametersDeclaration (Rule): # 167..169 "()" - OpenParen (Token): "(" # 167..168 - CloseParen (Token): ")" # 168..169 - - FunctionAttributesList (Rule): # 169..176 " public" + - FunctionAttributes (Rule): # 169..176 " public" - PublicKeyword (Token): "public" # 170..176 - Block (Rule): # 176..181 " { }\n" - OpenBrace (Token): "{" # 177..178 @@ -118,7 +118,7 @@ Tree: - Identifier (Token): "E1" # 188..190 - ErrorParametersDeclaration (Rule): # 190..198 "(string)" - OpenParen (Token): "(" # 190..191 - - ErrorParametersList (Rule): # 191..197 "string" + - ErrorParameters (Rule): # 191..197 "string" - ErrorParameter (Rule): # 191..197 "string" - TypeName (Rule): # 191..197 "string" - StringKeyword (Token): "string" # 191..197 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml index 01121b182a..b4b2f4bbca 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.22-success.yml @@ -31,12 +31,12 @@ Errors: [] Tree: - SourceUnit (Rule): # 0..243 'pragma solidity 0.0.0;\n\nimport "foo.sol";\n\nusing A...' - - SourceUnitMembersList (Rule): # 0..243 'pragma solidity 0.0.0;\n\nimport "foo.sol";\n\nusing A...' + - SourceUnitMembers (Rule): # 0..243 'pragma solidity 0.0.0;\n\nimport "foo.sol";\n\nusing A...' - PragmaDirective (Rule): # 0..23 "pragma solidity 0.0.0;\n" - PragmaKeyword (Token): "pragma" # 0..6 - VersionPragma (Rule): # 6..21 " solidity 0.0.0" - SolidityKeyword (Token): "solidity" # 7..15 - - VersionPragmaExpressionsList (Rule): # 15..21 " 0.0.0" + - VersionPragmaExpressions (Rule): # 15..21 " 0.0.0" - VersionPragmaExpression (Rule): # 15..21 " 0.0.0" - VersionPragmaSpecifier (Rule): # 15..21 " 0.0.0" - VersionPragmaValue (Token): "0" # 16..17 @@ -100,7 +100,7 @@ Tree: - ParametersDeclaration (Rule): # 167..169 "()" - OpenParen (Token): "(" # 167..168 - CloseParen (Token): ")" # 168..169 - - FunctionAttributesList (Rule): # 169..176 " public" + - FunctionAttributes (Rule): # 169..176 " public" - PublicKeyword (Token): "public" # 170..176 - Block (Rule): # 176..181 " { }\n" - OpenBrace (Token): "{" # 177..178 @@ -110,7 +110,7 @@ Tree: - Identifier (Token): "E1" # 188..190 - ErrorParametersDeclaration (Rule): # 190..198 "(string)" - OpenParen (Token): "(" # 190..191 - - ErrorParametersList (Rule): # 191..197 "string" + - ErrorParameters (Rule): # 191..197 "string" - ErrorParameter (Rule): # 191..197 "string" - TypeName (Rule): # 191..197 "string" - StringKeyword (Token): "string" # 191..197 @@ -127,7 +127,7 @@ Tree: - Identifier (Token): "E1" # 224..226 - EventParametersDeclaration (Rule): # 226..241 "(uint256 value)" - OpenParen (Token): "(" # 226..227 - - EventParametersList (Rule): # 227..240 "uint256 value" + - EventParameters (Rule): # 227..240 "uint256 value" - EventParameter (Rule): # 227..240 "uint256 value" - TypeName (Rule): # 227..234 "uint256" - UnsignedIntegerType (Token): "uint256" # 227..234 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/partial_definition/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/partial_definition/generated/0.4.11-failure.yml index e735e099da..d7ec2df0ec 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/partial_definition/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/partial_definition/generated/0.4.11-failure.yml @@ -16,12 +16,12 @@ Errors: # 1 total Tree: - SourceUnit (Rule): # 0..28 "contract Sample {\n function" - - SourceUnitMembersList (Rule): # 0..28 "contract Sample {\n function" + - SourceUnitMembers (Rule): # 0..28 "contract Sample {\n function" - ContractDefinition (Rule): # 0..28 "contract Sample {\n function" - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "Sample" # 9..15 - OpenBrace (Token): "{" # 16..17 - - ContractMembersList (Rule): # 18..28 " function" + - ContractMembers (Rule): # 18..28 " function" - FunctionDefinition (Rule): # 18..28 " function" - FunctionKeyword (Token): "function" # 20..28 - SKIPPED (Token): "" # 28..28 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_event/generated/0.8.22-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_event/generated/0.8.22-success.yml index e201ec4fb1..a23e5c0275 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_event/generated/0.8.22-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_event/generated/0.8.22-success.yml @@ -7,13 +7,13 @@ Errors: [] Tree: - SourceUnit (Rule): # 0..25 "event E1(uint256 value);\n" - - SourceUnitMembersList (Rule): # 0..25 "event E1(uint256 value);\n" + - SourceUnitMembers (Rule): # 0..25 "event E1(uint256 value);\n" - EventDefinition (Rule): # 0..25 "event E1(uint256 value);\n" - EventKeyword (Token): "event" # 0..5 - Identifier (Token): "E1" # 6..8 - EventParametersDeclaration (Rule): # 8..23 "(uint256 value)" - OpenParen (Token): "(" # 8..9 - - EventParametersList (Rule): # 9..22 "uint256 value" + - EventParameters (Rule): # 9..22 "uint256 value" - EventParameter (Rule): # 9..22 "uint256 value" - TypeName (Rule): # 9..16 "uint256" - UnsignedIntegerType (Token): "uint256" # 9..16 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_function/generated/0.7.1-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_function/generated/0.7.1-success.yml index 815e86f99e..be79fb484a 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_function/generated/0.7.1-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/top_level_function/generated/0.7.1-success.yml @@ -7,7 +7,7 @@ Errors: [] Tree: - SourceUnit (Rule): # 0..18 "function foo() { }" - - SourceUnitMembersList (Rule): # 0..18 "function foo() { }" + - SourceUnitMembers (Rule): # 0..18 "function foo() { }" - FunctionDefinition (Rule): # 0..18 "function foo() { }" - FunctionKeyword (Token): "function" # 0..8 - Identifier (Token): "foo" # 9..12 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia/generated/0.4.11-success.yml index 48415b2c88..d78e9d3149 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/trailing_trivia/generated/0.4.11-success.yml @@ -14,7 +14,7 @@ Errors: [] Tree: - SourceUnit (Rule): # 0..148 "contract First {}\n\n\n// Newlines both before and af..." - - SourceUnitMembersList (Rule): # 0..148 "contract First {}\n\n\n// Newlines both before and af..." + - SourceUnitMembers (Rule): # 0..148 "contract First {}\n\n\n// Newlines both before and af..." - ContractDefinition (Rule): # 0..18 "contract First {}\n" - ContractKeyword (Token): "contract" # 0..8 - Identifier (Token): "First" # 9..14 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.4.11-failure.yml index 147d1ee2c7..b497560851 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.4.11-failure.yml @@ -39,14 +39,14 @@ Errors: # 1 total Tree: - SourceUnit (Rule): # 0..793 "// SPDX-License-Identifier: MIT\npragma solidity ^0..." - - SourceUnitMembersList (Rule): # 0..56 "// SPDX-License-Identifier: MIT\npragma solidity ^0..." + - SourceUnitMembers (Rule): # 0..56 "// SPDX-License-Identifier: MIT\npragma solidity ^0..." - PragmaDirective (Rule): # 0..56 "// SPDX-License-Identifier: MIT\npragma solidity ^0..." - LeadingTrivia (Rule): # 0..32 "// SPDX-License-Identifier: MIT\n" - SingleLineComment (Trivia): "// SPDX-License-Identifier: MIT" # 0..31 - PragmaKeyword (Token): "pragma" # 32..38 - VersionPragma (Rule): # 38..54 " solidity ^0.8.0" - SolidityKeyword (Token): "solidity" # 39..47 - - VersionPragmaExpressionsList (Rule): # 47..54 " ^0.8.0" + - VersionPragmaExpressions (Rule): # 47..54 " ^0.8.0" - VersionPragmaExpression (Rule): # 47..54 " ^0.8.0" - VersionPragmaUnaryExpression (Rule): # 47..54 " ^0.8.0" - Caret (Token): "^" # 48..49 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml index c7dd8b6d9b..5155182311 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.8.13-success.yml @@ -29,14 +29,14 @@ Errors: [] Tree: - SourceUnit (Rule): # 0..793 "// SPDX-License-Identifier: MIT\npragma solidity ^0..." - - SourceUnitMembersList (Rule): # 0..793 "// SPDX-License-Identifier: MIT\npragma solidity ^0..." + - SourceUnitMembers (Rule): # 0..793 "// SPDX-License-Identifier: MIT\npragma solidity ^0..." - PragmaDirective (Rule): # 0..56 "// SPDX-License-Identifier: MIT\npragma solidity ^0..." - LeadingTrivia (Rule): # 0..32 "// SPDX-License-Identifier: MIT\n" - SingleLineComment (Trivia): "// SPDX-License-Identifier: MIT" # 0..31 - PragmaKeyword (Token): "pragma" # 32..38 - VersionPragma (Rule): # 38..54 " solidity ^0.8.0" - SolidityKeyword (Token): "solidity" # 39..47 - - VersionPragmaExpressionsList (Rule): # 47..54 " ^0.8.0" + - VersionPragmaExpressions (Rule): # 47..54 " ^0.8.0" - VersionPragmaExpression (Rule): # 47..54 " ^0.8.0" - VersionPragmaUnaryExpression (Rule): # 47..54 " ^0.8.0" - Caret (Token): "^" # 48..49 @@ -74,7 +74,7 @@ Tree: - StructKeyword (Token): "struct" # 643..649 - Identifier (Token): "Envelope" # 650..658 - OpenBrace (Token): "{" # 659..660 - - StructMembersList (Rule): # 661..791 " uint256 nonce;\n address origin;\n address desti..." + - StructMembers (Rule): # 661..791 " uint256 nonce;\n address origin;\n address desti..." - StructMember (Rule): # 661..678 " uint256 nonce;\n" - TypeName (Rule): # 661..670 " uint256" - UnsignedIntegerType (Token): "uint256" # 663..670 diff --git a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.4.11-failure.yml similarity index 91% rename from crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.4.11-failure.yml index db80aa56b1..c9109d3fce 100644 --- a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.4.11-failure.yml @@ -8,7 +8,7 @@ Source: > Errors: # 2 total - > Error: Expected Semicolon. - ╭─[crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol:2:7] + ╭─[crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/input.sol:2:7] │ 2 │ throw invalid ; │ ────┬─── @@ -16,7 +16,7 @@ Errors: # 2 total ───╯ - > Error: Expected Semicolon. - ╭─[crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol:3:16] + ╭─[crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/input.sol:3:16] │ 3 │ { 1 * 2; 3 * b invalid; } │ ───┬─── @@ -24,14 +24,14 @@ Errors: # 2 total ───╯ Tree: - - StatementsList (Rule): # 0..43 "\nthrow invalid ;\n{ 1 * 2; 3 * b invalid; }\n" + - Statements (Rule): # 0..43 "\nthrow invalid ;\n{ 1 * 2; 3 * b invalid; }\n" - ThrowStatement (Rule): # 0..17 "\nthrow invalid ;\n" - ThrowKeyword (Token): "throw" # 1..6 - SKIPPED (Token): "invalid " # 7..15 - Semicolon (Token): ";" # 15..16 - Block (Rule): # 17..43 "{ 1 * 2; 3 * b invalid; }\n" - OpenBrace (Token): "{" # 17..18 - - StatementsList (Rule): # 18..40 " 1 * 2; 3 * b invalid;" + - Statements (Rule): # 18..40 " 1 * 2; 3 * b invalid;" - ExpressionStatement (Rule): # 18..25 " 1 * 2;" - Expression (Rule): # 18..24 " 1 * 2" - BinaryExpression (Rule): # 18..24 " 1 * 2" diff --git a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.5.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.5.0-failure.yml similarity index 96% rename from crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.5.0-failure.yml rename to crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.5.0-failure.yml index d72fc195d9..ad51640d4e 100644 --- a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.5.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.5.0-failure.yml @@ -8,7 +8,7 @@ Source: > Errors: # 1 total - > Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword. - ╭─[crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/input.sol:1:1] │ 1 │ ╭─▶ ┆ ┆ diff --git a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.5.3-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.5.3-failure.yml similarity index 97% rename from crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.5.3-failure.yml rename to crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.5.3-failure.yml index 436b161b09..114e1bcb03 100644 --- a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.5.3-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.5.3-failure.yml @@ -8,7 +8,7 @@ Source: > Errors: # 1 total - > Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword. - ╭─[crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/input.sol:1:1] │ 1 │ ╭─▶ ┆ ┆ diff --git a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.6.0-failure.yml similarity index 97% rename from crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.6.0-failure.yml rename to crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.6.0-failure.yml index aaba004eb5..70b50738c9 100644 --- a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.6.0-failure.yml @@ -8,7 +8,7 @@ Source: > Errors: # 1 total - > Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnsignedFixedType or UnsignedIntegerType or WhileKeyword. - ╭─[crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/input.sol:1:1] │ 1 │ ╭─▶ ┆ ┆ diff --git a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.7.0-failure.yml similarity index 97% rename from crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.7.0-failure.yml rename to crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.7.0-failure.yml index 49eb0859f7..b4d626d53b 100644 --- a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.7.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.7.0-failure.yml @@ -8,7 +8,7 @@ Source: > Errors: # 1 total - > Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword. - ╭─[crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/input.sol:1:1] │ 1 │ ╭─▶ ┆ ┆ diff --git a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.8.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.8.0-failure.yml similarity index 97% rename from crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.8.0-failure.yml rename to crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.8.0-failure.yml index 6b2868ad1b..f23e02b474 100644 --- a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.8.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.8.0-failure.yml @@ -8,7 +8,7 @@ Source: > Errors: # 1 total - > Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UncheckedKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword. - ╭─[crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/input.sol:1:1] │ 1 │ ╭─▶ ┆ ┆ diff --git a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.8.4-failure.yml b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.8.4-failure.yml similarity index 97% rename from crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.8.4-failure.yml rename to crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.8.4-failure.yml index 7e1c46db26..b50e41ce52 100644 --- a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/generated/0.8.4-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/generated/0.8.4-failure.yml @@ -8,7 +8,7 @@ Source: > Errors: # 1 total - > Error: Expected AddressKeyword or AsciiStringLiteral or AssemblyKeyword or BoolKeyword or BreakKeyword or ContinueKeyword or DecimalLiteral or DeleteKeyword or DoKeyword or EmitKeyword or FalseKeyword or FixedBytesType or ForKeyword or FunctionKeyword or HexLiteral or HexStringLiteral or Identifier or IfKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or PayableKeyword or ReturnKeyword or RevertKeyword or SignedFixedType or SignedIntegerType or StringKeyword or TrueKeyword or TryKeyword or TypeKeyword or UncheckedKeyword or UnicodeStringLiteral or UnsignedFixedType or UnsignedIntegerType or WhileKeyword. - ╭─[crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/input.sol:1:1] │ 1 │ ╭─▶ ┆ ┆ diff --git a/crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol b/crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/StatementsList/invalid_termination/input.sol rename to crates/solidity/testing/snapshots/cst_output/Statements/invalid_termination/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/TryStatement/try_catch/generated/0.6.0-success.yml b/crates/solidity/testing/snapshots/cst_output/TryStatement/try_catch/generated/0.6.0-success.yml index 66f8544953..9ae60be1a6 100644 --- a/crates/solidity/testing/snapshots/cst_output/TryStatement/try_catch/generated/0.6.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TryStatement/try_catch/generated/0.6.0-success.yml @@ -22,7 +22,7 @@ Tree: - Block (Rule): # 9..12 " {}" - OpenBrace (Token): "{" # 10..11 - CloseBrace (Token): "}" # 11..12 - - CatchClausesList (Rule): # 12..21 " catch {}" + - CatchClauses (Rule): # 12..21 " catch {}" - CatchClause (Rule): # 12..21 " catch {}" - CatchKeyword (Token): "catch" # 13..18 - Block (Rule): # 18..21 " {}" diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_array_type/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_array_type/generated/0.4.11-success.yml index 6d1bc827c5..1739aaba5c 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_array_type/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_array_type/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - TupleDeconstructionStatement (Rule): # 0..69 "(uint32 a, uint32[] memory b) = abi.decode(data, (..." - OpenParen (Token): "(" # 0..1 - - TupleMembersList (Rule): # 1..28 "uint32 a, uint32[] memory b" + - TupleMembers (Rule): # 1..28 "uint32 a, uint32[] memory b" - TupleMember (Rule): # 1..9 "uint32 a" - TypeName (Rule): # 1..7 "uint32" - UnsignedIntegerType (Token): "uint32" # 1..7 @@ -35,14 +35,14 @@ Tree: - Identifier (Token): "decode" # 36..42 - ArgumentsDeclaration (Rule): # 42..68 "(data, (uint32, uint32[]))" - OpenParen (Token): "(" # 42..43 - - PositionalArgumentsList (Rule): # 43..67 "data, (uint32, uint32[])" + - PositionalArguments (Rule): # 43..67 "data, (uint32, uint32[])" - Expression (Rule): # 43..47 "data" - Identifier (Token): "data" # 43..47 - Comma (Token): "," # 47..48 - Expression (Rule): # 48..67 " (uint32, uint32[])" - TupleExpression (Rule): # 48..67 " (uint32, uint32[])" - OpenParen (Token): "(" # 49..50 - - TupleValuesList (Rule): # 50..66 "uint32, uint32[]" + - TupleValues (Rule): # 50..66 "uint32, uint32[]" - Expression (Rule): # 50..56 "uint32" - UnsignedIntegerType (Token): "uint32" # 50..56 - Comma (Token): "," # 56..57 diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_singleton_type/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_singleton_type/generated/0.4.11-success.yml index e806954ebc..eadfb8d7b4 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_singleton_type/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/abi_decode_singleton_type/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - TupleDeconstructionStatement (Rule): # 0..58 "(uint32 a, uint32 b) = abi.decode(data, (uint32, u..." - OpenParen (Token): "(" # 0..1 - - TupleMembersList (Rule): # 1..19 "uint32 a, uint32 b" + - TupleMembers (Rule): # 1..19 "uint32 a, uint32 b" - TupleMember (Rule): # 1..9 "uint32 a" - TypeName (Rule): # 1..7 "uint32" - UnsignedIntegerType (Token): "uint32" # 1..7 @@ -30,14 +30,14 @@ Tree: - Identifier (Token): "decode" # 27..33 - ArgumentsDeclaration (Rule): # 33..57 "(data, (uint32, uint32))" - OpenParen (Token): "(" # 33..34 - - PositionalArgumentsList (Rule): # 34..56 "data, (uint32, uint32)" + - PositionalArguments (Rule): # 34..56 "data, (uint32, uint32)" - Expression (Rule): # 34..38 "data" - Identifier (Token): "data" # 34..38 - Comma (Token): "," # 38..39 - Expression (Rule): # 39..56 " (uint32, uint32)" - TupleExpression (Rule): # 39..56 " (uint32, uint32)" - OpenParen (Token): "(" # 40..41 - - TupleValuesList (Rule): # 41..55 "uint32, uint32" + - TupleValues (Rule): # 41..55 "uint32, uint32" - Expression (Rule): # 41..47 "uint32" - UnsignedIntegerType (Token): "uint32" # 41..47 - Comma (Token): "," # 47..48 diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/ignored_members/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/ignored_members/generated/0.4.11-success.yml index 0ff86ba9a6..f575abfed9 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/ignored_members/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/ignored_members/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - TupleDeconstructionStatement (Rule): # 0..27 "(, second, , fourth) = rhs;" - OpenParen (Token): "(" # 0..1 - - TupleMembersList (Rule): # 1..19 ", second, , fourth" + - TupleMembers (Rule): # 1..19 ", second, , fourth" - TupleMember (Rule): [] # 1..1 - Comma (Token): "," # 1..2 - TupleMember (Rule): # 2..9 " second" diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.4.11-failure.yml index b96faed213..ee97698235 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.4.11-failure.yml @@ -19,7 +19,7 @@ Errors: # 1 total Tree: - TupleDeconstructionStatement (Rule): # 0..35 "(a, b) = (123, 135)\n/**/\n{ throw; \n" - OpenParen (Token): "(" # 0..1 - - TupleMembersList (Rule): # 1..5 "a, b" + - TupleMembers (Rule): # 1..5 "a, b" - TupleMember (Rule): # 1..2 "a" - Identifier (Token): "a" # 1..2 - Comma (Token): "," # 2..3 @@ -30,7 +30,7 @@ Tree: - Expression (Rule): # 8..20 " (123, 135)\n" - TupleExpression (Rule): # 8..20 " (123, 135)\n" - OpenParen (Token): "(" # 9..10 - - TupleValuesList (Rule): # 10..18 "123, 135" + - TupleValues (Rule): # 10..18 "123, 135" - Expression (Rule): # 10..13 "123" - DecimalNumberExpression (Rule): # 10..13 "123" - DecimalLiteral (Token): "123" # 10..13 diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.6.2-failure.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.6.2-failure.yml index 901bacbd0c..4fbdae024d 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.6.2-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/invalid_termination/generated/0.6.2-failure.yml @@ -18,7 +18,7 @@ Errors: # 1 total Tree: - TupleDeconstructionStatement (Rule): # 0..35 "(a, b) = (123, 135)\n/**/\n{ throw; \n" - OpenParen (Token): "(" # 0..1 - - TupleMembersList (Rule): # 1..5 "a, b" + - TupleMembers (Rule): # 1..5 "a, b" - TupleMember (Rule): # 1..2 "a" - Identifier (Token): "a" # 1..2 - Comma (Token): "," # 2..3 @@ -29,7 +29,7 @@ Tree: - Expression (Rule): # 8..26 " (123, 135)\n/**/\n{" - TupleExpression (Rule): # 8..20 " (123, 135)\n" - OpenParen (Token): "(" # 9..10 - - TupleValuesList (Rule): # 10..18 "123, 135" + - TupleValues (Rule): # 10..18 "123, 135" - Expression (Rule): # 10..13 "123" - DecimalNumberExpression (Rule): # 10..13 "123" - DecimalLiteral (Token): "123" # 10..13 diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_location/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_location/generated/0.4.11-success.yml index 710b79fc6d..5db0e5c0ed 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_location/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_location/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - TupleDeconstructionStatement (Rule): # 0..47 "(memory with_location, without_location) = rhs;" - OpenParen (Token): "(" # 0..1 - - TupleMembersList (Rule): # 1..39 "memory with_location, without_location" + - TupleMembers (Rule): # 1..39 "memory with_location, without_location" - TupleMember (Rule): # 1..21 "memory with_location" - MemoryKeyword (Token): "memory" # 1..7 - Identifier (Token): "with_location" # 8..21 diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type/generated/0.4.11-success.yml index 1d0e120d45..902d7609e6 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - TupleDeconstructionStatement (Rule): # 0..37 "(bool with_type, without_type) = rhs;" - OpenParen (Token): "(" # 0..1 - - TupleMembersList (Rule): # 1..29 "bool with_type, without_type" + - TupleMembers (Rule): # 1..29 "bool with_type, without_type" - TupleMember (Rule): # 1..15 "bool with_type" - TypeName (Rule): # 1..5 "bool" - BoolKeyword (Token): "bool" # 1..5 diff --git a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type_and_location/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type_and_location/generated/0.4.11-success.yml index 475926b369..f9b8493279 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type_and_location/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleDeconstructionStatement/with_type_and_location/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - TupleDeconstructionStatement (Rule): # 0..38 "(bool memory x, bool storage y) = rhs;" - OpenParen (Token): "(" # 0..1 - - TupleMembersList (Rule): # 1..30 "bool memory x, bool storage y" + - TupleMembers (Rule): # 1..30 "bool memory x, bool storage y" - TupleMember (Rule): # 1..14 "bool memory x" - TypeName (Rule): # 1..5 "bool" - BoolKeyword (Token): "bool" # 1..5 diff --git a/crates/solidity/testing/snapshots/cst_output/TupleExpression/empty/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleExpression/empty/generated/0.4.11-success.yml index a03a765449..5fb4f0a893 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleExpression/empty/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleExpression/empty/generated/0.4.11-success.yml @@ -8,5 +8,5 @@ Errors: [] Tree: - TupleExpression (Rule): # 0..3 "( )" - OpenParen (Token): "(" # 0..1 - - TupleValuesList (Rule): [] # 1..1 + - TupleValues (Rule): [] # 1..1 - CloseParen (Token): ")" # 2..3 diff --git a/crates/solidity/testing/snapshots/cst_output/TupleExpression/full/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleExpression/full/generated/0.4.11-success.yml index 98b6f7f194..4d0a3397b3 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleExpression/full/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleExpression/full/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - TupleExpression (Rule): # 0..30 "(first, second, third, fourth)" - OpenParen (Token): "(" # 0..1 - - TupleValuesList (Rule): # 1..29 "first, second, third, fourth" + - TupleValues (Rule): # 1..29 "first, second, third, fourth" - Expression (Rule): # 1..6 "first" - Identifier (Token): "first" # 1..6 - Comma (Token): "," # 6..7 diff --git a/crates/solidity/testing/snapshots/cst_output/TupleExpression/missing_elements/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/TupleExpression/missing_elements/generated/0.4.11-success.yml index dc78569463..456a15bfba 100644 --- a/crates/solidity/testing/snapshots/cst_output/TupleExpression/missing_elements/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/TupleExpression/missing_elements/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - TupleExpression (Rule): # 0..20 "(, second, , fourth)" - OpenParen (Token): "(" # 0..1 - - TupleValuesList (Rule): # 1..19 ", second, , fourth" + - TupleValues (Rule): # 1..19 ", second, , fourth" - Comma (Token): "," # 1..2 - Expression (Rule): # 2..9 " second" - Identifier (Token): "second" # 3..9 diff --git a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/multiple/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/multiple/generated/0.4.11-failure.yml similarity index 91% rename from crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/multiple/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/multiple/generated/0.4.11-failure.yml index 3e62c19aed..e9ab4ae515 100644 --- a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/multiple/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/multiple/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/UnicodeStringLiteralsList/multiple/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/multiple/input.sol:1:1] │ 1 │ ╭─▶ unicode"happy 😃" unicode'sad 😔' ───╯ diff --git a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/multiple/generated/0.7.0-success.yml b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/multiple/generated/0.7.0-success.yml similarity index 80% rename from crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/multiple/generated/0.7.0-success.yml rename to crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/multiple/generated/0.7.0-success.yml index 45e1271367..665c5d05f7 100644 --- a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/multiple/generated/0.7.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/multiple/generated/0.7.0-success.yml @@ -6,6 +6,6 @@ Source: > Errors: [] Tree: - - UnicodeStringLiteralsList (Rule): # 0..37 'unicode"happy 😃" unicode''sad 😔''' + - UnicodeStringLiterals (Rule): # 0..37 'unicode"happy 😃" unicode''sad 😔''' - UnicodeStringLiteral (Token): 'unicode"happy 😃"' # 0..19 - UnicodeStringLiteral (Token): "unicode'sad 😔'" # 20..37 diff --git a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/multiple/input.sol b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/multiple/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/multiple/input.sol rename to crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/multiple/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single/generated/0.4.11-failure.yml similarity index 91% rename from crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single/generated/0.4.11-failure.yml index 23ef5ec488..2ef72a089c 100644 --- a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single/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/UnicodeStringLiteralsList/single/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single/input.sol:1:1] │ 1 │ ╭─▶ unicode"emoji 😃" ───╯ diff --git a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single/generated/0.7.0-success.yml b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single/generated/0.7.0-success.yml similarity index 81% rename from crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single/generated/0.7.0-success.yml rename to crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single/generated/0.7.0-success.yml index ae2c40bf3c..28f4aadfe0 100644 --- a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single/generated/0.7.0-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single/generated/0.7.0-success.yml @@ -6,5 +6,5 @@ Source: > Errors: [] Tree: - - UnicodeStringLiteralsList (Rule): # 0..19 'unicode"emoji 😃"' + - UnicodeStringLiterals (Rule): # 0..19 'unicode"emoji 😃"' - UnicodeStringLiteral (Token): 'unicode"emoji 😃"' # 0..19 diff --git a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single/input.sol b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single/input.sol rename to crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single/input.sol diff --git a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single_trailing_ident/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single_trailing_ident/generated/0.4.11-failure.yml similarity index 88% rename from crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single_trailing_ident/generated/0.4.11-failure.yml rename to crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single_trailing_ident/generated/0.4.11-failure.yml index 74aa059e67..4b8e5edf5e 100644 --- a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single_trailing_ident/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single_trailing_ident/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/UnicodeStringLiteralsList/single_trailing_ident/input.sol:1:1] + ╭─[crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single_trailing_ident/input.sol:1:1] │ 1 │ ╭─▶ unicode"emoji 😃"happy ───╯ diff --git a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single_trailing_ident/generated/0.7.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single_trailing_ident/generated/0.7.0-failure.yml similarity index 79% rename from crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single_trailing_ident/generated/0.7.0-failure.yml rename to crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single_trailing_ident/generated/0.7.0-failure.yml index 5985efd785..01aa3f3012 100644 --- a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single_trailing_ident/generated/0.7.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single_trailing_ident/generated/0.7.0-failure.yml @@ -6,12 +6,12 @@ Source: > Errors: # 1 total - > Error: Expected UnicodeStringLiteral. - ╭─[crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single_trailing_ident/input.sol:1:20] + ╭─[crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single_trailing_ident/input.sol:1:20] │ 1 │ ╭─▶ unicode"emoji 😃"happy ───╯ Tree: - - UnicodeStringLiteralsList (Rule): # 0..25 'unicode"emoji 😃"happy\n' + - UnicodeStringLiterals (Rule): # 0..25 'unicode"emoji 😃"happy\n' - UnicodeStringLiteral (Token): 'unicode"emoji 😃"' # 0..19 - SKIPPED (Token): "happy\n" # 19..25 diff --git a/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single_trailing_ident/input.sol b/crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single_trailing_ident/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/UnicodeStringLiteralsList/single_trailing_ident/input.sol rename to crates/solidity/testing/snapshots/cst_output/UnicodeStringLiterals/single_trailing_ident/input.sol 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 ce5ecd3db2..4cbcb288b6 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 @@ -18,7 +18,7 @@ Tree: - UsingKeyword (Token): "using" # 0..5 - UsingDirectiveDeconstruction (Rule): # 5..36 " {add as +, sub, mul, div as /}" - OpenBrace (Token): "{" # 6..7 - - UsingDirectiveSymbolsList (Rule): # 7..10 "add" + - UsingDirectiveSymbols (Rule): # 7..10 "add" - UsingDirectiveSymbol (Rule): # 7..10 "add" - IdentifierPath (Rule): # 7..10 "add" - Identifier (Token): "add" # 7..10 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 d0a2f4dcdc..fa2b093757 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 @@ -10,7 +10,7 @@ Tree: - UsingKeyword (Token): "using" # 0..5 - UsingDirectiveDeconstruction (Rule): # 5..36 " {add as +, sub, mul, div as /}" - OpenBrace (Token): "{" # 6..7 - - UsingDirectiveSymbolsList (Rule): # 7..35 "add as +, sub, mul, div as /" + - UsingDirectiveSymbols (Rule): # 7..35 "add as +, sub, mul, div as /" - UsingDirectiveSymbol (Rule): # 7..15 "add as +" - IdentifierPath (Rule): # 7..10 "add" - Identifier (Token): "add" # 7..10 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 c56e4f7774..47c196e7bf 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 @@ -10,7 +10,7 @@ Tree: - UsingKeyword (Token): "using" # 0..5 - UsingDirectiveDeconstruction (Rule): # 5..11 " {add}" - OpenBrace (Token): "{" # 6..7 - - UsingDirectiveSymbolsList (Rule): # 7..10 "add" + - UsingDirectiveSymbols (Rule): # 7..10 "add" - UsingDirectiveSymbol (Rule): # 7..10 "add" - IdentifierPath (Rule): # 7..10 "add" - Identifier (Token): "add" # 7..10 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 bc1b7ac2a0..e96fb96b7b 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 @@ -18,7 +18,7 @@ Tree: - UsingKeyword (Token): "using" # 0..5 - UsingDirectiveDeconstruction (Rule): # 5..16 " {div as /}" - OpenBrace (Token): "{" # 6..7 - - UsingDirectiveSymbolsList (Rule): # 7..10 "div" + - UsingDirectiveSymbols (Rule): # 7..10 "div" - UsingDirectiveSymbol (Rule): # 7..10 "div" - IdentifierPath (Rule): # 7..10 "div" - Identifier (Token): "div" # 7..10 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 3250979b5d..80e1bbc85a 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 @@ -10,7 +10,7 @@ Tree: - UsingKeyword (Token): "using" # 0..5 - UsingDirectiveDeconstruction (Rule): # 5..16 " {div as /}" - OpenBrace (Token): "{" # 6..7 - - UsingDirectiveSymbolsList (Rule): # 7..15 "div as /" + - UsingDirectiveSymbols (Rule): # 7..15 "div as /" - UsingDirectiveSymbol (Rule): # 7..15 "div as /" - IdentifierPath (Rule): # 7..10 "div" - Identifier (Token): "div" # 7..10 diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/alternatives/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/alternatives/generated/0.4.11-success.yml index df9669607c..85def026b9 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/alternatives/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/alternatives/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - VersionPragma (Rule): # 0..33 "solidity 0.5.0 || 0.6.0 || ^0.7.0" - SolidityKeyword (Token): "solidity" # 0..8 - - VersionPragmaExpressionsList (Rule): # 8..33 " 0.5.0 || 0.6.0 || ^0.7.0" + - VersionPragmaExpressions (Rule): # 8..33 " 0.5.0 || 0.6.0 || ^0.7.0" - VersionPragmaExpression (Rule): # 8..33 " 0.5.0 || 0.6.0 || ^0.7.0" - VersionPragmaBinaryExpression (Rule): # 8..33 " 0.5.0 || 0.6.0 || ^0.7.0" - VersionPragmaExpression (Rule): # 8..23 " 0.5.0 || 0.6.0" diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/equal_operator/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/equal_operator/generated/0.4.11-success.yml index 7ea4b46a33..32b8a78c30 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/equal_operator/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/equal_operator/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - VersionPragma (Rule): # 0..15 "solidity =0.8.0" - SolidityKeyword (Token): "solidity" # 0..8 - - VersionPragmaExpressionsList (Rule): # 8..15 " =0.8.0" + - VersionPragmaExpressions (Rule): # 8..15 " =0.8.0" - VersionPragmaExpression (Rule): # 8..15 " =0.8.0" - VersionPragmaUnaryExpression (Rule): # 8..15 " =0.8.0" - Equal (Token): "=" # 9..10 diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/exact_version/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/exact_version/generated/0.4.11-success.yml index 3c3c7a0984..6e0a391583 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/exact_version/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/exact_version/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - VersionPragma (Rule): # 0..14 "solidity 0.8.0" - SolidityKeyword (Token): "solidity" # 0..8 - - VersionPragmaExpressionsList (Rule): # 8..14 " 0.8.0" + - VersionPragmaExpressions (Rule): # 8..14 " 0.8.0" - VersionPragmaExpression (Rule): # 8..14 " 0.8.0" - VersionPragmaSpecifier (Rule): # 8..14 " 0.8.0" - VersionPragmaValue (Token): "0" # 9..10 diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/less_than_operator/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/less_than_operator/generated/0.4.11-success.yml index ddc5c10fac..5029c2e26d 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/less_than_operator/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/less_than_operator/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - VersionPragma (Rule): # 0..15 "solidity <1.0.0" - SolidityKeyword (Token): "solidity" # 0..8 - - VersionPragmaExpressionsList (Rule): # 8..15 " <1.0.0" + - VersionPragmaExpressions (Rule): # 8..15 " <1.0.0" - VersionPragmaExpression (Rule): # 8..15 " <1.0.0" - VersionPragmaUnaryExpression (Rule): # 8..15 " <1.0.0" - LessThan (Token): "<" # 9..10 diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/multiple_exact_versions/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/multiple_exact_versions/generated/0.4.11-success.yml index 942d923267..f206f9517f 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/multiple_exact_versions/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/multiple_exact_versions/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - VersionPragma (Rule): # 0..20 "solidity 0.7.0 0.8.0" - SolidityKeyword (Token): "solidity" # 0..8 - - VersionPragmaExpressionsList (Rule): # 8..20 " 0.7.0 0.8.0" + - VersionPragmaExpressions (Rule): # 8..20 " 0.7.0 0.8.0" - VersionPragmaExpression (Rule): # 8..14 " 0.7.0" - VersionPragmaSpecifier (Rule): # 8..14 " 0.7.0" - VersionPragmaValue (Token): "0" # 9..10 diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/nested_expressions/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/nested_expressions/generated/0.4.11-success.yml index 22340701ee..f2ac65f9d2 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/nested_expressions/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/nested_expressions/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - VersionPragma (Rule): # 0..30 "solidity ^1.0.0 || 2.0.0-3.0.0" - SolidityKeyword (Token): "solidity" # 0..8 - - VersionPragmaExpressionsList (Rule): # 8..30 " ^1.0.0 || 2.0.0-3.0.0" + - VersionPragmaExpressions (Rule): # 8..30 " ^1.0.0 || 2.0.0-3.0.0" - VersionPragmaExpression (Rule): # 8..30 " ^1.0.0 || 2.0.0-3.0.0" - VersionPragmaBinaryExpression (Rule): # 8..30 " ^1.0.0 || 2.0.0-3.0.0" - VersionPragmaExpression (Rule): # 8..15 " ^1.0.0" diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/ranges/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/ranges/generated/0.4.11-success.yml index 41f1d30a10..2d3f769d55 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/ranges/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/ranges/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - VersionPragma (Rule): # 0..22 "solidity 0.6.0 - 0.7.0" - SolidityKeyword (Token): "solidity" # 0..8 - - VersionPragmaExpressionsList (Rule): # 8..22 " 0.6.0 - 0.7.0" + - VersionPragmaExpressions (Rule): # 8..22 " 0.6.0 - 0.7.0" - VersionPragmaExpression (Rule): # 8..22 " 0.6.0 - 0.7.0" - VersionPragmaBinaryExpression (Rule): # 8..22 " 0.6.0 - 0.7.0" - VersionPragmaExpression (Rule): # 8..14 " 0.6.0" diff --git a/crates/solidity/testing/snapshots/cst_output/VersionPragma/with_trivia/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/VersionPragma/with_trivia/generated/0.4.11-success.yml index 7abf2182b5..a2bdf337a2 100644 --- a/crates/solidity/testing/snapshots/cst_output/VersionPragma/with_trivia/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/VersionPragma/with_trivia/generated/0.4.11-success.yml @@ -8,7 +8,7 @@ Errors: [] Tree: - VersionPragma (Rule): # 0..68 "solidity /* comments */ 0 /* are */ . /* allowed *..." - SolidityKeyword (Token): "solidity" # 0..8 - - VersionPragmaExpressionsList (Rule): # 8..68 " /* comments */ 0 /* are */ . /* allowed */ 0 . /*..." + - VersionPragmaExpressions (Rule): # 8..68 " /* comments */ 0 /* are */ . /* allowed */ 0 . /*..." - VersionPragmaExpression (Rule): # 8..68 " /* comments */ 0 /* are */ . /* allowed */ 0 . /*..." - VersionPragmaSpecifier (Rule): # 8..68 " /* comments */ 0 /* are */ . /* allowed */ 0 . /*..." - LeadingTrivia (Rule): # 8..24 " /* comments */ " diff --git a/crates/solidity/testing/snapshots/cst_output/YulBlock/function_def/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulBlock/function_def/generated/0.4.11-success.yml index ebeb8b6726..e84ef77ea8 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulBlock/function_def/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulBlock/function_def/generated/0.4.11-success.yml @@ -12,26 +12,26 @@ Errors: [] Tree: - YulBlock (Rule): # 0..62 "{\n\tfunction mult(a, b) -> result {\n\t\tresult := mul..." - OpenBrace (Token): "{" # 0..1 - - YulStatementsList (Rule): # 2..60 "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." + - YulStatements (Rule): # 2..60 "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." - YulFunctionDefinition (Rule): # 2..60 "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." - FunctionKeyword (Token): "function" # 3..11 - YulIdentifier (Token): "mult" # 12..16 - YulParametersDeclaration (Rule): # 16..22 "(a, b)" - OpenParen (Token): "(" # 16..17 - - YulIdentifiersList (Rule): # 17..21 "a, b" + - YulIdentifiers (Rule): # 17..21 "a, b" - YulIdentifier (Token): "a" # 17..18 - Comma (Token): "," # 18..19 - YulIdentifier (Token): "b" # 20..21 - CloseParen (Token): ")" # 21..22 - YulReturnsDeclaration (Rule): # 22..32 " -> result" - MinusGreaterThan (Token): "->" # 23..25 - - YulIdentifiersList (Rule): # 25..32 " result" + - YulIdentifiers (Rule): # 25..32 " result" - YulIdentifier (Token): "result" # 26..32 - YulBlock (Rule): # 32..60 " {\n\t\tresult := mul(a, b)\n\t}\n" - OpenBrace (Token): "{" # 33..34 - - YulStatementsList (Rule): # 35..57 "\t\tresult := mul(a, b)\n" + - YulStatements (Rule): # 35..57 "\t\tresult := mul(a, b)\n" - YulAssignmentStatement (Rule): # 35..57 "\t\tresult := mul(a, b)\n" - - YulIdentifierPathsList (Rule): # 35..43 "\t\tresult" + - YulIdentifierPaths (Rule): # 35..43 "\t\tresult" - YulIdentifierPath (Rule): # 35..43 "\t\tresult" - YulIdentifier (Token): "result" # 37..43 - ColonEqual (Token): ":=" # 44..46 @@ -41,7 +41,7 @@ Tree: - YulIdentifierPath (Rule): # 46..50 " mul" - YulIdentifier (Token): "mul" # 47..50 - OpenParen (Token): "(" # 50..51 - - YulExpressionsList (Rule): # 51..55 "a, b" + - YulArguments (Rule): # 51..55 "a, b" - YulExpression (Rule): # 51..52 "a" - YulIdentifierPath (Rule): # 51..52 "a" - YulIdentifier (Token): "a" # 51..52 diff --git a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.4.11-failure.yml index 87c57fcf8f..0d02e1b089 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.4.11-failure.yml @@ -22,26 +22,26 @@ Errors: # 1 total Tree: - YulBlock (Rule): # 0..85 "{\n\tfunction mult(a, b) -> result {\n\t\tresult := mul..." - OpenBrace (Token): "{" # 0..1 - - YulStatementsList (Rule): # 2..83 "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." + - YulStatements (Rule): # 2..83 "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." - YulFunctionDefinition (Rule): # 2..83 "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." - FunctionKeyword (Token): "function" # 3..11 - YulIdentifier (Token): "mult" # 12..16 - YulParametersDeclaration (Rule): # 16..22 "(a, b)" - OpenParen (Token): "(" # 16..17 - - YulIdentifiersList (Rule): # 17..21 "a, b" + - YulIdentifiers (Rule): # 17..21 "a, b" - YulIdentifier (Token): "a" # 17..18 - Comma (Token): "," # 18..19 - YulIdentifier (Token): "b" # 20..21 - CloseParen (Token): ")" # 21..22 - YulReturnsDeclaration (Rule): # 22..32 " -> result" - MinusGreaterThan (Token): "->" # 23..25 - - YulIdentifiersList (Rule): # 25..32 " result" + - YulIdentifiers (Rule): # 25..32 " result" - YulIdentifier (Token): "result" # 26..32 - YulBlock (Rule): # 32..83 " {\n\t\tresult := mul(a, b)\n\t\tresult := [mul(a, b)\n\t}..." - OpenBrace (Token): "{" # 33..34 - - YulStatementsList (Rule): # 35..65 "\t\tresult := mul(a, b)\n\t\tresult" + - YulStatements (Rule): # 35..65 "\t\tresult := mul(a, b)\n\t\tresult" - YulAssignmentStatement (Rule): # 35..57 "\t\tresult := mul(a, b)\n" - - YulIdentifierPathsList (Rule): # 35..43 "\t\tresult" + - YulIdentifierPaths (Rule): # 35..43 "\t\tresult" - YulIdentifierPath (Rule): # 35..43 "\t\tresult" - YulIdentifier (Token): "result" # 37..43 - ColonEqual (Token): ":=" # 44..46 @@ -51,7 +51,7 @@ Tree: - YulIdentifierPath (Rule): # 46..50 " mul" - YulIdentifier (Token): "mul" # 47..50 - OpenParen (Token): "(" # 50..51 - - YulExpressionsList (Rule): # 51..55 "a, b" + - YulArguments (Rule): # 51..55 "a, b" - YulExpression (Rule): # 51..52 "a" - YulIdentifierPath (Rule): # 51..52 "a" - YulIdentifier (Token): "a" # 51..52 diff --git a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.6.0-failure.yml b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.6.0-failure.yml index 7a6fc2ac4e..bf6bddf2f8 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.6.0-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulBlock/ignore_unknown_delim/generated/0.6.0-failure.yml @@ -22,26 +22,26 @@ Errors: # 1 total Tree: - YulBlock (Rule): # 0..85 "{\n\tfunction mult(a, b) -> result {\n\t\tresult := mul..." - OpenBrace (Token): "{" # 0..1 - - YulStatementsList (Rule): # 2..83 "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." + - YulStatements (Rule): # 2..83 "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." - YulFunctionDefinition (Rule): # 2..83 "\tfunction mult(a, b) -> result {\n\t\tresult := mul(a..." - FunctionKeyword (Token): "function" # 3..11 - YulIdentifier (Token): "mult" # 12..16 - YulParametersDeclaration (Rule): # 16..22 "(a, b)" - OpenParen (Token): "(" # 16..17 - - YulIdentifiersList (Rule): # 17..21 "a, b" + - YulIdentifiers (Rule): # 17..21 "a, b" - YulIdentifier (Token): "a" # 17..18 - Comma (Token): "," # 18..19 - YulIdentifier (Token): "b" # 20..21 - CloseParen (Token): ")" # 21..22 - YulReturnsDeclaration (Rule): # 22..32 " -> result" - MinusGreaterThan (Token): "->" # 23..25 - - YulIdentifiersList (Rule): # 25..32 " result" + - YulIdentifiers (Rule): # 25..32 " result" - YulIdentifier (Token): "result" # 26..32 - YulBlock (Rule): # 32..83 " {\n\t\tresult := mul(a, b)\n\t\tresult := [mul(a, b)\n\t}..." - OpenBrace (Token): "{" # 33..34 - - YulStatementsList (Rule): # 35..65 "\t\tresult := mul(a, b)\n\t\tresult" + - YulStatements (Rule): # 35..65 "\t\tresult := mul(a, b)\n\t\tresult" - YulAssignmentStatement (Rule): # 35..57 "\t\tresult := mul(a, b)\n" - - YulIdentifierPathsList (Rule): # 35..43 "\t\tresult" + - YulIdentifierPaths (Rule): # 35..43 "\t\tresult" - YulIdentifierPath (Rule): # 35..43 "\t\tresult" - YulIdentifier (Token): "result" # 37..43 - ColonEqual (Token): ":=" # 44..46 @@ -51,7 +51,7 @@ Tree: - YulIdentifierPath (Rule): # 46..50 " mul" - YulIdentifier (Token): "mul" # 47..50 - OpenParen (Token): "(" # 50..51 - - YulExpressionsList (Rule): # 51..55 "a, b" + - YulArguments (Rule): # 51..55 "a, b" - YulExpression (Rule): # 51..52 "a" - YulIdentifierPath (Rule): # 51..52 "a" - YulIdentifier (Token): "a" # 51..52 diff --git a/crates/solidity/testing/snapshots/cst_output/YulExpression/function_call/generated/0.4.11-success.yml b/crates/solidity/testing/snapshots/cst_output/YulExpression/function_call/generated/0.4.11-success.yml index ee557c1d15..d20030d342 100644 --- a/crates/solidity/testing/snapshots/cst_output/YulExpression/function_call/generated/0.4.11-success.yml +++ b/crates/solidity/testing/snapshots/cst_output/YulExpression/function_call/generated/0.4.11-success.yml @@ -12,7 +12,7 @@ Tree: - YulIdentifierPath (Rule): # 0..3 "foo" - YulIdentifier (Token): "foo" # 0..3 - OpenParen (Token): "(" # 3..4 - - YulExpressionsList (Rule): # 4..5 "1" + - YulArguments (Rule): # 4..5 "1" - YulExpression (Rule): # 4..5 "1" - YulDecimalLiteral (Token): "1" # 4..5 - CloseParen (Token): ")" # 5..6 From bdff92b2f56d7686b3a6a5f47557b402aaa7ce4e Mon Sep 17 00:00:00 2001 From: Igor Matuszewski Date: Mon, 20 Nov 2023 20:21:14 +0100 Subject: [PATCH 3/4] Move pragma-specific keywords under dedicated topic (#661) Split from #650 We talked about this recently at our stand-up. These are never reserved in the default context and are only used in the (lexical) context of pragmas, so let's reflect that in the spec. Not updating v1 in this context since #650 is about to obsolete that and v0 does not have lexical contexts that might be impacted. --- .../inputs/language/src/definition.rs | 39 +++++++------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/crates/solidity/inputs/language/src/definition.rs b/crates/solidity/inputs/language/src/definition.rs index 17b49f69a0..c5cc7b21ff 100644 --- a/crates/solidity/inputs/language/src/definition.rs +++ b/crates/solidity/inputs/language/src/definition.rs @@ -200,6 +200,21 @@ codegen_language_macros::compile!(Language( Atom("*") ])) )] + ), + Keyword( + name = SolidityKeyword, + identifier = Identifier, + definitions = [KeywordDefinition(value = Atom("solidity"))] + ), + Keyword( + name = ExperimentalKeyword, + identifier = Identifier, + definitions = [KeywordDefinition(value = Atom("experimental"))] + ), + Keyword( + name = AbicoderKeyword, + identifier = Identifier, + definitions = [KeywordDefinition(value = Atom("abicoder"))] ) ] ), @@ -407,14 +422,6 @@ codegen_language_macros::compile!(Language( Topic( title = "Keywords", items = [ - Keyword( - name = AbicoderKeyword, - identifier = Identifier, - definitions = [KeywordDefinition( - reserved = Never, - value = Atom("abicoder") - )] - ), Keyword( name = AbstractKeyword, identifier = Identifier, @@ -661,14 +668,6 @@ codegen_language_macros::compile!(Language( identifier = Identifier, definitions = [KeywordDefinition(value = Atom("event"))] ), - Keyword( - name = ExperimentalKeyword, - identifier = Identifier, - definitions = [KeywordDefinition( - reserved = Never, - value = Atom("experimental") - )] - ), Keyword( name = ExternalKeyword, identifier = Identifier, @@ -1314,14 +1313,6 @@ codegen_language_macros::compile!(Language( value = Atom("sizeof") )] ), - Keyword( - name = SolidityKeyword, - identifier = Identifier, - definitions = [KeywordDefinition( - reserved = Never, - value = Atom("solidity") - )] - ), Keyword( name = StaticKeyword, identifier = Identifier, From 4b5f8b467d4cbab72cf27a539bb5ca8c71090dd6 Mon Sep 17 00:00:00 2001 From: Igor Matuszewski Date: Mon, 20 Nov 2023 23:51:53 +0100 Subject: [PATCH 4/4] Remove the CST Visitor API (#665) We discussed internally that the Visitor API for (dynamically typed) CST is a lot less useful now that we have the `Iterator` interface implemented in Rust (and hopefully [`Iterator`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Iterators_and_Generators#iterators) protocol in TS in the future), so let's remove the CST Visitor API altogether. The Visitor [pattern](https://rust-unofficial.github.io/patterns/patterns/behavioural/visitor.html) will be a lot useful once we have typed, heterogenous data such as the new AST (#634), so let's wait until then with designing and exposing such interface. --- .changeset/purple-parents-teach.md | 5 + .../parser/generator/src/code_generator.rs | 1 - crates/codegen/parser/runtime/src/cst.rs | 8 + crates/codegen/parser/runtime/src/cursor.rs | 13 +- crates/codegen/parser/runtime/src/lib.rs | 1 - .../parser/runtime/src/napi/napi_cursor.rs | 3 +- .../runtime/src/templates/mod.rs.jinja2 | 1 - crates/codegen/parser/runtime/src/visitor.rs | 75 --------- .../outputs/cargo/crate/src/generated/cst.rs | 8 + .../cargo/crate/src/generated/cursor.rs | 13 +- .../outputs/cargo/crate/src/generated/mod.rs | 1 - .../crate/src/generated/napi/napi_cursor.rs | 3 +- .../cargo/crate/src/generated/visitor.rs | 78 ---------- .../tests/src/doc_examples/cursor_api.rs | 24 +++ .../cargo/tests/src/doc_examples/mod.rs | 1 - .../tests/src/doc_examples/visitor_api.rs | 56 ------- .../outputs/npm/crate/src/generated/cst.rs | 8 + .../outputs/npm/crate/src/generated/cursor.rs | 13 +- .../outputs/npm/crate/src/generated/mod.rs | 1 - .../crate/src/generated/napi/napi_cursor.rs | 3 +- .../npm/crate/src/generated/visitor.rs | 78 ---------- .../everything/generated/0.4.11-failure.yml | 1 - .../everything/generated/0.8.13-failure.yml | 1 - .../generated/0.4.11-failure.yml | 1 - .../testing/utils/src/cst_snapshots/mod.rs | 130 ++++++++++++---- .../utils/src/cst_snapshots/test_nodes.rs | 144 ------------------ .../testing/utils/src/node_extensions/mod.rs | 5 +- .../public/user-guide/cargo-crate/index.md | 16 -- 28 files changed, 184 insertions(+), 508 deletions(-) create mode 100644 .changeset/purple-parents-teach.md delete mode 100644 crates/solidity/outputs/cargo/crate/src/generated/visitor.rs delete mode 100644 crates/solidity/outputs/cargo/tests/src/doc_examples/visitor_api.rs delete mode 100644 crates/solidity/outputs/npm/crate/src/generated/visitor.rs delete mode 100644 crates/solidity/testing/utils/src/cst_snapshots/test_nodes.rs diff --git a/.changeset/purple-parents-teach.md b/.changeset/purple-parents-teach.md new file mode 100644 index 0000000000..ad3cea04dd --- /dev/null +++ b/.changeset/purple-parents-teach.md @@ -0,0 +1,5 @@ +--- +"@nomicfoundation/slang": minor +--- + +Remove the CST Visitor API in favor of the Cursor API diff --git a/crates/codegen/parser/generator/src/code_generator.rs b/crates/codegen/parser/generator/src/code_generator.rs index 63fb5c578b..59c23460b4 100644 --- a/crates/codegen/parser/generator/src/code_generator.rs +++ b/crates/codegen/parser/generator/src/code_generator.rs @@ -113,7 +113,6 @@ impl CodeGenerator { "parse_error.rs", "parse_output.rs", "text_index.rs", - "visitor.rs", "napi/napi_cst.rs", "napi/napi_cursor.rs", "napi/napi_parse_error.rs", diff --git a/crates/codegen/parser/runtime/src/cst.rs b/crates/codegen/parser/runtime/src/cst.rs index e3c1437a91..0a3cfbb664 100644 --- a/crates/codegen/parser/runtime/src/cst.rs +++ b/crates/codegen/parser/runtime/src/cst.rs @@ -46,6 +46,14 @@ impl Node { } } + /// Returns a slice of the children (not all descendants) of this node. + pub fn children(&self) -> &[Node] { + match self { + Self::Rule(node) => &node.children, + Self::Token(_) => &[], + } + } + pub fn create_cursor(&self, text_offset: TextIndex) -> Cursor { Cursor::new(self.clone(), text_offset) } diff --git a/crates/codegen/parser/runtime/src/cursor.rs b/crates/codegen/parser/runtime/src/cursor.rs index 89bf585049..a2cdaac93d 100644 --- a/crates/codegen/parser/runtime/src/cursor.rs +++ b/crates/codegen/parser/runtime/src/cursor.rs @@ -144,11 +144,14 @@ impl Cursor { self.current.text_range() } - pub fn path_rule_nodes(&self) -> Vec> { - self.path - .iter() - .map(|path_element| path_element.rule_node.clone()) - .collect() + /// Returns the depth of the current node in the CST, i.e. the number of ancestors. + pub fn depth(&self) -> usize { + self.path.len() + } + + /// Returns an iterator over the current node's ancestors, starting from the cursor root node. + pub fn ancestors(&self) -> impl Iterator> { + self.path.iter().map(|elem| &elem.rule_node) } /// Attempts to go to current node's next one, according to the DFS pre-order traversal. diff --git a/crates/codegen/parser/runtime/src/lib.rs b/crates/codegen/parser/runtime/src/lib.rs index eb5b7b0741..8ed2f8ed55 100644 --- a/crates/codegen/parser/runtime/src/lib.rs +++ b/crates/codegen/parser/runtime/src/lib.rs @@ -10,7 +10,6 @@ pub(crate) mod lexer; pub mod parse_error; pub mod parse_output; pub mod text_index; -pub mod visitor; #[cfg(feature = "slang_napi_interfaces")] pub mod napi; diff --git a/crates/codegen/parser/runtime/src/napi/napi_cursor.rs b/crates/codegen/parser/runtime/src/napi/napi_cursor.rs index 33abaf9e19..153290358f 100644 --- a/crates/codegen/parser/runtime/src/napi/napi_cursor.rs +++ b/crates/codegen/parser/runtime/src/napi/napi_cursor.rs @@ -65,8 +65,7 @@ impl Cursor { #[napi(ts_return_type = "Array")] pub fn path_rule_nodes(&self, env: Env) -> Vec { self.0 - .path_rule_nodes() - .iter() + .ancestors() .map(|rust_rule_node| rust_rule_node.to_js(&env)) .collect() } diff --git a/crates/codegen/parser/runtime/src/templates/mod.rs.jinja2 b/crates/codegen/parser/runtime/src/templates/mod.rs.jinja2 index 711c87092a..4bb91487cf 100644 --- a/crates/codegen/parser/runtime/src/templates/mod.rs.jinja2 +++ b/crates/codegen/parser/runtime/src/templates/mod.rs.jinja2 @@ -9,7 +9,6 @@ pub(crate) mod lexer; pub mod parse_error; pub mod parse_output; pub mod text_index; -pub mod visitor; #[cfg(feature = "slang_napi_interfaces")] pub mod napi; diff --git a/crates/codegen/parser/runtime/src/visitor.rs b/crates/codegen/parser/runtime/src/visitor.rs index 1562bc0e59..8b13789179 100644 --- a/crates/codegen/parser/runtime/src/visitor.rs +++ b/crates/codegen/parser/runtime/src/visitor.rs @@ -1,76 +1 @@ -use std::ops::ControlFlow; -use std::rc::Rc; -use super::{cst::*, cursor::Cursor}; - -/// A Visitor pattern for traversing the CST. -/// -/// The trait supports fallible iteration, i.e. the visitor can early return an error from the visit. -pub trait Visitor { - /// Called when the [`Visitor`] enters a [`RuleNode`]. - fn rule_enter( - &mut self, - _node: &Rc, - _cursor: &Cursor, - ) -> Result, E> { - Ok(ControlFlow::Continue(Step::In)) - } - - /// Called when the [`Visitor`] exits a [`RuleNode`]. - fn rule_exit(&mut self, _node: &Rc, _cursor: &Cursor) -> Result, E> { - Ok(ControlFlow::Continue(())) - } - - /// Called when the [`Visitor`] enters a [`TokenNode`]. - fn token(&mut self, _node: &Rc, _cursor: &Cursor) -> Result, E> { - Ok(ControlFlow::Continue(())) - } -} - -/// Whether the [`Visitor`] should should enter the children of a [`RuleNode`] or not. -pub enum Step { - In, - Over, -} - -impl Cursor { - pub fn drive_visitor>( - &mut self, - visitor: &mut V, - ) -> Result, E> { - if self.is_completed() { - return Ok(ControlFlow::Continue(())); - } - - loop { - // Node clone is cheap because it's just an enum around an Rc - match self.node() { - Node::Rule(rule_node) => { - match visitor.rule_enter(&rule_node, self)? { - ControlFlow::Break(()) => return Ok(ControlFlow::Break(())), - ControlFlow::Continue(Step::In) => { - if self.go_to_first_child() { - self.drive_visitor(visitor)?; - self.go_to_parent(); - } - } - ControlFlow::Continue(Step::Over) => {} - } - if visitor.rule_exit(&rule_node, self)? == ControlFlow::Break(()) { - return Ok(ControlFlow::Break(())); - } - } - - Node::Token(token_node) => { - if visitor.token(&token_node, self)? == ControlFlow::Break(()) { - return Ok(ControlFlow::Break(())); - } - } - } - - if !self.go_to_next_sibling() { - return Ok(ControlFlow::Continue(())); - } - } - } -} diff --git a/crates/solidity/outputs/cargo/crate/src/generated/cst.rs b/crates/solidity/outputs/cargo/crate/src/generated/cst.rs index f20fe136e9..77154c22b6 100644 --- a/crates/solidity/outputs/cargo/crate/src/generated/cst.rs +++ b/crates/solidity/outputs/cargo/crate/src/generated/cst.rs @@ -48,6 +48,14 @@ impl Node { } } + /// Returns a slice of the children (not all descendants) of this node. + pub fn children(&self) -> &[Node] { + match self { + Self::Rule(node) => &node.children, + Self::Token(_) => &[], + } + } + pub fn create_cursor(&self, text_offset: TextIndex) -> Cursor { Cursor::new(self.clone(), text_offset) } diff --git a/crates/solidity/outputs/cargo/crate/src/generated/cursor.rs b/crates/solidity/outputs/cargo/crate/src/generated/cursor.rs index b3743ec4b6..2c265f043c 100644 --- a/crates/solidity/outputs/cargo/crate/src/generated/cursor.rs +++ b/crates/solidity/outputs/cargo/crate/src/generated/cursor.rs @@ -146,11 +146,14 @@ impl Cursor { self.current.text_range() } - pub fn path_rule_nodes(&self) -> Vec> { - self.path - .iter() - .map(|path_element| path_element.rule_node.clone()) - .collect() + /// Returns the depth of the current node in the CST, i.e. the number of ancestors. + pub fn depth(&self) -> usize { + self.path.len() + } + + /// Returns an iterator over the current node's ancestors, starting from the cursor root node. + pub fn ancestors(&self) -> impl Iterator> { + self.path.iter().map(|elem| &elem.rule_node) } /// Attempts to go to current node's next one, according to the DFS pre-order traversal. diff --git a/crates/solidity/outputs/cargo/crate/src/generated/mod.rs b/crates/solidity/outputs/cargo/crate/src/generated/mod.rs index 45a9519857..aa488c9b16 100644 --- a/crates/solidity/outputs/cargo/crate/src/generated/mod.rs +++ b/crates/solidity/outputs/cargo/crate/src/generated/mod.rs @@ -11,7 +11,6 @@ pub(crate) mod lexer; pub mod parse_error; pub mod parse_output; pub mod text_index; -pub mod visitor; #[cfg(feature = "slang_napi_interfaces")] pub mod napi; diff --git a/crates/solidity/outputs/cargo/crate/src/generated/napi/napi_cursor.rs b/crates/solidity/outputs/cargo/crate/src/generated/napi/napi_cursor.rs index 0dc62a5db8..5cc54070d1 100644 --- a/crates/solidity/outputs/cargo/crate/src/generated/napi/napi_cursor.rs +++ b/crates/solidity/outputs/cargo/crate/src/generated/napi/napi_cursor.rs @@ -67,8 +67,7 @@ impl Cursor { #[napi(ts_return_type = "Array")] pub fn path_rule_nodes(&self, env: Env) -> Vec { self.0 - .path_rule_nodes() - .iter() + .ancestors() .map(|rust_rule_node| rust_rule_node.to_js(&env)) .collect() } diff --git a/crates/solidity/outputs/cargo/crate/src/generated/visitor.rs b/crates/solidity/outputs/cargo/crate/src/generated/visitor.rs deleted file mode 100644 index 2a8585df5d..0000000000 --- a/crates/solidity/outputs/cargo/crate/src/generated/visitor.rs +++ /dev/null @@ -1,78 +0,0 @@ -// This file is generated automatically by infrastructure scripts. Please don't edit by hand. - -use std::ops::ControlFlow; -use std::rc::Rc; - -use super::{cst::*, cursor::Cursor}; - -/// A Visitor pattern for traversing the CST. -/// -/// The trait supports fallible iteration, i.e. the visitor can early return an error from the visit. -pub trait Visitor { - /// Called when the [`Visitor`] enters a [`RuleNode`]. - fn rule_enter( - &mut self, - _node: &Rc, - _cursor: &Cursor, - ) -> Result, E> { - Ok(ControlFlow::Continue(Step::In)) - } - - /// Called when the [`Visitor`] exits a [`RuleNode`]. - fn rule_exit(&mut self, _node: &Rc, _cursor: &Cursor) -> Result, E> { - Ok(ControlFlow::Continue(())) - } - - /// Called when the [`Visitor`] enters a [`TokenNode`]. - fn token(&mut self, _node: &Rc, _cursor: &Cursor) -> Result, E> { - Ok(ControlFlow::Continue(())) - } -} - -/// Whether the [`Visitor`] should should enter the children of a [`RuleNode`] or not. -pub enum Step { - In, - Over, -} - -impl Cursor { - pub fn drive_visitor>( - &mut self, - visitor: &mut V, - ) -> Result, E> { - if self.is_completed() { - return Ok(ControlFlow::Continue(())); - } - - loop { - // Node clone is cheap because it's just an enum around an Rc - match self.node() { - Node::Rule(rule_node) => { - match visitor.rule_enter(&rule_node, self)? { - ControlFlow::Break(()) => return Ok(ControlFlow::Break(())), - ControlFlow::Continue(Step::In) => { - if self.go_to_first_child() { - self.drive_visitor(visitor)?; - self.go_to_parent(); - } - } - ControlFlow::Continue(Step::Over) => {} - } - if visitor.rule_exit(&rule_node, self)? == ControlFlow::Break(()) { - return Ok(ControlFlow::Break(())); - } - } - - Node::Token(token_node) => { - if visitor.token(&token_node, self)? == ControlFlow::Break(()) { - return Ok(ControlFlow::Break(())); - } - } - } - - if !self.go_to_next_sibling() { - return Ok(ControlFlow::Continue(())); - } - } - } -} diff --git a/crates/solidity/outputs/cargo/tests/src/doc_examples/cursor_api.rs b/crates/solidity/outputs/cargo/tests/src/doc_examples/cursor_api.rs index e22290632a..76e81d2edd 100644 --- a/crates/solidity/outputs/cargo/tests/src/doc_examples/cursor_api.rs +++ b/crates/solidity/outputs/cargo/tests/src/doc_examples/cursor_api.rs @@ -92,6 +92,30 @@ fn cursor_api_using_iter() -> Result<()> { return Ok(()); } +#[test] +fn cursor_api_using_iter_combinators() -> Result<()> { + let language = Language::new(Version::parse("0.8.0")?)?; + let parse_output = language.parse(ProductionKind::ContractDefinition, "contract Foo {}"); + + let cursor = parse_output.create_tree_cursor(); + + let contract_names: Vec<_> = cursor + .filter_map(|node| { + let node = node.as_rule_with_kind(&[RuleKind::ContractDefinition])?; + let name = node + .children + .iter() + .find_map(|node| node.as_token_with_kind(&[TokenKind::Identifier]))?; + + Some(name.text.clone()) + }) + .collect(); + + assert_eq!(contract_names, &["Foo"]); + + return Ok(()); +} + #[test] fn cursor_as_iter() -> Result<()> { let language = Language::new(Version::parse("0.8.0")?)?; diff --git a/crates/solidity/outputs/cargo/tests/src/doc_examples/mod.rs b/crates/solidity/outputs/cargo/tests/src/doc_examples/mod.rs index b68ceef00e..670bdee50b 100644 --- a/crates/solidity/outputs/cargo/tests/src/doc_examples/mod.rs +++ b/crates/solidity/outputs/cargo/tests/src/doc_examples/mod.rs @@ -1,3 +1,2 @@ mod cursor_api; mod simple_contract; -mod visitor_api; diff --git a/crates/solidity/outputs/cargo/tests/src/doc_examples/visitor_api.rs b/crates/solidity/outputs/cargo/tests/src/doc_examples/visitor_api.rs deleted file mode 100644 index 1c7b5c8524..0000000000 --- a/crates/solidity/outputs/cargo/tests/src/doc_examples/visitor_api.rs +++ /dev/null @@ -1,56 +0,0 @@ -use std::ops::ControlFlow; -use std::rc::Rc; - -use anyhow::{bail, ensure, Error, Result}; -use semver::Version; - -use slang_solidity::{ - cst::{Node, RuleNode}, - cursor::Cursor, - kinds::{ProductionKind, RuleKind, TokenKind}, - language::Language, - visitor::{Step, Visitor}, -}; - -struct ContractCollector { - contract_names: Vec, -} - -impl Visitor for ContractCollector { - fn rule_enter( - &mut self, - node: &Rc, - _cursor: &Cursor, - ) -> Result> { - if node.kind == RuleKind::ContractDefinition { - if let Node::Token(token) = &node.children[2] { - ensure!(token.kind == TokenKind::Identifier); - self.contract_names.push(token.text.to_owned()); - } else { - bail!("Expected contract identifier: {node:?}"); - }; - - return Ok(ControlFlow::Continue(Step::Over)); - } - - Ok(ControlFlow::Continue(Step::In)) - } -} - -#[test] -fn visitor_api() -> Result<()> { - let language = Language::new(Version::parse("0.8.0")?)?; - let parse_output = language.parse(ProductionKind::ContractDefinition, "contract Foo {}"); - - let mut collector = ContractCollector { - contract_names: Vec::new(), - }; - - parse_output - .create_tree_cursor() - .drive_visitor(&mut collector)?; - - assert!(matches!(&collector.contract_names[..], [single] if single == "Foo")); - - return Ok(()); -} diff --git a/crates/solidity/outputs/npm/crate/src/generated/cst.rs b/crates/solidity/outputs/npm/crate/src/generated/cst.rs index f20fe136e9..77154c22b6 100644 --- a/crates/solidity/outputs/npm/crate/src/generated/cst.rs +++ b/crates/solidity/outputs/npm/crate/src/generated/cst.rs @@ -48,6 +48,14 @@ impl Node { } } + /// Returns a slice of the children (not all descendants) of this node. + pub fn children(&self) -> &[Node] { + match self { + Self::Rule(node) => &node.children, + Self::Token(_) => &[], + } + } + pub fn create_cursor(&self, text_offset: TextIndex) -> Cursor { Cursor::new(self.clone(), text_offset) } diff --git a/crates/solidity/outputs/npm/crate/src/generated/cursor.rs b/crates/solidity/outputs/npm/crate/src/generated/cursor.rs index b3743ec4b6..2c265f043c 100644 --- a/crates/solidity/outputs/npm/crate/src/generated/cursor.rs +++ b/crates/solidity/outputs/npm/crate/src/generated/cursor.rs @@ -146,11 +146,14 @@ impl Cursor { self.current.text_range() } - pub fn path_rule_nodes(&self) -> Vec> { - self.path - .iter() - .map(|path_element| path_element.rule_node.clone()) - .collect() + /// Returns the depth of the current node in the CST, i.e. the number of ancestors. + pub fn depth(&self) -> usize { + self.path.len() + } + + /// Returns an iterator over the current node's ancestors, starting from the cursor root node. + pub fn ancestors(&self) -> impl Iterator> { + self.path.iter().map(|elem| &elem.rule_node) } /// Attempts to go to current node's next one, according to the DFS pre-order traversal. diff --git a/crates/solidity/outputs/npm/crate/src/generated/mod.rs b/crates/solidity/outputs/npm/crate/src/generated/mod.rs index 45a9519857..aa488c9b16 100644 --- a/crates/solidity/outputs/npm/crate/src/generated/mod.rs +++ b/crates/solidity/outputs/npm/crate/src/generated/mod.rs @@ -11,7 +11,6 @@ pub(crate) mod lexer; pub mod parse_error; pub mod parse_output; pub mod text_index; -pub mod visitor; #[cfg(feature = "slang_napi_interfaces")] pub mod napi; diff --git a/crates/solidity/outputs/npm/crate/src/generated/napi/napi_cursor.rs b/crates/solidity/outputs/npm/crate/src/generated/napi/napi_cursor.rs index 0dc62a5db8..5cc54070d1 100644 --- a/crates/solidity/outputs/npm/crate/src/generated/napi/napi_cursor.rs +++ b/crates/solidity/outputs/npm/crate/src/generated/napi/napi_cursor.rs @@ -67,8 +67,7 @@ impl Cursor { #[napi(ts_return_type = "Array")] pub fn path_rule_nodes(&self, env: Env) -> Vec { self.0 - .path_rule_nodes() - .iter() + .ancestors() .map(|rust_rule_node| rust_rule_node.to_js(&env)) .collect() } diff --git a/crates/solidity/outputs/npm/crate/src/generated/visitor.rs b/crates/solidity/outputs/npm/crate/src/generated/visitor.rs deleted file mode 100644 index 2a8585df5d..0000000000 --- a/crates/solidity/outputs/npm/crate/src/generated/visitor.rs +++ /dev/null @@ -1,78 +0,0 @@ -// This file is generated automatically by infrastructure scripts. Please don't edit by hand. - -use std::ops::ControlFlow; -use std::rc::Rc; - -use super::{cst::*, cursor::Cursor}; - -/// A Visitor pattern for traversing the CST. -/// -/// The trait supports fallible iteration, i.e. the visitor can early return an error from the visit. -pub trait Visitor { - /// Called when the [`Visitor`] enters a [`RuleNode`]. - fn rule_enter( - &mut self, - _node: &Rc, - _cursor: &Cursor, - ) -> Result, E> { - Ok(ControlFlow::Continue(Step::In)) - } - - /// Called when the [`Visitor`] exits a [`RuleNode`]. - fn rule_exit(&mut self, _node: &Rc, _cursor: &Cursor) -> Result, E> { - Ok(ControlFlow::Continue(())) - } - - /// Called when the [`Visitor`] enters a [`TokenNode`]. - fn token(&mut self, _node: &Rc, _cursor: &Cursor) -> Result, E> { - Ok(ControlFlow::Continue(())) - } -} - -/// Whether the [`Visitor`] should should enter the children of a [`RuleNode`] or not. -pub enum Step { - In, - Over, -} - -impl Cursor { - pub fn drive_visitor>( - &mut self, - visitor: &mut V, - ) -> Result, E> { - if self.is_completed() { - return Ok(ControlFlow::Continue(())); - } - - loop { - // Node clone is cheap because it's just an enum around an Rc - match self.node() { - Node::Rule(rule_node) => { - match visitor.rule_enter(&rule_node, self)? { - ControlFlow::Break(()) => return Ok(ControlFlow::Break(())), - ControlFlow::Continue(Step::In) => { - if self.go_to_first_child() { - self.drive_visitor(visitor)?; - self.go_to_parent(); - } - } - ControlFlow::Continue(Step::Over) => {} - } - if visitor.rule_exit(&rule_node, self)? == ControlFlow::Break(()) { - return Ok(ControlFlow::Break(())); - } - } - - Node::Token(token_node) => { - if visitor.token(&token_node, self)? == ControlFlow::Break(()) { - return Ok(ControlFlow::Break(())); - } - } - } - - if !self.go_to_next_sibling() { - return Ok(ControlFlow::Continue(())); - } - } - } -} diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.4.11-failure.yml index 9a7d2d441b..d3b761085a 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.4.11-failure.yml @@ -60,5 +60,4 @@ Tree: - PathImport (Rule): # 30..40 ' "foo.sol"' - AsciiStringLiteral (Token): '"foo.sol"' # 31..40 - Semicolon (Token): ";" # 40..41 - - EndOfFileTrivia (Rule): "\n" # 42..43 - SKIPPED (Token): "using A for B;\n\ncontract C { }\n\ninterface I { }\n\nl..." # 43..243 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml index 82234f9e86..5112c22fd3 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/everything/generated/0.8.13-failure.yml @@ -130,5 +130,4 @@ Tree: - IsKeyword (Token): "is" # 208..210 - BoolKeyword (Token): "bool" # 211..215 - Semicolon (Token): ";" # 215..216 - - EndOfFileTrivia (Rule): "\n" # 217..218 - SKIPPED (Token): "event E1(uint256 value);\n" # 218..243 diff --git a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.4.11-failure.yml b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.4.11-failure.yml index b497560851..9d36bfff85 100644 --- a/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.4.11-failure.yml +++ b/crates/solidity/testing/snapshots/cst_output/SourceUnit/using_directive/generated/0.4.11-failure.yml @@ -58,5 +58,4 @@ Tree: - Period (Token): "." # 52..53 - VersionPragmaValue (Token): "0" # 53..54 - Semicolon (Token): ";" # 54..55 - - EndOfFileTrivia (Rule): "\n" # 56..57 - SKIPPED (Token): "using EnvelopeUtils for Envelope global;\nusing Tra..." # 57..793 diff --git a/crates/solidity/testing/utils/src/cst_snapshots/mod.rs b/crates/solidity/testing/utils/src/cst_snapshots/mod.rs index e85b331b86..041f3550f5 100644 --- a/crates/solidity/testing/utils/src/cst_snapshots/mod.rs +++ b/crates/solidity/testing/utils/src/cst_snapshots/mod.rs @@ -1,11 +1,14 @@ -mod test_nodes; - -use std::{self, cmp::max, fmt::Write}; +use std::{cmp::max, fmt::Write}; use anyhow::Result; -use slang_solidity::{cursor::Cursor, text_index::TextRangeExtensions}; +use slang_solidity::{ + cst, + cursor::Cursor, + kinds::TokenKind, + text_index::{TextRange, TextRangeExtensions}, +}; -use crate::cst_snapshots::test_nodes::{TestNode, TestNodeKind}; +use crate::node_extensions::NodeExtensions; pub struct CstSnapshots; @@ -83,55 +86,122 @@ fn write_errors(w: &mut W, errors: &Vec) -> Result<()> { return Ok(()); } -fn write_tree(w: &mut W, cursor: Cursor, source: &str) -> Result<()> { +fn write_tree(w: &mut W, mut cursor: Cursor, source: &str) -> Result<()> { write!(w, "Tree:")?; writeln!(w)?; - let tree = TestNode::from_cst(cursor); - write_node(w, &tree, source, 0)?; + let significant_nodes_with_range = std::iter::from_fn(|| loop { + let (depth, range) = (cursor.depth(), cursor.text_range()); + + // Skip whitespace and trivia rules containing only those tokens + match cursor.next() { + Some(cst::Node::Rule(rule)) + if rule.is_trivia() + && rule.children.iter().all(|node| { + node.as_token_matching(|t| is_whitespace(t.kind)).is_some() + }) => + { + continue + } + Some(cst::Node::Token(token)) if is_whitespace(token.kind) => continue, + next => break next.map(|item| (item, depth, range)), + } + }); - return Ok(()); + for (node, depth, range) in significant_nodes_with_range { + write_node(w, &node, &range, source, depth)?; + } + + Ok(()) } fn write_node( w: &mut W, - node: &TestNode, + node: &cst::Node, + range: &TextRange, source: &str, indentation: usize, ) -> Result<()> { - let range_string = format!("{range:?}", range = node.range.utf8()); + let range_string = format!("{range:?}", range = range.utf8()); - let (node_value, node_comment) = if node.range.is_empty() { - let preview = match node.kind { - TestNodeKind::Rule(_) => " []", - TestNodeKind::Token(_) | TestNodeKind::Trivia(_) => " \"\"", + let (node_value, node_comment) = if range.is_empty() { + let preview = match node { + cst::Node::Rule(_) => " []", + cst::Node::Token(_) => " \"\"", }; + (preview.to_owned(), range_string) } else { - let preview = node.render_preview(source, &node.range)?; - if node.children.is_empty() { - ( - format!(" {preview}"), - format!("{range:?}", range = node.range.utf8()), - ) + let preview = render_source_preview(source, &range)?; + + if node.children().is_empty() { + // "foo" # 1..2 + (format!(" {preview}"), range_string) } else { - ( - "".to_owned(), - format!("{range:?} {preview}", range = node.range.utf8()), - ) + // # 1..2 "foo" + ("".to_owned(), format!("{range_string} {preview}")) } }; + let name = match node { + cst::Node::Rule(rule) => format!("{:?} (Rule)", rule.kind), + cst::Node::Token(token) if is_comment(token.kind) => format!("{:?} (Trivia)", token.kind), + cst::Node::Token(token) => format!("{:?} (Token)", token.kind), + }; + writeln!( w, - "{indentation} - {kind}:{node_value} # {node_comment}", + "{indentation} - {name}:{node_value} # {node_comment}", indentation = " ".repeat(4 * indentation), - kind = node.kind, )?; - for child in &node.children { - write_node(w, child, source, indentation + 1)?; + Ok(()) +} + +pub fn render_source_preview(source: &str, range: &TextRange) -> Result { + let max_length = 50; + let length = range.end.utf8 - range.start.utf8; + + // Trim long values: + let contents = source + .bytes() + .skip(range.start.utf8) + .take(length.clamp(0, max_length)) + .collect(); + + // Add terminator if trimmed: + let mut contents = String::from_utf8(contents)?; + if length > max_length { + contents.push_str("..."); } - return Ok(()); + // Escape line breaks: + let contents = contents + .replace("\t", "\\t") + .replace("\r", "\\r") + .replace("\n", "\\n"); + + // Surround by quotes for use in yaml: + let contents = { + if contents.contains("\"") { + let contents = contents.replace("'", "''"); + format!("'{contents}'") + } else { + let contents = contents.replace("\"", "\\\""); + format!("\"{contents}\"") + } + }; + + return Ok(contents); +} + +fn is_whitespace(kind: TokenKind) -> bool { + matches!(kind, TokenKind::Whitespace | TokenKind::EndOfLine) +} + +fn is_comment(kind: TokenKind) -> bool { + matches!( + kind, + TokenKind::SingleLineComment | TokenKind::MultilineComment + ) } diff --git a/crates/solidity/testing/utils/src/cst_snapshots/test_nodes.rs b/crates/solidity/testing/utils/src/cst_snapshots/test_nodes.rs deleted file mode 100644 index 429a6b249c..0000000000 --- a/crates/solidity/testing/utils/src/cst_snapshots/test_nodes.rs +++ /dev/null @@ -1,144 +0,0 @@ -use std::ops::ControlFlow; -use std::rc::Rc; - -use anyhow::Result; -use slang_solidity::{ - cst::RuleNode, cst::TokenNode, cursor::Cursor, kinds::RuleKind, kinds::TokenKind, - text_index::TextRange, visitor::Step, visitor::Visitor, -}; - -#[derive(Debug)] -pub enum TestNodeKind { - Rule(RuleKind), - Token(TokenKind), - Trivia(TokenKind), -} - -pub struct TestNode { - pub kind: TestNodeKind, - pub range: TextRange, - pub children: Vec, -} - -struct TestNodeBuilder { - stack: Vec>, -} - -impl Visitor<()> for TestNodeBuilder { - fn rule_enter( - &mut self, - _node: &Rc, - _cursor: &Cursor, - ) -> Result, ()> { - self.stack.push(vec![]); - Ok(ControlFlow::Continue(Step::In)) - } - - fn rule_exit(&mut self, node: &Rc, cursor: &Cursor) -> Result, ()> { - let children = self.stack.pop().unwrap(); - - if (node.kind == RuleKind::LeadingTrivia) | (node.kind == RuleKind::TrailingTrivia) { - if children.is_empty() { - return Ok(ControlFlow::Continue(())); - } - } - - let new_node = TestNode { - kind: TestNodeKind::Rule(node.kind), - range: cursor.text_range(), - children, - }; - self.stack.last_mut().unwrap().push(new_node); - - Ok(ControlFlow::Continue(())) - } - - fn token(&mut self, node: &Rc, cursor: &Cursor) -> Result, ()> { - if !Self::is_whitespace(node) { - let kind = if Self::is_comment(node) { - TestNodeKind::Trivia(node.kind) - } else { - TestNodeKind::Token(node.kind) - }; - - let new_node = TestNode { - kind, - range: cursor.text_range(), - children: vec![], - }; - self.stack.last_mut().unwrap().push(new_node); - } - - Ok(ControlFlow::Continue(())) - } -} - -impl TestNodeBuilder { - fn is_whitespace(token_node: &Rc) -> bool { - (token_node.kind == TokenKind::Whitespace) | (token_node.kind == TokenKind::EndOfLine) - } - - fn is_comment(token_node: &Rc) -> bool { - (token_node.kind == TokenKind::SingleLineComment) - | (token_node.kind == TokenKind::MultilineComment) - } -} - -impl TestNode { - pub fn from_cst(mut cursor: Cursor) -> Self { - let mut visitor = TestNodeBuilder { - stack: vec![vec![]], - }; - - cursor.drive_visitor(&mut visitor).unwrap(); - - return visitor.stack.remove(0).remove(0); - } - - pub fn render_preview(&self, source: &str, range: &TextRange) -> Result { - let max_length = 50; - let length = range.end.utf8 - range.start.utf8; - - // Trim long values: - let contents = source - .bytes() - .skip(range.start.utf8) - .take(length.clamp(0, max_length)) - .collect(); - - // Add terminator if trimmed: - let mut contents = String::from_utf8(contents)?; - if length > max_length { - contents.push_str("..."); - } - - // Escape line breaks: - let contents = contents - .replace("\t", "\\t") - .replace("\r", "\\r") - .replace("\n", "\\n"); - - // Surround by quotes for use in yaml: - let contents = { - if contents.contains("\"") { - let contents = contents.replace("'", "''"); - format!("'{contents}'") - } else { - let contents = contents.replace("\"", "\\\""); - format!("\"{contents}\"") - } - }; - - return Ok(contents); - } -} - -impl std::fmt::Display for TestNodeKind { - fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { - return match self { - TestNodeKind::Rule(kind) => write!(f, "{kind:?} (Rule)"), - TestNodeKind::Token(kind) => write!(f, "{kind:?} (Token)"), - TestNodeKind::Trivia(kind) => write!(f, "{kind:?} (Trivia)"), - }; - } -} diff --git a/crates/solidity/testing/utils/src/node_extensions/mod.rs b/crates/solidity/testing/utils/src/node_extensions/mod.rs index 77d0f72852..f72bcec620 100644 --- a/crates/solidity/testing/utils/src/node_extensions/mod.rs +++ b/crates/solidity/testing/utils/src/node_extensions/mod.rs @@ -29,7 +29,10 @@ impl NodeExtensions for Node { impl NodeExtensions for RuleNode { fn is_trivia(&self) -> bool { - return self.kind == RuleKind::LeadingTrivia || self.kind == RuleKind::TrailingTrivia; + matches!( + self.kind, + RuleKind::LeadingTrivia | RuleKind::TrailingTrivia | RuleKind::EndOfFileTrivia + ) } fn extract_non_trivia(&self) -> String { diff --git a/documentation/public/user-guide/cargo-crate/index.md b/documentation/public/user-guide/cargo-crate/index.md index a9a2138bff..04e2086fa1 100644 --- a/documentation/public/user-guide/cargo-crate/index.md +++ b/documentation/public/user-guide/cargo-crate/index.md @@ -46,24 +46,8 @@ You can then iterate over the resulting children, and assert that they match the For many code analysis tasks, it is useful to traverse the parse tree and visit each node. The `Cursor` object allows callers to traverse the parse tree in a pre-order depth-first manner. -This is an internal iterator. The `Cursor` can drive an external iterator i.e. the `Visitor` trait, which is described below. - The below example uses a cursor to collect the names of all contracts in a source file, and returns them as a `Vec`: ```{ .rust } --8<-- "crates/solidity/outputs/cargo/tests/src/doc_examples/cursor_api.rs" ``` - -## Visitor API - -The `Visitor` trait allows callers to implement a visitor that will be called for each node in the tree. -The `std::ops::ControlFlow` enum coupled with the `Step` enum allows callers to control the traversal behavior. - -For example, if the visitor is only interested in the top-level nodes, it can return `ControlFlow::Continue(Step::Over)` to skip the children of the current node. -If the visitor is interested in the children of the current node, it can return `ControlFlow::Continue(Step::In)` to visit them. - -The below example defines a visitor that collects the names of all contracts in a source file, and returns them as a `Vec`: - -```{ .rust } ---8<-- "crates/solidity/outputs/cargo/tests/src/doc_examples/visitor_api.rs" -```