diff options
| author | chriseth <chris@ethereum.org> | 2017-06-23 00:43:39 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-23 00:43:39 +0800 |
| commit | ce069e9c1e510ce8a1073e3d6ef0814300c5af41 (patch) | |
| tree | 333b11700b007a1387a615e2cfd6946b50f0aea5 /docs | |
| parent | 0868a50eb1d0014fc582ab8bfdf6db0bb9d385ab (diff) | |
| parent | 1e3b45d61ee4dc51c3e787a5d981f588e2cb3ecf (diff) | |
| download | dexon-solidity-ce069e9c1e510ce8a1073e3d6ef0814300c5af41.tar dexon-solidity-ce069e9c1e510ce8a1073e3d6ef0814300c5af41.tar.gz dexon-solidity-ce069e9c1e510ce8a1073e3d6ef0814300c5af41.tar.bz2 dexon-solidity-ce069e9c1e510ce8a1073e3d6ef0814300c5af41.tar.lz dexon-solidity-ce069e9c1e510ce8a1073e3d6ef0814300c5af41.tar.xz dexon-solidity-ce069e9c1e510ce8a1073e3d6ef0814300c5af41.tar.zst dexon-solidity-ce069e9c1e510ce8a1073e3d6ef0814300c5af41.zip | |
Merge pull request #2423 from federicobond/tuple-grammar
Fix grammar for tuple expressions
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/grammar.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/grammar.txt b/docs/grammar.txt index 09e492f3..b38b7ffa 100644 --- a/docs/grammar.txt +++ b/docs/grammar.txt @@ -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' |