X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/9cad30fab188a57c3db8df0912a1691099468e64..f5d7110cd00f0884abe200716a0958cc0af04783:/Console.cpp diff --git a/Console.cpp b/Console.cpp index 44cadc7..80c9dbd 100644 --- a/Console.cpp +++ b/Console.cpp @@ -1,40 +1,22 @@ -/* Cycript - Inlining/Optimizing JavaScript Compiler - * Copyright (C) 2009 Jay Freeman (saurik) +/* Cycript - Optimizing JavaScript Compiler/Runtime + * Copyright (C) 2009-2012 Jay Freeman (saurik) */ -/* Modified BSD License {{{ */ +/* GNU Lesser General Public License, Version 3 {{{ */ /* - * Redistribution and use in source and binary - * forms, with or without modification, are permitted - * provided that the following conditions are met: + * 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. * - * 1. Redistributions of source code must retain the - * above copyright notice, this list of conditions - * and the following disclaimer. - * 2. Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the - * distribution. - * 3. The name of the author may not be used to endorse - * or promote products derived from this software - * without specific prior written permission. + * 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. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ + * You should have received a copy of the GNU Lesser General Public License + * along with Cycript. If not, see . +**/ /* }}} */ #include "cycript.hpp" @@ -48,8 +30,17 @@ #include +#ifdef HAVE_READLINE_H +#include +#else #include +#endif + +#ifdef HAVE_HISTORY_H +#include +#else #include +#endif #include @@ -72,6 +63,8 @@ #include +#include "Replace.hpp" + static volatile enum { Working, Parsing, @@ -112,31 +105,33 @@ void Setup(CYDriver &driver, cy::parser &parser) { driver.strict_ = true; } -void Setup(CYOutput &out, CYDriver &driver) { +void Setup(CYOutput &out, CYDriver &driver, CYOptions &options) { out.pretty_ = pretty_; - - CYContext context(driver.pool_); + CYContext context(options); driver.program_->Replace(context); } -void Run(int client, const char *data, size_t size, FILE *fout = NULL, bool expand = false) { - CYPool pool; - +static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) { const char *json; + size_t size; + if (client == -1) { mode_ = Running; #ifdef CY_EXECUTE - json = CYExecute(pool, data); + json = CYExecute(pool, code); #else json = NULL; #endif mode_ = Working; - if (json != NULL) + if (json == NULL) + size = 0; + else size = strlen(json); } else { mode_ = Sending; + size = code.size; CYSendAll(client, &size, sizeof(size)); - CYSendAll(client, data, size); + CYSendAll(client, code.data, code.size); mode_ = Waiting; CYRecvAll(client, &size, sizeof(size)); if (size == _not(size_t)) @@ -150,39 +145,245 @@ void Run(int client, const char *data, size_t size, FILE *fout = NULL, bool expa mode_ = Working; } - if (json != NULL && fout != NULL) { - if (!expand || json[0] != '"' && json[0] != '\'') - fputs(json, fout); - else for (size_t i(0); i != size; ++i) - if (json[i] != '\\') - fputc(json[i], fout); - else switch(json[++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; - } + return CYUTF8String(json, size); +} - done: - fputs("\n", fout); - fflush(fout); - } +static CYUTF8String Run(CYPool &pool, int client, const std::string &code) { + return Run(pool, client, CYUTF8String(code.c_str(), code.size())); +} + +FILE *fout_; + +static void Output(CYUTF8String json, FILE *fout, bool expand = false) { + const char *data(json.data); + size_t size(json.size); + + if (data == NULL || fout == NULL) + return; + + if (!expand || + data[0] != '@' && data[0] != '"' && data[0] != '\'' || + data[0] == '@' && data[1] != '"' && data[1] != '\'' + ) + fputs(data, fout); + else for (size_t i(0); i != size; ++i) + if (data[i] != '\\') + fputc(data[i], fout); + 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; + } + + done: + fputs("\n", fout); + fflush(fout); } -void Run(int client, std::string &code, FILE *fout = NULL, bool expand = false) { +static void Run(int client, const char *data, size_t size, FILE *fout = NULL, bool expand = false) { + CYPool pool; + Output(Run(pool, client, CYUTF8String(data, size)), fout, expand); +} + +static void Run(int client, std::string &code, FILE *fout = NULL, bool expand = false) { Run(client, code.c_str(), code.size(), fout, expand); } int (*append_history$)(int, const char *); -static void Console(apr_pool_t *pool, int client) { +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(); + + cy::parser parser(driver); + Setup(driver, parser); + + if (parser.parse() != 0 || !driver.errors_.empty()) + return NULL; + + CYOptions options; + CYContext context(options); + + // 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_; + +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(); + + driver.auto_ = true; + + if (parser.parse() != 0 || !driver.errors_.empty()) + return NULL; + + if (driver.mode_ == CYDriver::AutoNone) + return NULL; + + CYExpression *expression; + + CYOptions options; + CYContext context(options); + + std::ostringstream prefix; + + switch (driver.mode_) { + case CYDriver::AutoPrimary: + expression = $ CYThis(); + break; + + case CYDriver::AutoDirect: + expression = driver.context_; + break; + + case CYDriver::AutoIndirect: + expression = $ CYIndirect(driver.context_); + break; + + case CYDriver::AutoMessage: { + CYDriver::Context &thing(driver.contexts_.back()); + 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; + + default: + _assert(false); + } + + std::string begin(prefix.str()); + + driver.program_ = $ CYProgram($ CYExpress($C3(ParseExpression( + " function(object, prefix, word) {\n" + " var names = [];\n" + " var before = prefix.length;\n" + " prefix += word;\n" + " var entire = prefix.length;\n" + " for (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)))); + + driver.program_->Replace(context); + + std::ostringstream str; + CYOutput out(str, options); + out << *driver.program_; + + std::string code(str.str()); + CYUTF8String json(Run(pool, client_, code)); + + CYExpression *result(ParseExpression(json)); + if (result == NULL) + return NULL; + + CYArray *array(dynamic_cast(result)); + + if (array == NULL) { + fprintf(fout_, "\n"); + Output(json, fout_); + rl_forced_update_display(); + return NULL; + } + + // XXX: use an std::set? + typedef std::vector Completions; + Completions completions; + + std::string common; + bool rest(false); + + CYForEach (element, array->elements_) { + CYString *string(dynamic_cast(element->value_)); + _assert(string != NULL); + + std::string completion; + if (string->size_ != 0) + completion.assign(string->value_, string->size_); + else if (driver.mode_ == CYDriver::AutoMessage) + completion = "]"; + else + continue; + + completions.push_back(completion); + + if (!rest) { + common = completion; + rest = true; + } else { + size_t limit(completion.size()), size(common.size()); + if (size > limit) + common = common.substr(0, limit); + else + limit = size; + for (limit = 0; limit != size; ++limit) + if (common[limit] != completion[limit]) + break; + if (limit != size) + common = common.substr(0, limit); + } + } + + size_t count(completions.size()); + if (count == 0) + return NULL; + + size_t colon(common.find(':')); + if (colon != std::string::npos) + common = common.substr(0, colon + 1); + if (completions.size() == 1) + common += ' '; + + char **results(reinterpret_cast(malloc(sizeof(char *) * (count + 2)))); + + results[0] = strdup(common.c_str()); + size_t index(0); + for (Completions::const_iterator i(completions.begin()); i != completions.end(); ++i) + results[++index] = strdup(i->c_str()); + results[count + 1] = NULL; + + return results; +} + +// need char *, not const char * +static char name_[] = "cycript"; +static char break_[] = " \t\n\"\\'`@$><=;|&{(" ")}" ".:[]"; + +static void Console(CYOptions &options) { + CYPool pool; + passwd *passwd; if (const char *username = getenv("LOGNAME")) passwd = getpwnam(username); @@ -193,6 +394,9 @@ static void Console(apr_pool_t *pool, int client) { const char *histfile(apr_psprintf(pool, "%s/history", basedir)); size_t histlines(0); + rl_initialize(); + rl_readline_name = name_; + mkdir(basedir, 0700); read_history(histfile); @@ -200,9 +404,14 @@ static void Console(apr_pool_t *pool, int client) { bool debug(false); bool expand(false); - FILE *fout(stdout); + fout_ = stdout; + + // rl_completer_word_break_characters is broken in libedit + rl_basic_word_break_characters = break_; - rl_bind_key('\t', rl_insert); + rl_completer_word_break_characters = break_; + rl_attempted_completion_function = &Complete; + rl_bind_key('\t', rl_complete); struct sigaction action; sigemptyset(&action.sa_mask); @@ -211,7 +420,7 @@ static void Console(apr_pool_t *pool, int client) { sigaction(SIGINT, &action, NULL); restart: for (;;) { - std::string command; + command_.clear(); std::vector lines; bool extra(false); @@ -219,8 +428,8 @@ static void Console(apr_pool_t *pool, int client) { if (setjmp(ctrlc_) != 0) { mode_ = Working; - fputs("\n", fout); - fflush(fout); + fputs("\n", fout_); + fflush(fout_); goto restart; } @@ -239,16 +448,16 @@ static void Console(apr_pool_t *pool, int client) { std::string data(line + 1); if (data == "bypass") { bypass = !bypass; - fprintf(fout, "bypass == %s\n", bypass ? "true" : "false"); - fflush(fout); + fprintf(fout_, "bypass == %s\n", bypass ? "true" : "false"); + fflush(fout_); } else if (data == "debug") { debug = !debug; - fprintf(fout, "debug == %s\n", debug ? "true" : "false"); - fflush(fout); + fprintf(fout_, "debug == %s\n", debug ? "true" : "false"); + fflush(fout_); } else if (data == "expand") { expand = !expand; - fprintf(fout, "expand == %s\n", expand ? "true" : "false"); - fflush(fout); + fprintf(fout_, "expand == %s\n", expand ? "true" : "false"); + fflush(fout_); } add_history(line); ++histlines; @@ -256,7 +465,7 @@ static void Console(apr_pool_t *pool, int client) { } } - command += line; + command_ += line; char *begin(line), *end(line + strlen(line)); while (char *nl = reinterpret_cast(memchr(begin, '\n', end - begin))) { @@ -272,19 +481,20 @@ static void Console(apr_pool_t *pool, int client) { std::string code; if (bypass) - code = command; + code = command_; else { - CYDriver driver(""); + CYLocalPool pool; + CYDriver driver; cy::parser parser(driver); Setup(driver, parser); - driver.data_ = command.c_str(); - driver.size_ = command.size(); + 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_) { + if (begin.line != lines.size() || begin.column < lines.back().size() || error->warning_) { cy::position end(error->location_.end); if (begin.line != lines.size()) { @@ -293,7 +503,7 @@ static void Console(apr_pool_t *pool, int client) { } 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 << '^'; @@ -304,7 +514,7 @@ static void Console(apr_pool_t *pool, int client) { std::cerr << " | "; std::cerr << error->message_ << std::endl; - add_history(command.c_str()); + add_history(command_.c_str()); ++histlines; goto restart; } @@ -312,7 +522,7 @@ static void Console(apr_pool_t *pool, int client) { driver.errors_.clear(); - command += '\n'; + command_ += '\n'; prompt = "cy> "; goto read; } @@ -320,24 +530,24 @@ static void Console(apr_pool_t *pool, int client) { if (driver.program_ == NULL) goto restart; - if (client != -1) - code = command; + if (client_ != -1) + code = command_; else { std::ostringstream str; - CYOutput out(str); - Setup(out, driver); + CYOutput out(str, options); + Setup(out, driver, options); out << *driver.program_; code = str.str(); } } - add_history(command.c_str()); + add_history(command_.c_str()); ++histlines; if (debug) std::cout << code << std::endl; - Run(client, code, fout, expand); + Run(client_, code, fout_, expand); } if (append_history$ != NULL) { @@ -347,8 +557,8 @@ static void Console(apr_pool_t *pool, int client) { write_history(histfile); } - fputs("\n", fout); - fflush(fout); + fputs("\n", fout_); + fflush(fout_); } static void *Map(const char *path, size_t *psize) { @@ -373,8 +583,9 @@ void InjectLibrary(pid_t pid); int Main(int argc, char const * const argv[], char const * const envp[]) { bool tty(isatty(STDIN_FILENO)); 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)); @@ -420,6 +631,8 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { case 'g': if (false); + else if (strcmp(arg, "rename") == 0) + options.verbose_ = true; #if YYDEBUG else if (strcmp(arg, "bison") == 0) bison_ = true; @@ -531,11 +744,9 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { } #endif - int client; - #ifdef CY_ATTACH if (pid == _not(pid_t)) - client = -1; + client_ = -1; else { int server(_syscall(socket(PF_UNIX, SOCK_STREAM, 0))); try { struct sockaddr_un address; @@ -550,7 +761,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { try { _syscall(listen(server, 1)); InjectLibrary(pid); - client = _syscall(accept(server, NULL, NULL)); + client_ = _syscall(accept(server, NULL, NULL)); } catch (...) { // XXX: exception? unlink(address.sun_path); @@ -562,12 +773,13 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { } } #else - client = -1; + client_ = -1; #endif if (script == NULL && tty) - Console(pool, client); + Console(options); else { + CYLocalPool pool; CYDriver driver(script ?: ""); cy::parser parser(driver); Setup(driver, parser); @@ -601,19 +813,19 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { 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) { + if (client_ != -1) { std::string code(start, end-start); - Run(client, code, stdout); + Run(client_, code, stdout); } else { std::ostringstream str; - CYOutput out(str); - Setup(out, driver); + CYOutput out(str, options); + Setup(out, driver, options); out << *driver.program_; std::string code(str.str()); if (compile) std::cout << code; else - Run(client, code, stdout); + Run(client_, code, stdout); } }