From 1536e49b3d0b769d98374d7eed2559ccde857600 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Wed, 4 Nov 2020 23:18:44 +0000
Subject: [PATCH] Add more syntax tests for uncovered cases

---
 scripts/error_codes.py                         | 18 +++++++++---------
 .../calloptions_on_staticcall.sol              | 10 ++++++++++
 .../functionCalls/staticcall_on_homestead.sol  | 10 ++++++++++
 .../inheritance/base_not_contract.sol          |  5 +++++
 .../assignment_from_functiontype3.sol          | 11 +++++++++++
 .../assignment_from_opcode_like.sol            | 10 ++++++++++
 .../assignment_to_opcode_like.sol              | 10 ++++++++++
 .../inlineAssembly/evm_constantinople.sol      |  5 +++++
 .../evm_constantinople_on_byzantium.sol        |  7 +++++++
 .../shadowing/variable_by_opcode.sol           | 14 ++++++++++++++
 .../syntaxTests/tryCatch/creation.sol          | 13 +++++++++++++
 .../syntaxTests/tryCatch/no_special.sol        | 18 ++++++++++++++++++
 .../yulSyntaxTests/assignment_of_function.yul  |  6 ++++++
 .../yulSyntaxTests/builtin_identifier_6.yul    |  6 ++++++
 .../yulSyntaxTests/builtin_identifier_7.yul    |  7 +++++++
 test/libyul/yulSyntaxTests/call_literal.yul    |  5 +++++
 .../yulSyntaxTests/literal_invalid_type.yul    |  7 +++++++
 17 files changed, 153 insertions(+), 9 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/functionCalls/calloptions_on_staticcall.sol
 create mode 100644 test/libsolidity/syntaxTests/functionCalls/staticcall_on_homestead.sol
 create mode 100644 test/libsolidity/syntaxTests/inheritance/base_not_contract.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype3.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/assignment_from_opcode_like.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/assignment_to_opcode_like.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/shadowing/variable_by_opcode.sol
 create mode 100644 test/libsolidity/syntaxTests/tryCatch/creation.sol
 create mode 100644 test/libsolidity/syntaxTests/tryCatch/no_special.sol
 create mode 100644 test/libyul/yulSyntaxTests/assignment_of_function.yul
 create mode 100644 test/libyul/yulSyntaxTests/builtin_identifier_6.yul
 create mode 100644 test/libyul/yulSyntaxTests/builtin_identifier_7.yul
 create mode 100644 test/libyul/yulSyntaxTests/call_literal.yul
 create mode 100644 test/libyul/yulSyntaxTests/literal_invalid_type.yul

diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 9ecfd0dca..f84c8da93 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -220,15 +220,15 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
             return False
 
     old_source_only_ids = {
-        "1123", "1218", "1220", "1584", "1823", "1950",
-        "1988", "2461", "2512", "2592", "2657", "2800", "2842", "2856",
-        "3046", "3263", "3356", "3441", "3682", "3876",
-        "3893", "3996", "4010", "4281", "4802",
-        "5052", "5073", "5170", "5188", "5272", "5347", "5473",
-        "5622", "6041", "6084", "6272", "7110", "7128", "7186",
-        "7589", "7593", "7653", "7812", "7885", "8065", "8084", "8140",
-        "8261", "8312", "8592", "8758", "9011",
-        "9085", "9390", "9440", "9547", "9551", "9615", "9980",
+        "1123", "1220", "1584", "1823", "1950",
+        "1988", "2512", "2657", "2800",
+        "3046", "3263", "3356", "3682", "3876",
+        "3893", "3996", "4010", "4802",
+        "5073", "5188", "5272",
+        "5622", "6084", "6272", "7128", "7186",
+        "7589", "7593", "7653", "7885", "8065", "8084", "8140",
+        "8312", "8592", "9011",
+        "9085", "9390", "9551",
     }
 
     new_source_only_ids = source_only_ids - old_source_only_ids
diff --git a/test/libsolidity/syntaxTests/functionCalls/calloptions_on_staticcall.sol b/test/libsolidity/syntaxTests/functionCalls/calloptions_on_staticcall.sol
new file mode 100644
index 000000000..e128f03f1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionCalls/calloptions_on_staticcall.sol
@@ -0,0 +1,10 @@
+contract C {
+    function foo() pure internal {
+        address(10).staticcall{value: 7, gas: 3}("");
+    }
+}
+// ====
+// EVMVersion: >=byzantium
+// ----
+// TypeError 2842: (56-96): Cannot set option "value" for staticcall.
+// Warning 9302: (56-100): Return value of low-level calls not used.
diff --git a/test/libsolidity/syntaxTests/functionCalls/staticcall_on_homestead.sol b/test/libsolidity/syntaxTests/functionCalls/staticcall_on_homestead.sol
new file mode 100644
index 000000000..dc5797c91
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionCalls/staticcall_on_homestead.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() public {
+        (bool success, ) = address(10).staticcall{gas: 3}("");
+        success;
+    }
+}
+// ====
+// EVMVersion: <byzantium
+// ----
+// TypeError 5052: (66-100): "staticcall" is not supported by the VM version.
diff --git a/test/libsolidity/syntaxTests/inheritance/base_not_contract.sol b/test/libsolidity/syntaxTests/inheritance/base_not_contract.sol
new file mode 100644
index 000000000..8d12b6e07
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inheritance/base_not_contract.sol
@@ -0,0 +1,5 @@
+function fun() {}
+
+contract C is fun {}
+// ----
+// TypeError 8758: (33-36): Contract expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype3.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype3.sol
new file mode 100644
index 000000000..014a4dd45
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype3.sol
@@ -0,0 +1,11 @@
+function ff() {}
+
+contract C {
+  function f() public pure {
+    assembly {
+      let x := ff
+    }
+  }
+}
+// ----
+// DeclarationError 2025: (90-92): Access to functions is not allowed in inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_opcode_like.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_opcode_like.sol
new file mode 100644
index 000000000..3296252ea
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_opcode_like.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() public pure {
+        uint mload;
+        assembly {
+            let x := mload
+        }
+    }
+}
+// ----
+// ParserError 2314: (118-119): Expected '(' but got '}'
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_opcode_like.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_opcode_like.sol
new file mode 100644
index 000000000..7a783b9fe
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_opcode_like.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() public pure {
+        uint mload;
+        assembly {
+            mload := 1
+        }
+    }
+}
+// ----
+// ParserError 2314: (101-103): Expected '(' but got ':='
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/evm_constantinople.sol b/test/libsolidity/syntaxTests/inlineAssembly/evm_constantinople.sol
index 75d2f2895..2aff4351a 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/evm_constantinople.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/evm_constantinople.sol
@@ -11,6 +11,11 @@ contract C {
             ret := create2(0, 0, 0, 0)
         }
     }
+    function h() view external returns (bytes32 ret) {
+        assembly {
+            ret := extcodehash(address())
+        }
+    }
 }
 // ====
 // EVMVersion: >=constantinople
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/evm_constantinople_on_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/evm_constantinople_on_byzantium.sol
index 95f25c384..781cdc3f7 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/evm_constantinople_on_byzantium.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/evm_constantinople_on_byzantium.sol
@@ -11,6 +11,11 @@ contract C {
             ret := create2(0, 0, 0, 0)
         }
     }
+    function h() view external returns (bytes32 ret) {
+        assembly {
+            ret := extcodehash(address())
+        }
+    }
 }
 // ====
 // EVMVersion: =byzantium
@@ -23,3 +28,5 @@ contract C {
 // DeclarationError 8678: (160-178): Variable count does not match number of values (1 vs. 0)
 // TypeError 6166: (283-290): The "create2" instruction is only available for Constantinople-compatible VMs (you are currently compiling for "byzantium").
 // DeclarationError 8678: (276-302): Variable count does not match number of values (1 vs. 0)
+// TypeError 7110: (412-423): The "extcodehash" instruction is only available for Constantinople-compatible VMs (you are currently compiling for "byzantium").
+// DeclarationError 8678: (405-434): Variable count does not match number of values (1 vs. 0)
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/variable_by_opcode.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/variable_by_opcode.sol
new file mode 100644
index 000000000..a18abe90b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/variable_by_opcode.sol
@@ -0,0 +1,14 @@
+contract C {
+    function f() public pure {
+        uint mload;
+    }
+    function g() public pure {
+        uint mload;
+        assembly {
+        }
+    }
+}
+// ----
+// Warning 8261: (109-119): Variable is shadowed in inline assembly by an instruction of the same name
+// Warning 2072: (52-62): Unused local variable.
+// Warning 2072: (109-119): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/creation.sol b/test/libsolidity/syntaxTests/tryCatch/creation.sol
new file mode 100644
index 000000000..d92c179dc
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tryCatch/creation.sol
@@ -0,0 +1,13 @@
+contract D {
+}
+contract C {
+    function f() public {
+        try new D() {
+        } catch (bytes memory x) {
+            x;
+        }
+    }
+}
+// ====
+// EVMVersion: >=byzantium
+// ----
diff --git a/test/libsolidity/syntaxTests/tryCatch/no_special.sol b/test/libsolidity/syntaxTests/tryCatch/no_special.sol
new file mode 100644
index 000000000..858823afa
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tryCatch/no_special.sol
@@ -0,0 +1,18 @@
+contract C {
+    function f() public returns (uint, uint) {
+        try this {
+        } catch {
+        }
+        try gasleft() {
+        } catch {
+        }
+        try type(address) {
+        } catch {
+        }
+    }
+}
+// ----
+// TypeError 5347: (72-76): Try can only be used with external function calls and contract creation calls.
+// TypeError 2536: (119-128): Try can only be used with external function calls and contract creation calls.
+// TypeError 4259: (176-183): Invalid type for argument in the function call. A contract type or an integer type is required, but type(address) provided.
+// TypeError 2536: (171-184): Try can only be used with external function calls and contract creation calls.
diff --git a/test/libyul/yulSyntaxTests/assignment_of_function.yul b/test/libyul/yulSyntaxTests/assignment_of_function.yul
new file mode 100644
index 000000000..e1ddfd604
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/assignment_of_function.yul
@@ -0,0 +1,6 @@
+{
+    function f() {}
+    let x := f
+}
+// ----
+// TypeError 6041: (35-36): Function f used without being called.
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_6.yul b/test/libyul/yulSyntaxTests/builtin_identifier_6.yul
new file mode 100644
index 000000000..8f3395d79
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/builtin_identifier_6.yul
@@ -0,0 +1,6 @@
+{
+	// Test for the unreachable 6272_error
+	add := 1
+}
+// ----
+// ParserError 2314: (47-49): Expected '(' but got ':='
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_7.yul b/test/libyul/yulSyntaxTests/builtin_identifier_7.yul
new file mode 100644
index 000000000..391b190d9
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/builtin_identifier_7.yul
@@ -0,0 +1,7 @@
+{
+	// Test for the unreachable 6272_error
+	function f() -> a, b {}
+	add, mul := f()
+}
+// ----
+// ParserError 2314: (71-72): Expected '(' but got ','
diff --git a/test/libyul/yulSyntaxTests/call_literal.yul b/test/libyul/yulSyntaxTests/call_literal.yul
new file mode 100644
index 000000000..d1516f0ec
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/call_literal.yul
@@ -0,0 +1,5 @@
+{
+    1()
+}
+// ----
+// ParserError 9980: (7-8): Function name expected.
diff --git a/test/libyul/yulSyntaxTests/literal_invalid_type.yul b/test/libyul/yulSyntaxTests/literal_invalid_type.yul
new file mode 100644
index 000000000..07a51eb88
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/literal_invalid_type.yul
@@ -0,0 +1,7 @@
+{
+    let x:bool := true:unhappy
+}
+// ----
+// TypeError 5473: (20-32): "unhappy" is not a valid type (user defined types are not yet supported).
+// TypeError 5170: (20-32): Invalid type "unhappy" for literal "true".
+// TypeError 3947: (10-16): Assigning value of type "unhappy" to variable of type "bool".