X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/c2c9f509581b8c8e78b5745498c782ef1affd51a..def9084602162fbc6081fadd247ad50a78ad0bce:/Console.cpp?ds=sidebyside diff --git a/Console.cpp b/Console.cpp index 89cd62e..a7e0929 100644 --- a/Console.cpp +++ b/Console.cpp @@ -1,21 +1,21 @@ /* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2010 Jay Freeman (saurik) + * Copyright (C) 2009-2015 Jay Freeman (saurik) */ -/* GNU Lesser General Public License, Version 3 {{{ */ +/* GNU Affero 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 . + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + + * This program 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 Affero General Public License for more details. + + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . **/ /* }}} */ @@ -26,6 +26,7 @@ #endif #include +#include #include #include @@ -42,16 +43,16 @@ #include #endif -#include - #include +#include +#include #include +#include #include #include #include - -#include "Cycript.tab.hh" +#include #include #include @@ -59,12 +60,14 @@ #include #include -#include - #include +#include "Display.hpp" #include "Replace.hpp" +#include "Cycript.tab.hh" +#include "Driver.hpp" + static volatile enum { Working, Parsing, @@ -82,7 +85,8 @@ static void sigint(int) { case Parsing: longjmp(ctrlc_, 1); case Running: - throw "*** Ctrl-C"; + CYCancel(); + return; case Sending: return; case Waiting: @@ -105,20 +109,21 @@ void Setup(CYDriver &driver, cy::parser &parser) { driver.strict_ = true; } -void Setup(CYOutput &out, CYDriver &driver, CYOptions &options) { +void Setup(CYOutput &out, CYDriver &driver, CYOptions &options, bool lower) { out.pretty_ = pretty_; CYContext context(options); - driver.program_->Replace(context); + if (lower) + driver.program_->Replace(context); } static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) { const char *json; - size_t size; + uint32_t size; if (client == -1) { mode_ = Running; #ifdef CY_EXECUTE - json = CYExecute(pool, code); + json = CYExecute(CYGetJSContext(), pool, code); #else json = NULL; #endif @@ -130,15 +135,15 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) { } else { mode_ = Sending; size = code.size; - CYSendAll(client, &size, sizeof(size)); - CYSendAll(client, code.data, code.size); + _assert(CYSendAll(client, &size, sizeof(size))); + _assert(CYSendAll(client, code.data, code.size)); mode_ = Waiting; - CYRecvAll(client, &size, sizeof(size)); - if (size == _not(size_t)) + _assert(CYRecvAll(client, &size, sizeof(size))); + if (size == _not(uint32_t)) json = NULL; else { char *temp(new(pool) char[size + 1]); - CYRecvAll(client, temp, size); + _assert(CYRecvAll(client, temp, size)); temp[size] = '\0'; json = temp; } @@ -152,46 +157,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,43 +213,45 @@ 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); + + CYStatement *statement(driver.program_->statements_); + _assert(statement != NULL); + _assert(statement->next_ == NULL); CYExpress *express(dynamic_cast(driver.program_->statements_)); _assert(express != NULL); + return express->expression_; } static int client_; static char **Complete(const char *word, int start, int end) { - rl_attempted_completion_over = TRUE; + rl_attempted_completion_over = ~0; 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 +280,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 +294,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" - " for (name in object)\n" - " if (name.match(pattern) != null)\n" - " names.push(name.substr(length));\n" + " var before = prefix.length;\n" + " prefix += word;\n" + " var entire = prefix.length;\n" + " for (var name in object)\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 +312,16 @@ 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)); - CYArray *array(dynamic_cast(result)); + if (result == NULL) + return NULL; + CYArray *array(dynamic_cast(result->Primitive(context))); if (array == NULL) { - fprintf(fout_, "\n"); - Output(json, fout_); + *out_ << '\n'; + Output(false, json, out_); rl_forced_update_display(); return NULL; } @@ -369,30 +389,63 @@ static char **Complete(const char *word, int start, int end) { static char name_[] = "cycript"; static char break_[] = " \t\n\"\\'`@$><=;|&{(" ")}" ".:[]"; -static void Console(CYOptions &options) { - CYPool pool; +class History { + private: + std::string histfile_; + size_t histlines_; + + public: + History(std::string histfile) : + histfile_(histfile), + histlines_(0) + { + read_history(histfile_.c_str()); + } - passwd *passwd; - if (const char *username = getenv("LOGNAME")) - passwd = getpwnam(username); - else - passwd = getpwuid(getuid()); + ~History() { + if (append_history$ != NULL) { + int fd(_syscall(open(histfile_.c_str(), O_CREAT | O_WRONLY, 0600))); + _syscall(close(fd)); + _assert((*append_history$)(histlines_, histfile_.c_str()) == 0); + } else { + _assert(write_history(histfile_.c_str()) == 0); + } + } - const char *basedir(apr_psprintf(pool, "%s/.cycript", passwd->pw_dir)); - const char *histfile(apr_psprintf(pool, "%s/history", basedir)); - size_t histlines(0); + void operator +=(const std::string &command) { + add_history(command_.c_str()); + ++histlines_; + } +}; + +static void Console(CYOptions &options) { + std::string basedir; + if (const char *home = getenv("HOME")) + basedir = home; + else { + passwd *passwd; + if (const char *username = getenv("LOGNAME")) + passwd = getpwnam(username); + else + passwd = getpwuid(getuid()); + basedir = passwd->pw_dir; + } + + basedir += "/.cycript"; + mkdir(basedir.c_str(), 0700); rl_initialize(); rl_readline_name = name_; - mkdir(basedir, 0700); - read_history(histfile); + History history(basedir + "/history"); bool bypass(false); bool debug(false); bool expand(false); + bool lower(true); + bool syntax(true); - fout_ = stdout; + out_ = &std::cout; // rl_completer_word_break_characters is broken in libedit rl_basic_word_break_characters = break_; @@ -416,18 +469,27 @@ 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_redisplay_function = CYDisplayUpdate; + else + rl_redisplay_function = rl_redisplay; +#endif + mode_ = Parsing; char *line(readline(prompt)); mode_ = Working; - if (line == NULL) + + if (line == NULL) { + *out_ << std::endl; break; - if (line[0] == '\0') + } else if (line[0] == '\0') goto read; if (!extra) { @@ -436,19 +498,30 @@ 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 == "destroy") { + CYDestroyContext(); + } else if (data == "gc") { + *out_ << "collecting... " << std::flush; + CYGarbageCollect(CYGetJSContext()); + *out_ << "done." << std::endl; + } else if (data == "exit") { + return; } 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 == "lower") { + lower = !lower; + *out_ << "lower == " << (lower ? "true" : "false") << std::endl; + } else if (data == "syntax") { + syntax = !syntax; + *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl; } - add_history(line); - ++histlines; + command_ = line; + history += command_; goto restart; } } @@ -472,18 +545,18 @@ 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); - if (begin.line != lines.size() || begin.column - 1 != lines.back().size() || error->warning_) { - cy::position end(error->location_.end); + CYPosition begin(error->location_.begin); + if (begin.line != lines.size() || begin.column < lines.back().size() || error->warning_) { + CYPosition end(error->location_.end); if (begin.line != lines.size()) { std::cerr << " | "; @@ -491,7 +564,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 << '^'; @@ -502,8 +575,7 @@ static void Console(CYOptions &options) { std::cerr << " | "; std::cerr << error->message_ << std::endl; - add_history(command_.c_str()); - ++histlines; + history += command_; goto restart; } } @@ -518,111 +590,104 @@ static void Console(CYOptions &options) { if (driver.program_ == NULL) goto restart; - if (client_ != -1) - code = command_; - else { - std::ostringstream str; - CYOutput out(str, options); - Setup(out, driver, options); - out << *driver.program_; - code = str.str(); - } + std::ostringstream str; + CYOutput out(str, options); + Setup(out, driver, options, lower); + out << *driver.program_; + code = str.str(); } - add_history(command_.c_str()); - ++histlines; - - if (debug) - std::cout << code << std::endl; + history += command_; - Run(client_, code, fout_, expand); - } + if (debug) { + std::cout << "cy= "; + Write(syntax, code.c_str(), code.size(), std::cout); + std::cout << std::endl; + } - if (append_history$ != NULL) { - _syscall(close(_syscall(open(histfile, O_CREAT | O_WRONLY, 0600)))); - (*append_history$)(histlines, histfile); - } else { - write_history(histfile); + Run(client_, syntax, code, out_, expand); } - - fputs("\n", fout_); - fflush(fout_); -} - -static void *Map(const char *path, size_t *psize) { - int fd; - _syscall(fd = open(path, O_RDONLY)); - - struct stat stat; - _syscall(fstat(fd, &stat)); - size_t size(stat.st_size); - - *psize = size; - - void *base; - _syscall(base = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0)); - - _syscall(close(fd)); - return base; } -void InjectLibrary(pid_t pid); +void InjectLibrary(pid_t, int, const char *[]); -int Main(int argc, char const * const argv[], char const * const envp[]) { +int Main(int argc, char * const argv[], char const * const envp[]) { bool tty(isatty(STDIN_FILENO)); bool compile(false); + bool target(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)); #endif - CYPool pool; - apr_getopt_t *state; - _aprcall(apr_getopt_init(&state, pool, argc, argv)); + const char *host(NULL); + const char *port(NULL); - for (;;) { - char opt; - const char *arg; + optind = 1; - apr_status_t status(apr_getopt(state, - "cg:n:" + for (;;) { + int option(getopt_long(argc, argv, + "c" + "g:" + "n:" #ifdef CY_ATTACH "p:" #endif + "r:" "s" - , &opt, &arg)); + , (const struct option[]) { + {NULL, no_argument, NULL, 'c'}, + {NULL, required_argument, NULL, 'g'}, + {NULL, required_argument, NULL, 'n'}, +#ifdef CY_ATTACH + {NULL, required_argument, NULL, 'p'}, +#endif + {NULL, required_argument, NULL, 'r'}, + {NULL, no_argument, NULL, 's'}, + {0, 0, 0, 0}}, NULL)); - switch (status) { - case APR_EOF: + switch (option) { + case -1: goto getopt; - case APR_BADCH: - case APR_BADARG: + + case ':': + case '?': fprintf(stderr, "usage: cycript [-c]" #ifdef CY_ATTACH " [-p ]" #endif + " [-r ]" " [