]> git.saurik.com Git - cycript.git/blobdiff - Cycript.l.in
Fix lexer hack correctness check when more spaces.
[cycript.git] / Cycript.l.in
index 2b1c454dd33c9c94efb1fdc2b988107de9bc2a56..800ef749244313048e04d1e6dd4af241e99c1d4b 100644 (file)
 **/
 /* }}} */
 
-/* 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 */
-
 %top{
 #if defined(__clang__)
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-variable"
 #pragma clang diagnostic ignored "-Wdeprecated-register"
+#pragma clang diagnostic ignored "-Wunused-function"
+#pragma clang diagnostic ignored "-Wunused-variable"
 #else
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-compare"
@@ -44,17 +43,13 @@ typedef cy::parser::token tk;
 
 #define YY_EXTRA_TYPE CYDriver *
 
-// do /not/ fold token to the return: this is a macro and the ordering is dependent
 #define F(value, highlight) do { \
-    int token(value); \
-@begin ObjectiveC
-    yyextra->no_.AtImplementation = false; \
-@end
-    yyextra->no_.Function = false; \
-    yyextra->no_.NewLine = false; \
-    yyextra->no_.OpenBrace = false; \
+    yyextra->newline_ = yyextra->last_; \
+    yyextra->last_ = false; \
+    yyextra->next_ = false; \
+    BEGIN(yyextra->template_.top() ? DivOrTemplateTail : Div); \
     yylval->highlight_ = highlight; \
-    return token; \
+    return value; \
 } while (false)
 
 #define P yyextra->pool_
@@ -66,15 +61,11 @@ typedef cy::parser::token tk;
     F(value, highlight); \
 } while (false)
 
-#define C \
-    yyextra->newline_ = yyextra->last_; \
-    yyextra->last_ = false; \
-    BEGIN(Div);
-
 #define N \
-    yyextra->last_ = true; \
-    if (yyextra->no_.NewLine) \
-        F(tk::NewLine, hi::Nothing);
+    if (yyextra->last_ && yyextra->next_) { \
+        yyextra->last_ = false; \
+        F(tk::NewLine, hi::Nothing); \
+    }
 
 #define V(more) { \
     if (const char *nl = reinterpret_cast<const char *>(memchr(yytext, '\n', yyleng))) { \
@@ -92,16 +83,16 @@ typedef cy::parser::token tk;
     } else L \
 }
 
-#define L { \
-    yylloc->step(); \
-    yylloc->end.columns(yyleng); \
-}
+#define R yylloc->end.columns(yyleng);
+#define L yylloc->step(); R
 
-#define M { \
-    if (yyextra->commented_) { \
-        I(comment, Comment(Y), tk::Comment, hi::Comment); \
-    } \
-}
+#define H(value, highlight) do { \
+    if (yyextra->highlight_) \
+        F(value, highlight); \
+} while (false)
+
+#define M \
+    H(tk::Comment, hi::Comment);
 
 #define E(message) { \
     CYDriver::Error error; \
@@ -111,7 +102,7 @@ typedef cy::parser::token tk;
     yyterminate(); \
 }
 
-int H(char c) {
+int X(char c) {
     if (c >= '0' && c <= '9')
         return c - '0';
     if (c >= 'a' && c <= 'f')
@@ -121,7 +112,8 @@ int H(char c) {
     return -1;
 }
 
-static void U(char *&local, unsigned point) {
+template <typename Type_>
+static void U(Type_ &local, unsigned point) {
     if (false) {
     } else if (point < 0x000080) {
         *local++ = point;
@@ -146,7 +138,7 @@ static void U(char *&local, const char *text, yy_size_t &i) {
 
     char next(text[++i]);
     if (next != '{') {
-        point = H(text[i + 0]) << 12 | H(text[i + 1]) << 8 | H(text[i + 2]) << 4 | H(text[i + 3]);
+        point = X(text[i + 0]) << 12 | X(text[i + 1]) << 8 | X(text[i + 2]) << 4 | X(text[i + 3]);
         i += 3;
     } else {
         point = 0;
@@ -154,13 +146,36 @@ static void U(char *&local, const char *text, yy_size_t &i) {
             next = text[++i];
             if (next == '}')
                 break;
-            point = (point << 4) | H(next);
+            point = (point << 4) | X(next);
         }
     }
 
     U(local, point);
 }
 
+#define CYLexBufferPoint(point) do { \
+    std::back_insert_iterator<std::vector<char> > inserter(yyextra->buffer_); \
+    U(inserter, point); \
+} while (false)
+
+#define CYLexBufferUnit(value) do { \
+    yyextra->buffer_.push_back(value); \
+} while (false)
+
+#define CYLexBufferUnits(data, size) do { \
+    yyextra->buffer_.insert(yyextra->buffer_.end(), data, data + size); \
+} while (false)
+
+#define CYLexBufferStart(condition) do { \
+    yyextra->buffer_.clear(); \
+    yy_push_state(condition, yyscanner); \
+} while (false)
+
+#define CYLexBufferEnd(type, Type, value, highlight) do { \
+    yy_pop_state(yyscanner); \
+    I(type, Type(P.strmemdup(yyextra->buffer_.data(), yyextra->buffer_.size()), yyextra->buffer_.size()), value, highlight); \
+} while (false)
+
 #define YY_INPUT(data, value, size) { \
     if (yyextra->data_.eof()) \
         value = YY_NULL; \
@@ -197,27 +212,26 @@ U0 [\x80-\xbf]
 U2 [\xc2-\xdf]
 U3 [\xe0-\xef]
 U4 [\xf0-\xf4]
+UN [\xc0-\xc1\xf5-\xff]
 
 HexDigit [0-9a-fA-F]
 LineTerminatorSequence \r?\n|\r|\xe2\x80[\xa8\xa9]
 WhiteSpace [\x09\x0b\x0c\x20]|\xc2\xa0|\xef\xbb\xbf
 UnicodeEscape \\u({HexDigit}{4}|\{{HexDigit}+\})
 
-OctalEscape \\[1-7]|\\[4-7][0-7]|\\[0-3][0-7][0-7]?
-StringEscape \\['"\\bfnrtv]|\\0|{OctalEscape}|\\x{HexDigit}{2}|{UnicodeEscape}
-StringExtra {StringEscape}|\\{LineTerminatorSequence}
-SingleString ([^'\\\n]|{StringExtra})*
-DoubleString ([^"\\\n]|{StringExtra})*
-StringPrefix '{SingleString}|\"{DoubleString}
+@include NotLineTerminator.l
+CommentCharacter [^*/]{-}[\r\n\x80-\xff]|{NotLineTerminator}
+SingleCharacter [^'\\]{-}[\r\n\x80-\xff]|{NotLineTerminator}
+DoubleCharacter [^"\\]{-}[\r\n\x80-\xff]|{NotLineTerminator}
+PlateCharacter [^$`\\]{-}[\r\n\x80-\xff]|{NotLineTerminator}
 
 @include UnicodeIDStart.l
 @include UnicodeIDContinue.l
-
 IdentifierMore [$_]
 
 UnicodeStart {IdentifierMore}|{UnicodeIDStart}
 UnicodePart {IdentifierMore}|\xe2\x80[\x8c\x8d]|{UnicodeIDContinue}
-UnicodeFail {U2}|{U3}|{U3}{U0}|{U4}|{U4}{U0}|{U4}{U0}{U0}
+UnicodeFail {U2}|{U3}|{U3}{U0}|{U4}|{U4}{U0}|{U4}{U0}{U0}|{UN}|{U0}
 UnicodeScrap {UnicodePart}*{UnicodeFail}?
 
 IdentifierStart {UnicodeStart}|{UnicodeEscape}
@@ -239,8 +253,19 @@ XMLNamePart [a-zA-Z0-9.-_:]
 XMLName {XMLNameStart}{XMLNamePart}*
 @end
 
+%x MultiLine
+
+%x LegacySingleString
+%x LegacyDoubleString
+
+%x StrictSingleString
+%x StrictDoubleString
+%x StrictAccentString
+
 %s Div
+%s DivOrTemplateTail
 %s RegExp
+%s RegExpOrTemplateTail
 
 @begin E4X
 %x XMLContent
@@ -250,19 +275,25 @@ XMLName {XMLNameStart}{XMLNamePart}*
 %%
 
     /* RegEx {{{ */
-<RegExp>\/{RegularExpressionBody}\/{RegularExpressionFlags} L C I(literal, RegEx(Y), tk::RegularExpressionLiteral, hi::Constant);
-<RegExp>\/{RegularExpressionBody}\/{RegularExpressionFlags}{UnicodeFail} L E("invalid flags")
-<RegExp>\/{RegularExpressionBody}?\\? L E("unterminated regex")
+<RegExp,RegExpOrTemplateTail>{
+    \/{RegularExpressionBody}\/{RegularExpressionFlags} L I(literal, RegEx(Y), tk::RegularExpressionLiteral, hi::Constant);
+    \/{RegularExpressionBody}\/{RegularExpressionFlags}{UnicodeFail} L E("invalid flags")
+    \/{RegularExpressionBody}?\\? L E("unterminated regex")
+}
     /* }}} */
     /* Comment {{{ */
 #![^\n]* L M
 \/\/[^\n]* L M
 
-    /* http://ostermiller.org/findcomment.html */
-    /* XXX: unify these two rules using !? */
-\/\*!([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V() C I(comment, Comment(Y), tk::Comment, hi::Comment);
-\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V(N) M
-\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\** V() E("invalid comment")
+\/\* L yy_push_state(MultiLine, yyscanner);
+
+<MultiLine>{
+    \**\*\/ R yy_pop_state(yyscanner); M N
+    \**{LineTerminatorSequence} yylloc->end.lines(); yyextra->last_ = true;
+    \**{CommentCharacter}|\/ R
+    \**({UnicodeFail}|\*) R E("invalid comment");
+    <<EOF>> R E("invalid comment")
+}
     /* }}} */
     /* Element {{{ */
 @begin E4X
@@ -288,201 +319,201 @@ XMLName {XMLNameStart}{XMLNamePart}*
 @end
     /* }}} */
     /* Operator {{{ */
-"..."  L F(tk::PeriodPeriodPeriod, hi::Meta);
+"..."  L F(tk::PeriodPeriodPeriod, hi::Meta);
 ".."   L E("invalid operator")
 
 @begin E4X
-"::"   L F(tk::ColonColon, hi::Operator);
-".."   L F(tk::PeriodPeriod, hi::Operator);
+"::"   L F(tk::ColonColon, hi::Operator);
+".."   L F(tk::PeriodPeriod, hi::Operator);
 @end
 
 @begin E4X ObjectiveC
-"@"    L F(tk::At, hi::Operator);
-"#"    L F(tk::Pound, hi::Operator);
+"@"    L F(tk::At, hi::Operator);
+"#"    L F(tk::Pound, hi::Operator);
 @end
 
-"&"    L F(tk::Ampersand, hi::Operator);
-"&&"   L F(tk::AmpersandAmpersand, hi::Operator);
-"&="   L F(tk::AmpersandEqual, hi::Operator);
-"^"    L F(tk::Carrot, hi::Operator);
-"^="   L F(tk::CarrotEqual, hi::Operator);
-"="    L F(tk::Equal, hi::Operator);
-"=="   L F(tk::EqualEqual, hi::Operator);
-"==="  L F(tk::EqualEqualEqual, hi::Operator);
-"=>"   L F(yyextra->newline_ ? tk::EqualRight_ : tk::EqualRight, hi::Operator);
-"!"    L F(tk::Exclamation, hi::Operator);
-"!="   L F(tk::ExclamationEqual, hi::Operator);
-"!=="  L F(tk::ExclamationEqualEqual, hi::Operator);
-"-"    L F(tk::Hyphen, hi::Operator);
-"-="   L F(tk::HyphenEqual, hi::Operator);
-"--"   L F(yyextra->newline_ ? tk::HyphenHyphen_ : tk::HyphenHyphen, hi::Operator);
-"->"   L F(tk::HyphenRight, hi::Operator);
-"<"    L F(tk::Left, hi::Operator);
-"<="   L F(tk::LeftEqual, hi::Operator);
-"<<"   L F(tk::LeftLeft, hi::Operator);
-"<<="  L F(tk::LeftLeftEqual, hi::Operator);
-"%"    L F(tk::Percent, hi::Operator);
-"%="   L F(tk::PercentEqual, hi::Operator);
-"."    L F(tk::Period, hi::Operator);
-"|"    L F(tk::Pipe, hi::Operator);
-"|="   L F(tk::PipeEqual, hi::Operator);
-"||"   L F(tk::PipePipe, hi::Operator);
-"+"    L F(tk::Plus, hi::Operator);
-"+="   L F(tk::PlusEqual, hi::Operator);
-"++"   L F(yyextra->newline_ ? tk::PlusPlus_ : tk::PlusPlus, hi::Operator);
-">"    L F(tk::Right, hi::Operator);
-">="   L F(tk::RightEqual, hi::Operator);
-">>"   L F(tk::RightRight, hi::Operator);
-">>="  L F(tk::RightRightEqual, hi::Operator);
-">>>"  L F(tk::RightRightRight, hi::Operator);
-">>>=" L F(tk::RightRightRightEqual, hi::Operator);
-"*"    L F(tk::Star, hi::Operator);
-"*="   L F(tk::StarEqual, hi::Operator);
-"~"    L F(tk::Tilde, hi::Operator);
-
-<Div>"/"  L C F(tk::Slash, hi::Operator);
-<Div>"/=" L C F(tk::SlashEqual, hi::Operator);
-
-":"    L F(tk::Colon, hi::Structure);
-","    L F(tk::Comma, hi::Structure);
-"?"    L F(tk::Question, hi::Structure);
-";"    L F(tk::SemiColon, hi::Structure);
-
-"("    L F(tk::OpenParen, hi::Structure);
-")"    L F(tk::CloseParen, hi::Structure);
-
-"{"    L C F(yyextra->no_.OpenBrace ? tk::OpenBrace__ : yyextra->newline_ ? tk::OpenBrace_ : tk::OpenBrace, hi::Structure);
-"}"    L C F(tk::CloseBrace, hi::Structure);
-
-"["    L F(tk::OpenBracket, hi::Structure);
-"]"    L F(tk::CloseBracket, hi::Structure);
+"&"    L F(tk::Ampersand, hi::Operator);
+"&&"   L F(tk::AmpersandAmpersand, hi::Operator);
+"&="   L F(tk::AmpersandEqual, hi::Operator);
+"^"    L F(tk::Carrot, hi::Operator);
+"^="   L F(tk::CarrotEqual, hi::Operator);
+"="    L F(tk::Equal, hi::Operator);
+"=="   L F(tk::EqualEqual, hi::Operator);
+"==="  L F(tk::EqualEqualEqual, hi::Operator);
+"=>"   L F(yyextra->newline_ ? tk::EqualRight_ : tk::EqualRight, hi::Operator);
+"!"    L F(tk::Exclamation, hi::Operator);
+"!="   L F(tk::ExclamationEqual, hi::Operator);
+"!=="  L F(tk::ExclamationEqualEqual, hi::Operator);
+"-"    L F(tk::Hyphen, hi::Operator);
+"-="   L F(tk::HyphenEqual, hi::Operator);
+"--"   L F(yyextra->newline_ ? tk::HyphenHyphen_ : tk::HyphenHyphen, hi::Operator);
+"->"   L F(tk::HyphenRight, hi::Operator);
+"<"    L F(tk::Left, hi::Operator);
+"<="   L F(tk::LeftEqual, hi::Operator);
+"<<"   L F(tk::LeftLeft, hi::Operator);
+"<<="  L F(tk::LeftLeftEqual, hi::Operator);
+"%"    L F(tk::Percent, hi::Operator);
+"%="   L F(tk::PercentEqual, hi::Operator);
+"."    L F(tk::Period, hi::Operator);
+"|"    L F(tk::Pipe, hi::Operator);
+"|="   L F(tk::PipeEqual, hi::Operator);
+"||"   L F(tk::PipePipe, hi::Operator);
+"+"    L F(tk::Plus, hi::Operator);
+"+="   L F(tk::PlusEqual, hi::Operator);
+"++"   L F(yyextra->newline_ ? tk::PlusPlus_ : tk::PlusPlus, hi::Operator);
+">"    L F(tk::Right, hi::Operator);
+">="   L F(tk::RightEqual, hi::Operator);
+">>"   L F(tk::RightRight, hi::Operator);
+">>="  L F(tk::RightRightEqual, hi::Operator);
+">>>"  L F(tk::RightRightRight, hi::Operator);
+">>>=" L F(tk::RightRightRightEqual, hi::Operator);
+"*"    L F(tk::Star, hi::Operator);
+"*="   L F(tk::StarEqual, hi::Operator);
+"~"    L F(tk::Tilde, hi::Operator);
+
+<Div,DivOrTemplateTail>"/"  L F(tk::Slash, hi::Operator);
+<Div,DivOrTemplateTail>"/=" L F(tk::SlashEqual, hi::Operator);
+
+":"    L F(tk::Colon, hi::Structure);
+","    L F(tk::Comma, hi::Structure);
+"?"    L F(tk::Question, hi::Structure);
+";"    L F(tk::SemiColon, hi::Structure);
+
+"("    L F(tk::OpenParen, hi::Structure);
+")"    L F(tk::CloseParen, hi::Structure);
+
+"{"    L yyextra->template_.push(false); F(yyextra->newline_ ? tk::OpenBrace_ : tk::OpenBrace, hi::Structure);
+<Div,RegExp>"}" L yyextra->template_.pop(); F(tk::CloseBrace, hi::Structure);
+
+"["    L F(tk::OpenBracket, hi::Structure);
+"]"    L F(tk::CloseBracket, hi::Structure);
     /* }}} */
     /* Keyword {{{ */
-"@error"          L F(tk::At_error_, hi::Error);
+"@error"          L F(tk::At_error_, hi::Error);
 
 @begin Java
-"@class"          L F(tk::At_class_, hi::Meta);
+"@class"          L F(tk::At_class_, hi::Meta);
 @end
 
 @begin C
-"@encode"         L F(tk::At_encode_, hi::Meta);
+"@encode"         L F(tk::At_encode_, hi::Meta);
 @end
 
 @begin ObjectiveC
-"@end"            L F(tk::At_end_, hi::Meta);
-"@false"          L F(tk::At_false_, hi::Constant);
-"@implementation" L C F(yyextra->no_.AtImplementation ? tk::At_implementation__ : tk::At_implementation_, hi::Meta);
-"@import"         L F(tk::At_import_, hi::Special);
-"@NO"             L F(tk::At_NO_, hi::Constant);
-"@null"           L F(tk::At_null_, hi::Constant);
-"@selector"       L F(tk::At_selector_, hi::Meta);
-"@true"           L F(tk::At_true_, hi::Constant);
-"@YES"            L F(tk::At_YES_, hi::Constant);
+"@end"            L F(tk::At_end_, hi::Meta);
+"@false"          L F(tk::At_false_, hi::Constant);
+"@implementation" L F(tk::At_implementation_, hi::Meta);
+"@import"         L F(tk::At_import_, hi::Special);
+"@NO"             L F(tk::At_NO_, hi::Constant);
+"@null"           L F(tk::At_null_, hi::Constant);
+"@selector"       L F(tk::At_selector_, hi::Meta);
+"@true"           L F(tk::At_true_, hi::Constant);
+"@YES"            L F(tk::At_YES_, hi::Constant);
 @end
 
 @({UnicodeStart}{UnicodeScrap}|{UnicodeFail}) L E("invalid keyword")
     /* }}} */
     /* Highlight {{{ */
-"undefined"       L F(tk::_undefined_, hi::Operator);
+"undefined"       L F(tk::_undefined_, hi::Operator);
 
 @begin ObjectiveC
-"bool"            L F(tk::_bool_, hi::Type);
-"BOOL"            L F(tk::_BOOL_, hi::Type);
-"id"              L F(tk::_id_, hi::Type);
-"nil"             L F(tk::_nil_, hi::Constant);
-"NULL"            L F(tk::_NULL_, hi::Constant);
-"SEL"             L F(tk::_SEL_, hi::Type);
+"bool"            L F(tk::_bool_, hi::Type);
+"BOOL"            L F(tk::_BOOL_, hi::Type);
+"id"              L F(tk::_id_, hi::Type);
+"nil"             L F(tk::_nil_, hi::Constant);
+"NULL"            L F(tk::_NULL_, hi::Constant);
+"SEL"             L F(tk::_SEL_, hi::Type);
 @end
     /* }}} */
     /* Reserved {{{ */
-"abstract"        L /*FII*/ F(tk::_abstract_, hi::Meta);
-"await"           L /*II?*/ F(tk::_await_, hi::Meta);
-"boolean"         L /*FII*/ F(tk::_boolean_, hi::Type);
-"break"           L /*KKK*/ F(tk::_break_, hi::Control);
-"byte"            L /*FII*/ F(tk::_byte_, hi::Type);
-"case"            L /*KKK*/ F(tk::_case_, hi::Control);
-"catch"           L /*KKK*/ F(tk::_catch_, hi::Control);
-"char"            L /*FII*/ F(tk::_char_, hi::Type);
-"class"           L /*FFK*/ F(tk::_class_, hi::Meta);
-"const"           L /*FFK*/ F(tk::_const_, hi::Meta);
-"continue"        L /*KKK*/ F(tk::_continue_, hi::Control);
-"debugger"        L /*FKK*/ F(tk::_debugger_, hi::Meta);
-"default"         L /*KKK*/ F(tk::_default_, hi::Control);
-"delete"          L /*KKK*/ F(tk::_delete_, hi::Operator);
-"do"              L /*KKK*/ F(tk::_do_, hi::Control);
-"double"          L /*FII*/ F(tk::_double_, hi::Type);
-"else"            L /*KKK*/ F(tk::_else_, hi::Control);
-"enum"            L /*FFF*/ F(tk::_enum_, hi::Meta);
-"export"          L /*FFK*/ F(tk::_export_, hi::Meta);
-"extends"         L /*FFK*/ F(tk::_extends_, hi::Meta);
-"false"           L /*LLL*/ F(tk::_false_, hi::Constant);
-"final"           L /*FII*/ F(tk::_final_, hi::Meta);
-"finally"         L /*KKK*/ F(tk::_finally_, hi::Control);
-"float"           L /*FII*/ F(tk::_float_, hi::Type);
-"for"             L /*KKK*/ F(tk::_for_, hi::Control);
-"function"        L C /*KKK*/ F(yyextra->no_.Function ? tk::_function__ : tk::_function_, hi::Meta);
-"goto"            L /*FII*/ F(tk::_goto_, hi::Control);
-"if"              L /*KKK*/ F(tk::_if_, hi::Control);
-"implements"      L /*FSS*/ F(tk::_implements_, hi::Meta);
-"import"          L /*FFK*/ F(tk::_import_, hi::Meta);
-"in"              L /*KKK*/ F(yyextra->in_.top() ? tk::_in__ : tk::_in_, hi::Operator);
-"instanceof"      L /*KKK*/ F(tk::_instanceof_, hi::Operator);
-"int"             L /*FII*/ F(tk::_int_, hi::Type);
-"interface"       L /*FSS*/ F(tk::_interface_, hi::Meta);
-"let"             L /*IS?*/ F(tk::_let_, hi::Meta);
-"long"            L /*FII*/ F(tk::_long_, hi::Type);
-"native"          L /*FII*/ F(tk::_native_, hi::Meta);
-"new"             L /*KKK*/ F(tk::_new_, hi::Operator);
-"null"            L /*LLL*/ F(tk::_null_, hi::Constant);
-"package"         L /*FSS*/ F(tk::_package_, hi::Meta);
-"private"         L /*FSS*/ F(tk::_private_, hi::Meta);
-"protected"       L /*FSS*/ F(tk::_protected_, hi::Meta);
-"public"          L /*FSS*/ F(tk::_public_, hi::Meta);
-"return"          L /*KKK*/ F(tk::_return_, hi::Control);
-"short"           L /*FII*/ F(tk::_short_, hi::Type);
-"static"          L /*FS?*/ F(tk::_static_, hi::Meta);
-"super"           L /*FFK*/ F(tk::_super_, hi::Constant);
-"switch"          L /*KKK*/ F(tk::_switch_, hi::Control);
-"synchronized"    L /*FII*/ F(tk::_synchronized_, hi::Meta);
-"this"            L /*KKK*/ F(tk::_this_, hi::Constant);
-"throw"           L /*KKK*/ F(tk::_throw_, hi::Control);
-"throws"          L /*FII*/ F(tk::_throws_, hi::Meta);
-"transient"       L /*FII*/ F(tk::_transient_, hi::Meta);
-"true"            L /*LLL*/ F(tk::_true_, hi::Constant);
-"try"             L /*KKK*/ F(tk::_try_, hi::Control);
-"typeof"          L /*KKK*/ F(tk::_typeof_, hi::Operator);
-"var"             L /*KKK*/ F(tk::_var_, hi::Meta);
-"void"            L /*KKK*/ F(tk::_void_, hi::Operator);
-"volatile"        L /*FII*/ F(tk::_volatile_, hi::Meta);
-"while"           L /*KKK*/ F(tk::_while_, hi::Control);
-"with"            L /*KKK*/ F(tk::_with_, hi::Control);
-"yield"           L /*IS?*/ F(tk::_yield_, hi::Control);
-
-"auto"            L F(tk::_auto_, hi::Meta);
-"each"            L F(tk::_each_, hi::Control);
-"of"              L F(tk::_of_, hi::Operator);
+"abstract"        L /*FII*/ F(tk::_abstract_, hi::Meta);
+"await"           L /*II?*/ F(tk::_await_, hi::Meta);
+"boolean"         L /*FII*/ F(tk::_boolean_, hi::Type);
+"break"           L /*KKK*/ F(tk::_break_, hi::Control);
+"byte"            L /*FII*/ F(tk::_byte_, hi::Type);
+"case"            L /*KKK*/ F(tk::_case_, hi::Control);
+"catch"           L /*KKK*/ F(tk::_catch_, hi::Control);
+"char"            L /*FII*/ F(tk::_char_, hi::Type);
+"class"           L /*FFK*/ F(tk::_class_, hi::Meta);
+"const"           L /*FFK*/ F(tk::_const_, hi::Meta);
+"continue"        L /*KKK*/ F(tk::_continue_, hi::Control);
+"debugger"        L /*FKK*/ F(tk::_debugger_, hi::Meta);
+"default"         L /*KKK*/ F(tk::_default_, hi::Control);
+"delete"          L /*KKK*/ F(tk::_delete_, hi::Operator);
+"do"              L /*KKK*/ F(tk::_do_, hi::Control);
+"double"          L /*FII*/ F(tk::_double_, hi::Type);
+"else"            L /*KKK*/ F(tk::_else_, hi::Control);
+"enum"            L /*FFF*/ F(tk::_enum_, hi::Meta);
+"export"          L /*FFK*/ F(tk::_export_, hi::Meta);
+"extends"         L /*FFK*/ F(tk::_extends_, hi::Meta);
+"false"           L /*LLL*/ F(tk::_false_, hi::Constant);
+"final"           L /*FII*/ F(tk::_final_, hi::Meta);
+"finally"         L /*KKK*/ F(tk::_finally_, hi::Control);
+"float"           L /*FII*/ F(tk::_float_, hi::Type);
+"for"             L /*KKK*/ F(tk::_for_, hi::Control);
+"function"        L /*KKK*/ F(tk::_function_, hi::Meta);
+"goto"            L /*FII*/ F(tk::_goto_, hi::Control);
+"if"              L /*KKK*/ F(tk::_if_, hi::Control);
+"implements"      L /*FSS*/ F(tk::_implements_, hi::Meta);
+"import"          L /*FFK*/ F(tk::_import_, hi::Meta);
+"in"              L /*KKK*/ F(yyextra->in_.top() ? tk::_in__ : tk::_in_, hi::Operator);
+"instanceof"      L /*KKK*/ F(tk::_instanceof_, hi::Operator);
+"int"             L /*FII*/ F(tk::_int_, hi::Type);
+"interface"       L /*FSS*/ F(tk::_interface_, hi::Meta);
+"let"             L /*IS?*/ F(tk::_let_, hi::Meta);
+"long"            L /*FII*/ F(tk::_long_, hi::Type);
+"native"          L /*FII*/ F(tk::_native_, hi::Meta);
+"new"             L /*KKK*/ F(tk::_new_, hi::Operator);
+"null"            L /*LLL*/ F(tk::_null_, hi::Constant);
+"package"         L /*FSS*/ F(tk::_package_, hi::Meta);
+"private"         L /*FSS*/ F(tk::_private_, hi::Meta);
+"protected"       L /*FSS*/ F(tk::_protected_, hi::Meta);
+"public"          L /*FSS*/ F(tk::_public_, hi::Meta);
+"return"          L /*KKK*/ F(tk::_return_, hi::Control);
+"short"           L /*FII*/ F(tk::_short_, hi::Type);
+"static"          L /*FS?*/ F(tk::_static_, hi::Meta);
+"super"           L /*FFK*/ F(tk::_super_, hi::Constant);
+"switch"          L /*KKK*/ F(tk::_switch_, hi::Control);
+"synchronized"    L /*FII*/ F(tk::_synchronized_, hi::Meta);
+"this"            L /*KKK*/ F(tk::_this_, hi::Constant);
+"throw"           L /*KKK*/ F(tk::_throw_, hi::Control);
+"throws"          L /*FII*/ F(tk::_throws_, hi::Meta);
+"transient"       L /*FII*/ F(tk::_transient_, hi::Meta);
+"true"            L /*LLL*/ F(tk::_true_, hi::Constant);
+"try"             L /*KKK*/ F(tk::_try_, hi::Control);
+"typeof"          L /*KKK*/ F(tk::_typeof_, hi::Operator);
+"var"             L /*KKK*/ F(tk::_var_, hi::Meta);
+"void"            L /*KKK*/ F(tk::_void_, hi::Operator);
+"volatile"        L /*FII*/ F(tk::_volatile_, hi::Meta);
+"while"           L /*KKK*/ F(tk::_while_, hi::Control);
+"with"            L /*KKK*/ F(tk::_with_, hi::Control);
+"yield"           L /*IS?*/ F(tk::_yield_, hi::Control);
+
+"auto"            L F(tk::_auto_, hi::Meta);
+"each"            L F(tk::_each_, hi::Control);
+"of"              L F(tk::_of_, hi::Operator);
 
 @begin C
-"extern"          L F(tk::_extern_, hi::Type);
-"signed"          L F(tk::_signed_, hi::Type);
-"typedef"         L F(tk::_typedef_, hi::Meta);
-"unsigned"        L F(tk::_unsigned_, hi::Type);
+"extern"          L F(tk::_extern_, hi::Type);
+"signed"          L F(tk::_signed_, hi::Type);
+"typedef"         L F(tk::_typedef_, hi::Meta);
+"unsigned"        L F(tk::_unsigned_, hi::Type);
 @end
 
 @begin ObjectiveC
-"NO"              L F(tk::_NO_, hi::Constant);
-"YES"             L F(tk::_YES_, hi::Constant);
+"NO"              L F(tk::_NO_, hi::Constant);
+"YES"             L F(tk::_YES_, hi::Constant);
 @end
 
 @begin E4X
-"namespace"       L F(tk::_namespace_, hi::Meta);
-"xml"             L F(tk::_xml_, hi::Meta);
+"namespace"       L F(tk::_namespace_, hi::Meta);
+"xml"             L F(tk::_xml_, hi::Meta);
 @end
     /* }}} */
     /* Identifier {{{ */
-{UnicodeStart}{UnicodePart}* L I(identifier, Identifier(Y), tk::Identifier_, hi::Identifier);
+{UnicodeStart}{UnicodePart}* L I(identifier, Identifier(Y), tk::Identifier_, hi::Identifier);
 
-{IdentifierStart}{IdentifierPart}* L {
+{IdentifierStart}{IdentifierPart}* L {
     char *value(A char[yyleng + 1]);
     char *local(value);
 
@@ -501,81 +532,89 @@ XMLName {XMLNameStart}{XMLNamePart}*
 ({IdentifierStart}{IdentifierPart}*)?{IdentifierFail} L E("invalid identifier")
     /* }}} */
     /* Number {{{ */
-0[0-7]+ L I(number, Number(strtoull(yytext + 1, NULL, 8)), tk::NumericLiteral, hi::Constant);
-0[0-9]+ L I(number, Number(strtoull(yytext + 1, NULL, 10)), tk::NumericLiteral, hi::Constant);
+0[0-7]+ L I(number, Number(strtoull(yytext + 1, NULL, 8)), tk::NumericLiteral, hi::Constant);
+0[0-9]+ L I(number, Number(strtoull(yytext + 1, NULL, 10)), tk::NumericLiteral, hi::Constant);
 
-0[xX][0-9a-fA-F]+ L I(number, Number(strtoull(yytext + 2, NULL, 16)), tk::NumericLiteral, hi::Constant);
-0[oO][0-7]+ L I(number, Number(strtoull(yytext + 2, NULL, 8)), tk::NumericLiteral, hi::Constant);
-0[bB][0-1]+ L I(number, Number(strtoull(yytext + 2, NULL, 2)), tk::NumericLiteral, hi::Constant);
+0[xX][0-9a-fA-F]+ L I(number, Number(strtoull(yytext + 2, NULL, 16)), tk::NumericLiteral, hi::Constant);
+0[oO][0-7]+ L I(number, Number(strtoull(yytext + 2, NULL, 8)), tk::NumericLiteral, hi::Constant);
+0[bB][0-1]+ L I(number, Number(strtoull(yytext + 2, NULL, 2)), tk::NumericLiteral, hi::Constant);
 
-(\.[0-9]+|(0|[1-9][0-9]*)(\.[0-9]*)?)([eE][+-]?[0-9]+)? L I(number, Number(strtod(yytext, NULL)), tk::NumericLiteral, hi::Constant);
+(\.[0-9]+|(0|[1-9][0-9]*)(\.[0-9]*)?)([eE][+-]?[0-9]+)? L I(number, Number(strtod(yytext, NULL)), tk::NumericLiteral, hi::Constant);
 (\.[0-9]+|(0|[1-9][0-9]*)(\.[0-9]*)?)[eE][+-]?{IdentifierScrap} L E("invalid exponent")
 (\.?[0-9]|(0|[1-9][0-9]*)\.){IdentifierScrap} L E("invalid number")
     /* }}} */
     /* String {{{ */
-'{SingleString}'|\"{DoubleString}\" L C {
-    char *value(A char[yyleng]);
-    char *local(value);
+\' L CYLexBufferStart(LegacySingleString);
+<LegacySingleString,StrictSingleString>{
+    \' R CYLexBufferEnd(string, String, tk::StringLiteral, hi::Constant);
+    {SingleCharacter}+ R CYLexBufferUnits(yytext, yyleng);
+    {SingleCharacter}*{UnicodeFail} R E("invalid character");
+    {LineTerminatorSequence} R E("invalid newline");
+}
 
-    for (yy_size_t i(1), e(yyleng - 1); i != e; ++i) {
-        char next(yytext[i]);
+\" L CYLexBufferStart(LegacyDoubleString);
+<LegacyDoubleString,StrictDoubleString>{
+    \" R CYLexBufferEnd(string, String, tk::StringLiteral, hi::Constant);
+    {DoubleCharacter}+ R CYLexBufferUnits(yytext, yyleng);
+    {DoubleCharacter}*{UnicodeFail} R E("invalid character");
+    {LineTerminatorSequence} R E("invalid newline");
+}
+    /* }}} */
+    /* Template {{{ */
+"`" L yyextra->tail_ = false; CYLexBufferStart(StrictAccentString);
+<DivOrTemplateTail,RegExpOrTemplateTail>"}" L yyextra->tail_ = true; yyextra->template_.pop(); CYLexBufferStart(StrictAccentString);
 
-        if (yytext[i] == '\\')
-            // XXX: support more line continuation characters
-            if (false) line: {
-                yylloc->end.lines(1);
-                yylloc->end.columns(yyleng - i);
-            } else switch (next = yytext[++i]) {
-                case '\n': goto line;
-
-                case '\\': next = '\\'; break;
-                case '\'': next = '\''; break;
-                case '"': next = '"'; break;
-                case 'b': next = '\b'; break;
-                case 'f': next = '\f'; break;
-                case 'n': next = '\n'; break;
-                case 'r': next = '\r'; break;
-                case 't': next = '\t'; break;
-                case 'v': next = '\v'; break;
-
-                case '0': case '1': case '2': case '3':
-                    if (yytext[i + 1] < '0' || yytext[i + 1] > '7')
-                        next = H(yytext[i]), i += 0;
-                    else if (yytext[i + 2] < '0' || yytext[i + 2] > '7')
-                        next = H(yytext[i]) << 3 | H(yytext[i + 1]), i += 1;
-                    else
-                        next = H(yytext[i]) << 6 | H(yytext[i + 1]) << 3 | H(yytext[i + 2]), i += 2;
-                break;
+<StrictAccentString>{
+    "`" R CYLexBufferEnd(string, String, yyextra->tail_ ? tk::TemplateTail : tk::NoSubstitutionTemplate, hi::Constant);
+    "${" R yyextra->template_.push(true); CYLexBufferEnd(string, String, yyextra->tail_ ? tk::TemplateMiddle : tk::TemplateHead, hi::Constant);
 
-                case '4': case '5': case '6': case '7':
-                    if (yytext[i + 1] < '0' || yytext[i + 1] > '7')
-                        next = H(yytext[i]), i += 0;
-                    else
-                        next = H(yytext[i]) << 3 | H(yytext[i + 1]), i += 1;
-                break;
+    "$" R CYLexBufferUnit('$');
+
+    {PlateCharacter}+ R CYLexBufferUnits(yytext, yyleng);
+    {PlateCharacter}*{UnicodeFail} R E("invalid character");
+    {LineTerminatorSequence} R E("invalid newline");
+}
+    /* }}} */
+    /* Escapes {{{ */
+<LegacySingleString,LegacyDoubleString>{
+    \\[0-3][0-7][0-7] R CYLexBufferPoint(X(yytext[1]) << 6 | X(yytext[2]) << 3 | X(yytext[3]));
+    \\[0-7][0-7] R CYLexBufferUnit(X(yytext[1]) << 3 | X(yytext[2]));
+    \\[0-7] R CYLexBufferUnit(X(yytext[1]));
+}
+
+<StrictSingleString,StrictDoubleString,StrictAccentString>{
+    \\0[0-7] R E("legacy escape");
+    \\0 R CYLexBufferUnit('\0');
+}
+
+<LegacySingleString,LegacyDoubleString,StrictSingleString,StrictDoubleString,StrictAccentString>{
+    \\b R CYLexBufferUnit('\b');
+    \\f R CYLexBufferUnit('\f');
+    \\n R CYLexBufferUnit('\n');
+    \\r R CYLexBufferUnit('\r');
+    \\t R CYLexBufferUnit('\t');
+    \\v R CYLexBufferUnit('\v');
 
-                case 'x':
-                    U(local, H(yytext[i + 1]) << 4 | H(yytext[i + 2]));
-                    i += 2;
-                continue;
+    \\x{HexDigit}{2} R CYLexBufferPoint(X(yytext[2]) << 4 | X(yytext[3]));
 
-                case 'u':
-                    U(local, yytext, i);
-                continue;
-            }
+    \\u{HexDigit}{4} R CYLexBufferPoint(X(yytext[2]) << 12 | X(yytext[3]) << 8 | X(yytext[4]) << 4 | X(yytext[5]));
 
-        *local++ = next;
+    \\u\{{HexDigit}+\} R {
+        unsigned point(0);
+        for (yy_size_t i(3); i != yyleng - 1; ++i)
+            point = point << 4 | X(yytext[i]);
+        CYLexBufferPoint(point);
     }
 
-    *local = '\0';
-    I(string, String(value, local - value), tk::StringLiteral, hi::Constant);
-}
+    \\{LineTerminatorSequence} yylloc->end.lines();
+    \\(.|{NotLineTerminator}) R CYLexBufferUnits(yytext + 1, yyleng - 1);
 
-{StringPrefix}\\(x.{0,2}|u([^{].{0,3}|\{[^}]*)?|{UnicodeFail})? L E("invalid escape")
-{StringPrefix} L E("invalid string")
+    \\(x{HexDigit}{0,1}|u({HexDigit}{0,3}|\{{HexDigit}*)|{UnicodeFail})? R E("invalid escape");
+    <<EOF>> R E("invalid string");
+}
     /* }}} */
 
-{LineTerminatorSequence} yylloc->step(); yylloc->end.lines(); N
+{LineTerminatorSequence} yylloc->step(); yylloc->end.lines(); yyextra->last_ = true; N
 {WhiteSpace} L
 
 <<EOF>> if (yyextra->auto_) { yyextra->auto_ = false; F(tk::AutoComplete, hi::Nothing); } L yyterminate();
@@ -593,27 +632,12 @@ void CYDriver::ScannerDestroy() {
     cylex_destroy(scanner_);
 }
 
-CYDriver::Condition CYDriver::GetCondition() {
-    switch (yy_top_state(scanner_)) {
-        case RegExp:
-            return RegExpCondition;
-@begin E4X
-        case XMLContent:
-            return XMLContentCondition;
-        case XMLTag:
-            return XMLTagCondition;
-@end
-        default:
-            _assert(false);
-    }
-}
-
 void CYDriver::SetCondition(Condition condition) {
     struct yyguts_t *yyg(reinterpret_cast<struct yyguts_t *>(scanner_));
 
     switch (condition) {
         case RegExpCondition:
-            BEGIN(RegExp);
+            BEGIN(template_.top() ? RegExpOrTemplateTail : RegExp);
             break;
 @begin E4X
         case XMLContentCondition: