Fix grammar for tuple expressions

nandodj · Jun 19, 2017 · 1e3b45d · 1e3b45d
1 parent 26ea9ce
commit 1e3b45d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/docs/grammar.txt b/docs/grammar.txt
@@ -88,14 +88,14 @@ Expression =
   | Expression '||' Expression
   | Expression '?' Expression ':' Expression
   | Expression ('=' | '|=' | '^=' | '&=' | '<<=' | '>>=' | '+=' | '-=' | '*=' | '/=' | '%=') Expression
-  | Expression? (',' Expression)
   | PrimaryExpression
 
 PrimaryExpression = Identifier
                   | BooleanLiteral
                   | 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'