cerc-io/solidity
10
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 #1011 from walter-weinmann/wwe_grammar

Browse Source 
Changes related to issues #984, #989, #999, #1001 and #1004.
This commit is contained in:
chriseth 2016-09-06 15:43:06 +02:00 committed by GitHub
commit fb73da30d8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsolidity/grammar.txt
View File

@ -43,9 +43,9 @@ StorageLocation = 'memory' | 'storage'
Block = '{' Statement* '}' Block = '{' Statement* '}'
Statement = IfStatement | WhileStatement | ForStatement | Block | Statement = IfStatement | WhileStatement | ForStatement | Block |
( PlaceholderStatement | Continue | Break | Return | ( PlaceholderStatement | Continue | Break | Return |
Throw | SimpleStatement | ExpressionStatement ) ';' Throw | SimpleStatement ) ';'
ExpressionStatement = Expression | VariableDefinition ExpressionStatement = Expression
IfStatement = 'if' '(' Expression ')' Statement ( 'else' Statement )? IfStatement = 'if' '(' Expression ')' Statement ( 'else' Statement )?
WhileStatement = 'while' '(' Expression ')' Statement WhileStatement = 'while' '(' Expression ')' Statement
PlaceholderStatement = '_' PlaceholderStatement = '_'
@ -79,7 +79,7 @@ Expression =
PrimaryExpression = Identifier | BooleanLiteral | NumberLiteral | StringLiteral PrimaryExpression = Identifier | BooleanLiteral | NumberLiteral | StringLiteral
FunctionCall = Identifier '(' Expression? ( ',' Expression )* ')' FunctionCall = ( PrimaryExpression | NewExpression | TypeName ) ( ( '.' Identifier ) | ( '[' Expression ']' ) )* '(' Expression? ( ',' Expression )* ')'
NewExpression = 'new' Identifier NewExpression = 'new' Identifier
MemberAccess = Expression '.' Identifier MemberAccess = Expression '.' Identifier
IndexAccess = Expression '[' Expression? ']' IndexAccess = Expression '[' Expression? ']'