Support building non-fat injection trampolines.

[cycript.git] / Cycript.yy.in

diff --git a/Cycript.yy.in b/Cycript.yy.in
index 925481af97cd977d20d04ec6b0b8a68e804a4edb..9c05469a3445eebc81fdba7f69e07e55e6934266 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -641,6 +641,13 @@ Word
     | "while" { $$ = $1; }
     | "with" { $$ = $1; }
     ;
+
+PrimaryExpressionNo
+    : "@" LiteralNoRE { $$ = CYNew CYBox($2); }
+    | "@" ArrayLiteral { $$ = CYNew CYBox($2); }
+    | "@" ObjectLiteral { $$ = CYNew CYBox($2); }
+    | "@" "(" Expression ")" { $$ = CYNew CYBox($3); }
+    ;
 @end
 
 Identifier
@@ -687,7 +694,6 @@ LiteralNoRE
     | BooleanLiteral { $$ = $1; }
     | NumericLiteral { $$ = $1; }
     | StringLiteral { $$ = $1; }
-    | "@" StringLiteral { $$ = $2; }
     ;
 
 LiteralRE
@@ -1594,7 +1600,7 @@ ClassStatement
     ;
 
 CategoryName
-    : "(" Word ")"
+    : "(" WordOpt ")"
     ;
 
 CategoryStatement