Upgrade parser and fix several issues (#750)

* Support address as member

* Add support for boolean literals in assembly

* Add test for multiple assembly assignment

* Add support for AssemblyStackAssignment node

* cleaning printer

Co-authored-by: Klaus Hott <klahott@gmail.com>

Author: fvictorio

package-lock.json

@@ -83,7 +83,7 @@
     "solc": "^0.8.17"
   },
   "dependencies": {
-    "@solidity-parser/parser": "^0.14.3",
+    "@solidity-parser/parser": "^0.14.5",
     "emoji-regex": "^10.1.0",
     "escape-string-regexp": "^4.0.0",
     "semver": "^7.3.7",

package.json

@@ -1,4 +1,4 @@
-/* This file was automatically generated on 1657595765.198 */
+/* This file was automatically generated on 1666691919.933 */
 
 /* eslint-disable global-require */
 

src/binary-operator-printers/index.js

@@ -0,0 +1,9 @@
+const AssemblyAssignment = {
+  print: ({ node, path, print }) => [
+    path.call(print, 'expression'),
+    ' =: ',
+    node.name
+  ]
+};
+
+module.exports = AssemblyAssignment;

src/nodes/AssemblyStackAssignment.js

@@ -1,4 +1,4 @@
-/* This file was automatically generated on 1657595765.093 */
+/* This file was automatically generated on 1666691919.885 */
 
 /* eslint-disable global-require */
 
@@ -13,6 +13,7 @@ module.exports = {
   AssemblyIf: require('./AssemblyIf'),
   AssemblyLocalDefinition: require('./AssemblyLocalDefinition'),
   AssemblyMemberAccess: require('./AssemblyMemberAccess'),
+  AssemblyStackAssignment: require('./AssemblyStackAssignment'),
   AssemblySwitch: require('./AssemblySwitch'),
   BinaryOperation: require('./BinaryOperation'),
   Block: require('./Block'),

src/nodes/index.js

@@ -201,3 +201,34 @@ for { let i := 0 } lt(i, x) { i := add(i, 1) } {
 }
 }
 }
+
+contract BooleanLiteralsInAssembly {
+  function f() {
+    uint a;
+    assembly {
+      a := true
+      a := false
+    }
+  }
+}
+
+contract MultipleAssemblyAssignement {
+    function foo() public pure {
+        assembly {
+            function bar() -> a, b {
+                a := 1
+                b := 2
+            }
+
+            let i, j := bar()
+        }
+    }
+}
+
+contract AssemblyStackAssignment {
+  function f() public {
+    assembly {
+      4 =: y
+    }
+  }
+}

tests/format/Assembly/Assembly.sol

@@ -210,6 +210,37 @@ for { let i := 0 } lt(i, x) { i := add(i, 1) } {
 }
 }
 
+contract BooleanLiteralsInAssembly {
+  function f() {
+    uint a;
+    assembly {
+      a := true
+      a := false
+    }
+  }
+}
+
+contract MultipleAssemblyAssignement {
+    function foo() public pure {
+        assembly {
+            function bar() -> a, b {
+                a := 1
+                b := 2
+            }
+
+            let i, j := bar()
+        }
+    }
+}
+
+contract AssemblyStackAssignment {
+  function f() public {
+    assembly {
+      4 =: y
+    }
+  }
+}
+
 =====================================output=====================================
 contract Assembly {
     function ifAssembly() {
@@ -454,5 +485,36 @@ contract Assembly {
     }
 }
 
+contract BooleanLiteralsInAssembly {
+    function f() {
+        uint a;
+        assembly {
+            a := true
+            a := false
+        }
+    }
+}
+
+contract MultipleAssemblyAssignement {
+    function foo() public pure {
+        assembly {
+            function bar() -> a, b {
+                a := 1
+                b := 2
+            }
+
+            let i, j := bar()
+        }
+    }
+}
+
+contract AssemblyStackAssignment {
+    function f() public {
+        assembly {
+            4 =: y
+        }
+    }
+}
+
 ================================================================================
 `;

tests/format/Assembly/__snapshots__/jsfmt.spec.js.snap

@@ -57,6 +57,11 @@ contract MemberAccess {
             path,
             address(this, aoeu, aoeueu, aoeu)
         );
+        vm.mockCall(
+            f.address,
+            abi.encodeWithSelector(f.selector),
+            abi.encode(returned1)
+        );
     }
 }
 
@@ -99,4 +104,4 @@ contract MemberAccessIsEndOfChainCases {
         // break if is an ReturnStatement
         return b.c;
     }
-}
+}

tests/format/MemberAccess/MemberAccess.sol

@@ -65,6 +65,11 @@ contract MemberAccess {
             path,
             address(this, aoeu, aoeueu, aoeu)
         );
+        vm.mockCall(
+            f.address,
+            abi.encodeWithSelector(f.selector),
+            abi.encode(returned1)
+        );
     }
 }
 
@@ -108,6 +113,7 @@ contract MemberAccessIsEndOfChainCases {
         return b.c;
     }
 }
+
 =====================================output=====================================
 pragma solidity ^0.5.0;
 
@@ -195,6 +201,11 @@ contract MemberAccess {
                 path,
                 address(this, aoeu, aoeueu, aoeu)
             );
+        vm.mockCall(
+            f.address,
+            abi.encodeWithSelector(f.selector),
+            abi.encode(returned1)
+        );
     }
 }