"/=" 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);
+
"}" 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
-"@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" 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
-"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;
+@({UnicodeStart}{UnicodeScrap}|{UnicodeFail}) L E("invalid keyword")
+ /* }}} */
+ /* Highlight {{{ */
+"undefined" L F(tk::_undefined_, hi::Operator);
-@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;
+@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
-{IdentifierStart}{IdentifierPart}* L C yylval->identifier_ = new(yyextra->pool_) CYIdentifier(apr_pstrmemdup(yyextra->pool_, yytext, yyleng)); return 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;
+@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 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;
+@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(reinterpret_cast
(apr_palloc(yyextra->pool_, yyleng)));
+{IdentifierStart}{IdentifierPart}* L {
+ char *value(A char[yyleng + 1]);
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]);
-
- 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';
- yylval->string_ = new(yyextra->pool_) CYString(value, local - value);
- return tk::StringLiteral;
+ I(identifier, Identifier(value), tk::Identifier_, hi::Identifier);
}
-\r?\n yylloc->end.lines(); yylloc->step(); N
+({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);
+{
+ \' 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);
+{
+ \" 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);
+"}" L yyextra->tail_ = true; yyextra->template_.pop(); CYLexBufferStart(StrictAccentString);
-[ \t] L
+{
+ "`" 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);
-<> if (yyextra->auto_) { yyextra->auto_ = false; return tk::AutoComplete; } L yyterminate();
+ "$" R CYLexBufferUnit('$');
-. L {
- CYDriver::Error error;
- error.location_ = *yylloc;
- error.message_ = "syntax error, unknown token";
- yyextra->errors_.push_back(error);
- yyterminate();
+ {PlateCharacter}+ R CYLexBufferUnits(yytext, yyleng);
+ {PlateCharacter}*{UnicodeFail} R E("invalid character");
+ {LineTerminatorSequence} R E("invalid newline");
}
+ /* }}} */
+ /* Escapes {{{ */
+{
+ \\[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]));
+}
+
+{
+ \\0[0-7] R E("legacy escape");
+ \\0 R CYLexBufferUnit('\0');
+}
+
+{
+ \\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");
+ <> R E("invalid string");
+}
+ /* }}} */
+
+{LineTerminatorSequence} yylloc->step(); yylloc->end.lines(); yyextra->last_ = true; N
+{WhiteSpace} L
+
+<> if (yyextra->auto_) { yyextra->auto_ = false; F(tk::AutoComplete, hi::Nothing); } L yyterminate();
+
+. L E("invalid character")
%%
@@ -411,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(scanner_));
switch (condition) {
case RegExpCondition:
- BEGIN(RegExp);
+ BEGIN(template_.top() ? RegExpOrTemplateTail : RegExp);
break;
@begin E4X
case XMLContentCondition:
@@ -467,3 +673,10 @@ void CYDriver::PushCondition(Condition condition) {
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