Merge branch 'master' of https://github.com/ConsenSys/solidity-parser

Author: cgewecke

CHANGELOG.md

@@ -1,4 +1,13 @@
-### 0.3.0 (unreleased)
+### 0.4.0 (unreleased)
+
+ * Build parser on package install
+ * Parse array constructors correctly
+ * Parse named arguments correctly
+ * Parse assembly local bindings correctly
+ * Parse missing values when destructuring tuples correctly
+ * Add support for Solidity interfaces
+
+### 0.3.0
 
  * Improve parsing of visibility and storage specifiers
  * Add separate `StateVariableDeclaration` node type

imports.pegjs

@@ -127,6 +127,7 @@ ContractToken   = "contract"  !IdentifierPart
 FromToken       = "from"      !IdentifierPart
 ForToken        = "for"       !IdentifierPart
 ImportToken     = "import"    !IdentifierPart
+InterfaceToken  = "interface" !IdentifierPart
 IsToken         = "is"        !IdentifierPart
 LibraryToken    = "library"   !IdentifierPart
 MappingToken    = "mapping"   !IdentifierPart
@@ -210,6 +211,7 @@ Statement
   = PragmaStatement
   / ImportStatement
   / ContractStatement
+  / InterfaceStatement
   / LibraryStatement
   / UsingStatement
 
@@ -274,6 +276,13 @@ ContractStatement
     return undefined
   }
 
+InterfaceStatement
+  = InterfaceToken __ id:Identifier __ BlockList
+  {
+    return undefined
+  }
+
+
 LibraryStatement
   = LibraryToken __ id:Identifier __ is:IsStatement? __ BlockList
   {

package.json

@@ -12,7 +12,26 @@
   "bin": {
     "solidity-parser": "./cli.js"
   },
-  "author": "Tim Coulter <[email protected]> (http://timothyjcoulter.com), Raghav Dua <[email protected]> (http://raghavdua.com)",
+  "contributors": [
+    {
+      "name": "Tim Coulter",
+      "email": "[email protected]",
+      "url": "http://timothyjcoulter.com"
+    },
+    {
+      "name": "Raghav Dua",
+      "email": "[email protected]",
+      "url": "http://raghavdua.com"
+    },
+    {
+      "name": "Federico Bond",
+      "email": "[email protected]"
+    },
+    {
+      "name": "Christopher Gewecke",
+      "email": "[email protected]"
+    }
+  ],
   "license": "MIT",
   "dependencies": {
     "mocha": "^2.4.5",

solidity.pegjs

@@ -208,6 +208,7 @@ Keyword
   = BreakToken
   / ContinueToken
   / ContractToken
+  / InterfaceToken
   / DeleteToken
   / DoToken
   / ElseToken
@@ -479,6 +480,7 @@ IfToken         = "if"         !IdentifierPart
 IsToken         = "is"         !IdentifierPart
 IndexedToken    = "indexed"    !IdentifierPart
 ImportToken     = "import"     !IdentifierPart
+InterfaceToken  = "interface"  !IdentifierPart
 InternalToken   = "internal"   !IdentifierPart
 LibraryToken    = "library"    !IdentifierPart
 MappingToken    = "mapping"    !IdentifierPart
@@ -522,6 +524,9 @@ EOS = __ ";"
 EOF
   = !.
 
+Comma
+  = __ "," __
+
 /* ----- A.2 Number Conversions ----- */
 
 /* Irrelevant. */
@@ -652,12 +657,31 @@ Arguments
   = "(" __ args:(ArgumentList __)? ")" {
       return optionalList(extractOptional(args, 0));
     }
+  / "(" __ "{" __ args:(NameValueList (__ ",")? )? __ "}" __ ")" {
+      return optionalList(extractOptional(args, 0));
+    }
 
 ArgumentList
   = head:AssignmentExpression tail:(__ "," __ AssignmentExpression)* {
       return buildList(head, tail, 3);
     }
 
+NameValueList
+  = head:NameValueAssignment tail:(__ "," __ NameValueAssignment)* {
+      return buildList(head, tail, 3);
+    }
+
+NameValueAssignment
+  = name:Identifier __ ":" __ value:AssignmentExpression __ {
+      return {
+        type: "NameValueAssignment",
+        name: name,
+        value: value,
+        start: location().start.offset,
+        end: location().end.offset
+      };
+    }
+
 LeftHandSideExpression
   = DeclarativeExpression
   / CallExpression
@@ -995,9 +1019,9 @@ VariableStatement
     }
 
 VariableDeclarationTuple
-  = "(" head:VariableDeclarationNoInit tail:(__ "," __ VariableDeclarationNoInit)* ")" init:(__ Initialiser) {
+  = "("Comma* __ head:VariableDeclarationNoInit tail:(Comma+ VariableDeclarationNoInit)* __ Comma* ")" init:(__ Initialiser) {
       return {
-        declarations: buildList(head, tail, 3),
+        declarations: buildList(head, tail, 1),
         init: extractOptional(init, 1)
       }
     }
@@ -1037,7 +1061,7 @@ EmptyStatement
   = ";" { return { type: "EmptyStatement", start: location().start.offset, end: location().end.offset }; }
 
 ExpressionStatement
-  = !("{" / FunctionToken / ContractToken / LibraryToken / StructToken / EnumToken) expression:Expression EOS {
+  = !("{" / FunctionToken / ContractToken / InterfaceToken / LibraryToken / StructToken / EnumToken) expression:Expression EOS {
       return {
         type:       "ExpressionStatement",
         expression: expression,
@@ -1270,6 +1294,21 @@ ContractStatement
     }
   }
 
+InterfaceStatement
+  = InterfaceToken __ id:Identifier __
+    "{" __ body:SourceElements? __ "}"
+  {
+    return {
+      type: "InterfaceStatement",
+      name: id.name,
+      is: [],
+      body: body,
+      start: location().start.offset,
+      end: location().end.offset
+    }
+  }
+
+
 LibraryStatement
   = LibraryToken __ id:Identifier __ is:IsStatement? __
     "{" __ body:SourceElements? __ "}"
@@ -1495,6 +1534,7 @@ SourceUnit
   = PragmaStatement
   / ImportStatement
   / ContractStatement
+  / InterfaceStatement
   / LibraryStatement
 
 SourceElements
@@ -1522,7 +1562,7 @@ InlineAssemblyBlock
   }
 
 AssemblyItem
-  = FunctionalAssemblyExpression
+  = FunctionalAssemblyInstruction
   / InlineAssemblyBlock
   / AssemblyLocalBinding
   / AssemblyAssignment
@@ -1531,8 +1571,17 @@ AssemblyItem
   / HexStringLiteral
   / Identifier
 
+AssemblyExpression
+  = FunctionalAssemblyInstruction
+  / ElementaryAssemblyOperation
+
+ElementaryAssemblyOperation
+  = NumericLiteral
+  / StringLiteral
+  / Identifier
+
 AssemblyLocalBinding
-  = 'let' __ name:Identifier __ ':=' __ expression:FunctionalAssemblyExpression {
+  = 'let' __ name:Identifier __ ':=' __ expression:AssemblyExpression {
     return {
       type: "AssemblyLocalBinding",
       name: name,
@@ -1543,7 +1592,7 @@ AssemblyLocalBinding
   }
 
 AssemblyAssignment
-  = name:Identifier __ ':=' __ expression:FunctionalAssemblyExpression {
+  = name:Identifier __ ':=' __ expression:FunctionalAssemblyInstruction {
     return {
       type: "AssemblyAssignment",
       name: name,
@@ -1561,10 +1610,10 @@ AssemblyAssignment
     }
   }
 
-FunctionalAssemblyExpression
+FunctionalAssemblyInstruction
   = name:Identifier __ '(' __ head:AssemblyItem? __ tail:( ',' __ AssemblyItem )* __ ')' {
     return {
-      type: "FunctionalAssemblyExpression",
+      type: "FunctionalAssemblyInstruction",
       name: name,
       arguments: buildList(head, tail, 2),
       start: location().start.offset,

test/doc_examples.sol

@@ -16,6 +16,10 @@ import "SomeFile.sol" as SomeOtherFile;
 import * as SomeSymbol from "AnotherFile.sol";
 import {symbol1 as alias, symbol2} from "File.sol";
 
+interface i {
+  function f();
+}
+
 contract c {
   function c()
   {
@@ -297,6 +301,17 @@ library GetCode {
     }
 }
 
+contract assemblyLocalBinding {
+  function test(){
+    assembly {
+      let v := 1
+      let x := 0x00
+      let y := x
+      let z := "hello" 
+    }
+  }
+}
+
 contract usesConst {
   uint const = 0;
 }
@@ -341,10 +356,42 @@ contract VariableDeclarationTuple {
   function ham (){
     var (x, y) = (10, 20);
     var (a, b) = getMyTuple();
+    var (,c) = (10, 20);
+    var (d,,) = (10, 20, 30);
+    var (,e,,f,) = (10, 20, 30, 40, 50);
+
+    var (
+      num1, num2,
+      num3, ,num5
+    ) = (10, 20, 30, 40, 50);
   }
 }
 
 contract TypeIndexSpacing {
   uint [ 7 ] x;
   uint  []  y;
 }
+
+contract Ballot {
+
+    struct Voter {
+        uint weight;
+        bool voted;
+    }
+
+    function abstain() returns (bool) {
+      return false;
+    }
+
+    Voter you = Voter(1, true);
+
+    Voter me = Voter({
+        weight: 2,
+        voted: abstain()
+    });
+
+    Voter airbnb = Voter({
+      weight: 2,
+      voted: true,
+    });
+}