Merge remote-tracking branch 'upstream/main' into fix-lists-in-v2

Xanewok · Nov 22, 2023 · 6555c10 · 6555c10
2 parents 23f8804 + a90a6fe
commit 6555c10
Show file tree

Hide file tree

Showing 221 changed files with 579 additions and 634 deletions.
diff --git a/crates/codegen/schema/src/validation/rules/utils.rs b/crates/codegen/schema/src/validation/rules/utils.rs
@@ -3,13 +3,5 @@ pub fn is_a_keyword_scanner(reference_name: &str) -> bool {
     // In the meantime, let's just skip them from this validation.
     // https://github.com/NomicFoundation/slang/issues/505
 
-    return match reference_name {
-        "FixedBytesType"
-        | "SignedFixedType"
-        | "UnsignedFixedType"
-        | "SignedIntegerType"
-        | "UnsignedIntegerType" => true,
-        keyword if keyword.contains("Keyword") || keyword.contains("ReservedWord") => true,
-        _ => false,
-    };
+    reference_name.contains("Keyword") || reference_name.contains("ReservedWord")
 }
diff --git a/crates/solidity/inputs/language/definition/03-types/02-elementary-types/productions.yml b/crates/solidity/inputs/language/definition/03-types/02-elementary-types/productions.yml
@@ -10,22 +10,22 @@
         - reference: "ByteKeyword"
         - reference: "StringKeyword"
         - reference: "AddressType"
-        - reference: "FixedBytesType"
-        - reference: "SignedIntegerType"
-        - reference: "UnsignedIntegerType"
-        - reference: "SignedFixedType"
-        - reference: "UnsignedFixedType"
+        - reference: "BytesKeyword"
+        - reference: "IntKeyword"
+        - reference: "UintKeyword"
+        - reference: "FixedKeyword"
+        - reference: "UfixedKeyword"
     0.8.0:
       # removed: ByteKeyword
       choice:
         - reference: "BoolKeyword"
         - reference: "StringKeyword"
         - reference: "AddressType"
-        - reference: "FixedBytesType"
-        - reference: "SignedIntegerType"
-        - reference: "UnsignedIntegerType"
-        - reference: "SignedFixedType"
-        - reference: "UnsignedFixedType"
+        - reference: "BytesKeyword"
+        - reference: "IntKeyword"
+        - reference: "UintKeyword"
+        - reference: "FixedKeyword"
+        - reference: "UfixedKeyword"
 
 - name: "AddressType"
   kind: "Parser"
@@ -37,7 +37,7 @@
               reference: "PayableKeyword"
       - reference: "PayableKeyword"
 
-- name: "FixedBytesType"
+- name: "BytesKeyword"
   kind: "Scanner"
   unversioned:
     trailingContext:
@@ -86,7 +86,7 @@
       - terminal: "31"
       - terminal: "32"
 
-- name: "SignedIntegerType"
+- name: "IntKeyword"
   kind: "Scanner"
   unversioned:
     trailingContext:
@@ -98,7 +98,7 @@
       notFollowedBy:
         reference: "IdentifierPart"
 
-- name: "UnsignedIntegerType"
+- name: "UintKeyword"
   kind: "Scanner"
   unversioned:
     trailingContext:
@@ -148,7 +148,7 @@
       - terminal: "248"
       - terminal: "256"
 
-- name: "SignedFixedType"
+- name: "FixedKeyword"
   kind: "Scanner"
   unversioned:
     trailingContext:
@@ -160,7 +160,7 @@
       notFollowedBy:
         reference: "IdentifierPart"
 
-- name: "UnsignedFixedType"
+- name: "UfixedKeyword"
   kind: "Scanner"
   unversioned:
     trailingContext:

diff --git a/crates/solidity/inputs/language/definition/05-expressions/06-identifiers/productions.yml b/crates/solidity/inputs/language/definition/05-expressions/06-identifiers/productions.yml
@@ -40,11 +40,11 @@
   unversioned:
     choice:
       # Types
-      - reference: "FixedBytesType"
-      - reference: "SignedFixedType"
-      - reference: "UnsignedFixedType"
-      - reference: "SignedIntegerType"
-      - reference: "UnsignedIntegerType"
+      - reference: "BytesKeyword"
+      - reference: "FixedKeyword"
+      - reference: "UfixedKeyword"
+      - reference: "IntKeyword"
+      - reference: "UintKeyword"
       # Keywords
       - reference: "AddressKeyword"
       - reference: "AnonymousKeyword"

diff --git a/crates/solidity/inputs/language/src/definition.rs b/crates/solidity/inputs/language/src/definition.rs
diff --git a/crates/solidity/inputs/language/src/dsl.rs b/crates/solidity/inputs/language/src/dsl.rs
@@ -263,7 +263,7 @@ slang_grammar! {
         parser DoWhileStatement = ((DoKeyword Statement WhileKeyword (Expression delimited by OpenParen and CloseParen)) terminated by Semicolon) ;
 
         inline parser ElementaryType = (
-            BoolKeyword | StringKeyword | AddressType | FixedBytesType | SignedIntegerType | UnsignedIntegerType | SignedFixedType | UnsignedFixedType |
+            BoolKeyword | StringKeyword | AddressType | BytesKeyword | IntKeyword | UintKeyword | FixedKeyword | UfixedKeyword |
             { removed in "0.8.0" ByteKeyword}
         ) ;
 
@@ -768,11 +768,11 @@ slang_grammar! {
 
     // Constructed Identifiers (Typenames)
 
-    scanner FixedBytesType =      ("bytes"  FixedBytesTypeSize) ;
-    scanner SignedFixedType =     ("fixed"  (FixedTypeSize ?)) ;
-    scanner SignedIntegerType =   ("int"    (IntegerTypeSize ?)) ;
-    scanner UnsignedFixedType =   ("ufixed" (FixedTypeSize ?)) ;
-    scanner UnsignedIntegerType = ("uint"   (IntegerTypeSize ?)) ;
+    scanner BytesKeyword =        ("bytes"  FixedBytesTypeSize) ;
+    scanner FixedKeyword =        ("fixed"  (FixedTypeSize ?)) ;
+    scanner IntKeyword =          ("int"    (IntegerTypeSize ?)) ;
+    scanner UfixedKeyword =   ("ufixed" (FixedTypeSize ?)) ;
+    scanner UintKeyword = ("uint"   (IntegerTypeSize ?)) ;
 
     scanner FixedBytesTypeSize = (
         "1"  | "2"  | "3"  | "4"  | "5"  | "6"  | "7"  | "8"  |

diff --git a/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs b/crates/solidity/outputs/cargo/crate/src/generated/kinds.rs