From 82a02edec66cecb6ab494865736e5d75519b81db Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 11 Sep 2012 15:12:23 -0700 Subject: [PATCH] Add a new ?syntax option to syntax highlight output. --- Console.cpp | 37 ++++-- Cycript.l.in | 338 +++++++++++++++++++++++++------------------------ Cycript.yy.in | 3 + GNUmakefile.in | 2 +- Highlight.cpp | 93 ++++++++++++++ Highlight.hpp | 42 ++++++ 6 files changed, 334 insertions(+), 181 deletions(-) create mode 100644 Highlight.cpp create mode 100644 Highlight.hpp diff --git a/Console.cpp b/Console.cpp index d407948..596f804 100644 --- a/Console.cpp +++ b/Console.cpp @@ -154,7 +154,14 @@ static CYUTF8String Run(CYPool &pool, int client, const std::string &code) { static std::ostream *out_; -static void Output(CYUTF8String json, std::ostream *out, bool expand = false) { +static void Write(bool syntax, const char *data, size_t size, std::ostream &out) { + if (syntax) + CYLexerHighlight(data, size, out); + else + out.write(data, size); +} + +static void Output(bool syntax, CYUTF8String json, std::ostream *out, bool expand = false) { const char *data(json.data); size_t size(json.size); @@ -165,7 +172,7 @@ static void Output(CYUTF8String json, std::ostream *out, bool expand = false) { data[0] != '@' && data[0] != '"' && data[0] != '\'' || data[0] == '@' && data[1] != '"' && data[1] != '\'' ) - out->write(data, size); + Write(syntax, data, size, *out); else for (size_t i(0); i != size; ++i) if (data[i] != '\\') *out << data[i]; @@ -187,13 +194,13 @@ static void Output(CYUTF8String json, std::ostream *out, bool expand = false) { *out << std::endl; } -static void Run(int client, const char *data, size_t size, std::ostream *out = NULL, bool expand = false) { +static void Run(int client, bool syntax, const char *data, size_t size, std::ostream *out = NULL, bool expand = false) { CYPool pool; - Output(Run(pool, client, CYUTF8String(data, size)), out, expand); + Output(syntax, Run(pool, client, CYUTF8String(data, size)), out, expand); } -static void Run(int client, std::string &code, std::ostream *out = NULL, bool expand = false) { - Run(client, code.c_str(), code.size(), out, expand); +static void Run(int client, bool syntax, std::string &code, std::ostream *out = NULL, bool expand = false) { + Run(client, syntax, code.c_str(), code.size(), out, expand); } int (*append_history$)(int, const char *); @@ -307,7 +314,7 @@ static char **Complete(const char *word, int start, int end) { if (array == NULL) { *out_ << '\n'; - Output(json, out_); + Output(false, json, out_); rl_forced_update_display(); return NULL; } @@ -397,6 +404,7 @@ static void Console(CYOptions &options) { bool bypass(false); bool debug(false); bool expand(false); + bool syntax(false); out_ = &std::cout; @@ -448,6 +456,9 @@ static void Console(CYOptions &options) { } else if (data == "expand") { expand = !expand; *out_ << "expand == " << (expand ? "true" : "false") << std::endl; + } else if (data == "syntax") { + syntax = !syntax; + *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl; } add_history(line); ++histlines; @@ -534,10 +545,12 @@ static void Console(CYOptions &options) { add_history(command_.c_str()); ++histlines; - if (debug) - std::cout << code << std::endl; + if (debug) { + Write(syntax, code.c_str(), code.size(), std::cout); + std::cout << std::endl; + } - Run(client_, code, out_, expand); + Run(client_, syntax, code, out_, expand); } if (append_history$ != NULL) { @@ -808,7 +821,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { if (client_ != -1) { // XXX: this code means that you can't pipe to another process std::string code(start, end-start); - Run(client_, code, &std::cout); + Run(client_, false, code, &std::cout); } else { std::ostringstream str; CYOutput out(str, options); @@ -818,7 +831,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { if (compile) std::cout << code; else - Run(client_, code, &std::cout); + Run(client_, false, code, &std::cout); } } diff --git a/Cycript.l.in b/Cycript.l.in index f2bd9b9..141e846 100644 --- a/Cycript.l.in +++ b/Cycript.l.in @@ -26,22 +26,24 @@ #include "Cycript.tab.hh" typedef cy::parser::token tk; +#include "Highlight.hpp" + #define YY_EXTRA_TYPE CYDriver * -#define F(value) do { \ - int token(value); \ +#define F(value, highlight) do { \ yyextra->no_.AtImplementation = false; \ yyextra->no_.Function = false; \ yyextra->no_.OpenBrace = false; \ - return token; \ + yylval->highlight_ = highlight; \ + return value; \ } while (false) #define A new($pool) #define Y apr_pstrmemdup($pool, yytext, yyleng) -#define I(type, Type, value) do { \ +#define I(type, Type, value, highlight) do { \ yylval->type ## _ = A CY ## Type; \ - F(value); \ + F(value, highlight); \ } while (false) #define T yylval->newline_ = yyextra->state_ == CYNewLine; BEGIN(Div); @@ -54,7 +56,7 @@ typedef cy::parser::token tk; yyextra->state_ = CYNewLine; \ else { \ yyextra->state_ = CYClear; \ - F(tk::NewLine); \ + F(tk::NewLine, hi::Nothing); \ } \ } @@ -141,200 +143,200 @@ XMLName {XMLNameStart}{XMLNamePart}* %% -\/{RegularExpressionBody}\/{RegularExpressionFlags} L C I(literal, RegEx(Y), tk::RegularExpressionLiteral); +\/{RegularExpressionBody}\/{RegularExpressionFlags} L C I(literal, RegEx(Y), tk::RegularExpressionLiteral, hi::Constant); \/\/[^\n]* L /* http://ostermiller.org/findcomment.html */ /* XXX: unify these two rules using !? */ -\/\*!([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V() C I(comment, Comment(Y), tk::Comment); +\/\*!([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V() C I(comment, Comment(Y), tk::Comment, hi::Comment); \/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/ V(N) @begin E4X -"<>" L F(tk::LeftRight); -"" L F(tk::LeftSlashRight); +"<>" L F(tk::LeftRight, hi::Structure); +"" L F(tk::LeftSlashRight, hi::Structure); -\])*]]> V() F(tk::XMLCDATA); -\ V() F(tk::XMLComment); -\])*?> V() F(tk::XMLPI); +\])*]]> V() F(tk::XMLCDATA, hi::Constant); +\ V() F(tk::XMLComment, hi::Comment); +\])*?> V() F(tk::XMLPI, hi::Meta); -"=" L F(tk::Equal); -">" L F(tk::Right); -"/>" L F(tk::SlashRight); -"{" L F(tk::OpenBrace); +"=" L F(tk::Equal, hi::Structure); +">" L F(tk::Right, hi::Structure); +"/>" L F(tk::SlashRight, hi::Structure); +"{" L F(tk::OpenBrace, hi::Structure); -\"(\n|[^"])*\"|'(\n|[^'])*' V() F(tk::XMLAttributeValue); -{XMLName} L F(tk::XMLName); -[ \t\r\n] V() F(tk::XMLWhitespace); +\"(\n|[^"])*\"|'(\n|[^'])*' V() F(tk::XMLAttributeValue, hi::Constant); +{XMLName} L F(tk::XMLName, hi::Identifier); +[ \t\r\n] V() F(tk::XMLWhitespace, hi::Nothing); -"{" L F(tk::OpenBrace); -"<" L F(tk::Left); -""{" L F(tk::OpenBrace, hi::Structure); +"<" L F(tk::Left, hi::Structure); +"" L C F(tk::EqualRight); -"!" L C F(tk::Exclamation); -"!=" L C F(tk::ExclamationEqual); -"!==" L C F(tk::ExclamationEqualEqual); -"-" L C F(tk::Hyphen); -"-=" L C F(tk::HyphenEqual); -"--" L C F(yylval->newline_ ? tk::HyphenHyphen_ : tk::HyphenHyphen); -"->" L C F(tk::HyphenRight); -"<" L C F(tk::Left); -"<=" L C F(tk::LeftEqual); -"<<" L C F(tk::LeftLeft); -"<<=" L C F(tk::LeftLeftEqual); -"%" L C F(tk::Percent); -"%=" L C F(tk::PercentEqual); -"." L C F(tk::Period); -"|" L C F(tk::Pipe); -"|=" L C F(tk::PipeEqual); -"||" L C F(tk::PipePipe); -"+" L C F(tk::Plus); -"+=" L C F(tk::PlusEqual); -"++" L C F(yylval->newline_ ? tk::PlusPlus_ : tk::PlusPlus); -">" L C F(tk::Right); -">=" L C F(tk::RightEqual); -">>" L C F(tk::RightRight); -">>=" L C F(tk::RightRightEqual); -">>>" L C F(tk::RightRightRight); -">>>=" L C F(tk::RightRightRightEqual); -"*" L C F(tk::Star); -"*=" L C F(tk::StarEqual); -"~" L C F(tk::Tilde); - -
"/" L C F(tk::Slash); -
"/=" 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(yyextra->no_.OpenBrace ? tk::OpenBrace__ : 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(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); @begin Java -"@class" L C F(tk::AtClass); +"@class" L C F(tk::AtClass, hi::Meta); @end @begin ObjectiveC -"@end" L C F(tk::AtEnd); -"@implementation" L C F(yyextra->no_.AtImplementation ? tk::AtImplementation_ : 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::Meta); +"@selector" L C F(tk::AtSelector, hi::Meta); @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); - -"auto" L C I(word, Word("auto"), tk::Auto); -"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"), yyextra->no_.Function ? tk::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); -"of" L C I(identifier, Identifier("of"), tk::Of); +"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); -"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_); +{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); +(\.[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); -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[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(A char[yyleng]); @@ -367,14 +369,14 @@ XMLName {XMLNameStart}{XMLNamePart}* } *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 [ \t] L -<> if (yyextra->auto_) { yyextra->auto_ = false; F(tk::AutoComplete); } L yyterminate(); +<> if (yyextra->auto_) { yyextra->auto_ = false; F(tk::AutoComplete, hi::Nothing); } L yyterminate(); . L { CYDriver::Error error; diff --git a/Cycript.yy.in b/Cycript.yy.in index 465b32b..3f240e4 100644 --- a/Cycript.yy.in +++ b/Cycript.yy.in @@ -39,8 +39,11 @@ #include "E4X/Syntax.hpp" @end +#include "Highlight.hpp" + typedef struct { bool newline_; + hi::Value highlight_; union { bool bool_; diff --git a/GNUmakefile.in b/GNUmakefile.in index 719a6fe..ff8c1be 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -82,7 +82,7 @@ all := cycript header := Cycript.tab.hh Parser.hpp Pooling.hpp List.hpp Local.hpp cycript.hpp Internal.hpp Error.hpp String.hpp Exception.hpp Standard.hpp code := -code += Replace.lo Output.lo +code += Replace.lo Output.lo Highlight.lo code += Cycript.tab.lo lex.cy.lo code += Network.lo Parser.lo code += JavaScriptCore.lo Library.lo diff --git a/Highlight.cpp b/Highlight.cpp new file mode 100644 index 0000000..371722e --- /dev/null +++ b/Highlight.cpp @@ -0,0 +1,93 @@ +/* Cycript - Optimizing JavaScript Compiler/Runtime + * Copyright (C) 2009-2012 Jay Freeman (saurik) +*/ + +/* GNU Lesser General Public License, Version 3 {{{ */ +/* + * Cycript is free software: you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * Cycript 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 Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Cycript. If not, see . +**/ +/* }}} */ + +#include "Highlight.hpp" + +#include "Cycript.tab.hh" +#include "Parser.hpp" + +static void Skip(const char *data, size_t size, std::ostream &output, size_t &offset, cy::position ¤t, cy::position target) { + while (current.line != target.line || current.column != target.column) { + _assert(offset != size); + char next(data[offset++]); + + output.put(next); + + _assert(current.line < target.line || current.line == target.line && current.column < target.column); + if (next == '\n') + current.lines(); + else + current.columns(); + } +} + +struct CYColor { + bool bold_; + unsigned code_; + + CYColor() { + } + + CYColor(bool bold, unsigned code) : + bold_(bold), + code_(code) + { + } +}; + +void CYLexerHighlight(const char *data, size_t size, std::ostream &output) { + CYStream stream(data, data + size); + CYDriver driver(stream); + + size_t offset(0); + cy::position current; + + CYLocalPool pool; + + YYSTYPE value; + cy::location location; + + while (cylex(&value, &location, driver.scanner_) != 0) { + CYColor color; + + switch (value.highlight_) { + case hi::Comment: color = CYColor(true, 30); break; + case hi::Constant: color = CYColor(false, 31); break; + case hi::Control: color = CYColor(false, 33); break; + case hi::Escape: color = CYColor(true, 31); break; + case hi::Identifier: color = CYColor(false, 0); break; + case hi::Meta: color = CYColor(false, 32); break; + case hi::Nothing: color = CYColor(false, 0); break; + case hi::Operator: color = CYColor(false, 36); break; + case hi::Structure: color = CYColor(true, 34); break; + case hi::Type: color = CYColor(true, 34); break; + } + + Skip(data, size, output, offset, current, location.begin); + if (color.code_ != 0) + output << "\e[" << (color.bold_ ? '1' : '0') << ";" << color.code_ << "m"; + Skip(data, size, output, offset, current, location.end); + if (color.code_ != 0) + output << "\e[0m"; + } + + output.write(data + offset, size - offset); +} diff --git a/Highlight.hpp b/Highlight.hpp new file mode 100644 index 0000000..a3eae0c --- /dev/null +++ b/Highlight.hpp @@ -0,0 +1,42 @@ +/* Cycript - Optimizing JavaScript Compiler/Runtime + * Copyright (C) 2009-2012 Jay Freeman (saurik) +*/ + +/* GNU Lesser General Public License, Version 3 {{{ */ +/* + * Cycript is free software: you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * Cycript 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 Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Cycript. If not, see . +**/ +/* }}} */ + +#ifndef CYCRIPT_HIGHLIGHT_HPP +#define CYCRIPT_HIGHLIGHT_HPP + +#include + +namespace hi { enum Value { + Comment, + Constant, + Control, + Escape, + Identifier, + Meta, + Nothing, + Operator, + Structure, + Type, +}; } + +void CYLexerHighlight(const char *data, size_t size, std::ostream &output); + +#endif/*CYCRIPT_HIGHLIGHT_HPP*/ -- 2.45.2