X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/ddeb187697cfab9802f10cc09b9901a50afe88e9..341d1456832396678c21074a7ec2a07181e12f49:/Cycript.yy.in

diff --git a/Cycript.yy.in b/Cycript.yy.in
index d797aed..8b00100 100644
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -28,7 +28,7 @@
 #include "Driver.hpp"
 #include "Parser.hpp"
 #include "Stack.hpp"
-#define CYNew new($pool)
+#define CYNew new(driver.pool_)
 
 @begin ObjectiveC
 #include "ObjectiveC/Syntax.hpp"
@@ -260,65 +260,48 @@ int cylex(YYSTYPE *, CYLocation *, void *);
 %token <identifier_> No "NO"
 @end
 
-%token <false_> False "false"
-%token <null_> Null "null"
-%token <true_> True "true"
-
-// ES3/ES5/WIE/JSC Reserved
-%token <word_> Auto "auto"
-%token <word_> Break "break"
-%token <word_> Case "case"
-%token <word_> Catch "catch"
-%token <word_> Continue "continue"
-%token <word_> Default "default"
-%token <word_> Delete "delete"
-%token <word_> Do "do"
-%token <word_> Else "else"
-%token <word_> Finally "finally"
-%token <word_> For "for"
-%token <word_> Function "function"
-%token <word_> Function_ ";function"
-%token <word_> If "if"
-%token <word_> In "in"
-%token <word_> In_ "!in"
-%token <word_> InstanceOf "instanceof"
-%token <word_> New "new"
-%token <word_> Return "return"
-%token <word_> Switch "switch"
-%token <this_> This "this"
-%token <word_> Throw "throw"
-%token <word_> Try "try"
-%token <word_> TypeOf "typeof"
-%token <word_> Var "var"
-%token <word_> Void "void"
-%token <word_> While "while"
-%token <word_> With "with"
-
-// ES3/IE6 Future, ES5/JSC Reserved
-%token <word_> Debugger "debugger"
-
-// ES3/ES5/IE6 Future, JSC Reserved
-%token <word_> Const "const"
-
-// ES3/ES5/IE6/JSC Future
-%token <word_> Class "class"
-%token <word_> Enum "enum"
-%token <word_> Export "export"
-%token <word_> Extends "extends"
-%token <word_> Import "import"
-%token <word_> Super "super"
-
-// ES3 Future, ES5 Strict Future
-%token <identifier_> Implements "implements"
-%token <identifier_> Interface "interface"
-%token <identifier_> Package "package"
-%token <identifier_> Private "private"
-%token <identifier_> Protected "protected"
-%token <identifier_> Public "public"
-%token <identifier_> Static "static"
+%token False "false"
+%token Null "null"
+%token True "true"
+
+%token Break "break"
+%token Case "case"
+%token Catch "catch"
+%token Class "class"
+%token Const "const"
+%token Continue "continue"
+%token Debugger "debugger"
+%token Default "default"
+%token Delete "delete"
+%token Do "do"
+%token Else "else"
+%token Enum "enum"
+%token Export "export"
+%token Extends "extends"
+%token Finally "finally"
+%token For "for"
+%token Function "function"
+%token Function_ ";function"
+%token If "if"
+%token Import "import"
+%token In "in"
+%token In_ "!in"
+%token InstanceOf "instanceof"
+%token New "new"
+%token Return "return"
+%token Super "super"
+%token Switch "switch"
+%token This "this"
+%token Throw "throw"
+%token Try "try"
+%token TypeOf "typeof"
+%token Var "var"
+%token Void "void"
+%token While "while"
+%token With "with"
 
-// ES3 Future
 %token <identifier_> Abstract "abstract"
+%token <identifier_> Await "await"
 %token <identifier_> Boolean "boolean"
 %token <identifier_> Byte "byte"
 %token <identifier_> Char "char"
@@ -326,25 +309,29 @@ int cylex(YYSTYPE *, CYLocation *, void *);
 %token <identifier_> Final "final"
 %token <identifier_> Float "float"
 %token <identifier_> Goto "goto"
+%token <identifier_> Implements "implements"
 %token <identifier_> Int "int"
+%token <identifier_> Interface "interface"
+%token <identifier_> Let "let"
 %token <identifier_> Long "long"
 %token <identifier_> Native "native"
+%token <identifier_> Package "package"
+%token <identifier_> Private "private"
+%token <identifier_> Protected "protected"
+%token <identifier_> Public "public"
 %token <identifier_> Short "short"
+%token <identifier_> Static "static"
 %token <identifier_> Synchronized "synchronized"
 %token <identifier_> Throws "throws"
 %token <identifier_> Transient "transient"
 %token <identifier_> Volatile "volatile"
-
-// ES5 Strict
-%token <identifier_> Let "let"
 %token <identifier_> Yield "yield"
 
-// Woah?!
+%token Auto "auto"
 %token <identifier_> Each "each"
 %token <identifier_> Of "of"
 
 @begin E4X
-// E4X Conditional
 %token <identifier_> Namespace "namespace"
 %token <identifier_> XML "xml"
 @end
@@ -621,48 +608,49 @@ NewLineOpt
 
 Word
     : Identifier { $$ = $1; }
-    | "auto" { $$ = $1; }
-    | "break" NewLineOpt { $$ = $1; }
-    | "case" { $$ = $1; }
-    | "catch" { $$ = $1; }
-    | "class" { $$ = $1; }
-    | "const" { $$ = $1; }
-    | "continue" NewLineOpt { $$ = $1; }
-    | "debugger" { $$ = $1; }
-    | "default" { $$ = $1; }
-    | "delete" LexSetRegExp { $$ = $1; }
-    | "do" { $$ = $1; }
-    | "else" { $$ = $1; }
-    | "enum" { $$ = $1; }
-    | "export" { $$ = $1; }
-    | "extends" { $$ = $1; }
-    | "false" { $$ = $1; }
-    | "finally" { $$ = $1; }
-    /* XXX: | "for" { $$ = $1; } */
-    | "function" { $$ = $1; }
-    | "if" { $$ = $1; }
-    | "import" { $$ = $1; }
-    /* XXX: | "in" { $$ = $1; } */
-    | "!in" { $$ = $1; }
-    /* XXX: | "instanceof" { $$ = $1; } */
+
+    | "auto" { $$ = CYNew CYWord("auto"); }
+    | "break" NewLineOpt { $$ = CYNew CYWord("break"); }
+    | "case" { $$ = CYNew CYWord("case"); }
+    | "catch" { $$ = CYNew CYWord("catch"); }
+    | "class" { $$ = CYNew CYWord("class"); }
+    | "const" { $$ = CYNew CYWord("const"); }
+    | "continue" NewLineOpt { $$ = CYNew CYWord("continue"); }
+    | "debugger" { $$ = CYNew CYWord("debugger"); }
+    | "default" { $$ = CYNew CYWord("default"); }
+    | "delete" LexSetRegExp { $$ = CYNew CYWord("delete"); }
+    | "do" { $$ = CYNew CYWord("do"); }
+    | "else" { $$ = CYNew CYWord("else"); }
+    | "enum" { $$ = CYNew CYWord("enum"); }
+    | "export" { $$ = CYNew CYWord("export"); }
+    | "extends" { $$ = CYNew CYWord("extends"); }
+    | "false" { $$ = CYNew CYWord("false"); }
+    | "finally" { $$ = CYNew CYWord("finally"); }
+    /* XXX: | "for" { $$ = CYNew CYWord("for"); } */
+    | "function" { $$ = CYNew CYWord("function"); }
+    | "if" { $$ = CYNew CYWord("if"); }
+    | "import" { $$ = CYNew CYWord("import"); }
+    /* XXX: | "in" { $$ = CYNew CYWord("in"); } */
+    | "!in" { $$ = CYNew CYWord("in"); }
+    /* XXX: | "instanceof" { $$ = CYNew CYWord("instanceof"); } */
 
     // XXX: as it currently is not an Identifier
     | "let" { $$ = $1; }
 
-    | "new" LexSetRegExp { $$ = $1; }
-    | "null" { $$ = $1; }
-    | "return" NewLineOpt { $$ = $1; }
-    | "super" { $$ = $1; }
-    | "switch" { $$ = $1; }
-    | "this" { $$ = $1; }
-    | "throw" NewLineOpt { $$ = $1; }
-    | "true" { $$ = $1; }
-    | "try" { $$ = $1; }
-    | "typeof" LexSetRegExp { $$ = $1; }
-    | "var" { $$ = $1; }
-    | "void" LexSetRegExp { $$ = $1; }
-    | "while" { $$ = $1; }
-    | "with" { $$ = $1; }
+    | "new" LexSetRegExp { $$ = CYNew CYWord("new"); }
+    | "null" { $$ = CYNew CYWord("null"); }
+    | "return" NewLineOpt { $$ = CYNew CYWord("return"); }
+    | "super" { $$ = CYNew CYWord("super"); }
+    | "switch" { $$ = CYNew CYWord("switch"); }
+    | "this" { $$ = CYNew CYWord("this"); }
+    | "throw" NewLineOpt { $$ = CYNew CYWord("throw"); }
+    | "true" { $$ = CYNew CYWord("true"); }
+    | "try" { $$ = CYNew CYWord("try"); }
+    | "typeof" LexSetRegExp { $$ = CYNew CYWord("typeof"); }
+    | "var" { $$ = CYNew CYWord("var"); }
+    | "void" LexSetRegExp { $$ = CYNew CYWord("void"); }
+    | "while" { $$ = CYNew CYWord("while"); }
+    | "with" { $$ = CYNew CYWord("with"); }
     ;
 
 @begin ObjectiveC
@@ -675,22 +663,22 @@ WordOpt
 IdentifierType
     : Identifier_ { $$ = $1; }
 
-    | "implements" { $$ = $1; }
-    | "interface" { $$ = $1; }
-    | "package" { $$ = $1; }
-    | "private" { $$ = $1; }
-    | "protected" { $$ = $1; }
-    | "public" { $$ = $1; }
-    | "static" { $$ = $1; }
-
     | "abstract" { $$ = $1; }
+    | "await" { $$ = $1; }
     | "boolean" { $$ = $1; }
     | "byte" { $$ = $1; }
     | "double" { $$ = $1; }
     | "final" { $$ = $1; }
     | "float" { $$ = $1; }
     | "goto" { $$ = $1; }
+    | "implements" { $$ = $1; }
+    | "interface" { $$ = $1; }
     | "native" { $$ = $1; }
+    | "package" { $$ = $1; }
+    | "private" { $$ = $1; }
+    | "protected" { $$ = $1; }
+    | "public" { $$ = $1; }
+    | "static" { $$ = $1; }
     | "synchronized" { $$ = $1; }
     | "throws" { $$ = $1; }
     | "transient" { $$ = $1; }
@@ -712,14 +700,14 @@ Identifier
     | "short" { $$ = $1; }
     | "volatile" { $$ = $1; }
 @begin C
+    | "extern" { $$ = $1; }
+    | "signed" { $$ = $1; }
     | "typedef" { $$ = $1; }
     | "unsigned" { $$ = $1; }
-    | "signed" { $$ = $1; }
-    | "extern" { $$ = $1; }
 @end
 @begin ObjectiveC
-    | "YES" { $$ = $1; }
     | "NO" { $$ = $1; }
+    | "YES" { $$ = $1; }
 @end
     ;
 
@@ -744,13 +732,13 @@ ValueLiteral
 /* }}} */
 /* 7.8.1 Null Literals {{{ */
 NullLiteral
-    : "null" { $$ = $1; }
+    : "null" { $$ = CYNew CYNull(); }
     ;
 /* }}} */
 /* 7.8.2 Boolean Literals {{{ */
 BooleanLiteral
-    : "true" { $$ = $1; }
-    | "false" { $$ = $1; }
+    : "true" { $$ = CYNew CYTrue(); }
+    | "false" { $$ = CYNew CYFalse(); }
     ;
 /* }}} */
 
@@ -780,7 +768,7 @@ Variable
     ;
 
 PrimaryExpression
-    : "this" { $$ = $1; }
+    : "this" { $$ = CYNew CYThis(); }
     | Variable { $$ = $1; }
     | Literal { $$ = $1; }
     | ArrayInitialiser { $$ = $1; }
@@ -1587,7 +1575,7 @@ SelectorCall_
     ;
 
 SelectorCall
-    : SelectorWordOpt ":" AssignmentExpression SelectorCall_ { $$ = CYNew CYArgument($1 ?: CYNew CYBlank(), $3, $4); }
+    : SelectorWordOpt ":" AssignmentExpression SelectorCall_ { $$ = CYNew CYArgument($1 ?: CYNew CYWord(""), $3, $4); }
     ;
 
 SelectorList