Fix issue in 64-bit choose() reported by heardrwt.

[cycript.git] / Cycript.yy.in

diff --git a/Cycript.yy.in b/Cycript.yy.in
index c8a18629aa0a2d8bc749b0389e8bbc8a123f93cb..3a31f1ebbe797f220e5cf17bb7123ecc846eb4fb 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -1054,11 +1054,11 @@ AssignmentExpression
 /* 11.14 Comma Operator {{{ */
 Expression_
     : "," Expression { $$ = $2; }
-    | { $$ = CYNew CYCompound(); }
+    | { $$ = NULL; }
     ;
 
 Expression
-    : AssignmentExpression Expression_ { $2->AddPrev($1); $$ = $2; }
+    : AssignmentExpression Expression_ { $$ = CYNew CYCompound($1, $2); }
     ;
 
 ExpressionOpt
@@ -1449,7 +1449,7 @@ IntegerType
 
 IntegerTypeOpt
     : IntegerType { $$ = $1; }
-    |
+    | { $$ = CYNew CYTypeVariable("int"); }
     ;
 
 PrimitiveType
@@ -1470,7 +1470,7 @@ EncodedType
     ;
 
 PrimaryExpression
-    : AtEncode "(" EncodedType ")" { $$ = $3; }
+    : "@encode" "(" EncodedType ")" { $$ = $3; }
     ;
 /* }}} */
 /* Cycript (Objective-C): @class Declaration {{{ */
@@ -1481,7 +1481,7 @@ ClassSuperOpt
     ;
 
 ClassFieldListOpt
-    : Expression Identifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $2, $4); }
+    : TypedIdentifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $3); }
     | LexSetRegExp { $$ = NULL; }
     ;