Skip to content

Commit

Permalink
fix: Properly mark override as introduced since 0.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Xanewok committed Mar 12, 2024
1 parent dff1201 commit cc0bb85
Show file tree
Hide file tree
Showing 29 changed files with 571 additions and 410 deletions.
13 changes: 8 additions & 5 deletions crates/solidity/inputs/language/src/definition.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)]
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand All @@ -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)
Expand All @@ -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,
Expand Down Expand Up @@ -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")),
Expand Down Expand Up @@ -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"))
]
),
Expand Down
126 changes: 72 additions & 54 deletions crates/solidity/outputs/cargo/slang_solidity/src/generated/language.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions crates/solidity/outputs/spec/generated/grammar.ebnf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit cc0bb85

Please sign in to comment.