diff options
| author | Federico Bond <federicobond@gmail.com> | 2017-06-15 09:59:58 +0800 |
|---|---|---|
| committer | Federico Bond <federicobond@gmail.com> | 2017-06-23 00:55:08 +0800 |
| commit | 9fc4c877d35f87d6efef6ca9143d196c9cfb9f7f (patch) | |
| tree | a6a441d21bab7892051da018a8890031f6820a11 /docs | |
| parent | f0f1e5abfa21e97253bbc9d3e9791c8f4a956d06 (diff) | |
| download | dexon-solidity-9fc4c877d35f87d6efef6ca9143d196c9cfb9f7f.tar.gz dexon-solidity-9fc4c877d35f87d6efef6ca9143d196c9cfb9f7f.tar.zst dexon-solidity-9fc4c877d35f87d6efef6ca9143d196c9cfb9f7f.zip | |
Fix and improve grammar.txt
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/grammar.txt | 9 | ||||
| -rw-r--r-- | docs/miscellaneous.rst | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/docs/grammar.txt b/docs/grammar.txt index da9e27d6..6c041460 100644 --- a/docs/grammar.txt +++ b/docs/grammar.txt @@ -77,10 +77,11 @@ IdentifierList = '(' ( Identifier? ',' )* Identifier? ')' // Precedence by order (see github.com/ethereum/solidity/pull/732) Expression = Expression ('++' | '--') - | FunctionCall | NewExpression - | MemberAccess | IndexAccess + | MemberAccess + | FunctionCall + | '(' Expression ')' | ('!' | '~' | 'delete' | '++' | '--' | '+' | '-') Expression | Expression '**' Expression | Expression ('*' | '/' | '%') Expression @@ -97,12 +98,12 @@ Expression | Expression ('=' | '|=' | '^=' | '&=' | '<<=' | '>>=' | '+=' | '-=' | '*=' | '/=' | '%=') Expression | PrimaryExpression -PrimaryExpression = Identifier - | BooleanLiteral +PrimaryExpression = BooleanLiteral | NumberLiteral | HexLiteral | StringLiteral | TupleExpression + | Identifier | ElementaryTypeNameExpression ExpressionList = Expression ( ',' Expression )* diff --git a/docs/miscellaneous.rst b/docs/miscellaneous.rst index 2e0ccf45..17f2dcf9 100644 --- a/docs/miscellaneous.rst +++ b/docs/miscellaneous.rst @@ -394,12 +394,14 @@ The following is the order of precedence for operators, listed in order of evalu +============+=====================================+============================================+ | *1* | Postfix increment and decrement | ``++``, ``--`` | + +-------------------------------------+--------------------------------------------+ -| | Function-like call | ``<func>(<args...>)`` | +| | New expression | ``new <typename>`` | + +-------------------------------------+--------------------------------------------+ | | Array subscripting | ``<array>[<index>]`` | + +-------------------------------------+--------------------------------------------+ | | Member access | ``<object>.<member>`` | + +-------------------------------------+--------------------------------------------+ +| | Function-like call | ``<func>(<args...>)`` | ++ +-------------------------------------+--------------------------------------------+ | | Parentheses | ``(<statement>)`` | +------------+-------------------------------------+--------------------------------------------+ | *2* | Prefix increment and decrement | ``++``, ``--`` | |