Upgrade grammar

lib/grammar/Solidity.tokens

@@ -150,22 +150,22 @@ LINE_COMMENT=119
 'enum'=31
 '['=32
 ']'=33
-'.'=34
-'mapping'=35
-'=>'=36
-'memory'=37
-'storage'=38
-'calldata'=39
-'if'=40
-'else'=41
-'while'=42
-'assembly'=43
-'do'=44
-'return'=45
-'throw'=46
-'emit'=47
-'var'=48
-'address'=49
+'address'=34
+'.'=35
+'mapping'=36
+'=>'=37
+'memory'=38
+'storage'=39
+'calldata'=40
+'if'=41
+'else'=42
+'while'=43
+'assembly'=44
+'do'=45
+'return'=46
+'throw'=47
+'emit'=48
+'var'=49
 'bool'=50
 'string'=51
 'byte'=52

lib/grammar/SolidityLexer.tokens

@@ -150,22 +150,22 @@ LINE_COMMENT=119
 'enum'=31
 '['=32
 ']'=33
-'.'=34
-'mapping'=35
-'=>'=36
-'memory'=37
-'storage'=38
-'calldata'=39
-'if'=40
-'else'=41
-'while'=42
-'assembly'=43
-'do'=44
-'return'=45
-'throw'=46
-'emit'=47
-'var'=48
-'address'=49
+'address'=34
+'.'=35
+'mapping'=36
+'=>'=37
+'memory'=38
+'storage'=39
+'calldata'=40
+'if'=41
+'else'=42
+'while'=43
+'assembly'=44
+'do'=45
+'return'=46
+'throw'=47
+'emit'=48
+'var'=49
 'bool'=50
 'string'=51
 'byte'=52

lib/grammar/SolidityListener.js

@@ -1,4 +1,4 @@
-// Generated from Solidity.g4 by ANTLR 4.7
+// Generated from ./Solidity.g4 by ANTLR 4.7.1
 // jshint ignore: start
 var antlr4 = require('antlr4/index');
 

package.json

@@ -19,7 +19,7 @@
     "exec-tests": "nyc -x \"**/grammar/**\" mocha && nyc report --reporter=text-lcov | coveralls",
     "test": "npm run exec-tests",
     "test-only": "mocha",
-    "generate": "(cd ./solidity-antlr4; java org.antlr.v4.Tool ./Solidity.g4 -Dlanguage=JavaScript -o ../lib/grammar)",
+    "generate": "scripts/build-grammar.sh",
     "lint": "eslint ."
   },
   "bin": {

scripts/build-grammar.sh

@@ -1,11 +1,13 @@
 #!/usr/bin/env sh
 
+# download antlr4
 ANTLR_JAR="antlr4.jar"
-
 if [ ! -e "$ANTLR_JAR" ]; then
-  curl http://www.antlr.org/download/antlr-4.7-complete.jar -o "$ANTLR_JAR"
+  curl https://www.antlr.org/download/antlr-4.7.1-complete.jar -o "$ANTLR_JAR"
 fi
 
-java -jar $ANTLR_JAR -Dlanguage=JavaScript lib/grammar/Solidity.g4
+# build grammar based on solidity-antlr4 submodule
+cd ./solidity-antlr4; java -jar ../$ANTLR_JAR ./Solidity.g4 -Dlanguage=JavaScript -o ../lib/grammar; cd - > /dev/null
 
-find lib/grammar/ -name '*interp' -delete
+# cleanup
+rm lib/grammar/*.interp antlr4.jar