fix: Mark pure and view as only used since 0.4.16 and add missing…

… `constant` attribute (#887) https://github.com/ethereum/solidity/releases/tag/v0.4.16
NomicFoundation · Mar 12, 2024 · dff1201 · dff1201
1 parent ce5050f
commit dff1201
Show file tree

Hide file tree

Showing 41 changed files with 843 additions and 87 deletions.
diff --git a/.changeset/pretty-tigers-search.md b/.changeset/pretty-tigers-search.md
@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/slang": patch
+---
+
+Support view and pure function modifiers only from 0.4.16
diff --git a/.changeset/quiet-points-suffer.md b/.changeset/quiet-points-suffer.md
@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/slang": minor
+---
+
+Add support for constant function modifier removed in 0.5.0
diff --git a/crates/solidity/inputs/language/src/definition.rs b/crates/solidity/inputs/language/src/definition.rs
@@ -1269,7 +1269,10 @@ codegen_language_macros::compile!(Language(
                         Keyword(
                             name = PureKeyword,
                             identifier = Identifier,
-                            definitions = [KeywordDefinition(value = Atom("pure"))]
+                            definitions = [KeywordDefinition(
+                                enabled = From("0.4.16"),
+                                value = Atom("pure")
+                            )]
                         ),
                         Keyword(
                             name = ReceiveKeyword,
@@ -1773,7 +1776,10 @@ codegen_language_macros::compile!(Language(
                         Keyword(
                             name = ViewKeyword,
                             identifier = Identifier,
-                            definitions = [KeywordDefinition(value = Atom("view"))]
+                            definitions = [KeywordDefinition(
+                                enabled = From("0.4.16"),
+                                value = Atom("view")
+                            )]
                         ),
                         Keyword(
                             name = VirtualKeyword,
@@ -2326,8 +2332,8 @@ codegen_language_macros::compile!(Language(
                                 EnumVariant(reference = PayableKeyword),
                                 EnumVariant(reference = PrivateKeyword),
                                 EnumVariant(reference = PublicKeyword),
-                                EnumVariant(reference = PureKeyword),
-                                EnumVariant(reference = ViewKeyword),
+                                EnumVariant(reference = PureKeyword, enabled = From("0.4.16")),
+                                EnumVariant(reference = ViewKeyword, enabled = From("0.4.16")),
                                 EnumVariant(reference = VirtualKeyword, enabled = From("0.6.0"))
                             ]
                         ),
@@ -2425,13 +2431,20 @@ codegen_language_macros::compile!(Language(
                             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")),
                                 EnumVariant(reference = PayableKeyword),
                                 EnumVariant(reference = PrivateKeyword, enabled = Till("0.5.0")),
                                 EnumVariant(reference = PublicKeyword, enabled = Till("0.5.0")),
-                                EnumVariant(reference = PureKeyword),
-                                EnumVariant(reference = ViewKeyword)
+                                EnumVariant(
+                                    reference = PureKeyword,
+                                    enabled = Range(from = "0.4.16", till = "0.6.0")
+                                ),
+                                EnumVariant(
+                                    reference = ViewKeyword,
+                                    enabled = Range(from = "0.4.16", till = "0.6.0")
+                                )
                             ]
                         ),
                         Struct(
@@ -2683,8 +2696,9 @@ codegen_language_macros::compile!(Language(
                                 EnumVariant(reference = ExternalKeyword),
                                 EnumVariant(reference = PrivateKeyword),
                                 EnumVariant(reference = PublicKeyword),
-                                EnumVariant(reference = PureKeyword),
-                                EnumVariant(reference = ViewKeyword),
+                                EnumVariant(reference = ConstantKeyword, enabled = Till("0.5.0")),
+                                EnumVariant(reference = PureKeyword, enabled = From("0.4.16")),
+                                EnumVariant(reference = ViewKeyword, enabled = From("0.4.16")),
                                 EnumVariant(reference = PayableKeyword)
                             ]
                         ),

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/function_definition.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/function_definition.rs
diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/function_type.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/function_type.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/struct_definition.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/struct_definition.rs
diff --git a/crates/solidity/outputs/cargo/tests/src/cst_output/generated/unnamed_function_definition.rs b/crates/solidity/outputs/cargo/tests/src/cst_output/generated/unnamed_function_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/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