diff options
| author | chriseth <chris@ethereum.org> | 2016-09-06 21:43:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-06 21:43:06 +0800 |
| commit | fb73da30d83624a1579fd10210946af0e82394b0 (patch) | |
| tree | c5fa7437adc6051097c1cc8c32b4c37cc11fe8d1 | |
| parent | 5ade1bc20facd81f651548589a5e49ccfc71f14e (diff) | |
| parent | 70d91462db154eed74b5c75faa204b11a98ed73e (diff) | |
| download | dexon-solidity-fb73da30d83624a1579fd10210946af0e82394b0.tar.gz dexon-solidity-fb73da30d83624a1579fd10210946af0e82394b0.tar.zst dexon-solidity-fb73da30d83624a1579fd10210946af0e82394b0.zip | |
Merge pull request #1011 from walter-weinmann/wwe_grammar
Changes related to issues #984, #989, #999, #1001 and #1004.
| -rw-r--r-- | libsolidity/grammar.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/grammar.txt b/libsolidity/grammar.txt index 86df3db0..755cf281 100644 --- a/libsolidity/grammar.txt +++ b/libsolidity/grammar.txt @@ -43,9 +43,9 @@ StorageLocation = 'memory' | 'storage' Block = '{' Statement* '}' Statement = IfStatement | WhileStatement | ForStatement | Block | ( PlaceholderStatement | Continue | Break | Return | - Throw | SimpleStatement | ExpressionStatement ) ';' + Throw | SimpleStatement ) ';' -ExpressionStatement = Expression | VariableDefinition +ExpressionStatement = Expression IfStatement = 'if' '(' Expression ')' Statement ( 'else' Statement )? WhileStatement = 'while' '(' Expression ')' Statement PlaceholderStatement = '_' @@ -79,7 +79,7 @@ Expression = PrimaryExpression = Identifier | BooleanLiteral | NumberLiteral | StringLiteral -FunctionCall = Identifier '(' Expression? ( ',' Expression )* ')' +FunctionCall = ( PrimaryExpression | NewExpression | TypeName ) ( ( '.' Identifier ) | ( '[' Expression ']' ) )* '(' Expression? ( ',' Expression )* ')' NewExpression = 'new' Identifier MemberAccess = Expression '.' Identifier IndexAccess = Expression '[' Expression? ']' |