Fixed tuple errors (#106)

* Fixed a tupple error

* Linting fixed

* Updated test case

* Fixed tupples

* Added test case for (x, )

* Generalized null

Author: maxsam4

package.json

@@ -37,6 +37,10 @@
     {
       "email": "victorio.franco@gmail.com",
       "name": "Franco Victorio"
+    },
+    {
+      "email": "hi@mudit.blog",
+      "name": "Mudit Gupta"
     }
   ],
   "license": "MIT",
@@ -59,7 +63,7 @@
     "escape-string-regexp": "^1.0.5",
     "extract-comments": "^1.1.0",
     "prettier": "^1.15.3",
-    "solidity-parser-antlr": "^0.3.3",
+    "solidity-parser-antlr": "^0.4.0",
     "string-width": "^3.0.0"
   }
 }

src/printer.js

@@ -31,6 +31,10 @@ function printPreservingEmptyLines(path, key, options, print) {
 function genericPrint(path, options, print) {
   const node = path.getValue();
   let doc;
+  if (node === null) {
+    return '';
+  }
+
   switch (node.type) {
     case 'SourceUnit':
       return concat([
@@ -307,12 +311,7 @@ function genericPrint(path, options, print) {
 
       doc = join(
         ', ',
-        path.map(statementPath => {
-          if (!statementPath.getValue()) {
-            return ', ';
-          }
-          return print(statementPath);
-        }, 'variables')
+        path.map(statementPath => print(statementPath), 'variables')
       );
 
       if (node.variables.length > 1 || startsWithVar) {

tests/AllSolidityFeatures/__snapshots__/jsfmt.spec.js.snap

@@ -771,11 +771,11 @@ contract VariableDeclarationTuple {
   function ham() {
     var (x, y) = (10, 20);
     var (a, b) = getMyTuple();
-    var (, , c) = (10, 20);
+    var (, c) = (10, 20);
     var (d, , ) = (10, 20, 30);
-    var (, , e, , , f, , ) = (10, 20, 30, 40, 50);
+    var (, e, , f, ) = (10, 20, 30, 40, 50);
 
-    var (num1, num2, num3, , , num5) = (10, 20, 30, 40, 50);
+    var (num1, num2, num3, , num5) = (10, 20, 30, 40, 50);
   }
 }
 

tests/Tupples/Tupples.sol

@@ -0,0 +1,19 @@
+pragma solidity ^0.5.0;
+
+contract demo {
+    function hello() public view returns(bool,bool) {}    
+    function hello2() public view returns(bool) {}
+    function hello3() public view returns(bool,bool,bool) {}   
+
+}
+
+contract Tupples {
+    function world(address payable _yo) public view {
+        bool yo;
+        yo = demo(_yo).hello2();
+        (yo, ) = demo(_yo).hello();
+        (, yo) = demo(_yo).hello();
+        (yo, , yo) = demo(_yo).hello3();
+        (yo, yo) = demo(_yo).hello();
+    }
+}

tests/Tupples/__snapshots__/jsfmt.spec.js.snap

@@ -0,0 +1,43 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Tupples.sol 1`] = `
+pragma solidity ^0.5.0;
+
+contract demo {
+    function hello() public view returns(bool,bool) {}    
+    function hello2() public view returns(bool) {}
+    function hello3() public view returns(bool,bool,bool) {}   
+
+}
+
+contract Tupples {
+    function world(address payable _yo) public view {
+        bool yo;
+        yo = demo(_yo).hello2();
+        (yo, ) = demo(_yo).hello();
+        (, yo) = demo(_yo).hello();
+        (yo, , yo) = demo(_yo).hello3();
+        (yo, yo) = demo(_yo).hello();
+    }
+}~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+pragma solidity ^0.5.0;
+
+contract demo {
+  function hello() public view returns (bool, bool) {}
+  function hello2() public view returns (bool) {}
+  function hello3() public view returns (bool, bool, bool) {}
+
+}
+
+contract Tupples {
+  function world(address payable _yo) public view {
+    bool yo;
+    yo = demo(_yo).hello2();
+    (yo, ) = demo(_yo).hello();
+    (, yo) = demo(_yo).hello();
+    (yo, , yo) = demo(_yo).hello3();
+    (yo, yo) = demo(_yo).hello();
+  }
+}
+
+`;

tests/Tupples/jsfmt.spec.js

@@ -0,0 +1 @@
+run_spec(__dirname);