Generalize and centralize cpr flag conflict check.

[cycript.git] / Cycript.yy.in

diff --git a/Cycript.yy.in b/Cycript.yy.in
index 2227201e0cd184bf619e48ad062d0690b53a7d6a..2c8125ea37c1a0d663f4968f62082dfbc1ac1af5 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -161,7 +161,6 @@ int cylex(YYSTYPE *, cy::location *, void *);
 
 @begin E4X ObjectiveC
 %token At "@"
 
 @begin E4X ObjectiveC
 %token At "@"

-%token Pound "#"

 @end
 
 %token Ampersand "&"
 @end
 
 %token Ampersand "&"


@@ -1054,11 +1053,11 @@ AssignmentExpression
 /* 11.14 Comma Operator {{{ */
 Expression_
     : "," Expression { $$ = $2; }
 /* 11.14 Comma Operator {{{ */
 Expression_
     : "," Expression { $$ = $2; }

-    | { $$ = CYNew CYCompound(); }
+    | { $$ = NULL; }

     ;
 
 Expression
     ;
 
 Expression

-    : AssignmentExpression Expression_ { $2->AddPrev($1); $$ = $2; }
+    : AssignmentExpression Expression_ { $$ = CYNew CYCompound($1, $2); }

     ;
 
 ExpressionOpt
     ;
 
 ExpressionOpt


@@ -1665,7 +1664,7 @@ PrimaryExpression
 /* }}} */
 /* Cycript (Objective-C): Instance Literals {{{ */
 PrimaryExpression
 /* }}} */
 /* Cycript (Objective-C): Instance Literals {{{ */
 PrimaryExpression

-    : "#" NumericLiteral { $$ = CYNew CYInstanceLiteral($2); }
+    : "^" NumericLiteral { $$ = CYNew CYInstanceLiteral($2); }

     ;
 /* }}} */
 @end
     ;
 /* }}} */
 @end