Add support for member access in assembly

Author: fvictorio

package-lock.json

@@ -1338,6 +1338,8 @@ const transformAST = {
     let names = ctx.assemblyIdentifierOrList()
     if (names.identifier()) {
       names = [this.visit(names.identifier())]
+    } else if (names.assemblyMember()) {
+      names = [this.visit(names.assemblyMember())]
     } else {
       names = this.visit(names.assemblyIdentifierList().identifier())
     }
@@ -1369,6 +1371,8 @@ const transformAST = {
     let names = ctx.assemblyIdentifierOrList()
     if (names.identifier()) {
       names = [this.visit(names.identifier())]
+    } else if (names.assemblyMember()) {
+      names = [this.visit(names.assemblyMember())]
     } else {
       names = this.visit(names.assemblyIdentifierList().identifier())
     }
@@ -1379,6 +1383,15 @@ const transformAST = {
     }
   },
 
+  AssemblyMember(ctx) {
+    const [accessed, member] = ctx.identifier()
+    return {
+      type: 'AssemblyMemberAccess',
+      expression: this.visit(accessed),
+      memberName: this.visit(member),
+    }
+  },
+
   LabelDefinition(ctx) {
     return {
       name: toText(ctx.identifier())

src/ASTBuilder.js

@@ -1,4 +1,4 @@
-// Generated from antlr/Solidity.g4 by ANTLR 4.7.2
+// Generated from antlr/Solidity.g4 by ANTLR 4.8
 // jshint ignore: start
 var antlr4 = require('../antlr4/index');
 
@@ -1417,6 +1417,5 @@ SolidityLexer.prototype.ruleNames = [ "T__0", "T__1", "T__2", "T__3", "T__4",
 SolidityLexer.prototype.grammarFileName = "Solidity.g4";
 
 
-
 exports.SolidityLexer = SolidityLexer;
 

src/lib/Solidity.interp

@@ -1,4 +1,4 @@
-// Generated from antlr/Solidity.g4 by ANTLR 4.7.2
+// Generated from antlr/Solidity.g4 by ANTLR 4.8
 // jshint ignore: start
 var antlr4 = require('../antlr4/index');
 
@@ -623,6 +623,15 @@ SolidityListener.prototype.exitAssemblyExpression = function(ctx) {
 };
 
 
+// Enter a parse tree produced by SolidityParser#assemblyMember.
+SolidityListener.prototype.enterAssemblyMember = function(ctx) {
+};
+
+// Exit a parse tree produced by SolidityParser#assemblyMember.
+SolidityListener.prototype.exitAssemblyMember = function(ctx) {
+};
+
+
 // Enter a parse tree produced by SolidityParser#assemblyCall.
 SolidityListener.prototype.enterAssemblyCall = function(ctx) {
 };

src/lib/SolidityLexer.js

@@ -1933,6 +1933,54 @@ describe('AST', () => {
     })
   })
 
+  it("AssemblyAssignment, left member access", function() {
+    var ast = parseAssembly("a.slot := 10")
+    assert.deepEqual(ast, {
+      "type": "AssemblyAssignment",
+      "names": [
+        {
+          "type": "AssemblyMemberAccess",
+          "expression": {
+            "name": "a",
+            "type": "Identifier"
+          },
+          "memberName": {
+            "name": "slot",
+            "type": "Identifier"
+          }
+        }
+      ],
+      "expression": {
+        "type": "DecimalNumber",
+        "value": "10"
+      }
+    })
+  })
+
+  it("AssemblyAssignment, right member access", function() {
+    var ast = parseAssembly("o := x.offset")
+    assert.deepEqual(ast, {
+      "type": "AssemblyAssignment",
+      "names": [
+        {
+          "type": "Identifier",
+          "name": "o"
+        }
+      ],
+      "expression": {
+          "type": "AssemblyMemberAccess",
+          "expression": {
+            "name": "x",
+            "type": "Identifier"
+          },
+          "memberName": {
+            "name": "offset",
+            "type": "Identifier"
+          }
+      }
+    })
+  })
+
   it("LabelDefinition", function() {
     var ast = parseAssembly("loop:")
     assert.deepEqual(ast, {

src/lib/SolidityListener.js

@@ -694,3 +694,12 @@ contract FunctionsNamedAsKeywords {
 contract ImmutableKeyword {
   uint immutable foo;
 }
+
+contract AssemblySlotNotation {
+  function foo() {
+    assembly {
+      ds.slot := position
+      offset := x.offset
+    }
+  }
+}