Merge pull request #10 from remollemo/support-address-payable

Support address payable
cag · Dec 16, 2020 · 12ecf38 · 12ecf38
2 parents b004b6e + 8e09c90
commit 12ecf38
Show file tree

Hide file tree

Showing 6 changed files with 781 additions and 738 deletions.
diff --git a/sphinxcontrib/soliditydomain/Solidity.g4 b/sphinxcontrib/soliditydomain/Solidity.g4
@@ -106,7 +106,7 @@ parameterList
   : '(' ( parameter (',' parameter)* )? ')' ;
 
 parameter
-  : typeName storageLocation? identifier? ;
+  : typeName PayableKeyword? storageLocation? identifier? ;
 
 eventParameterList
   : '(' ( eventParameter (',' eventParameter)* )? ')' ;
@@ -118,10 +118,10 @@ functionTypeParameterList
   : '(' ( functionTypeParameter (',' functionTypeParameter)* )? ')' ;
 
 functionTypeParameter
-  : typeName storageLocation? ;
+  : typeName PayableKeyword? storageLocation? ;
 
 variableDeclaration
-  : typeName storageLocation? identifier ;
+  : typeName PayableKeyword? storageLocation? identifier ;
 
 typeName
   : elementaryTypeName
@@ -454,4 +454,4 @@ COMMENT
   : '/*' .*? '*/' -> channel(HIDDEN) ;
 
 LINE_COMMENT
-  : '//' ~[\r\n]* -> channel(HIDDEN) ;
+  : '//' ~[\r\n]* -> channel(HIDDEN) ;
diff --git a/sphinxcontrib/soliditydomain/Solidity.interp b/sphinxcontrib/soliditydomain/Solidity.interp
diff --git a/sphinxcontrib/soliditydomain/SolidityLexer.py b/sphinxcontrib/soliditydomain/SolidityLexer.py
@@ -1,4 +1,4 @@
-# Generated from Solidity.g4 by ANTLR 4.7.1
+# Generated from Solidity.g4 by ANTLR 4.7.2
 from antlr4 import *
 from io import StringIO
 from typing.io import TextIO
@@ -965,7 +965,7 @@ class SolidityLexer(Lexer):
 
     def __init__(self, input=None, output:TextIO = sys.stdout):
         super().__init__(input, output)
-        self.checkVersion("4.7.1")
+        self.checkVersion("4.7.2")
         self._interp = LexerATNSimulator(self, self.atn, self.decisionsToDFA, PredictionContextCache())
         self._actions = None
         self._predicates = None

diff --git a/sphinxcontrib/soliditydomain/SolidityListener.py b/sphinxcontrib/soliditydomain/SolidityListener.py
@@ -1,4 +1,4 @@
-# Generated from Solidity.g4 by ANTLR 4.7.1
+# Generated from Solidity.g4 by ANTLR 4.7.2
 from antlr4 import *
 if __name__ is not None and "." in __name__:
     from .SolidityParser import SolidityParser