"/=" 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(yylval->newline_ ? tk::OpenBrace_ : tk::OpenBrace);
-"}" L C F(tk::CloseBrace);
-
-"[" L C F(tk::OpenBracket);
-"]" L C F(tk::CloseBracket);
+"&" L C F(tk::Ampersand, hi::Operator);
+"&&" L C F(tk::AmpersandAmpersand, hi::Operator);
+"&=" L C F(tk::AmpersandEqual, hi::Operator);
+"^" L C F(tk::Carrot, hi::Operator);
+"^=" L C F(tk::CarrotEqual, hi::Operator);
+"=" L C F(tk::Equal, hi::Operator);
+"==" L C F(tk::EqualEqual, hi::Operator);
+"===" L C F(tk::EqualEqualEqual, hi::Operator);
+"=>" L C F(yylval->newline_ ? tk::EqualRight_ : tk::EqualRight, hi::Operator);
+"!" L C F(tk::Exclamation, hi::Operator);
+"!=" L C F(tk::ExclamationEqual, hi::Operator);
+"!==" L C F(tk::ExclamationEqualEqual, hi::Operator);
+"-" L C F(tk::Hyphen, hi::Operator);
+"-=" L C F(tk::HyphenEqual, hi::Operator);
+"--" L C F(yylval->newline_ ? tk::HyphenHyphen_ : tk::HyphenHyphen, hi::Operator);
+"->" L C F(tk::HyphenRight, hi::Operator);
+"<" L C F(tk::Left, hi::Operator);
+"<=" L C F(tk::LeftEqual, hi::Operator);
+"<<" L C F(tk::LeftLeft, hi::Operator);
+"<<=" L C F(tk::LeftLeftEqual, hi::Operator);
+"%" L C F(tk::Percent, hi::Operator);
+"%=" L C F(tk::PercentEqual, hi::Operator);
+"." L C F(tk::Period, hi::Operator);
+"|" L C F(tk::Pipe, hi::Operator);
+"|=" L C F(tk::PipeEqual, hi::Operator);
+"||" L C F(tk::PipePipe, hi::Operator);
+"+" L C F(tk::Plus, hi::Operator);
+"+=" L C F(tk::PlusEqual, hi::Operator);
+"++" L C F(yylval->newline_ ? tk::PlusPlus_ : tk::PlusPlus, hi::Operator);
+">" L C F(tk::Right, hi::Operator);
+">=" L C F(tk::RightEqual, hi::Operator);
+">>" L C F(tk::RightRight, hi::Operator);
+">>=" L C F(tk::RightRightEqual, hi::Operator);
+">>>" L C F(tk::RightRightRight, hi::Operator);
+">>>=" L C F(tk::RightRightRightEqual, hi::Operator);
+"*" L C F(tk::Star, hi::Operator);
+"*=" L C F(tk::StarEqual, hi::Operator);
+"~" L C F(tk::Tilde, hi::Operator);
+
+
"/" L C F(tk::Slash, hi::Operator);
+
"/=" L C F(tk::SlashEqual, hi::Operator);
+
+":" L C F(tk::Colon, hi::Structure);
+"," L C F(tk::Comma, hi::Structure);
+"?" L C F(tk::Question, hi::Structure);
+";" L C F(tk::SemiColon, hi::Structure);
+
+"(" L C F(tk::OpenParen, hi::Structure);
+")" L C F(tk::CloseParen, hi::Structure);
+
+"{" L C F(yyextra->no_.OpenBrace ? tk::OpenBrace__ : yylval->newline_ ? tk::OpenBrace_ : tk::OpenBrace, hi::Structure);
+"}" L C F(tk::CloseBrace, hi::Structure);
+
+"[" L C F(tk::OpenBracket, hi::Structure);
+"]" L C F(tk::CloseBracket, hi::Structure);
+
+"@error" L C F(tk::AtError, hi::Error);
@begin Java
-"@class" L C F(tk::AtClass);
+"@class" L C F(tk::AtClass, hi::Meta);
+@end
+
+@begin C
+"typedef" L C I(identifier, Identifier("typedef"), tk::Typedef, hi::Meta);
+"unsigned" L C I(identifier, Identifier("unsigned"), tk::Unsigned, hi::Type);
+"signed" L C I(identifier, Identifier("signed"), tk::Signed, hi::Type);
+"extern" L C I(identifier, Identifier("extern"), tk::Extern, hi::Type);
+@end
+
+@begin C
+"@encode" L C F(tk::AtEncode, hi::Meta);
@end
@begin ObjectiveC
-"@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" L C F(tk::AtEnd, hi::Meta);
+"@implementation" L C F(yyextra->no_.AtImplementation ? tk::AtImplementation_ : tk::AtImplementation, hi::Meta);
+"@import" L C F(tk::AtImport, hi::Special);
+"@selector" L C F(tk::AtSelector, hi::Meta);
+
+"@null" L C F(tk::AtNull, hi::Constant);
+"@YES" L C F(tk::AtYes, hi::Constant);
+"@NO" L C F(tk::AtNo, hi::Constant);
+"@true" L C F(tk::AtTrue, hi::Constant);
+"@false" L C F(tk::AtFalse, hi::Constant);
+
+"NULL" L C I(identifier, Identifier("NULL"), tk::Identifier_, hi::Constant);
+"nil" L C I(identifier, Identifier("nil"), tk::Identifier_, hi::Constant);
+"YES" L C I(identifier, Identifier("YES"), tk::Yes, hi::Constant);
+"NO" L C I(identifier, Identifier("NO"), tk::No, hi::Constant);
+
+"bool" L C I(identifier, Identifier("bool"), tk::Identifier_, hi::Type);
+"BOOL" L C I(identifier, Identifier("BOOL"), tk::Identifier_, hi::Type);
+"id" L C I(identifier, Identifier("id"), tk::Identifier_, hi::Type);
+"SEL" L C I(identifier, Identifier("SEL"), tk::Identifier_, hi::Type);
@end
-"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);
+"undefined" L C I(identifier, Identifier("undefined"), tk::Identifier_, hi::Operator);
+
+"false" L C I(false, False(), tk::False, hi::Constant);
+"null" L C I(null, Null(), tk::Null, hi::Constant);
+"true" L C I(true, True(), tk::True, hi::Constant);
+
+"auto" L C I(word, Word("auto"), tk::Auto, hi::Meta);
+"break" L R I(word, Word("break"), tk::Break, hi::Control);
+"case" L C I(word, Word("case"), tk::Case, hi::Control);
+"catch" L C I(word, Word("catch"), tk::Catch, hi::Control);
+"continue" L R I(word, Word("continue"), tk::Continue, hi::Control);
+"default" L C I(word, Word("default"), tk::Default, hi::Control);
+"delete" L C I(word, Word("delete"), tk::Delete, hi::Operator);
+"do" L C I(word, Word("do"), tk::Do, hi::Control);
+"else" L C I(word, Word("else"), tk::Else, hi::Control);
+"finally" L C I(word, Word("finally"), tk::Finally, hi::Control);
+"for" L C I(word, Word("for"), tk::For, hi::Control);
+"function" L C I(word, Word("function"), yyextra->no_.Function ? tk::Function_ : tk::Function, hi::Meta);
+"if" L C I(word, Word("if"), tk::If, hi::Control);
+"in" L C I(word, Word("in"), yyextra->in_.top() ? tk::In_ : tk::In, hi::Operator);
+"instanceof" L C I(word, Word("instanceof"), tk::InstanceOf, hi::Operator);
+"new" L C I(word, Word("new"), tk::New, hi::Operator);
+"return" L R I(word, Word("return"), tk::Return, hi::Control);
+"switch" L C I(word, Word("switch"), tk::Switch, hi::Control);
+"this" L C I(this, This(), tk::This, hi::Constant);
+"throw" L R I(word, Word("throw"), tk::Throw, hi::Control);
+"try" L C I(word, Word("try"), tk::Try, hi::Control);
+"typeof" L C I(word, Word("typeof"), tk::TypeOf, hi::Operator);
+"var" L C I(word, Word("var"), tk::Var, hi::Meta);
+"void" L C I(word, Word("void"), tk::Void, hi::Operator);
+"while" L C I(word, Word("while"), tk::While, hi::Control);
+"with" L C I(word, Word("with"), tk::With, hi::Control);
+
+"debugger" L C I(word, Word("debugger"), tk::Debugger, hi::Meta);
+
+"const" L C I(word, Word("const"), tk::Const, hi::Meta);
+
+"class" L C I(word, Word("class"), tk::Class, hi::Meta);
+"enum" L C I(word, Word("enum"), tk::Enum, hi::Meta);
+"export" L C I(word, Word("export"), tk::Export, hi::Meta);
+"extends" L C I(word, Word("extends"), tk::Extends, hi::Meta);
+"import" L C I(word, Word("import"), tk::Import, hi::Meta);
+"super" L C I(word, Word("super"), tk::Super, hi::Constant);
+
+"implements" L C I(identifier, Identifier("implements"), tk::Implements, hi::Meta);
+"interface" L C I(identifier, Identifier("interface"), tk::Interface, hi::Meta);
+"package" L C I(identifier, Identifier("package"), tk::Package, hi::Meta);
+"private" L C I(identifier, Identifier("private"), tk::Private, hi::Meta);
+"protected" L C I(identifier, Identifier("protected"), tk::Protected, hi::Meta);
+"public" L C I(identifier, Identifier("public"), tk::Public, hi::Meta);
+"static" L C I(identifier, Identifier("static"), tk::Static, hi::Meta);
+
+"abstract" L C I(identifier, Identifier("abstract"), tk::Abstract, hi::Meta);
+"boolean" L C I(identifier, Identifier("boolean"), tk::Boolean, hi::Type);
+"byte" L C I(identifier, Identifier("byte"), tk::Byte, hi::Type);
+"char" L C I(identifier, Identifier("char"), tk::Char, hi::Type);
+"double" L C I(identifier, Identifier("double"), tk::Double, hi::Type);
+"final" L C I(identifier, Identifier("final"), tk::Final, hi::Meta);
+"float" L C I(identifier, Identifier("float"), tk::Float, hi::Type);
+"goto" L C I(identifier, Identifier("goto"), tk::Goto, hi::Control);
+"int" L C I(identifier, Identifier("int"), tk::Int, hi::Type);
+"long" L C I(identifier, Identifier("long"), tk::Long, hi::Type);
+"native" L C I(identifier, Identifier("native"), tk::Native, hi::Meta);
+"short" L C I(identifier, Identifier("short"), tk::Short, hi::Type);
+"synchronized" L C I(identifier, Identifier("synchronized"), tk::Synchronized, hi::Meta);
+"throws" L C I(identifier, Identifier("throws"), tk::Throws, hi::Meta);
+"transient" L C I(identifier, Identifier("transient"), tk::Transient, hi::Meta);
+"volatile" L C I(identifier, Identifier("volatile"), tk::Volatile, hi::Meta);
+
+"let" L C I(identifier, Identifier("let"), tk::Let, hi::Meta);
+"yield" L R I(identifier, Identifier("yield"), tk::Yield, hi::Control);
+
+"each" L C I(identifier, Identifier("each"), tk::Each, hi::Control);
+"of" L C I(identifier, Identifier("of"), tk::Of, hi::Operator);
@begin E4X
-"namespace" L C I(identifier, Identifier("namespace"), tk::Namespace);
-"xml" L C I(identifier, Identifier("xml"), tk::XML);
+"namespace" L C I(identifier, Identifier("namespace"), tk::Namespace, hi::Meta);
+"xml" L C I(identifier, Identifier("xml"), tk::XML, hi::Meta);
@end
-{IdentifierStart}{IdentifierPart}* L C I(identifier, Identifier(Y), tk::Identifier_);
+{UnicodeStart}{UnicodePart}* L C I(identifier, Identifier(Y), tk::Identifier_, hi::Identifier);
+
+{IdentifierStart}{IdentifierPart}* L C {
+ char *value(A char[yyleng + 1]);
+ char *local(value);
+
+ for (yy_size_t i(0), e(yyleng); i != e; ++i) {
+ char next(yytext[i]);
+ if (next != '\\')
+ *local++ = next;
+ else
+ U(local, yytext, ++i);
+ }
+
+ *local = '\0';
+ I(identifier, Identifier(value), tk::Identifier_, hi::Identifier);
+}
-(\.[0-9]+|(0|[1-9][0-9]*)(\.[0-9]*)?){Exponent}? L C I(number, Number(strtod(yytext, NULL)), tk::NumericLiteral);
+({IdentifierStart}{IdentifierPart}*)?{IdentifierFail} L E("invalid identifier")
-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);
+0[0-7]+ L C I(number, Number(strtoull(yytext + 1, NULL, 8)), tk::NumericLiteral, hi::Constant);
+0[0-9]+ L C I(number, Number(strtoull(yytext + 1, NULL, 10)), tk::NumericLiteral, hi::Constant);
-\"([^"\\\n]|{Escape})*\"|'([^'\\\n]|{Escape})*' L C {
+0[xX][0-9a-fA-F]+ L C I(number, Number(strtoull(yytext + 2, NULL, 16)), tk::NumericLiteral, hi::Constant);
+0[oO][0-7]+ L C I(number, Number(strtoull(yytext + 2, NULL, 8)), tk::NumericLiteral, hi::Constant);
+0[bB][0-1]+ L C 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 C 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")
+
+'{SingleString}'|\"{DoubleString}\" L C {
char *value(A char[yyleng]);
char *local(value);
@@ -346,8 +508,13 @@ XMLName {XMLNameStart}{XMLNamePart}*
char next(yytext[i]);
if (yytext[i] == '\\')
- switch (next = yytext[++i]) {
- case '\n': continue;
+ // 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;
@@ -357,34 +524,52 @@ XMLName {XMLNameStart}{XMLNamePart}*
case 'r': next = '\r'; break;
case 't': next = '\t'; break;
case 'v': next = '\v'; break;
- case '0': next = '\0'; 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;
+
+ 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;
case 'x':
- next = H(yytext[i + 1]) << 4 | H(yytext[i + 2]);
+ U(local, H(yytext[i + 1]) << 4 | H(yytext[i + 2]));
i += 2;
- break;
+ continue;
+
+ case 'u':
+ U(local, yytext, i);
+ continue;
}
*local++ = next;
}
*local = '\0';
- I(string, String(value, local - value), tk::StringLiteral);
+ I(string, String(value, local - value), tk::StringLiteral, hi::Constant);
}
-\r?\n|\r|\xe2\x80[\xa8\xa9] yylloc->end.lines(); yylloc->step(); N
+{StringPrefix}\\(x.{0,2}|u([^{].{0,3}|\{[^}]*)?|{UnicodeFail})? L E("invalid escape")
+{StringPrefix} L E("invalid string")
-[ \t] L
+{LineTerminatorSequence} yylloc->step(); yylloc->end.lines(); N
-<> if (yyextra->auto_) { yyextra->auto_ = false; F(tk::AutoComplete); } L yyterminate();
+{WhiteSpace} L
-. L {
- CYDriver::Error error;
- error.location_ = *yylloc;
- error.message_ = "syntax error, unknown token";
- yyextra->errors_.push_back(error);
- yyterminate();
-}
+<> if (yyextra->auto_) { yyextra->auto_ = false; F(tk::AutoComplete, hi::Nothing); } L yyterminate();
+
+@({UnicodeStart}{UnicodeScrap}|{UnicodeFail}) L E("invalid keyword")
+
+. L E("invalid character")
%%
@@ -453,3 +638,7 @@ void CYDriver::PushCondition(Condition condition) {
void CYDriver::PopCondition() {
yy_pop_state(scanner_);
}
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif