Merge commit '0b865f35667e41578976c548e0ca702223d8c2f1' into sanctuar…

…y-fixes
Xanewok · Mar 8, 2024 · 93c5dc3 · 93c5dc3
2 parents 13319ce + 0b865f3
commit 93c5dc3
Show file tree

Hide file tree

Showing 30 changed files with 571 additions and 412 deletions.
diff --git a/crates/solidity/inputs/language/src/definition.rs b/crates/solidity/inputs/language/src/definition.rs
@@ -1224,6 +1224,7 @@ codegen_language_macros::compile!(Language(
                             name = OverrideKeyword,
                             identifier = Identifier,
                             definitions = [KeywordDefinition(
+                                enabled = From("0.6.0"),
                                 reserved = From("0.5.0"),
                                 value = Atom("override")
                             )]
@@ -2258,7 +2259,7 @@ codegen_language_macros::compile!(Language(
                         Enum(
                             name = StateVariableAttribute,
                             variants = [
-                                EnumVariant(reference = OverrideSpecifier),
+                                EnumVariant(reference = OverrideSpecifier, enabled = From("0.6.0")),
                                 EnumVariant(reference = ConstantKeyword),
                                 EnumVariant(reference = InternalKeyword),
                                 EnumVariant(reference = PrivateKeyword),
@@ -2325,7 +2326,7 @@ codegen_language_macros::compile!(Language(
                             name = FunctionAttribute,
                             variants = [
                                 EnumVariant(reference = ModifierInvocation),
-                                EnumVariant(reference = OverrideSpecifier),
+                                EnumVariant(reference = OverrideSpecifier, enabled = From("0.6.0")),
                                 EnumVariant(reference = ConstantKeyword, enabled = Till("0.5.0")),
                                 EnumVariant(reference = ExternalKeyword),
                                 EnumVariant(reference = InternalKeyword),
@@ -2339,13 +2340,15 @@ codegen_language_macros::compile!(Language(
                         ),
                         Struct(
                             name = OverrideSpecifier,
+                            enabled = From("0.6.0"),
                             fields = (
                                 override_keyword = Required(OverrideKeyword),
                                 overridden = Optional(reference = OverridePathsDeclaration)
                             )
                         ),
                         Struct(
                             name = OverridePathsDeclaration,
+                            enabled = From("0.6.0"),
                             error_recovery = FieldsErrorRecovery(
                                 delimiters =
                                     FieldDelimiters(open = open_paren, close = close_paren)
@@ -2359,7 +2362,8 @@ codegen_language_macros::compile!(Language(
                         Separated(
                             name = OverridePaths,
                             reference = IdentifierPath,
-                            separator = Comma
+                            separator = Comma,
+                            enabled = From("0.6.0")
                         ),
                         Struct(
                             name = ReturnsDeclaration,
@@ -2430,7 +2434,6 @@ codegen_language_macros::compile!(Language(
                             enabled = Till("0.6.0"),
                             variants = [
                                 EnumVariant(reference = ModifierInvocation),
-                                EnumVariant(reference = OverrideSpecifier),
                                 EnumVariant(reference = ConstantKeyword, enabled = Till("0.5.0")),
                                 EnumVariant(reference = ExternalKeyword),
                                 EnumVariant(reference = InternalKeyword, enabled = Till("0.5.0")),
@@ -2527,7 +2530,7 @@ codegen_language_macros::compile!(Language(
                         Enum(
                             name = ModifierAttribute,
                             variants = [
-                                EnumVariant(reference = OverrideSpecifier),
+                                EnumVariant(reference = OverrideSpecifier, enabled = From("0.6.0")),
                                 EnumVariant(reference = VirtualKeyword, enabled = From("0.6.0"))
                             ]
                         ),

diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/language.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/language.rs
diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/napi_interface/ast_selectors.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/napi_interface/ast_selectors.rs
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
diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/modifier_definition.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/modifier_definition.rs
diff --git a/crates/solidity/outputs/npm/package/src/ast/generated/ast_types.ts b/crates/solidity/outputs/npm/package/src/ast/generated/ast_types.ts
diff --git a/crates/solidity/outputs/npm/package/src/generated/index.d.ts b/crates/solidity/outputs/npm/package/src/generated/index.d.ts
diff --git a/crates/solidity/outputs/spec/generated/grammar.ebnf b/crates/solidity/outputs/spec/generated/grammar.ebnf
diff --git a/crates/solidity/outputs/spec/generated/public/01-file-structure/08-keywords.md b/crates/solidity/outputs/spec/generated/public/01-file-structure/08-keywords.md
diff --git a/crates/solidity/outputs/spec/generated/public/02-definitions/07-state-variables.md b/crates/solidity/outputs/spec/generated/public/02-definitions/07-state-variables.md