Allow of to be used as Identifier, not just Word.

[cycript.git] / Cycript.l.in

diff --git a/Cycript.l.in b/Cycript.l.in
index bdd25ed31d661177c039b1f2b215f06b96124d27..953264b3ae5876b25d6e6464f0a7aa12f0caca22 100644 (file)
--- a/Cycript.l.in
+++ b/Cycript.l.in
@@ -1,40 +1,22 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2010  Jay Freeman (saurik)

 */
 
 */
 

-/* Modified BSD License {{{ */
+/* GNU Lesser General Public License, Version 3 {{{ */

 /*
 /*

- *        Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * Cycript is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.

  *
  *

- * 1. Redistributions of source code must retain the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation
- *    and/or other materials provided with the
- *    distribution.
- * 3. The name of the author may not be used to endorse
- *    or promote products derived from this software
- *    without specific prior written permission.
+ * Cycript is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.

  *
  *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/

 /* }}} */
 
 /* XXX: supposedly I will be screwed on very very long multi-line comments and need to replace these with a manual lexer. http://websrv.cs.fsu.edu/~engelen/courses/COP5621/Pr2.pdf */
 /* }}} */
 
 /* XXX: supposedly I will be screwed on very very long multi-line comments and need to replace these with a manual lexer. http://websrv.cs.fsu.edu/~engelen/courses/COP5621/Pr2.pdf */


@@ -46,27 +28,34 @@ typedef cy::parser::token tk;
 
 #define YY_EXTRA_TYPE CYDriver *
 
 
 #define YY_EXTRA_TYPE CYDriver *
 

+#define F(value) do { \
+    int token(value); \
+    yyextra->nobrace_ = false; \
+    return token; \
+} while (false)
+
+#define A new($pool)
+#define Y apr_pstrmemdup($pool, yytext, yyleng)
+
+#define I(type, Type, value) do { \
+    yylval->type ## _ = A CY ## Type; \
+    F(value); \
+} while (false)
+

 #define T yylval->newline_ = yyextra->state_ == CYNewLine; BEGIN(Div);
 #define C T yyextra->state_ = CYClear;
 #define R T yyextra->state_ = CYRestricted;
 
 #define T yylval->newline_ = yyextra->state_ == CYNewLine; BEGIN(Div);
 #define C T yyextra->state_ = CYClear;
 #define R T yyextra->state_ = CYRestricted;
 

-#define E(prefix) L C { \
-    char *value(reinterpret_cast<char *>(apr_palloc(yyextra->pool_, yyleng + sizeof(prefix)))); \
-    memcpy(value, prefix, sizeof(prefix) - 1); \
-    memcpy(value + sizeof(prefix) - 1, yytext, yyleng); \
-    value[yyleng + sizeof(prefix) - 1] = '\0'; \
-    yylval->literal_ = new(yyextra->pool_) CYRegEx(value); \
-    return tk::RegularExpressionLiteral; \
-}
+#define E L C I(literal, RegEx(Y), tk::RegularExpressionLiteral);

 
 #define N \
     if (yyextra->state_ != CYNewLine) { \
 
 #define N \
     if (yyextra->state_ != CYNewLine) { \

-        bool restricted(yyextra->state_ == CYRestricted); \
-        if (restricted) { \
-            yyextra->state_ = CYClear; \
-            return tk::NewLine; \
-        } else \
+        if (yyextra->state_ != CYRestricted) \

             yyextra->state_ = CYNewLine; \
             yyextra->state_ = CYNewLine; \

+        else { \
+            yyextra->state_ = CYClear; \
+            F(tk::NewLine); \
+        } \

     }
 
 #define V(more) { \
     }
 
 #define V(more) { \


@@ -158,196 +147,202 @@ XMLName {XMLNameStart}{XMLNamePart}*
 
 %%
 
 
 %%
 

-<RegExp>\/{RegularExpressionBody}\/{RegularExpressionFlags} E("")
+<RegExp>\/{RegularExpressionBody}\/{RegularExpressionFlags} E

 
 \/\/[^\n]* L
 
        /* http://ostermiller.org/findcomment.html */
        /* XXX: unify these two rules using !? */
 
 \/\/[^\n]* L
 
        /* http://ostermiller.org/findcomment.html */
        /* XXX: unify these two rules using !? */

-\/\*!([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V() C yylval->comment_ = new(yyextra->pool_) CYComment(apr_pstrmemdup(yyextra->pool_, yytext, yyleng)); return tk::Comment;
+\/\*!([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V() C I(comment, Comment(Y), tk::Comment);

 \/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V(N)
 
 @begin E4X
 \/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V(N)
 
 @begin E4X

-<RegExp>"<>"      L return tk::LeftRight;
-<XMLContent>"</>" L return tk::LeftSlashRight;
-
-<RegExp,XMLContent>\<!\[CDATA\[(\n|[^[]|\[[^[]|\[\[[^>])*]]> V() return tk::XMLCDATA;
-<RegExp,XMLContent>\<!--(\n|[^-]|-[^-])*--> V() return tk::XMLComment;
-<RegExp,XMLContent>\<?(\n|[^?]|\?[^>])*?> V() return tk::XMLPI;
+<RegExp>"<>"      L F(tk::LeftRight);
+<XMLContent>"</>" L F(tk::LeftSlashRight);

 
 

-<XMLTag>"="  L return tk::Equal;
-<XMLTag>">"  L return tk::Right;
-<XMLTag>"/>" L return tk::SlashRight;
-<XMLTag>"{"  L return tk::OpenBrace;
+<RegExp,XMLContent>\<!\[CDATA\[(\n|[^[]|\[[^[]|\[\[[^>])*]]> V() F(tk::XMLCDATA);
+<RegExp,XMLContent>\<!--(\n|[^-]|-[^-])*--> V() F(tk::XMLComment);
+<RegExp,XMLContent>\<?(\n|[^?]|\?[^>])*?> V() F(tk::XMLPI);

 
 

-<XMLTag>\"(\n|[^"])*\"|'(\n|[^'])*' V() {
-    return tk::XMLAttributeValue;
-}
+<XMLTag>"="  L F(tk::Equal);
+<XMLTag>">"  L F(tk::Right);
+<XMLTag>"/>" L F(tk::SlashRight);
+<XMLTag>"{"  L F(tk::OpenBrace);

 
 

-<XMLTag>{XMLName} L return tk::XMLName;
-<XMLTag>[ \t\r\n] V() return tk::XMLWhitespace;
+<XMLTag>\"(\n|[^"])*\"|'(\n|[^'])*' V() F(tk::XMLAttributeValue);
+<XMLTag>{XMLName} L F(tk::XMLName);
+<XMLTag>[ \t\r\n] V() F(tk::XMLWhitespace);

 
 

-<XMLContent>"{"  L return tk::OpenBrace;
-<XMLContent>"<"  L return tk::Left;
-<XMLContent>"</" L return tk::LeftSlash;
+<XMLContent>"{"  L F(tk::OpenBrace);
+<XMLContent>"<"  L F(tk::Left);
+<XMLContent>"</" L F(tk::LeftSlash);

 @end
 
 @end
 

+"..."  L C F(tk::PeriodPeriodPeriod);
+

 @begin E4X
 @begin E4X

-"::"   L C return tk::ColonColon;
-".."   L C return tk::PeriodPeriod;
+"::"   L C F(tk::ColonColon);
+".."   L C F(tk::PeriodPeriod);

 @end
 
 @begin E4X ObjectiveC
 @end
 
 @begin E4X ObjectiveC

-"@"    L C return tk::At;
+"@"    L C F(tk::At);

 @end
 
 @end
 

-"&"    L C return tk::Ampersand;
-"&&"   L C return tk::AmpersandAmpersand;
-"&="   L C return tk::AmpersandEqual;
-"^"    L C return tk::Carrot;
-"^="   L C return tk::CarrotEqual;
-"="    L C return tk::Equal;
-"=="   L C return tk::EqualEqual;
-"==="  L C return tk::EqualEqualEqual;
-"!"    L C return tk::Exclamation;
-"!="   L C return tk::ExclamationEqual;
-"!=="  L C return tk::ExclamationEqualEqual;
-"-"    L C return tk::Hyphen;
-"-="   L C return tk::HyphenEqual;
-"--"   L C return yylval->newline_ ? tk::HyphenHyphen_ : tk::HyphenHyphen;
-"->"   L C return tk::HyphenRight;
-"<"    L C return tk::Left;
-"<="   L C return tk::LeftEqual;
-"<<"   L C return tk::LeftLeft;
-"<<="  L C return tk::LeftLeftEqual;
-"%"    L C return tk::Percent;
-"%="   L C return tk::PercentEqual;
-"."    L C return tk::Period;
-"|"    L C return tk::Pipe;
-"|="   L C return tk::PipeEqual;
-"||"   L C return tk::PipePipe;
-"+"    L C return tk::Plus;
-"+="   L C return tk::PlusEqual;
-"++"   L C return yylval->newline_ ? tk::PlusPlus_ : tk::PlusPlus;
-">"    L C return tk::Right;
-">="   L C return tk::RightEqual;
-">>"   L C return tk::RightRight;
-">>="  L C return tk::RightRightEqual;
-">>>"  L C return tk::RightRightRight;
-">>>=" L C return tk::RightRightRightEqual;
-"*"    L C return tk::Star;
-"*="   L C return tk::StarEqual;
-"~"    L C return tk::Tilde;
-
-<Div>"/"  L C return tk::Slash;
-<Div>"/=" L C return tk::SlashEqual;
-
-":"    L C return tk::Colon;
-","    L C return tk::Comma;
-"?"    L C return tk::Question;
-";"    L C return tk::SemiColon;
-
-"("    L C return tk::OpenParen;
-")"    L C return tk::CloseParen;
-
-"{"    L C return tk::OpenBrace;
-"}"    L C return tk::CloseBrace;
-
-"["    L C return tk::OpenBracket;
-"]"    L C return tk::CloseBracket;
+"&"    L C F(tk::Ampersand);
+"&&"   L C F(tk::AmpersandAmpersand);
+"&="   L C F(tk::AmpersandEqual);
+"^"    L C F(tk::Carrot);
+"^="   L C F(tk::CarrotEqual);
+"="    L C F(tk::Equal);
+"=="   L C F(tk::EqualEqual);
+"==="  L C F(tk::EqualEqualEqual);
+"=>"   L C F(tk::EqualRight);
+"!"    L C F(tk::Exclamation);
+"!="   L C F(tk::ExclamationEqual);
+"!=="  L C F(tk::ExclamationEqualEqual);
+"-"    L C F(tk::Hyphen);
+"-="   L C F(tk::HyphenEqual);
+"--"   L C F(yylval->newline_ ? tk::HyphenHyphen_ : tk::HyphenHyphen);
+"->"   L C F(tk::HyphenRight);
+"<"    L C F(tk::Left);
+"<="   L C F(tk::LeftEqual);
+"<<"   L C F(tk::LeftLeft);
+"<<="  L C F(tk::LeftLeftEqual);
+"%"    L C F(tk::Percent);
+"%="   L C F(tk::PercentEqual);
+"."    L C F(tk::Period);
+"|"    L C F(tk::Pipe);
+"|="   L C F(tk::PipeEqual);
+"||"   L C F(tk::PipePipe);
+"+"    L C F(tk::Plus);
+"+="   L C F(tk::PlusEqual);
+"++"   L C F(yylval->newline_ ? tk::PlusPlus_ : tk::PlusPlus);
+">"    L C F(tk::Right);
+">="   L C F(tk::RightEqual);
+">>"   L C F(tk::RightRight);
+">>="  L C F(tk::RightRightEqual);
+">>>"  L C F(tk::RightRightRight);
+">>>=" L C F(tk::RightRightRightEqual);
+"*"    L C F(tk::Star);
+"*="   L C F(tk::StarEqual);
+"~"    L C F(tk::Tilde);
+
+<Div>"/"  L C F(tk::Slash);
+<Div>"/=" L C F(tk::SlashEqual);
+
+":"    L C F(tk::Colon);
+","    L C F(tk::Comma);
+"?"    L C F(tk::Question);
+";"    L C F(tk::SemiColon);
+
+"("    L C F(tk::OpenParen);
+")"    L C F(tk::CloseParen);
+
+"{"    L C F(yyextra->nobrace_ ? tk::OpenBrace__ : yylval->newline_ ? tk::OpenBrace_ : tk::OpenBrace);
+"}"    L C F(tk::CloseBrace);
+
+"["    L C F(tk::OpenBracket);
+"]"    L C F(tk::CloseBracket);
+
+@begin Java
+"@class"          L C F(tk::AtClass);
+@end

 
 @begin ObjectiveC
 
 @begin ObjectiveC

-"@class"       L C return tk::AtClass;
-"@end"         L C return tk::AtEnd;
-"@selector"    L C return tk::AtSelector;
+"@end"            L C F(tk::AtEnd);
+"@implementation" L C F(tk::AtImplementation);
+"@import"         L C F(tk::AtImport);
+"@selector"       L C F(tk::AtSelector);

 @end
 
 @end
 

-"false"        L C yylval->false_ = new(yyextra->pool_) CYFalse(); return tk::False;
-"null"         L C yylval->null_ = new(yyextra->pool_) CYNull(); return tk::Null;
-"true"         L C yylval->true_ = new(yyextra->pool_) CYTrue(); return tk::True;
-
-"break"        L R yylval->word_ = new(yyextra->pool_) CYWord("break"); return tk::Break;
-"case"         L C yylval->word_ = new(yyextra->pool_) CYWord("case"); return tk::Case;
-"catch"        L C yylval->word_ = new(yyextra->pool_) CYWord("catch"); return tk::Catch;
-"continue"     L R yylval->word_ = new(yyextra->pool_) CYWord("continue"); return tk::Continue;
-"default"      L C yylval->word_ = new(yyextra->pool_) CYWord("default"); return tk::Default;
-"delete"       L C yylval->word_ = new(yyextra->pool_) CYWord("delete"); return tk::Delete;
-"do"           L C yylval->word_ = new(yyextra->pool_) CYWord("do"); return tk::Do;
-"else"         L C yylval->word_ = new(yyextra->pool_) CYWord("else"); return tk::Else;
-"finally"      L C yylval->word_ = new(yyextra->pool_) CYWord("finally"); return tk::Finally;
-"for"          L C yylval->word_ = new(yyextra->pool_) CYWord("for"); return tk::For;
-"function"     L C yylval->word_ = new(yyextra->pool_) CYWord("function"); return tk::Function;
-"if"           L C yylval->word_ = new(yyextra->pool_) CYWord("if"); return tk::If;
-"in"           L C yylval->word_ = new(yyextra->pool_) CYWord("in"); return tk::In;
-"instanceof"   L C yylval->word_ = new(yyextra->pool_) CYWord("instanceof"); return tk::InstanceOf;
-"new"          L C yylval->word_ = new(yyextra->pool_) CYWord("new"); return tk::New;
-"return"       L R yylval->word_ = new(yyextra->pool_) CYWord("return"); return tk::Return;
-"switch"       L C yylval->word_ = new(yyextra->pool_) CYWord("switch"); return tk::Switch;
-"this"         L C yylval->this_ = new(yyextra->pool_) CYThis(); return tk::This;
-"throw"        L R yylval->word_ = new(yyextra->pool_) CYWord("throw"); return tk::Throw;
-"try"          L C yylval->word_ = new(yyextra->pool_) CYWord("try"); return tk::Try;
-"typeof"       L C yylval->word_ = new(yyextra->pool_) CYWord("typeof"); return tk::TypeOf;
-"var"          L C yylval->word_ = new(yyextra->pool_) CYWord("var"); return tk::Var;
-"void"         L C yylval->word_ = new(yyextra->pool_) CYWord("void"); return tk::Void;
-"while"        L C yylval->word_ = new(yyextra->pool_) CYWord("while"); return tk::While;
-"with"         L C yylval->word_ = new(yyextra->pool_) CYWord("with"); return tk::With;
-
-"debugger"     L C yylval->word_ = new(yyextra->pool_) CYWord("debugger"); return tk::Debugger;
-
-"const"        L C yylval->word_ = new(yyextra->pool_) CYWord("const"); return tk::Const;
-
-"class"        L C yylval->word_ = new(yyextra->pool_) CYWord("class"); return tk::Class;
-"enum"         L C yylval->word_ = new(yyextra->pool_) CYWord("enum"); return tk::Enum;
-"export"       L C yylval->word_ = new(yyextra->pool_) CYWord("export"); return tk::Export;
-"extends"      L C yylval->word_ = new(yyextra->pool_) CYWord("extends"); return tk::Extends;
-"import"       L C yylval->word_ = new(yyextra->pool_) CYWord("import"); return tk::Import;
-"super"        L C yylval->word_ = new(yyextra->pool_) CYWord("super"); return tk::Super;
-
-"implements"   L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("implements"); return tk::Implements;
-"interface"    L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("interface"); return tk::Interface;
-"package"      L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("package"); return tk::Package;
-"private"      L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("private"); return tk::Private;
-"protected"    L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("protected"); return tk::Protected;
-"public"       L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("public"); return tk::Public;
-"static"       L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("static"); return tk::Static;
-
-"abstract"     L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("abstract"); return tk::Abstract;
-"boolean"      L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("boolean"); return tk::Boolean;
-"byte"         L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("byte"); return tk::Byte;
-"char"         L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("char"); return tk::Char;
-"double"       L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("double"); return tk::Double;
-"final"        L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("final"); return tk::Final;
-"float"        L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("float"); return tk::Float;
-"goto"         L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("goto"); return tk::Goto;
-"int"          L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("int"); return tk::Int;
-"long"         L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("long"); return tk::Long;
-"native"       L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("native"); return tk::Native;
-"short"        L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("short"); return tk::Short;
-"synchronized" L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("synchronized"); return tk::Synchronized;
-"throws"       L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("throws"); return tk::Throws;
-"transient"    L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("transient"); return tk::Transient;
-"volatile"     L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("volatile"); return tk::Volatile;
-
-"let"          L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("let"); return tk::Let;
-"yield"        L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("yield"); return tk::Yield;
-
-"each"         L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("each"); return tk::Each;
+"false"        L C I(false, False(), tk::False);
+"null"         L C I(null, Null(), tk::Null);
+"true"         L C I(true, True(), tk::True);
+
+"break"        L R I(word, Word("break"), tk::Break);
+"case"         L C I(word, Word("case"), tk::Case);
+"catch"        L C I(word, Word("catch"), tk::Catch);
+"continue"     L R I(word, Word("continue"), tk::Continue);
+"default"      L C I(word, Word("default"), tk::Default);
+"delete"       L C I(word, Word("delete"), tk::Delete);
+"do"           L C I(word, Word("do"), tk::Do);
+"else"         L C I(word, Word("else"), tk::Else);
+"finally"      L C I(word, Word("finally"), tk::Finally);
+"for"          L C I(word, Word("for"), tk::For);
+"function"     L C I(word, Word("function"), tk::Function);
+"if"           L C I(word, Word("if"), tk::If);
+"in"           L C I(word, Word("in"), yyextra->in_.top() ? tk::In_ : tk::In);
+"instanceof"   L C I(word, Word("instanceof"), tk::InstanceOf);
+"new"          L C I(word, Word("new"), tk::New);
+"return"       L R I(word, Word("return"), tk::Return);
+"switch"       L C I(word, Word("switch"), tk::Switch);
+"this"         L C I(this, This(), tk::This);
+"throw"        L R I(word, Word("throw"), tk::Throw);
+"try"          L C I(word, Word("try"), tk::Try);
+"typeof"       L C I(word, Word("typeof"), tk::TypeOf);
+"var"          L C I(word, Word("var"), tk::Var);
+"void"         L C I(word, Word("void"), tk::Void);
+"while"        L C I(word, Word("while"), tk::While);
+"with"         L C I(word, Word("with"), tk::With);
+
+"debugger"     L C I(word, Word("debugger"), tk::Debugger);
+
+"const"        L C I(word, Word("const"), tk::Const);
+
+"class"        L C I(word, Word("class"), tk::Class);
+"enum"         L C I(word, Word("enum"), tk::Enum);
+"export"       L C I(word, Word("export"), tk::Export);
+"extends"      L C I(word, Word("extends"), tk::Extends);
+"import"       L C I(word, Word("import"), tk::Import);
+"super"        L C I(word, Word("super"), tk::Super);
+
+"implements"   L C I(identifier, Identifier("implements"), tk::Implements);
+"interface"    L C I(identifier, Identifier("interface"), tk::Interface);
+"package"      L C I(identifier, Identifier("package"), tk::Package);
+"private"      L C I(identifier, Identifier("private"), tk::Private);
+"protected"    L C I(identifier, Identifier("protected"), tk::Protected);
+"public"       L C I(identifier, Identifier("public"), tk::Public);
+"static"       L C I(identifier, Identifier("static"), tk::Static);
+
+"abstract"     L C I(identifier, Identifier("abstract"), tk::Abstract);
+"boolean"      L C I(identifier, Identifier("boolean"), tk::Boolean);
+"byte"         L C I(identifier, Identifier("byte"), tk::Byte);
+"char"         L C I(identifier, Identifier("char"), tk::Char);
+"double"       L C I(identifier, Identifier("double"), tk::Double);
+"final"        L C I(identifier, Identifier("final"), tk::Final);
+"float"        L C I(identifier, Identifier("float"), tk::Float);
+"goto"         L C I(identifier, Identifier("goto"), tk::Goto);
+"int"          L C I(identifier, Identifier("int"), tk::Int);
+"long"         L C I(identifier, Identifier("long"), tk::Long);
+"native"       L C I(identifier, Identifier("native"), tk::Native);
+"short"        L C I(identifier, Identifier("short"), tk::Short);
+"synchronized" L C I(identifier, Identifier("synchronized"), tk::Synchronized);
+"throws"       L C I(identifier, Identifier("throws"), tk::Throws);
+"transient"    L C I(identifier, Identifier("transient"), tk::Transient);
+"volatile"     L C I(identifier, Identifier("volatile"), tk::Volatile);
+
+"let"          L C I(identifier, Identifier("let"), tk::Let);
+"yield"        L C I(identifier, Identifier("yield"), tk::Yield);
+
+"each"         L C I(identifier, Identifier("each"), tk::Each);
+"of"           L C I(identifier, Identifier("of"), tk::Of);

 
 @begin E4X
 
 @begin E4X

-"namespace"    L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("namespace"); return tk::Namespace;
-"xml"          L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier("xml"); return tk::XML;
+"namespace"    L C I(identifier, Identifier("namespace"), tk::Namespace);
+"xml"          L C I(identifier, Identifier("xml"), tk::XML);

 @end
 
 @end
 

-{IdentifierStart}{IdentifierPart}* L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier(apr_pstrmemdup(yyextra->pool_, yytext, yyleng)); return tk::Identifier_;
+{IdentifierStart}{IdentifierPart}* L C I(identifier, Identifier(Y), tk::Identifier_);

 
 

-(\.[0-9]+|(0|[1-9][0-9]*)(\.[0-9]*)?){Exponent}? L C yylval->number_ = new(yyextra->pool_) CYNumber(strtod(yytext, NULL)); return tk::NumericLiteral;
+(\.[0-9]+|(0|[1-9][0-9]*)(\.[0-9]*)?){Exponent}? L C I(number, Number(strtod(yytext, NULL)), tk::NumericLiteral);

 
 

-0[xX][0-9a-fA-F]+ L C yylval->number_ = new(yyextra->pool_) CYNumber(strtoull(yytext + 2, NULL, 16)); return tk::NumericLiteral;
-0[0-7]+ L C yylval->number_ = new(yyextra->pool_) CYNumber(strtoull(yytext + 1, NULL, 8)); return tk::NumericLiteral;
-0[bB][0-1]+ L C yylval->number_ = new(yyextra->pool_) CYNumber(strtoull(yytext + 2, NULL, 2)); return tk::NumericLiteral;
+0[xX][0-9a-fA-F]+ L C I(number, Number(strtoull(yytext + 2, NULL, 16)), tk::NumericLiteral);
+0[0-7]+ L C I(number, Number(strtoull(yytext + 1, NULL, 8)), tk::NumericLiteral);
+0[bB][0-1]+ L C I(number, Number(strtoull(yytext + 2, NULL, 2)), tk::NumericLiteral);

 
 \"([^"\\\n]|{Escape})*\"|'([^'\\\n]|{Escape})*' L C {
 
 \"([^"\\\n]|{Escape})*\"|'([^'\\\n]|{Escape})*' L C {

-    char *value(reinterpret_cast<char *>(apr_palloc(yyextra->pool_, yyleng)));
+    char *value(A char[yyleng]);

     char *local(value);
 
     for (yy_size_t i(1), e(yyleng - 1); i != e; ++i) {
     char *local(value);
 
     for (yy_size_t i(1), e(yyleng - 1); i != e; ++i) {


@@ -377,15 +372,14 @@ XMLName {XMLNameStart}{XMLNamePart}*
     }
 
     *local = '\0';
     }
 
     *local = '\0';

-    yylval->string_ = new(yyextra->pool_) CYString(value, local - value);
-    return tk::StringLiteral;
+    I(string, String(value, local - value), tk::StringLiteral);

 }
 
 }
 

-\r?\n yylloc->end.lines(); yylloc->step(); N
+\r?\n|\r|\xe2\x80[\xa8\xa9] yylloc->end.lines(); yylloc->step(); N

 
 [ \t] L
 
 
 [ \t] L
 

-<<EOF>> if (yyextra->auto_) { yyextra->auto_ = false; return tk::AutoComplete; } L yyterminate();
+<<EOF>> if (yyextra->auto_) { yyextra->auto_ = false; F(tk::AutoComplete); } L yyterminate();

 
 . L {
     CYDriver::Error error;
 
 . L {
     CYDriver::Error error;