Merge 48900bb into 7eb0dc0

lib/grammar/Solidity.tokens

@@ -87,35 +87,36 @@ T__85=86
 T__86=87
 T__87=88
 T__88=89
-Int=90
-Uint=91
-Byte=92
-Fixed=93
-Ufixed=94
-VersionLiteral=95
-BooleanLiteral=96
-DecimalNumber=97
-HexNumber=98
-NumberUnit=99
-HexLiteral=100
-ReservedKeyword=101
-AnonymousKeyword=102
-BreakKeyword=103
-ConstantKeyword=104
-ContinueKeyword=105
-ExternalKeyword=106
-IndexedKeyword=107
-InternalKeyword=108
-PayableKeyword=109
-PrivateKeyword=110
-PublicKeyword=111
-PureKeyword=112
-ViewKeyword=113
-Identifier=114
-StringLiteral=115
-WS=116
-COMMENT=117
-LINE_COMMENT=118
+T__89=90
+Int=91
+Uint=92
+Byte=93
+Fixed=94
+Ufixed=95
+VersionLiteral=96
+BooleanLiteral=97
+DecimalNumber=98
+HexNumber=99
+NumberUnit=100
+HexLiteral=101
+ReservedKeyword=102
+AnonymousKeyword=103
+BreakKeyword=104
+ConstantKeyword=105
+ContinueKeyword=106
+ExternalKeyword=107
+IndexedKeyword=108
+InternalKeyword=109
+PayableKeyword=110
+PrivateKeyword=111
+PublicKeyword=112
+PureKeyword=113
+ViewKeyword=114
+Identifier=115
+StringLiteral=116
+WS=117
+COMMENT=118
+LINE_COMMENT=119
 'pragma'=1
 ';'=2
 '^'=3
@@ -154,66 +155,67 @@ LINE_COMMENT=118
 '=>'=36
 'memory'=37
 'storage'=38
-'if'=39
-'else'=40
-'while'=41
-'assembly'=42
-'do'=43
-'return'=44
-'throw'=45
-'emit'=46
-'var'=47
-'address'=48
-'bool'=49
-'string'=50
-'byte'=51
-'++'=52
-'--'=53
-'new'=54
-'+'=55
-'-'=56
-'after'=57
-'delete'=58
-'!'=59
-'**'=60
-'/'=61
-'%'=62
-'<<'=63
-'>>'=64
-'&'=65
-'|'=66
-'=='=67
-'!='=68
-'&&'=69
-'||'=70
-'?'=71
-':'=72
-'|='=73
-'^='=74
-'&='=75
-'<<='=76
-'>>='=77
-'+='=78
-'-='=79
-'*='=80
-'/='=81
-'%='=82
-'let'=83
-':='=84
-'=:'=85
-'switch'=86
-'case'=87
-'default'=88
-'->'=89
-'anonymous'=102
-'break'=103
-'constant'=104
-'continue'=105
-'external'=106
-'indexed'=107
-'internal'=108
-'payable'=109
-'private'=110
-'public'=111
-'pure'=112
-'view'=113
+'calldata'=39
+'if'=40
+'else'=41
+'while'=42
+'assembly'=43
+'do'=44
+'return'=45
+'throw'=46
+'emit'=47
+'var'=48
+'address'=49
+'bool'=50
+'string'=51
+'byte'=52
+'++'=53
+'--'=54
+'new'=55
+'+'=56
+'-'=57
+'after'=58
+'delete'=59
+'!'=60
+'**'=61
+'/'=62
+'%'=63
+'<<'=64
+'>>'=65
+'&'=66
+'|'=67
+'=='=68
+'!='=69
+'&&'=70
+'||'=71
+'?'=72
+':'=73
+'|='=74
+'^='=75
+'&='=76
+'<<='=77
+'>>='=78
+'+='=79
+'-='=80
+'*='=81
+'/='=82
+'%='=83
+'let'=84
+':='=85
+'=:'=86
+'switch'=87
+'case'=88
+'default'=89
+'->'=90
+'anonymous'=103
+'break'=104
+'constant'=105
+'continue'=106
+'external'=107
+'indexed'=108
+'internal'=109
+'payable'=110
+'private'=111
+'public'=112
+'pure'=113
+'view'=114