Make Expression always return a compact CYCompound.

[cycript.git] / Cycript.yy.in

diff --git a/Cycript.yy.in b/Cycript.yy.in
index 02d2f0140953ae9ca59eba7a9622ff371fb45a5d..dfabafbed19c7b362f2cd5f83341362c1bf59e40 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -362,7 +362,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <statement_> EmptyStatement
 %type <expression_> EqualityExpression
 %type <compound_> Expression_
-%type <expression_> Expression
+%type <compound_> Expression
 %type <expression_> ExpressionOpt
 %type <statement_> ExpressionStatement
 %type <finally_> FinallyOpt
@@ -928,12 +928,12 @@ AssignmentExpression
 /* }}} */
 /* 11.14 Comma Operator {{{ */
 Expression_
-    : "," Expression { $$ = CYNew CYCompound($2); }
-    | { $$ = NULL; }
+    : "," Expression { $$ = $2; }
+    | { $$ = CYNew CYCompound(); }
     ;
 
 Expression
-    : AssignmentExpression Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }
+    : AssignmentExpression Expression_ { $2->AddPrev($1); $$ = $2; }
     ;
 
 ExpressionOpt