cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2423 from federicobond/tuple-grammar

Browse Source 
Fix grammar for tuple expressions
This commit is contained in:
chriseth 2017-06-22 18:43:39 +02:00 committed by GitHub
commit ce069e9c1e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/grammar.txt
View File

@ -88,7 +88,6 @@ Expression =
| Expression '||' Expression
| Expression '?' Expression ':' Expression
| Expression ('=' | '|=' | '^=' | '&=' | '<<=' | '>>=' | '+=' | '-=' | '*=' | '/=' | '%=') Expression
| Expression? (',' Expression)
| PrimaryExpression
PrimaryExpression = Identifier
@ -96,6 +95,7 @@ PrimaryExpression = Identifier
| NumberLiteral
| HexLiteral
| StringLiteral
| TupleExpression
| ElementaryTypeNameExpression
ExpressionList = Expression ( ',' Expression )*
@ -120,6 +120,9 @@ Identifier = [a-zA-Z_$] [a-zA-Z_$0-9]*
HexNumber = '0x' [0-9a-fA-F]+
DecimalNumber = [0-9]+
TupleExpression = '(' ( Expression ( ',' Expression )* )? ')'
| '[' ( Expression ( ',' Expression )* )? ']'
ElementaryTypeNameExpression = ElementaryTypeName
ElementaryTypeName = 'address' | 'bool' | 'string' | 'var'