X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/c247172c9d181431960ee83eaa34c16a50b543bd..39ed6a515508c195281495054579ab82f30545e8:/Console.cpp?ds=sidebyside diff --git a/Console.cpp b/Console.cpp index 50692f2..642cc20 100644 --- a/Console.cpp +++ b/Console.cpp @@ -1,5 +1,5 @@ /* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2010 Jay Freeman (saurik) + * Copyright (C) 2009-2012 Jay Freeman (saurik) */ /* GNU Lesser General Public License, Version 3 {{{ */ @@ -64,6 +64,7 @@ #include #include "Replace.hpp" +#include "Display.hpp" static volatile enum { Working, @@ -152,46 +153,55 @@ static CYUTF8String Run(CYPool &pool, int client, const std::string &code) { return Run(pool, client, CYUTF8String(code.c_str(), code.size())); } -FILE *fout_; +static std::ostream *out_; -static void Output(CYUTF8String json, FILE *fout, 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); - if (data == NULL || fout == NULL) + if (data == NULL || out == NULL) return; - if (!expand || data[0] != '"' && data[0] != '\'') - fputs(data, fout); + if (!expand || + data[0] != '@' && data[0] != '"' && data[0] != '\'' || + data[0] == '@' && data[1] != '"' && data[1] != '\'' + ) + Write(syntax, data, size, *out); else for (size_t i(0); i != size; ++i) if (data[i] != '\\') - fputc(data[i], fout); + *out << data[i]; else switch(data[++i]) { case '\0': goto done; - case '\\': fputc('\\', fout); break; - case '\'': fputc('\'', fout); break; - case '"': fputc('"', fout); break; - case 'b': fputc('\b', fout); break; - case 'f': fputc('\f', fout); break; - case 'n': fputc('\n', fout); break; - case 'r': fputc('\r', fout); break; - case 't': fputc('\t', fout); break; - case 'v': fputc('\v', fout); break; - default: fputc('\\', fout); --i; break; + case '\\': *out << '\\'; break; + case '\'': *out << '\''; break; + case '"': *out << '"'; break; + case 'b': *out << '\b'; break; + case 'f': *out << '\f'; break; + case 'n': *out << '\n'; break; + case 'r': *out << '\r'; break; + case 't': *out << '\t'; break; + case 'v': *out << '\v'; break; + default: *out << '\\'; --i; break; } done: - fputs("\n", fout); - fflush(fout); + *out << std::endl; } -static void Run(int client, const char *data, size_t size, FILE *fout = 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)), fout, expand); + Output(syntax, Run(pool, client, CYUTF8String(data, size)), out, expand); } -static void Run(int client, std::string &code, FILE *fout = NULL, bool expand = false) { - Run(client, code.c_str(), code.size(), fout, 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 *); @@ -199,23 +209,24 @@ int (*append_history$)(int, const char *); static std::string command_; static CYExpression *ParseExpression(CYUTF8String code) { - std::ostringstream str; - str << '(' << code << ')'; - std::string string(str.str()); - - CYDriver driver; - driver.data_ = string.c_str(); - driver.size_ = string.size(); + std::stringstream stream; + stream << '(' << code << ')'; + CYDriver driver(stream); cy::parser parser(driver); Setup(driver, parser); if (parser.parse() != 0 || !driver.errors_.empty()) - _assert(false); + return NULL; + + CYOptions options; + CYContext context(options); - CYExpress *express(dynamic_cast(driver.program_->statements_)); - _assert(express != NULL); - return express->expression_; + // XXX: this could be replaced with a CYStatement::Primitive() + if (CYExpress *express = dynamic_cast(driver.program_->statements_)) + return express->expression_->Primitive(context); + + return NULL; } static int client_; @@ -224,18 +235,16 @@ static char **Complete(const char *word, int start, int end) { rl_attempted_completion_over = TRUE; CYLocalPool pool; - CYDriver driver; - cy::parser parser(driver); - Setup(driver, parser); std::string line(rl_line_buffer, start); - std::string command(command_ + line); - - driver.data_ = command.c_str(); - driver.size_ = command.size(); + std::istringstream stream(command_ + line); + CYDriver driver(stream); driver.auto_ = true; + cy::parser parser(driver); + Setup(driver, parser); + if (parser.parse() != 0 || !driver.errors_.empty()) return NULL; @@ -264,7 +273,7 @@ static char **Complete(const char *word, int start, int end) { case CYDriver::AutoMessage: { CYDriver::Context &thing(driver.contexts_.back()); - expression = $M($M($ CYIndirect(thing.context_), $S("isa")), $S("messages")); + expression = $M($C1($V("object_getClass"), thing.context_), $S("messages")); for (CYDriver::Context::Words::const_iterator part(thing.words_.begin()); part != thing.words_.end(); ++part) prefix << (*part)->word_ << ':'; } break; @@ -278,11 +287,12 @@ static char **Complete(const char *word, int start, int end) { driver.program_ = $ CYProgram($ CYExpress($C3(ParseExpression( " function(object, prefix, word) {\n" " var names = [];\n" - " var pattern = '^' + prefix + word;\n" - " var length = prefix.length;\n" + " var before = prefix.length;\n" + " prefix += word;\n" + " var entire = prefix.length;\n" " for (name in object)\n" - " if (name.match(pattern) != null)\n" - " names.push(name.substr(length));\n" + " if (name.substring(0, entire) == prefix)\n" + " names.push(name.substr(before));\n" " return names;\n" " }\n" ), expression, $S(begin.c_str()), $S(word)))); @@ -295,13 +305,17 @@ static char **Complete(const char *word, int start, int end) { std::string code(str.str()); CYUTF8String json(Run(pool, client_, code)); + // XXX: if this fails we should not try to parse it CYExpression *result(ParseExpression(json)); + if (result == NULL) + return NULL; + CYArray *array(dynamic_cast(result)); if (array == NULL) { - fprintf(fout_, "\n"); - Output(json, fout_); + *out_ << '\n'; + Output(false, json, out_); rl_forced_update_display(); return NULL; } @@ -391,8 +405,9 @@ static void Console(CYOptions &options) { bool bypass(false); bool debug(false); bool expand(false); + bool syntax(true); - fout_ = stdout; + out_ = &std::cout; // rl_completer_word_break_characters is broken in libedit rl_basic_word_break_characters = break_; @@ -416,15 +431,28 @@ static void Console(CYOptions &options) { if (setjmp(ctrlc_) != 0) { mode_ = Working; - fputs("\n", fout_); - fflush(fout_); + *out_ << std::endl; goto restart; } read: + +#if RL_READLINE_VERSION >= 0x0600 + if (syntax) { + rl_prep_term_function = CYDisplayStart; + rl_redisplay_function = CYDisplayUpdate; + rl_deprep_term_function = CYDisplayFinish; + } else { + rl_prep_term_function = rl_prep_terminal; + rl_redisplay_function = rl_redisplay; + rl_deprep_term_function = rl_deprep_terminal; + } +#endif + mode_ = Parsing; char *line(readline(prompt)); mode_ = Working; + if (line == NULL) break; if (line[0] == '\0') @@ -436,16 +464,16 @@ static void Console(CYOptions &options) { std::string data(line + 1); if (data == "bypass") { bypass = !bypass; - fprintf(fout_, "bypass == %s\n", bypass ? "true" : "false"); - fflush(fout_); + *out_ << "bypass == " << (bypass ? "true" : "false") << std::endl; } else if (data == "debug") { debug = !debug; - fprintf(fout_, "debug == %s\n", debug ? "true" : "false"); - fflush(fout_); + *out_ << "debug == " << (debug ? "true" : "false") << std::endl; } else if (data == "expand") { expand = !expand; - fprintf(fout_, "expand == %s\n", expand ? "true" : "false"); - fflush(fout_); + *out_ << "expand == " << (expand ? "true" : "false") << std::endl; + } else if (data == "syntax") { + syntax = !syntax; + *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl; } add_history(line); ++histlines; @@ -472,13 +500,13 @@ static void Console(CYOptions &options) { code = command_; else { CYLocalPool pool; - CYDriver driver; + + std::istringstream stream(command_); + CYDriver driver(stream); + cy::parser parser(driver); Setup(driver, parser); - driver.data_ = command_.c_str(); - driver.size_ = command_.size(); - if (parser.parse() != 0 || !driver.errors_.empty()) { for (CYDriver::Errors::const_iterator error(driver.errors_.begin()); error != driver.errors_.end(); ++error) { cy::position begin(error->location_.begin); @@ -491,7 +519,7 @@ static void Console(CYOptions &options) { } std::cerr << "...."; - for (size_t i(0); i != begin.column - 1; ++i) + for (size_t i(0); i != begin.column; ++i) std::cerr << '.'; if (begin.line != end.line || begin.column == end.column) std::cerr << '^'; @@ -532,10 +560,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, fout_, expand); + Run(client_, syntax, code, out_, expand); } if (append_history$ != NULL) { @@ -545,8 +575,7 @@ static void Console(CYOptions &options) { write_history(histfile); } - fputs("\n", fout_); - fflush(fout_); + *out_ << std::endl; } static void *Map(const char *path, size_t *psize) { @@ -573,7 +602,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { bool compile(false); CYOptions options; - append_history$ = reinterpret_cast(dlsym(RTLD_DEFAULT, "append_history")); + append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history")); #ifdef CY_ATTACH pid_t pid(_not(pid_t)); @@ -768,17 +797,14 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { Console(options); else { CYLocalPool pool; - CYDriver driver(script ?: ""); - cy::parser parser(driver); - Setup(driver, parser); char *start, *end; + std::istream *indirect; if (script == NULL) { start = NULL; end = NULL; - - driver.file_ = stdin; + indirect = &std::cin; } else { size_t size; start = reinterpret_cast(Map(script, &size)); @@ -793,17 +819,24 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { start = end; } - driver.data_ = start; - driver.size_ = end - start; + indirect = NULL; } + CYStream direct(start, end); + std::istream &stream(indirect == NULL ? direct : *indirect); + CYDriver driver(stream, script ?: ""); + + cy::parser parser(driver); + Setup(driver, parser); + if (parser.parse() != 0 || !driver.errors_.empty()) { for (CYDriver::Errors::const_iterator i(driver.errors_.begin()); i != driver.errors_.end(); ++i) std::cerr << i->location_.begin << ": " << i->message_ << std::endl; } else if (driver.program_ != NULL) if (client_ != -1) { + // XXX: this code means that you can't pipe to another process std::string code(start, end-start); - Run(client_, code, stdout); + Run(client_, false, code, &std::cout); } else { std::ostringstream str; CYOutput out(str, options); @@ -813,7 +846,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { if (compile) std::cout << code; else - Run(client_, code, stdout); + Run(client_, false, code, &std::cout); } }