aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
diff options
context:
space:
mode:
authorNicolai <NicolaiSoeborg@users.noreply.github.com>2016-07-31 01:27:32 +0800
committerNicolai <NicolaiSoeborg@users.noreply.github.com>2016-07-31 01:27:32 +0800
commit9f772cb9a1d7ffcf4670901d2aa039ecbde92600 (patch)
treee28b63830c31c93b53b6cec0ab5bc3afc8e9a81a /libsolidity
parentb2de2a9d0fc43c8733f830bda2c1ea220b81fad4 (diff)
downloaddexon-solidity-9f772cb9a1d7ffcf4670901d2aa039ecbde92600.tar
dexon-solidity-9f772cb9a1d7ffcf4670901d2aa039ecbde92600.tar.gz
dexon-solidity-9f772cb9a1d7ffcf4670901d2aa039ecbde92600.tar.bz2
dexon-solidity-9f772cb9a1d7ffcf4670901d2aa039ecbde92600.tar.lz
dexon-solidity-9f772cb9a1d7ffcf4670901d2aa039ecbde92600.tar.xz
dexon-solidity-9f772cb9a1d7ffcf4670901d2aa039ecbde92600.tar.zst
dexon-solidity-9f772cb9a1d7ffcf4670901d2aa039ecbde92600.zip
Remove 'reduce/reduce conflicts' with comma operator
Diffstat (limited to 'libsolidity')
-rw-r--r--libsolidity/grammar.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/libsolidity/grammar.txt b/libsolidity/grammar.txt
index 66cb1dfb..97a9ad39 100644
--- a/libsolidity/grammar.txt
+++ b/libsolidity/grammar.txt
@@ -70,7 +70,7 @@ Expression =
| Expression '||' Expression
| Expression '?' Expression ':' Expression
| Expression ('=' | '|=' | '^=' | '&=' | '<<=' | '>>=' | '+=' | '-=' | '*=' | '/=' | '%=') Expression
- | Expression? ',' Expression?
+ | Expression? (',' Expression)?
| PrimaryExpression
PrimaryExpression = Identifier | BooleanLiteral | NumberLiteral | StringLiteral