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/src/dsl.rs b/crates/solidity/inputs/language/src/dsl.rs index 46953b6dfc..1843549cda 100644 --- a/crates/solidity/inputs/language/src/dsl.rs +++ b/crates/solidity/inputs/language/src/dsl.rs @@ -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) ; @@ -497,7 +497,7 @@ slang_grammar! { 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 } diff --git a/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs b/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs index 64f482c6ad..35f704b3c6 100644 --- a/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs +++ b/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs @@ -107,7 +107,7 @@ pub enum ProductionKind { SourceUnitMembers, StateVariableAttributesList, StateVariableDefinition, - StatementsList, + Statements, StructDefinition, StructMember, StructMembersList, @@ -270,7 +270,7 @@ pub enum RuleKind { SourceUnitMembers, StateVariableAttributesList, StateVariableDefinition, - StatementsList, + Statements, StructDefinition, StructMember, StructMembersList, diff --git a/crates/solidity/outputs/cargo/crate/src/generated/language.rs b/crates/solidity/outputs/cargo/crate/src/generated/language.rs index e2fcc210ff..42c066353d 100644 --- a/crates/solidity/outputs/cargo/crate/src/generated/language.rs +++ b/crates/solidity/outputs/cargo/crate/src/generated/language.rs @@ -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, @@ -3636,7 +3636,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| { @@ -3696,7 +3696,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::StatementsList) + .with_kind(RuleKind::Statements) } #[allow(unused_assignments, unused_parens)] @@ -6083,7 +6083,7 @@ impl Language { 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), 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/mod.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/mod.rs index 2a639df963..86b8c09c77 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 @@ -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)] diff --git a/crates/solidity/outputs/npm/crate/src/generated/kinds.rs b/crates/solidity/outputs/npm/crate/src/generated/kinds.rs index 64f482c6ad..35f704b3c6 100644 --- a/crates/solidity/outputs/npm/crate/src/generated/kinds.rs +++ b/crates/solidity/outputs/npm/crate/src/generated/kinds.rs @@ -107,7 +107,7 @@ pub enum ProductionKind { SourceUnitMembers, StateVariableAttributesList, StateVariableDefinition, - StatementsList, + Statements, StructDefinition, StructMember, StructMembersList, @@ -270,7 +270,7 @@ pub enum RuleKind { SourceUnitMembers, StateVariableAttributesList, StateVariableDefinition, - StatementsList, + Statements, StructDefinition, StructMember, StructMembersList, diff --git a/crates/solidity/outputs/npm/crate/src/generated/language.rs b/crates/solidity/outputs/npm/crate/src/generated/language.rs index e2fcc210ff..42c066353d 100644 --- a/crates/solidity/outputs/npm/crate/src/generated/language.rs +++ b/crates/solidity/outputs/npm/crate/src/generated/language.rs @@ -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, @@ -3636,7 +3636,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| { @@ -3696,7 +3696,7 @@ impl Language { choice.finish(input) }) }) - .with_kind(RuleKind::StatementsList) + .with_kind(RuleKind::Statements) } #[allow(unused_assignments, unused_parens)] @@ -6083,7 +6083,7 @@ impl Language { 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), 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 6a6840aca2..229c2aa221 100644 --- a/crates/solidity/outputs/npm/package/src/generated/index.d.ts +++ b/crates/solidity/outputs/npm/package/src/generated/index.d.ts @@ -102,7 +102,7 @@ export namespace kinds { SourceUnitMembers = "SourceUnitMembers", StateVariableAttributesList = "StateVariableAttributesList", StateVariableDefinition = "StateVariableDefinition", - StatementsList = "StatementsList", + Statements = "Statements", StructDefinition = "StructDefinition", StructMember = "StructMember", StructMembersList = "StructMembersList", @@ -251,7 +251,7 @@ export namespace kinds { SourceUnitMembers = "SourceUnitMembers", StateVariableAttributesList = "StateVariableAttributesList", StateVariableDefinition = "StateVariableDefinition", - StatementsList = "StatementsList", + Statements = "Statements", StructDefinition = "StructDefinition", StructMember = "StructMember", StructMembersList = "StructMembersList", 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-list/unversioned.md b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/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/04-statements/01-blocks/statements/unversioned.md index 881236998a..0eba3ac59f 100644 --- a/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements-list/unversioned.md +++ b/crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/statements/unversioned.md @@ -1,5 +1,5 @@ -```{ .ebnf .slang-ebnf #StatementsList } -StatementsList = «Statement»+; +```{ .ebnf .slang-ebnf #Statements } +Statements = «Statement»+; ``` 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 8d31f6fc4e..ac9cf34819 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 @@ -264,7 +264,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" 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 0d8568a177..f24717ed99 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 @@ -265,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.21.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/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 8a59d1d543..47c19e8ffa 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 @@ -269,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.4.21.md" --8<-- "crates/solidity/outputs/spec/generated/ebnf/04-statements/01-blocks/simple-statement/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 6cf220593a..1f96e709cf 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 @@ -267,7 +267,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" 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 f2a9fd891f..858682d649 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 @@ -268,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" 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 3651a247d7..ddfd634430 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 @@ -276,7 +276,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" 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 b084f3e5dc..24176d3c14 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 @@ -278,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" 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 addc158a2e..40a4d3facc 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 @@ -276,7 +276,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" 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 2b521804c3..ea46a3fbb8 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 @@ -277,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" 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 7e3a5b8685..871ec6709b 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 @@ -276,7 +276,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" 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 aea429943c..1a03115521 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 @@ -276,7 +276,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" 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 d745581661..de243ea49a 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 @@ -280,7 +280,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" 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 3e2922bc22..34d1d94f94 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 @@ -280,7 +280,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" 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 3b7d9bb5aa..5527d7f963 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 @@ -297,7 +297,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" 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 2928a51eb6..fa4fb2570a 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 @@ -297,7 +297,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" 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 71103d60cc..887d09dacb 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 @@ -298,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" 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 ef105b8874..40d594df14 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 @@ -298,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" 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 3fdb8db2b0..4cede422e1 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 @@ -289,7 +289,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" 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 e212e4b466..15ed5e4e55 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 @@ -293,7 +293,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" 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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