Fix lexer hack correctness check when more spaces.

[cycript.git] / Cycript.l.in

diff --git a/Cycript.l.in b/Cycript.l.in
index 7a5dbee795d05801182eaac4c183564a4d1627f7..800ef749244313048e04d1e6dd4af241e99c1d4b 100644 (file)
--- a/Cycript.l.in
+++ b/Cycript.l.in
@@ -1,79 +1,70 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)

 */
 
 */
 

-/* Modified BSD License {{{ */
+/* GNU Affero 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:
- *
- * 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.
- *
- * 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.
-*/
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program 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 Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  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 */
+%top{
+#if defined(__clang__)
+#pragma clang diagnostic push
+#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"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#endif
+}

 
 %{
 
 %{

-#define YYLTYPE cy::location
+
+#define YYLTYPE CYLocation

 #include "Cycript.tab.hh"
 typedef cy::parser::token tk;
 
 #include "Cycript.tab.hh"
 typedef cy::parser::token tk;
 

-#define YY_EXTRA_TYPE CYDriver *
+#include "Highlight.hpp"

 
 

-#define A new($pool)
-#define Y apr_pstrmemdup($pool, yytext, yyleng)
+#define YY_EXTRA_TYPE CYDriver *

 
 

-#define I(type, Type, Name) do { \
-    yylval->type ## _ = A CY ## Type; \
-    return tk::Name; \
+#define F(value, highlight) do { \
+    yyextra->newline_ = yyextra->last_; \
+    yyextra->last_ = false; \
+    yyextra->next_ = false; \
+    BEGIN(yyextra->template_.top() ? DivOrTemplateTail : Div); \
+    yylval->highlight_ = highlight; \
+    return value; \

 } while (false)
 
 } while (false)
 

-#define T yylval->newline_ = yyextra->state_ == CYNewLine; BEGIN(Div);
-#define C T yyextra->state_ = CYClear;
-#define R T yyextra->state_ = CYRestricted;
+#define P yyextra->pool_
+#define A new(P)
+#define Y P.strmemdup(yytext, yyleng)

 
 

-#define E(prefix) L C { \
-    char *value(A char[yyleng + sizeof(prefix)]); \
-    memcpy(value, prefix, sizeof(prefix) - 1); \
-    memcpy(value + sizeof(prefix) - 1, yytext, yyleng); \
-    value[yyleng + sizeof(prefix) - 1] = '\0'; \
-    I(literal, RegEx(value), RegularExpressionLiteral); \
-}
+#define I(type, Type, value, highlight) do { \
+    yylval->semantic_.type ## _ = A CY ## Type; \
+    F(value, highlight); \
+} while (false)

 
 #define N \
 
 #define N \

-    if (yyextra->state_ != CYNewLine) { \
-        if (yyextra->state_ != CYRestricted) \
-            yyextra->state_ = CYNewLine; \
-        else { \
-            yyextra->state_ = CYClear; \
-            return tk::NewLine; \
-        } \
+    if (yyextra->last_ && yyextra->next_) { \
+        yyextra->last_ = false; \
+        F(tk::NewLine, hi::Nothing); \

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


@@ -85,19 +76,33 @@ typedef cy::parser::token tk;
             left = yyleng - (nl - yytext) - 1; \
             nl = reinterpret_cast<const char *>(memchr(nl + 1, '\n', left)); \
         } while (nl != NULL); \
             left = yyleng - (nl - yytext) - 1; \
             nl = reinterpret_cast<const char *>(memchr(nl + 1, '\n', left)); \
         } while (nl != NULL); \

+        yylloc->step(); \

         yylloc->end.lines(lines); \
         yylloc->end.columns(left); \
         yylloc->end.lines(lines); \
         yylloc->end.columns(left); \

-        yylloc->step(); \

         more \
     } else L \
 }
 
         more \
     } else L \
 }
 

-#define L { \
-    yylloc->step(); \
-    yylloc->columns(yyleng); \
+#define R yylloc->end.columns(yyleng);
+#define L yylloc->step(); R
+
+#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; \
+    error.location_ = *yylloc; \
+    error.message_ = "syntax error, " message; \
+    yyextra->errors_.push_back(error); \
+    yyterminate(); \

 }
 
 }
 

-int H(char c) {
+int X(char c) {

     if (c >= '0' && c <= '9')
         return c - '0';
     if (c >= 'a' && c <= 'f')
     if (c >= '0' && c <= '9')
         return c - '0';
     if (c >= 'a' && c <= 'f')


@@ -107,19 +112,77 @@ int H(char c) {
     return -1;
 }
 
     return -1;
 }
 

+template <typename Type_>
+static void U(Type_ &local, unsigned point) {
+    if (false) {
+    } else if (point < 0x000080) {
+        *local++ = point;
+    } else if (point < 0x000800) {
+        *local++ = 0xc0 | point >> 0x06 & 0x1f;
+        goto one;
+    } else if (point < 0x010000) {
+        *local++ = 0xe0 | point >> 0x0c & 0x0f;
+        goto two;
+    } else if (point < 0x110000) {
+        *local++ = 0xf0 | point >> 0x12 & 0x07;
+        *local++ = 0x80 | point >> 0x0c & 0x3f;
+      two:
+        *local++ = 0x80 | point >> 0x06 & 0x3f;
+      one:
+        *local++ = 0x80 | point >> 0x00 & 0x3f;
+    } else _assert(false);
+}
+
+static void U(char *&local, const char *text, yy_size_t &i) {
+    unsigned point;
+
+    char next(text[++i]);
+    if (next != '{') {
+        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;
+        for (;;) {
+            next = text[++i];
+            if (next == '}')
+                break;
+            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) { \
 #define YY_INPUT(data, value, size) { \

-    if (yyextra->file_ != NULL) { \
-        size_t copy(fread(data, 1, size, yyextra->file_)); \
-        value = copy == 0 ? YY_NULL : copy; \
-    } else if (yyextra->size_ == 0) \
+    if (yyextra->data_.eof()) \

         value = YY_NULL; \
     else { \
         value = YY_NULL; \
     else { \

-        size_t copy(size); \
-        copy = (std::min(copy, yyextra->size_)); \
-        memcpy(data, yyextra->data_, copy); \
-        yyextra->data_ += copy; \
-        yyextra->size_ -= copy; \
-        value = copy; \
+        yyextra->data_.read(data, size); \
+        size_t copy(yyextra->data_.gcount()); \
+        value = copy == 0 ? YY_NULL : copy; \

     } \
 }
 
     } \
 }
 


@@ -128,24 +191,59 @@ int H(char c) {
 %option prefix="cy"
 %option bison-bridge
 %option bison-locations
 %option prefix="cy"
 %option bison-bridge
 %option bison-locations

+%option nodefault

 %option noyywrap
 %option noyywrap

-%option yylineno
+%option noyylineno

 %option nounput
 %option nounput

-%option interactive
+%option nounistd
+%option 8bit
+%option backup
+%option batch
+%option never-interactive
+%option pointer

 %option reentrant
 %option stack
 
 %option reentrant
 %option stack
 

-Exponent [eE][+-]?[0-9]+
-Escape   \\[\\'"bfnrtv]|\\0|\\x[0-9a-fA-F]{2}|\\u[0-9a-fA-F]{4}|\\\n
-
-IdentifierStart [a-zA-Z$_]
-IdentifierPart  [a-zA-Z$_0-9]
+%option full
+%option ecs
+
+U1 [\x00-\x7f]
+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}+\})
+
+@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}|{UN}|{U0}
+UnicodeScrap {UnicodePart}*{UnicodeFail}?
+
+IdentifierStart {UnicodeStart}|{UnicodeEscape}
+IdentifierPart {UnicodePart}|{UnicodeEscape}
+IdentifierFail {UnicodeFail}|\\(u({HexDigit}{0,3}|\{{HexDigit}*))?
+IdentifierScrap {IdentifierPart}*{IdentifierFail}?

 
 NonTerminator [^\n]
 BackslashSequence \\{NonTerminator}
 RegularExpressionFirstChar [^\n*\\/]|{BackslashSequence}
 RegularExpressionChar [^\n\\/]|{BackslashSequence}
 
 NonTerminator [^\n]
 BackslashSequence \\{NonTerminator}
 RegularExpressionFirstChar [^\n*\\/]|{BackslashSequence}
 RegularExpressionChar [^\n\\/]|{BackslashSequence}

-RegularExpressionFlags {IdentifierPart}*
+RegularExpressionFlags {UnicodePart}*

 RegularExpressionChars {RegularExpressionChar}*
 RegularExpressionBody {RegularExpressionFirstChar}{RegularExpressionChars}
 
 RegularExpressionChars {RegularExpressionChar}*
 RegularExpressionBody {RegularExpressionFirstChar}{RegularExpressionChars}
 


@@ -155,8 +253,19 @@ XMLNamePart [a-zA-Z0-9.-_:]
 XMLName {XMLNameStart}{XMLNamePart}*
 @end
 
 XMLName {XMLNameStart}{XMLNamePart}*
 @end
 

+%x MultiLine
+
+%x LegacySingleString
+%x LegacyDoubleString
+
+%x StrictSingleString
+%x StrictDoubleString
+%x StrictAccentString
+

 %s Div
 %s Div

+%s DivOrTemplateTail

 %s RegExp
 %s RegExp

+%s RegExpOrTemplateTail

 
 @begin E4X
 %x XMLContent
 
 @begin E4X
 %x XMLContent


@@ -165,244 +274,353 @@ XMLName {XMLNameStart}{XMLNamePart}*
 
 %%
 
 
 %%
 

-<RegExp>\/{RegularExpressionBody}\/{RegularExpressionFlags} E("")
-
-\/\/[^\n]* L
-
-       /* http://ostermiller.org/findcomment.html */
-       /* XXX: unify these two rules using !? */
-\/\*!([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V() C I(comment, Comment(Y), Comment);
-\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V(N)
-
+    /* 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
+
+\/\* 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
 @begin E4X

-<RegExp>"<>"      L return tk::LeftRight;
-<XMLContent>"</>" L return tk::LeftSlashRight;
+<RegExp>"<>"      L F(tk::LeftRight, hi::Structure);
+<XMLContent>"</>" L F(tk::LeftSlashRight, hi::Structure);

 
 

-<RegExp,XMLContent>\<!\[CDATA\[(\n|[^[]|\[[^[]|\[\[[^>])*]]> V() return tk::XMLCDATA;
-<RegExp,XMLContent>\<!--(\n|[^-]|-[^-])*--> V() return tk::XMLComment;
-<RegExp,XMLContent>\<?(\n|[^?]|\?[^>])*?> V() return tk::XMLPI;
+<RegExp,XMLContent>\<!\[CDATA\[(\n|[^[]|\[[^[]|\[\[[^>])*]]> V() F(tk::XMLCDATA, hi::Constant);
+<RegExp,XMLContent>\<!--(\n|[^-]|-[^-])*--> V() F(tk::XMLComment, hi::Comment);
+<RegExp,XMLContent>\<?(\n|[^?]|\?[^>])*?> V() F(tk::XMLPI, hi::Meta);

 
 

-<XMLTag>"="  L return tk::Equal;
-<XMLTag>">"  L return tk::Right;
-<XMLTag>"/>" L return tk::SlashRight;
-<XMLTag>"{"  L return tk::OpenBrace;
+<XMLTag>"="  L F(tk::Equal, hi::Structure);
+<XMLTag>">"  L F(tk::Right, hi::Structure);
+<XMLTag>"/>" L F(tk::SlashRight, hi::Structure);
+<XMLTag>"{"  L F(tk::OpenBrace, hi::Structure);

 
 

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

 
 

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

 @end
 @end

+    /* }}} */
+    /* Operator {{{ */
+"..."  L F(tk::PeriodPeriodPeriod, hi::Meta);
+".."   L E("invalid operator")

 
 @begin E4X
 
 @begin E4X

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

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

-"@"    L C return tk::At;
+"@"    L F(tk::At, hi::Operator);
+"#"    L F(tk::Pound, hi::Operator);

 @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 yylval->newline_ ? tk::OpenBrace_ : tk::OpenBrace;
-"}"    L C return tk::CloseBrace;
-
-"["    L C return tk::OpenBracket;
-"]"    L C return tk::CloseBracket;
+"&"    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);

 
 @begin Java
 
 @begin Java

-"@class"          L C return tk::AtClass;
+"@class"          L F(tk::At_class_, hi::Meta);
+@end
+
+@begin C
+"@encode"         L F(tk::At_encode_, hi::Meta);

 @end
 
 @begin ObjectiveC
 @end
 
 @begin ObjectiveC

-"@end"            L C return tk::AtEnd;
-"@implementation" L C return tk::AtImplementation;
-"@import"         L C return tk::AtImport;
-"@selector"       L C return tk::AtSelector;
+"@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
 
 @end
 

-"false"        L C I(false, False(), False);
-"null"         L C I(null, Null(), Null);
-"true"         L C I(true, True(), True);
-
-"break"        L R I(word, Word("break"), Break);
-"case"         L C I(word, Word("case"), Case);
-"catch"        L C I(word, Word("catch"), Catch);
-"continue"     L R I(word, Word("continue"), Continue);
-"default"      L C I(word, Word("default"), Default);
-"delete"       L C I(word, Word("delete"), Delete);
-"do"           L C I(word, Word("do"), Do);
-"else"         L C I(word, Word("else"), Else);
-"finally"      L C I(word, Word("finally"), Finally);
-"for"          L C I(word, Word("for"), For);
-"function"     L C I(word, Word("function"), Function);
-"if"           L C I(word, Word("if"), If);
-"in"           L C I(word, Word("in"), In);
-"instanceof"   L C I(word, Word("instanceof"), InstanceOf);
-"new"          L C I(word, Word("new"), New);
-"return"       L R I(word, Word("return"), Return);
-"switch"       L C I(word, Word("switch"), Switch);
-"this"         L C I(this, This(), This);
-"throw"        L R I(word, Word("throw"), Throw);
-"try"          L C I(word, Word("try"), Try);
-"typeof"       L C I(word, Word("typeof"), TypeOf);
-"var"          L C I(word, Word("var"), Var);
-"void"         L C I(word, Word("void"), Void);
-"while"        L C I(word, Word("while"), While);
-"with"         L C I(word, Word("with"), With);
-
-"debugger"     L C I(word, Word("debugger"), Debugger);
-
-"const"        L C I(word, Word("const"), Const);
-
-"class"        L C I(word, Word("class"), Class);
-"enum"         L C I(word, Word("enum"), Enum);
-"export"       L C I(word, Word("export"), Export);
-"extends"      L C I(word, Word("extends"), Extends);
-"import"       L C I(word, Word("import"), Import);
-"super"        L C I(word, Word("super"), Super);
-
-"implements"   L C I(identifier, Identifier("implements"), Implements);
-"interface"    L C I(identifier, Identifier("interface"), Interface);
-"package"      L C I(identifier, Identifier("package"), Package);
-"private"      L C I(identifier, Identifier("private"), Private);
-"protected"    L C I(identifier, Identifier("protected"), Protected);
-"public"       L C I(identifier, Identifier("public"), Public);
-"static"       L C I(identifier, Identifier("static"), Static);
-
-"abstract"     L C I(identifier, Identifier("abstract"), Abstract);
-"boolean"      L C I(identifier, Identifier("boolean"), Boolean);
-"byte"         L C I(identifier, Identifier("byte"), Byte);
-"char"         L C I(identifier, Identifier("char"), Char);
-"double"       L C I(identifier, Identifier("double"), Double);
-"final"        L C I(identifier, Identifier("final"), Final);
-"float"        L C I(identifier, Identifier("float"), Float);
-"goto"         L C I(identifier, Identifier("goto"), Goto);
-"int"          L C I(identifier, Identifier("int"), Int);
-"long"         L C I(identifier, Identifier("long"), Long);
-"native"       L C I(identifier, Identifier("native"), Native);
-"short"        L C I(identifier, Identifier("short"), Short);
-"synchronized" L C I(identifier, Identifier("synchronized"), Synchronized);
-"throws"       L C I(identifier, Identifier("throws"), Throws);
-"transient"    L C I(identifier, Identifier("transient"), Transient);
-"volatile"     L C I(identifier, Identifier("volatile"), Volatile);
-
-"let"          L C I(identifier, Identifier("let"), Let);
-"yield"        L C I(identifier, Identifier("yield"), Yield);
-
-"each"         L C I(identifier, Identifier("each"), Each);
+@({UnicodeStart}{UnicodeScrap}|{UnicodeFail}) L E("invalid keyword")
+    /* }}} */
+    /* Highlight {{{ */
+"undefined"       L F(tk::_undefined_, hi::Operator);

 
 

-@begin E4X
-"namespace"    L C I(identifier, Identifier("namespace"), Namespace);
-"xml"          L C I(identifier, Identifier("xml"), XML);
+@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);
+@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 /*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);

 @end
 
 @end
 

-{IdentifierStart}{IdentifierPart}* L C I(identifier, Identifier(Y), Identifier_);
-
-(\.[0-9]+|(0|[1-9][0-9]*)(\.[0-9]*)?){Exponent}? L C I(number, Number(strtod(yytext, NULL)), NumericLiteral);
+@begin ObjectiveC
+"NO"              L F(tk::_NO_, hi::Constant);
+"YES"             L F(tk::_YES_, hi::Constant);
+@end

 
 

-0[xX][0-9a-fA-F]+ L C I(number, Number(strtoull(yytext + 2, NULL, 16)), NumericLiteral);
-0[0-7]+ L C I(number, Number(strtoull(yytext + 1, NULL, 8)), NumericLiteral);
-0[bB][0-1]+ L C I(number, Number(strtoull(yytext + 2, NULL, 2)), NumericLiteral);
+@begin E4X
+"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);

 
 

-\"([^"\\\n]|{Escape})*\"|'([^'\\\n]|{Escape})*' L C {
-    char *value(A char[yyleng]);
+{IdentifierStart}{IdentifierPart}* L {
+    char *value(A char[yyleng + 1]);

     char *local(value);
 
     char *local(value);
 

-    for (yy_size_t i(1), e(yyleng - 1); i != e; ++i) {
+    for (yy_size_t i(0), e(yyleng); i != e; ++i) {

         char next(yytext[i]);
         char next(yytext[i]);

-
-        if (yytext[i] == '\\')
-            switch (next = yytext[++i]) {
-                case '\n': continue;
-                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': next = '\0'; break;
-
-                case 'x':
-                    next = H(yytext[i + 1]) << 4 | H(yytext[i + 2]);
-                    i += 2;
-                break;
-            }
-
-        *local++ = next;
+        if (next != '\\')
+            *local++ = next;
+        else
+            U(local, yytext, ++i);

     }
 
     *local = '\0';
     }
 
     *local = '\0';

-    I(string, String(value, local - value), StringLiteral);
+    I(identifier, Identifier(value), tk::Identifier_, hi::Identifier);
+}
+
+({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[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][+-]?{IdentifierScrap} L E("invalid exponent")
+(\.?[0-9]|(0|[1-9][0-9]*)\.){IdentifierScrap} L E("invalid number")
+    /* }}} */
+    /* String {{{ */
+\' 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");
+}
+
+\" 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);

 
 

-\r?\n yylloc->end.lines(); yylloc->step(); N
+<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);

 
 

-[ \t] L
+    "$" R CYLexBufferUnit('$');

 
 

-<<EOF>> if (yyextra->auto_) { yyextra->auto_ = false; return tk::AutoComplete; } L yyterminate();
+    {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]));
+}

 
 

-. L {
-    CYDriver::Error error;
-    error.location_ = *yylloc;
-    error.message_ = "syntax error, unknown token";
-    yyextra->errors_.push_back(error);
-    yyterminate();
+<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');
+
+    \\x{HexDigit}{2} R CYLexBufferPoint(X(yytext[2]) << 4 | X(yytext[3]));
+
+    \\u{HexDigit}{4} R CYLexBufferPoint(X(yytext[2]) << 12 | X(yytext[3]) << 8 | X(yytext[4]) << 4 | X(yytext[5]));
+
+    \\u\{{HexDigit}+\} R {
+        unsigned point(0);
+        for (yy_size_t i(3); i != yyleng - 1; ++i)
+            point = point << 4 | X(yytext[i]);
+        CYLexBufferPoint(point);
+    }
+
+    \\{LineTerminatorSequence} yylloc->end.lines();
+    \\(.|{NotLineTerminator}) R CYLexBufferUnits(yytext + 1, yyleng - 1);
+
+    \\(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(); yyextra->last_ = true; N
+{WhiteSpace} L
+
+<<EOF>> if (yyextra->auto_) { yyextra->auto_ = false; F(tk::AutoComplete, hi::Nothing); } L yyterminate();
+
+. L E("invalid character")
+

 %%
 
 void CYDriver::ScannerInit() {
 %%
 
 void CYDriver::ScannerInit() {


@@ -414,27 +632,12 @@ void CYDriver::ScannerDestroy() {
     cylex_destroy(scanner_);
 }
 
     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:
 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:
             break;
 @begin E4X
         case XMLContentCondition:


@@ -470,3 +673,10 @@ void CYDriver::PushCondition(Condition condition) {
 void CYDriver::PopCondition() {
     yy_pop_state(scanner_);
 }
 void CYDriver::PopCondition() {
     yy_pop_state(scanner_);
 }

+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#else
+// must not pop -Wunused-function
+//#pragma GCC diagnostic pop
+#endif