diff --git a/crates/solidity/inputs/language/src/definition.rs b/crates/solidity/inputs/language/src/definition.rs index d1f5f309e1..a0b5b889b1 100644 --- a/crates/solidity/inputs/language/src/definition.rs +++ b/crates/solidity/inputs/language/src/definition.rs @@ -2079,7 +2079,7 @@ codegen_language_macros::compile!(Language( Optional(reference = AbstractKeyword, enabled = From("0.6.0")), contract_keyword = Required(ContractKeyword), name = Required(Identifier), - inheritence = Optional(reference = InheritanceSpecifier), + inheritance = Optional(reference = InheritanceSpecifier), open_brace = Required(OpenBrace), members = Required(ContractMembers), close_brace = Required(CloseBrace) @@ -2156,7 +2156,7 @@ codegen_language_macros::compile!(Language( fields = ( interface_keyword = Required(InterfaceKeyword), name = Required(Identifier), - inheritence = Optional(reference = InheritanceSpecifier), + inheritance = Optional(reference = InheritanceSpecifier), open_brace = Required(OpenBrace), members = Required(InterfaceMembers), close_brace = Required(CloseBrace) diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/generated/kinds.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/generated/kinds.rs index 013faab58a..c3fc0f1164 100644 --- a/crates/solidity/outputs/cargo/slang_solidity/src/generated/generated/kinds.rs +++ b/crates/solidity/outputs/cargo/slang_solidity/src/generated/generated/kinds.rs @@ -322,7 +322,7 @@ pub enum EdgeLabel { ImportKeyword, Index, IndexedKeyword, - Inheritence, + Inheritance, Initialization, InterfaceKeyword, IsKeyword, diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/generated/language.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/generated/language.rs index b81cd28140..e385b297c3 100644 --- a/crates/solidity/outputs/cargo/slang_solidity/src/generated/generated/language.rs +++ b/crates/solidity/outputs/cargo/slang_solidity/src/generated/generated/language.rs @@ -945,7 +945,7 @@ impl Language { ), )?; seq.elem_labeled( - EdgeLabel::Inheritence, + EdgeLabel::Inheritance, OptionalHelper::transform(self.inheritance_specifier(input)), )?; seq.elem(SequenceHelper::run(|mut seq| { @@ -3131,7 +3131,7 @@ impl Language { ), )?; seq.elem_labeled( - EdgeLabel::Inheritence, + EdgeLabel::Inheritance, OptionalHelper::transform(self.inheritance_specifier(input)), )?; seq.elem(SequenceHelper::run(|mut seq| { diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/contract_definition.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/contract_definition.rs index eb1ada1bc1..2722119620 100644 --- a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/contract_definition.rs +++ b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/contract_definition.rs @@ -35,8 +35,8 @@ fn header_comment() -> Result<()> { } #[test] -fn inheritence_specifier() -> Result<()> { - run("ContractDefinition", "inheritence_specifier") +fn inheritance_specifier() -> Result<()> { + run("ContractDefinition", "inheritance_specifier") } #[test] diff --git a/crates/solidity/outputs/npm/package/src/generated/ast/generated/ast_types.ts b/crates/solidity/outputs/npm/package/src/generated/ast/generated/ast_types.ts index 3842274cd9..028411aeb3 100644 --- a/crates/solidity/outputs/npm/package/src/generated/ast/generated/ast_types.ts +++ b/crates/solidity/outputs/npm/package/src/generated/ast/generated/ast_types.ts @@ -464,14 +464,14 @@ export class UsingAlias { export class ContractDefinition { private readonly fetch = once(() => { - const [$abstractKeyword, $contractKeyword, $name, $inheritence, $openBrace, $members, $closeBrace] = + const [$abstractKeyword, $contractKeyword, $name, $inheritance, $openBrace, $members, $closeBrace] = ast_internal.selectSequence(this.cst); return { abstractKeyword: $abstractKeyword === null ? undefined : ($abstractKeyword as TerminalNode), contractKeyword: $contractKeyword as TerminalNode, name: $name as TerminalNode, - inheritence: $inheritence === null ? undefined : new InheritanceSpecifier($inheritence as NonterminalNode), + inheritance: $inheritance === null ? undefined : new InheritanceSpecifier($inheritance as NonterminalNode), openBrace: $openBrace as TerminalNode, members: new ContractMembers($members as NonterminalNode), closeBrace: $closeBrace as TerminalNode, @@ -494,8 +494,8 @@ export class ContractDefinition { return this.fetch().name; } - public get inheritence(): InheritanceSpecifier | undefined { - return this.fetch().inheritence; + public get inheritance(): InheritanceSpecifier | undefined { + return this.fetch().inheritance; } public get openBrace(): TerminalNode { @@ -559,14 +559,14 @@ export class InheritanceType { export class InterfaceDefinition { private readonly fetch = once(() => { - const [$interfaceKeyword, $name, $inheritence, $openBrace, $members, $closeBrace] = ast_internal.selectSequence( + const [$interfaceKeyword, $name, $inheritance, $openBrace, $members, $closeBrace] = ast_internal.selectSequence( this.cst, ); return { interfaceKeyword: $interfaceKeyword as TerminalNode, name: $name as TerminalNode, - inheritence: $inheritence === null ? undefined : new InheritanceSpecifier($inheritence as NonterminalNode), + inheritance: $inheritance === null ? undefined : new InheritanceSpecifier($inheritance as NonterminalNode), openBrace: $openBrace as TerminalNode, members: new InterfaceMembers($members as NonterminalNode), closeBrace: $closeBrace as TerminalNode, @@ -585,8 +585,8 @@ export class InterfaceDefinition { return this.fetch().name; } - public get inheritence(): InheritanceSpecifier | undefined { - return this.fetch().inheritence; + public get inheritance(): InheritanceSpecifier | undefined { + return this.fetch().inheritance; } public get openBrace(): TerminalNode { diff --git a/crates/solidity/outputs/npm/package/src/generated/napi-bindings/generated/index.d.ts b/crates/solidity/outputs/npm/package/src/generated/napi-bindings/generated/index.d.ts index 5d188ee4a4..60eb9c7a2f 100644 --- a/crates/solidity/outputs/npm/package/src/generated/napi-bindings/generated/index.d.ts +++ b/crates/solidity/outputs/npm/package/src/generated/napi-bindings/generated/index.d.ts @@ -291,7 +291,7 @@ export namespace kinds { ImportKeyword = "ImportKeyword", Index = "Index", IndexedKeyword = "IndexedKeyword", - Inheritence = "Inheritence", + Inheritance = "Inheritance", Initialization = "Initialization", InterfaceKeyword = "InterfaceKeyword", IsKeyword = "IsKeyword", 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/inheritance_specifier/generated/0.4.11-success.yml similarity index 97% rename from crates/solidity/testing/snapshots/cst_output/ContractDefinition/inheritence_specifier/generated/0.4.11-success.yml rename to crates/solidity/testing/snapshots/cst_output/ContractDefinition/inheritance_specifier/generated/0.4.11-success.yml index 163ef21349..62bf183c32 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/inheritance_specifier/generated/0.4.11-success.yml @@ -10,7 +10,7 @@ Tree: - (contract_keyword꞉ ContractKeyword): "contract" # (0..8) - (leading_trivia꞉ Whitespace): " " # (8..9) - (name꞉ Identifier): "Sample" # (9..15) - - (inheritence꞉ InheritanceSpecifier): # " is Foo, Bar(1, 2), Baz" (15..38) + - (inheritance꞉ InheritanceSpecifier): # " is Foo, Bar(1, 2), Baz" (15..38) - (leading_trivia꞉ Whitespace): " " # (15..16) - (is_keyword꞉ IsKeyword): "is" # (16..18) - (types꞉ InheritanceTypes): # " Foo, Bar(1, 2), Baz" (18..38) diff --git a/crates/solidity/testing/snapshots/cst_output/ContractDefinition/inheritence_specifier/input.sol b/crates/solidity/testing/snapshots/cst_output/ContractDefinition/inheritance_specifier/input.sol similarity index 100% rename from crates/solidity/testing/snapshots/cst_output/ContractDefinition/inheritence_specifier/input.sol rename to crates/solidity/testing/snapshots/cst_output/ContractDefinition/inheritance_specifier/input.sol