From 9f772cb9a1d7ffcf4670901d2aa039ecbde92600 Mon Sep 17 00:00:00 2001
From: Nicolai <NicolaiSoeborg@users.noreply.github.com>
Date: Sat, 30 Jul 2016 19:27:32 +0200
Subject: Remove 'reduce/reduce conflicts' with comma operator

---
 libsolidity/grammar.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libsolidity/grammar.txt')

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
-- 
cgit