"/=" L C return tk::SlashEqual;
-
-":" L C return tk::Colon;
-"," L C return tk::Comma;
-"?" L C return tk::Question;
-";" L C return tk::SemiColon;
-
-"(" L C return tk::OpenParen;
-")" L C return tk::CloseParen;
-
-"{" L C return tk::OpenBrace;
-"}" L C return tk::CloseBrace;
-
-"[" L C return tk::OpenBracket;
-"]" L C return tk::CloseBracket;
+"&" L C F(tk::Ampersand, 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(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, 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);
+@end
@begin ObjectiveC
-"@class" L C return tk::AtClass;
-"@end" L C return tk::AtEnd;
-"@selector" L C return tk::AtSelector;
+"@encode" L C F(tk::AtEncode, hi::Meta);
+"@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 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 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;
-
-{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;
-
-0[xX][0-9a-fA-F]+ L C yylval->number_ = new(yyextra->pool_) CYNumber(strtoull(yytext + 2, NULL, 16)); return tk::NumericLiteral;
-
-0[bB][0-1]+ L C yylval->number_ = new(yyextra->pool_) CYNumber(strtoull(yytext + 2, NULL, 2)); return tk::NumericLiteral;
+"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 C 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, hi::Meta);
+"xml" L C I(identifier, Identifier("xml"), tk::XML, hi::Meta);
+@end
+
+{IdentifierStart}{IdentifierPart}* L C I(identifier, Identifier(Y), tk::Identifier_, hi::Identifier);
+
+(\.[0-9]+|(0|[1-9][0-9]*)(\.[0-9]*)?){Exponent}? L C I(number, Number(strtod(yytext, NULL)), tk::NumericLiteral, hi::Constant);
+
+0[xX][0-9a-fA-F]+ L C I(number, Number(strtoull(yytext + 2, NULL, 16)), tk::NumericLiteral, hi::Constant);
+0[0-7]+ L C I(number, Number(strtoull(yytext + 1, NULL, 8)), tk::NumericLiteral, hi::Constant);
+0[bB][0-1]+ L C I(number, Number(strtoull(yytext + 2, NULL, 2)), tk::NumericLiteral, hi::Constant);
\"([^"\\\n]|{Escape})*\"|'([^'\\\n]|{Escape})*' L C {
- char *value(reinterpret_cast(apr_palloc(yyextra->pool_, yyleng)));
+ char *value(A char[yyleng]);
char *local(value);
- for (int i(1); i != yyleng - 1; ++i) {
+ for (yy_size_t i(1), e(yyleng - 1); i != e; ++i) {
char next(yytext[i]);
if (yytext[i] == '\\')
@@ -295,14 +404,14 @@ RegularExpressionBody {RegularExpressionFirstChar}{RegularExpressionChars}
}
*local = '\0';
- yylval->string_ = new(yyextra->pool_) CYString(value, local - value);
- return tk::StringLiteral;
+ I(string, String(value, local - value), tk::StringLiteral, hi::Constant);
}
-\r?\n yylloc->end.lines(); yylloc->step(); N
+\r?\n|\r|\xe2\x80[\xa8\xa9] yylloc->end.lines(); yylloc->step(); N
[ \t] L
-<> L yyterminate();
+
+<> if (yyextra->auto_) { yyextra->auto_ = false; F(tk::AutoComplete, hi::Nothing); } L yyterminate();
. L {
CYDriver::Error error;
@@ -323,14 +432,59 @@ void CYDriver::ScannerDestroy() {
cylex_destroy(scanner_);
}
-void CYDriver::BeginCondition(Condition condition) {
+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);
break;
+@begin E4X
+ case XMLContentCondition:
+ BEGIN(XMLContent);
+ break;
+ case XMLTagCondition:
+ BEGIN(XMLTag);
+ break;
+@end
+ default:
+ _assert(false);
+ }
+}
+
+void CYDriver::PushCondition(Condition condition) {
+ switch (condition) {
+ case RegExpCondition:
+ yy_push_state(RegExp, scanner_);
+ break;
+@begin E4X
+ case XMLContentCondition:
+ yy_push_state(XMLContent, scanner_);
+ break;
+ case XMLTagCondition:
+ yy_push_state(XMLTag, scanner_);
+ break;
+@end
default:
_assert(false);
}
}
+
+void CYDriver::PopCondition() {
+ yy_pop_state(scanner_);
+}