X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/74dde0f879f5c11cfb10e161ec5e4c4f2abbca73..e7ff015817107dbac9373c19ce851178e4f3c791:/Cycript.yy.in?ds=sidebyside

diff --git a/Cycript.yy.in b/Cycript.yy.in
index a11643f..5a35dd7 100644
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -1019,6 +1019,7 @@ LogicalORExpression
 ConditionalExpression
     : LogicalORExpression { $$ = $1; }
     | LogicalORExpression "?" LexPushInOff AssignmentExpression ":" LexPopIn AssignmentExpression { $$ = CYNew CYCondition($1, $4, $7); }
+    | LogicalORExpression "?" LexPushInOff LexSetRegExp ":" LexPopIn AssignmentExpression { $$ = CYNew CYCondition($1, $1, $7); }
     ;
 /* }}} */
 /* 11.13 Assignment Operators {{{ */
@@ -1633,6 +1634,11 @@ PrimaryExpression
     : "^" ModifiedType "(" LexPushInOff TypedParameterListOpt ")" LexPopIn BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYObjCBlock($2, $5, $10); }
     ;
 /* }}} */
+/* Cycript (Objective-C): Instance Literals {{{ */
+PrimaryExpression
+    : "#" NumericLiteral { $$ = CYNew CYInstanceLiteral($2); }
+    ;
+/* }}} */
 @end
 
 @begin C