X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b6d0605d27499279414e2433fae470302c99c110..7e5391fd937dd287b3aef363e641f2d3abc5f422:/Console.cpp diff --git a/Console.cpp b/Console.cpp index 25f624e..4a27c64 100644 --- a/Console.cpp +++ b/Console.cpp @@ -1,4 +1,4 @@ -/* Cycript - Remove Execution Server and Disassembler +/* Cycript - Inlining/Optimizing JavaScript Compiler * Copyright (C) 2009 Jay Freeman (saurik) */ @@ -37,18 +37,28 @@ */ /* }}} */ -#define _GNU_SOURCE - -#include #include "cycript.hpp" +#ifdef CY_EXECUTE +#include "JavaScript.hpp" +#endif + #include #include #include +#ifdef HAVE_READLINE_H +#include +#else #include +#endif + +#ifdef HAVE_HISTORY_H +#include +#else #include +#endif #include @@ -65,42 +75,112 @@ #include #include #include +#include + +#include + +#include + +#include "Replace.hpp" + +static volatile enum { + Working, + Parsing, + Running, + Sending, + Waiting, +} mode_; static jmp_buf ctrlc_; static void sigint(int) { - longjmp(ctrlc_, 1); + switch (mode_) { + case Working: + return; + case Parsing: + longjmp(ctrlc_, 1); + case Running: + throw "*** Ctrl-C"; + case Sending: + return; + case Waiting: + return; + } } -void Run(int socket, const char *data, size_t size, FILE *fout, bool expand = false) { - CYPool pool; +#if YYDEBUG +static bool bison_; +#endif +static bool strict_; +static bool pretty_; + +void Setup(CYDriver &driver, cy::parser &parser) { +#if YYDEBUG + if (bison_) + parser.set_debug_level(1); +#endif + if (strict_) + driver.strict_ = true; +} + +void Setup(CYOutput &out, CYDriver &driver, CYOptions &options) { + out.pretty_ = pretty_; + CYContext context(driver.pool_, options); + driver.program_->Replace(context); +} +static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) { const char *json; - if (socket == -1) { - json = CYExecute(pool, data); + size_t size; + + if (client == -1) { + mode_ = Running; +#ifdef CY_EXECUTE + json = CYExecute(pool, code.data); +#else + json = NULL; +#endif + mode_ = Working; if (json != NULL) size = strlen(json); } else { - CYSendAll(socket, &size, sizeof(size)); - CYSendAll(socket, data, size); - CYRecvAll(socket, &size, sizeof(size)); + mode_ = Sending; + CYSendAll(client, &size, sizeof(size)); + CYSendAll(client, code.data, size); + mode_ = Waiting; + CYRecvAll(client, &size, sizeof(size)); if (size == _not(size_t)) json = NULL; else { char *temp(new(pool) char[size + 1]); - CYRecvAll(socket, temp, size); + CYRecvAll(client, temp, size); temp[size] = '\0'; json = temp; } + mode_ = Working; } - if (json != NULL && fout != NULL) { - if (!expand || json[0] != '"' && json[0] != '\'') - fputs(json, fout); + return CYUTF8String(json, size); +} + +static CYUTF8String Run(CYPool &pool, int client, const std::string &code) { + return Run(pool, client, CYUTF8String(code.c_str(), code.size())); +} + +void Run(int client, const char *data, size_t size, FILE *fout = NULL, bool expand = false) { + CYPool pool; + CYUTF8String json(Run(pool, client, CYUTF8String(data, size))); + + data = json.data; + size = json.size; + + if (data != NULL && fout != NULL) { + if (!expand || data[0] != '"' && data[0] != '\'') + fputs(data, fout); else for (size_t i(0); i != size; ++i) - if (json[i] != '\\') - fputc(json[i], fout); - else switch(json[++i]) { + if (data[i] != '\\') + fputc(data[i], fout); + else switch(data[++i]) { case '\0': goto done; case '\\': fputc('\\', fout); break; case '\'': fputc('\'', fout); break; @@ -120,18 +200,199 @@ void Run(int socket, const char *data, size_t size, FILE *fout, bool expand = fa } } -void Run(int socket, std::string &code, FILE *fout, bool expand = false) { - Run(socket, code.c_str(), code.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 std::string command_; + +static CYExpression *ParseExpression(CYPool &pool, CYUTF8String code) { + std::ostringstream str; + str << '(' << code << ')'; + std::string string(str.str()); + + CYDriver driver(pool); + driver.data_ = string.c_str(); + driver.size_ = string.size(); + + cy::parser parser(driver); + Setup(driver, parser); + + if (parser.parse() != 0 || !driver.errors_.empty()) + _assert(false); + + 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; + + CYPool pool; + + CYDriver driver(pool); + 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(driver.pool_, 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($M($ CYIndirect(thing.context_), $S("isa")), $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() + word); + + driver.program_ = $ CYProgram($ CYExpress($C2(ParseExpression(pool, + " function(object, prefix) {\n" + " var names = [];\n" + " var pattern = '^' + prefix;\n" + " for (name in object)\n" + " if (name.match(pattern) != null)\n" + " names.push(name);\n" + " return names;\n" + " }\n" + ), expression, $S(begin.c_str())))); + + 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(pool, json)); + CYArray *array(dynamic_cast(result)); + _assert(array != NULL); + + // XXX: use an std::set? + typedef std::vector Completions; + Completions completions; + + std::string common; + bool rest(false); + + for (CYElement *element(array->elements_); element != NULL; element = element->next_) { + CYString *string(dynamic_cast(element->value_)); + _assert(string != NULL); + + std::string completion(string->value_, string->size_); + 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; + + if (!common.empty()) { + size_t size(prefix.str().size()); + _assert(common.size() >= size); + common = common.substr(size); + } + + 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; } -static void Console(int socket) { +// need char *, not const char * +static char name_[] = "cycript"; +static char break_[] = " \t\n\"\\'`@$><=;|&{(" ".:"; + +static void Console(apr_pool_t *pool, CYOptions &options) { + passwd *passwd; + if (const char *username = getenv("LOGNAME")) + passwd = getpwnam(username); + else + passwd = getpwuid(getuid()); + + const char *basedir(apr_psprintf(pool, "%s/.cycript", passwd->pw_dir)); + 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); + bool bypass(false); bool debug(false); bool expand(false); FILE *fout(stdout); - rl_bind_key('\t', rl_insert); + // rl_completer_word_break_characters is broken in libedit + rl_basic_word_break_characters = break_; + rl_attempted_completion_function = &Complete; + rl_bind_key('\t', rl_complete); struct sigaction action; sigemptyset(&action.sa_mask); @@ -140,22 +401,27 @@ static void Console(int socket) { sigaction(SIGINT, &action, NULL); restart: for (;;) { - std::string command; + command_.clear(); std::vector lines; bool extra(false); const char *prompt("cy# "); if (setjmp(ctrlc_) != 0) { + mode_ = Working; fputs("\n", fout); fflush(fout); goto restart; } read: + mode_ = Parsing; char *line(readline(prompt)); + mode_ = Working; if (line == NULL) break; + if (line[0] == '\0') + goto read; if (!extra) { extra = true; @@ -175,74 +441,100 @@ static void Console(int socket) { fflush(fout); } add_history(line); + ++histlines; goto restart; } } - lines.push_back(line); - command += line; + command_ += line; + + char *begin(line), *end(line + strlen(line)); + while (char *nl = reinterpret_cast(memchr(begin, '\n', end - begin))) { + *nl = '\0'; + lines.push_back(begin); + begin = nl + 1; + } + + lines.push_back(begin); + free(line); std::string code; if (bypass) - code = command; + code = command_; else { - CYDriver driver(""); + 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()) { + if (begin.line != lines.size() || begin.column - 1 != lines.back().size() || error->warning_) { cy::position end(error->location_.end); + if (begin.line != lines.size()) { std::cerr << " | "; std::cerr << lines[begin.line - 1] << std::endl; } - std::cerr << " | "; + + std::cerr << "...."; for (size_t i(0); i != begin.column - 1; ++i) std::cerr << '.'; - if (begin.line != end.line) + if (begin.line != end.line || begin.column == end.column) std::cerr << '^'; else for (size_t i(0), e(end.column - begin.column); i != e; ++i) std::cerr << '^'; std::cerr << std::endl; + std::cerr << " | "; std::cerr << error->message_ << std::endl; - add_history(command.c_str()); + + add_history(command_.c_str()); + ++histlines; goto restart; } } driver.errors_.clear(); - command += '\n'; + command_ += '\n'; prompt = "cy> "; goto read; } - if (driver.source_ == NULL) + if (driver.program_ == NULL) goto restart; - if (socket != -1) - code = command; + if (client_ != -1) + code = command_; else { std::ostringstream str; - driver.source_->Show(str); + 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(socket, code, fout, expand); + Run(client_, code, fout, expand); + } + + if (append_history$ != NULL) { + _syscall(close(_syscall(open(histfile, O_CREAT | O_WRONLY, 0600)))); + (*append_history$)(histlines, histfile); + } else { + write_history(histfile); } fputs("\n", fout); @@ -266,94 +558,270 @@ static void *Map(const char *path, size_t *psize) { return base; } -int main(int argc, char *argv[]) { +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")); + +#ifdef CY_ATTACH pid_t pid(_not(pid_t)); +#endif - for (;;) switch (getopt(argc, argv, "p:")) { - case -1: - goto getopt; - case '?': - fprintf(stderr, "usage: cycript [-p ] [