Add support for member access in assembly (#332)

Author: fvictorio

__tests__/nodes/__snapshots__/index.test.js.snap

@@ -11,6 +11,7 @@ Array [
   "AssemblyFunctionDefinition",
   "AssemblyIf",
   "AssemblyLocalDefinition",
+  "AssemblyMemberAccess",
   "AssemblySwitch",
   "BinaryOperation",
   "Block",

package-lock.json

@@ -71,7 +71,7 @@
     "jest-watch-typeahead": "^0.6.0"
   },
   "dependencies": {
-    "@solidity-parser/parser": "^0.7.0",
+    "@solidity-parser/parser": "^0.8.0",
     "dir-to-object": "^2.0.0",
     "emoji-regex": "^9.0.0",
     "escape-string-regexp": "^4.0.0",

package.json

@@ -13,5 +13,5 @@ exports[`makeData to match snapshot for nodes 1`] = `
 
   /* eslint-disable global-require */
 
-  module.exports = {ArrayTypeName:require('./ArrayTypeName.js'),AssemblyAssignment:require('./AssemblyAssignment.js'),AssemblyBlock:require('./AssemblyBlock.js'),AssemblyCall:require('./AssemblyCall.js'),AssemblyCase:require('./AssemblyCase.js'),AssemblyFor:require('./AssemblyFor.js'),AssemblyFunctionDefinition:require('./AssemblyFunctionDefinition.js'),AssemblyIf:require('./AssemblyIf.js'),AssemblyLocalDefinition:require('./AssemblyLocalDefinition.js'),AssemblySwitch:require('./AssemblySwitch.js'),BinaryOperation:require('./BinaryOperation.js'),Block:require('./Block.js'),BooleanLiteral:require('./BooleanLiteral.js'),BreakStatement:require('./BreakStatement.js'),CatchClause:require('./CatchClause.js'),Conditional:require('./Conditional.js'),ContinueStatement:require('./ContinueStatement.js'),ContractDefinition:require('./ContractDefinition.js'),DecimalNumber:require('./DecimalNumber.js'),DoWhileStatement:require('./DoWhileStatement.js'),ElementaryTypeName:require('./ElementaryTypeName.js'),EmitStatement:require('./EmitStatement.js'),EnumDefinition:require('./EnumDefinition.js'),EnumValue:require('./EnumValue.js'),EventDefinition:require('./EventDefinition.js'),ExpressionStatement:require('./ExpressionStatement.js'),ForStatement:require('./ForStatement.js'),FunctionCall:require('./FunctionCall.js'),FunctionDefinition:require('./FunctionDefinition.js'),FunctionTypeName:require('./FunctionTypeName.js'),HexLiteral:require('./HexLiteral.js'),HexNumber:require('./HexNumber.js'),Identifier:require('./Identifier.js'),IfStatement:require('./IfStatement.js'),ImportDirective:require('./ImportDirective.js'),IndexAccess:require('./IndexAccess.js'),IndexRangeAccess:require('./IndexRangeAccess.js'),InheritanceSpecifier:require('./InheritanceSpecifier.js'),InlineAssemblyStatement:require('./InlineAssemblyStatement.js'),LabelDefinition:require('./LabelDefinition.js'),Mapping:require('./Mapping.js'),MemberAccess:require('./MemberAccess.js'),ModifierDefinition:require('./ModifierDefinition.js'),ModifierInvocation:require('./ModifierInvocation.js'),NameValueExpression:require('./NameValueExpression.js'),NameValueList:require('./NameValueList.js'),NewExpression:require('./NewExpression.js'),NumberLiteral:require('./NumberLiteral.js'),PragmaDirective:require('./PragmaDirective.js'),ReturnStatement:require('./ReturnStatement.js'),SourceUnit:require('./SourceUnit.js'),StateVariableDeclaration:require('./StateVariableDeclaration.js'),StringLiteral:require('./StringLiteral.js'),StructDefinition:require('./StructDefinition.js'),ThrowStatement:require('./ThrowStatement.js'),TryStatement:require('./TryStatement.js'),TupleExpression:require('./TupleExpression.js'),TypeNameExpression:require('./TypeNameExpression.js'),UnaryOperation:require('./UnaryOperation.js'),UserDefinedTypeName:require('./UserDefinedTypeName.js'),UsingForDeclaration:require('./UsingForDeclaration.js'),VariableDeclaration:require('./VariableDeclaration.js'),VariableDeclarationStatement:require('./VariableDeclarationStatement.js'),WhileStatement:require('./WhileStatement.js')};"
+  module.exports = {ArrayTypeName:require('./ArrayTypeName.js'),AssemblyAssignment:require('./AssemblyAssignment.js'),AssemblyBlock:require('./AssemblyBlock.js'),AssemblyCall:require('./AssemblyCall.js'),AssemblyCase:require('./AssemblyCase.js'),AssemblyFor:require('./AssemblyFor.js'),AssemblyFunctionDefinition:require('./AssemblyFunctionDefinition.js'),AssemblyIf:require('./AssemblyIf.js'),AssemblyLocalDefinition:require('./AssemblyLocalDefinition.js'),AssemblyMemberAccess:require('./AssemblyMemberAccess.js'),AssemblySwitch:require('./AssemblySwitch.js'),BinaryOperation:require('./BinaryOperation.js'),Block:require('./Block.js'),BooleanLiteral:require('./BooleanLiteral.js'),BreakStatement:require('./BreakStatement.js'),CatchClause:require('./CatchClause.js'),Conditional:require('./Conditional.js'),ContinueStatement:require('./ContinueStatement.js'),ContractDefinition:require('./ContractDefinition.js'),DecimalNumber:require('./DecimalNumber.js'),DoWhileStatement:require('./DoWhileStatement.js'),ElementaryTypeName:require('./ElementaryTypeName.js'),EmitStatement:require('./EmitStatement.js'),EnumDefinition:require('./EnumDefinition.js'),EnumValue:require('./EnumValue.js'),EventDefinition:require('./EventDefinition.js'),ExpressionStatement:require('./ExpressionStatement.js'),ForStatement:require('./ForStatement.js'),FunctionCall:require('./FunctionCall.js'),FunctionDefinition:require('./FunctionDefinition.js'),FunctionTypeName:require('./FunctionTypeName.js'),HexLiteral:require('./HexLiteral.js'),HexNumber:require('./HexNumber.js'),Identifier:require('./Identifier.js'),IfStatement:require('./IfStatement.js'),ImportDirective:require('./ImportDirective.js'),IndexAccess:require('./IndexAccess.js'),IndexRangeAccess:require('./IndexRangeAccess.js'),InheritanceSpecifier:require('./InheritanceSpecifier.js'),InlineAssemblyStatement:require('./InlineAssemblyStatement.js'),LabelDefinition:require('./LabelDefinition.js'),Mapping:require('./Mapping.js'),MemberAccess:require('./MemberAccess.js'),ModifierDefinition:require('./ModifierDefinition.js'),ModifierInvocation:require('./ModifierInvocation.js'),NameValueExpression:require('./NameValueExpression.js'),NameValueList:require('./NameValueList.js'),NewExpression:require('./NewExpression.js'),NumberLiteral:require('./NumberLiteral.js'),PragmaDirective:require('./PragmaDirective.js'),ReturnStatement:require('./ReturnStatement.js'),SourceUnit:require('./SourceUnit.js'),StateVariableDeclaration:require('./StateVariableDeclaration.js'),StringLiteral:require('./StringLiteral.js'),StructDefinition:require('./StructDefinition.js'),ThrowStatement:require('./ThrowStatement.js'),TryStatement:require('./TryStatement.js'),TupleExpression:require('./TupleExpression.js'),TypeNameExpression:require('./TypeNameExpression.js'),UnaryOperation:require('./UnaryOperation.js'),UserDefinedTypeName:require('./UserDefinedTypeName.js'),UsingForDeclaration:require('./UsingForDeclaration.js'),VariableDeclaration:require('./VariableDeclaration.js'),VariableDeclarationStatement:require('./VariableDeclarationStatement.js'),WhileStatement:require('./WhileStatement.js')};"
 `;

scripts/__snapshots__/makeData.test.js.snap

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

src/binary-operator-printers/index.js

@@ -0,0 +1,17 @@
+const {
+  doc: {
+    builders: { concat }
+  }
+} = require('prettier/standalone');
+
+const AssemblyMemberAccess = {
+  print: ({ path, print }) => {
+    return concat([
+      path.call(print, 'expression'),
+      '.',
+      path.call(print, 'memberName')
+    ]);
+  }
+};
+
+module.exports = AssemblyMemberAccess;

src/nodes/AssemblyMemberAccess.js

@@ -1,4 +1,4 @@
-/* This file was automatically generated on 1589415198.485 */
+/* This file was automatically generated on 1599144978.631 */
 
 /* eslint-disable global-require */
 
@@ -12,6 +12,7 @@ module.exports = {
   AssemblyFunctionDefinition: require('./AssemblyFunctionDefinition.js'),
   AssemblyIf: require('./AssemblyIf.js'),
   AssemblyLocalDefinition: require('./AssemblyLocalDefinition.js'),
+  AssemblyMemberAccess: require('./AssemblyMemberAccess.js'),
   AssemblySwitch: require('./AssemblySwitch.js'),
   BinaryOperation: require('./BinaryOperation.js'),
   Block: require('./Block.js'),

src/nodes/index.js

@@ -152,4 +152,12 @@ function $somefn(somearg) {
 
        assembly {   let result   }
   }
+
+    function   memberAccess ( ) {
+
+       assembly {  
+          ds.slot   :=   position
+          offset   :=   x.offset
+       }
+  }
 }

tests/Assembly/Assembly.sol

@@ -155,6 +155,14 @@ function $somefn(somearg) {
 
        assembly {   let result   }
   }
+
+    function   memberAccess ( ) {
+
+       assembly {  
+          ds.slot   :=   position
+          offset   :=   x.offset
+       }
+  }
 }
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 contract Assembly {
@@ -347,6 +355,13 @@ contract Assembly {
             let result
         }
     }
+
+    function memberAccess() {
+        assembly {
+            ds.slot := position
+            offset := x.offset
+        }
+    }
 }
 
 `;