Update tests.

9 files changed, 146 insertions, 9 deletions

diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponents.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponents.sol
new file mode 100644
index 00000000..3b05a54c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponents.sol
@@ -0,0 +1,25 @@
+contract C {
+    function f() public {
+        uint a = (1,2);
+        uint b = (1,2,3);
+        uint c = (1,2,3,4);
+    }
+    function g() public {
+        (uint a1, uint b1, uint c1, uint d1) = 1;
+        (uint a2, uint b2, uint c2) = 1;
+        (uint a3, uint b3) = 1;
+    }
+    function h() public {
+        (uint a1, uint b1, uint c1, uint d1) = (1,2,3);
+        (uint a2, uint b2, uint c2) = (1,2,3,4);
+    }
+}
+// ----
+// TypeError: (47-61): Different number of components on the left hand side (1) than on the right hand side (2).
+// TypeError: (71-87): Different number of components on the left hand side (1) than on the right hand side (3).
+// TypeError: (97-115): Different number of components on the left hand side (1) than on the right hand side (4).
+// TypeError: (157-197): Different number of components on the left hand side (4) than on the right hand side (1).
+// TypeError: (207-238): Different number of components on the left hand side (3) than on the right hand side (1).
+// TypeError: (248-270): Different number of components on the left hand side (2) than on the right hand side (1).
+// TypeError: (312-358): Different number of components on the left hand side (4) than on the right hand side (3).
+// TypeError: (368-407): Different number of components on the left hand side (3) than on the right hand side (4).
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponentsFromReturn.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponentsFromReturn.sol
new file mode 100644
index 00000000..7b556350
--- /dev/null
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponentsFromReturn.sol
@@ -0,0 +1,29 @@
+contract C {
+    function f() public {
+        uint a = two();
+        uint b = three();
+        uint c = four();
+    }
+    function g() public {
+        (uint a1, uint b1, uint c1, uint d1) = one();
+        (uint a2, uint b2, uint c2) = one();
+        (uint a3, uint b3) = one();
+    }
+    function h() public {
+        (uint a1, uint b1, uint c1, uint d1) = three();
+        (uint a2, uint b2, uint c2) = four();
+    }
+    function one() public pure returns (uint);
+    function two() public pure returns (uint, uint);
+    function three() public pure returns (uint, uint, uint);
+    function four() public pure returns (uint, uint, uint, uint);
+}
+// ----
+// TypeError: (47-61): Different number of components on the left hand side (1) than on the right hand side (2).
+// TypeError: (71-87): Different number of components on the left hand side (1) than on the right hand side (3).
+// TypeError: (97-112): Different number of components on the left hand side (1) than on the right hand side (4).
+// TypeError: (154-198): Different number of components on the left hand side (4) than on the right hand side (1).
+// TypeError: (208-243): Different number of components on the left hand side (3) than on the right hand side (1).
+// TypeError: (253-279): Different number of components on the left hand side (2) than on the right hand side (1).
+// TypeError: (321-367): Different number of components on the left hand side (4) than on the right hand side (3).
+// TypeError: (377-413): Different number of components on the left hand side (3) than on the right hand side (4).
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcards.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcards.sol
new file mode 100644
index 00000000..b500823d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcards.sol
@@ -0,0 +1,24 @@
+contract C {
+    function fn() public pure {
+        (uint a,) = (1,2,3);
+        (,uint b) = (1,2,3);
+        (,uint c,) = (1,2,3,4,5);
+        (uint d, uint e,) = (1,2,3,4);
+        (,uint f, uint g) = (1,2,3,4);
+        (,uint h, uint i,) = (1,2,3);
+        (uint j,) = 1;
+        (,uint k) = 1;
+        (,uint l,) = 1;
+        a;b;c;d;e;f;g;h;i;j;k;l;
+    }
+}
+// ----
+// TypeError: (53-72): Different number of components on the left hand side (2) than on the right hand side (3).
+// TypeError: (82-101): Different number of components on the left hand side (2) than on the right hand side (3).
+// TypeError: (111-135): Different number of components on the left hand side (3) than on the right hand side (5).
+// TypeError: (145-174): Different number of components on the left hand side (3) than on the right hand side (4).
+// TypeError: (184-213): Different number of components on the left hand side (3) than on the right hand side (4).
+// TypeError: (223-251): Different number of components on the left hand side (4) than on the right hand side (3).
+// TypeError: (261-274): Different number of components on the left hand side (2) than on the right hand side (1).
+// TypeError: (284-297): Different number of components on the left hand side (2) than on the right hand side (1).
+// TypeError: (307-321): Different number of components on the left hand side (3) than on the right hand side (1).
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcardsFromReturn.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcardsFromReturn.sol
new file mode 100644
index 00000000..3224a182
--- /dev/null
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcardsFromReturn.sol
@@ -0,0 +1,31 @@
+contract C {
+    function fn() public pure {
+        (uint a,) = three();
+        (,uint b) = three();
+        (,uint c,) = five();
+        (uint d, uint e,) = four();
+        (,uint f, uint g) = four();
+        (,uint h, uint i,) = three();
+        (uint j,) = one();
+        (,uint k) = one();
+        (,uint l,) = one();
+        (,uint m, uint n,) = five();
+        a;b;c;d;e;f;g;h;i;j;k;l;m;n;
+    }
+    function one() public pure returns (uint);
+    function two() public pure returns (uint, uint);
+    function three() public pure returns (uint, uint, uint);
+    function four() public pure returns (uint, uint, uint, uint);
+    function five() public pure returns (uint, uint, uint, uint, uint);
+}
+// ----
+// TypeError: (53-72): Different number of components on the left hand side (2) than on the right hand side (3).
+// TypeError: (82-101): Different number of components on the left hand side (2) than on the right hand side (3).
+// TypeError: (111-130): Different number of components on the left hand side (3) than on the right hand side (5).
+// TypeError: (140-166): Different number of components on the left hand side (3) than on the right hand side (4).
+// TypeError: (176-202): Different number of components on the left hand side (3) than on the right hand side (4).
+// TypeError: (212-240): Different number of components on the left hand side (4) than on the right hand side (3).
+// TypeError: (250-267): Different number of components on the left hand side (2) than on the right hand side (1).
+// TypeError: (277-294): Different number of components on the left hand side (2) than on the right hand side (1).
+// TypeError: (304-322): Different number of components on the left hand side (3) than on the right hand side (1).
+// TypeError: (332-359): Different number of components on the left hand side (4) than on the right hand side (5).
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationComplex.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationComplex.sol
index a3ce6a74..ba6e9916 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationComplex.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationComplex.sol
@@ -2,10 +2,10 @@ contract D {
   struct S { uint a; uint b; }
 }
 contract C {
-  function f() internal returns (uint, uint, uint, D.S[20] storage, uint) {
-    (,,,D.S[10*2] storage x,) = f();
+  function f() internal pure {
+    (,,,D.S[10*2] storage x,) = g();
     x;
   }
-} 
+  function g() internal pure returns (uint, uint, uint, D.S[20] storage x, uint) { x = x; }
+}
 // ----
-// Warning: (110-117): This variable is of storage pointer type and might be returned without assignment. This can cause storage corruption. Assign the variable (potentially from itself) to remove this warning.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationEmpty.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationEmpty.sol
new file mode 100644
index 00000000..9618958e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationEmpty.sol
@@ -0,0 +1,11 @@
+contract C {
+    function f() public pure {
+        (uint a, uint b) = f();
+        (uint c) = f();
+        uint d = f();
+    }
+}
+// ----
+// TypeError: (52-74): Different number of components on the left hand side (2) than on the right hand side (0).
+// TypeError: (84-98): Different number of components on the left hand side (1) than on the right hand side (0).
+// TypeError: (108-120): Different number of components on the left hand side (1) than on the right hand side (0).
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationSimple.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationSimple.sol
index 8e06322c..a2fcce18 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationSimple.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationSimple.sol
@@ -1,12 +1,12 @@
 contract C {
-  function f() internal returns (uint, uint, uint, uint) {
+  function f() internal pure returns (uint, uint, uint, uint) {
     (uint a, uint b,,) = f();
     a; b;
   }
-  function g() internal returns (bytes memory, string storage) {
-    (bytes memory a, string storage b) = g();
+  function g() internal pure {
+    (bytes memory a, string storage b) = h();
     a; b;
   }
-} 
+  function h() internal pure returns (bytes memory, string storage s) { s = s; }
+}
 // ----
-// Warning: (163-169): This variable is of storage pointer type and might be returned without assignment. This can cause storage corruption. Assign the variable (potentially from itself) to remove this warning.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/oneElementTuple.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/oneElementTuple.sol
new file mode 100644
index 00000000..562c7c0b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/oneElementTuple.sol
@@ -0,0 +1,8 @@
+contract C {
+    function f() public {
+        (uint a,) = (1,);
+        a;
+    }
+}
+// ----
+// TypeError: (59-63): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/sameNumberOfComponents.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/sameNumberOfComponents.sol
new file mode 100644
index 00000000..59eb34af
--- /dev/null
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/sameNumberOfComponents.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f() public pure {
+        (uint a1, uint b1, uint c1, uint d1) = (1,2,3,4);
+        (uint a2, uint b2, uint c2) = (1,2,3);
+        (uint a3, uint b3) = (1,2);
+        a1; b1; c1; d1; a2; b2; c2; a3; b3;
+    }
+}
+// ----