diff options
| author | Nicolai <NicolaiSoeborg@users.noreply.github.com> | 2016-07-27 22:42:33 +0800 |
|---|---|---|
| committer | Nicolai <NicolaiSoeborg@users.noreply.github.com> | 2016-07-27 22:42:33 +0800 |
| commit | 97d7b8509c07db4bc3f1f99237b687351bd9d8fc (patch) | |
| tree | 909be15e47d157bdb709b7a859e9f1c0bb9862be | |
| parent | cde629d48d36aa7944a5e6c9a436b8a021c12f2d (diff) | |
| download | dexon-solidity-97d7b8509c07db4bc3f1f99237b687351bd9d8fc.tar dexon-solidity-97d7b8509c07db4bc3f1f99237b687351bd9d8fc.tar.gz dexon-solidity-97d7b8509c07db4bc3f1f99237b687351bd9d8fc.tar.bz2 dexon-solidity-97d7b8509c07db4bc3f1f99237b687351bd9d8fc.tar.lz dexon-solidity-97d7b8509c07db4bc3f1f99237b687351bd9d8fc.tar.xz dexon-solidity-97d7b8509c07db4bc3f1f99237b687351bd9d8fc.tar.zst dexon-solidity-97d7b8509c07db4bc3f1f99237b687351bd9d8fc.zip | |
Fixes to expression
| -rw-r--r-- | libsolidity/grammar.txt | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/libsolidity/grammar.txt b/libsolidity/grammar.txt index 02726a89..e38fdb54 100644 --- a/libsolidity/grammar.txt +++ b/libsolidity/grammar.txt @@ -31,7 +31,7 @@ TypeParameterList = '(' ( TypeName (',' TypeName)* )? ')' ParameterList = '(' ( VariableDeclaration (',' VariableDeclaration)* )? ')' // semantic restriction: mappings and structs (recursively) containing mappings // are not allowed in argument lists -VariableDeclaration = TypeName Identifier | 'var' assignment +VariableDeclaration = TypeName Identifier TypeName = ElementaryTypeName | Identifier StorageLocation? | Mapping | ArrayTypeName Mapping = 'mapping' '(' ElementaryTypeName '=>' TypeName ')' ArrayTypeName = TypeName StorageLocation? '[' Expression? ']' @@ -39,25 +39,24 @@ StorageLocation = 'memory' | 'storage' Block = '{' Statement* '}' Statement = IfStatement | WhileStatement | ForStatement | Block | PlaceholderStatement | - ( Continue | Break | Return | Throw | VardefOrExprStmt | ExpressionStatement ) ';' + ( Continue | Break | Return | Throw | SimpleStatement | ExpressionStatement ) ';' -ExpressionStatement = Expression | VariableDefinition | Assignment | 'delete' Expression +ExpressionStatement = Expression | VariableDefinition IfStatement = 'if' '(' Expression ')' Statement ( 'else' Statement )? WhileStatement = 'while' '(' Expression ')' Statement PlaceholderStatement = '_' -VardefOrExprStmt = VariableDefinition | ExpressionStatement -ForStatement = 'for' '(' (VardefOrExprStmt)? ';' (Expression)? ';' (ExpressionStatement)? ')' Statement +SimpleStatement = VariableDefinition | ExpressionStatement +ForStatement = 'for' '(' (SimpleStatement)? ';' (Expression)? ';' (ExpressionStatement)? ')' Statement Continue = 'continue' Break = 'break' Return = 'return' Expression? Throw = 'throw' VariableDefinition = VariableDeclaration ( '=' Expression )? -Assignment = Expression ('=' | '|=' | '^=' | '&=' | '<<=' | '>>=' | '+=' | '-=' | '*=' | '/=' | '%=') Expression // Precedence by order (see github.com/ethereum/solidity/pull/732) Expression = ( Expression ('++' | '--') | FunctionCall | IndexAccess | MemberAccess | '(' Expression ')' ) - | ('++' | '--' | '+' | '-' | '!' | '~') Expression + | ('!' | '~' | 'after' | 'delete' | '++' | '--' | '+' | '-') Expression | Expression '**' Expression | Expression ('*' | '/' | '%') Expression | Expression ('+' | '-') Expression @@ -70,8 +69,8 @@ Expression = | Expression '&&' Expression | Expression '||' Expression | Expression '?' Expression ':' Expression -/* | Expression ('=' | '|=' | '^=' | '&=' | '<<=' | '/=' | '%=') Expression */ - | Expression ',' Expression? + | Expression ('=' | '|=' | '^=' | '&=' | '<<=' | '>>=' | '+=' | '-=' | '*=' | '/=' | '%=') Expression + | Expression? ',' Expression? | PrimaryExpression PrimaryExpression = Identifier | BooleanLiteral | NumberLiteral | StringLiteral | FunctionCall @@ -89,7 +88,7 @@ StringLiteral = '"' ([^"\r\n\\] | '\\' .)* '"' Identifier = [a-zA-Z_] [a-zA-Z_0-9]* -ElementaryTypeName = 'address' | 'bool' | 'string' +ElementaryTypeName = 'address' | 'bool' | 'string' | 'var' | 'int' | 'int8' | 'int16' | 'int24' | 'int32' | 'int40' | 'int48' | 'int56' | 'int64' | 'int72' | 'int80' | 'int88' | 'int96' | 'int104' | 'int112' | 'int120' | 'int128' | 'int136' | 'int144' | 'int152' | 'int160' | 'int168' | 'int176' | 'int184' | 'int192' | 'int200' | 'int208' | 'int216' | 'int224' | 'int232' | 'int240' | 'int248' | 'int256' | 'uint' | 'uint8' | 'uint16' | 'uint24' | 'uint32' | 'uint40' | 'uint48' | 'uint56' | 'uint64' | 'uint72' | 'uint80' | 'uint88' | 'uint96' | 'uint104' | 'uint112' | 'uint120' | 'uint128' | 'uint136' | 'uint144' | 'uint152' | 'uint160' | 'uint168' | 'uint176' | 'uint184' | 'uint192' | 'uint200' | 'uint208' | 'uint216' | 'uint224' | 'uint232' | 'uint240' | 'uint248' | 'uint256' | 'byte' | 'bytes' | 'bytes1' | 'bytes2' | 'bytes3' | 'bytes4' | 'bytes5' | 'bytes6' | 'bytes7' | 'bytes8' | 'bytes9' | 'bytes10' | 'bytes11' | 'bytes12' | 'bytes13' | 'bytes14' | 'bytes15' | 'bytes16' | 'bytes17' | 'bytes18' | 'bytes19' | 'bytes20' | 'bytes21' | 'bytes22' | 'bytes23' | 'bytes24' | 'bytes25' | 'bytes26' | 'bytes27' | 'bytes28' | 'bytes29' | 'bytes30' | 'bytes31' | 'bytes32' |