X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/a664a58af473f46e9a20aa62b8ec938fd6ccf81a..cfcbf601798082a68a1f3e46788773bf62f9708a:/Console.cpp diff --git a/Console.cpp b/Console.cpp index 164438c..db86eb8 100644 --- a/Console.cpp +++ b/Console.cpp @@ -1,5 +1,5 @@ -/* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2015 Jay Freeman (saurik) +/* Cycript - The Truly Universal Scripting Language + * Copyright (C) 2009-2016 Jay Freeman (saurik) */ /* GNU Affero General Public License, Version 3 {{{ */ @@ -68,6 +68,7 @@ #include #endif +#include "Code.hpp" #include "Driver.hpp" #include "Error.hpp" #include "Highlight.hpp" @@ -219,7 +220,9 @@ static void sigint(int) { case Parsing: longjmp(ctrlc_, 1); case Running: +#ifndef __ANDROID__ CYCancel(); +#endif return; case Sending: return; @@ -289,7 +292,25 @@ 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 Output(CYUTF8String json, std::ostream *out, bool expand = false, bool reparse = false) { + CYPool pool; + + if (reparse) do { + CYStream stream(json.data, json.data + json.size); + CYDriver driver(pool, stream); + if (driver.Parse(CYMarkExpression)) + break; + std::stringbuf str; + CYOptions options; + CYOutput out(str, options); + out.pretty_ = true; + out << *driver.context_; + std::string data(str.str()); + json = CYPoolUTF8String(pool, data); + if (json.size == 0) + json.data = NULL; + } while (false); + const char *data(json.data); size_t size(json.size); @@ -361,7 +382,7 @@ class History { if (*character == '\x01') *character = '\n'; } - ~History() { + ~History() { try { for (HIST_ENTRY *history((history_set_pos(0), current_history())); history; history = next_history()) for (char *character(history->line); *character; ++character) if (*character == '\n') *character = '\x01'; @@ -373,23 +394,73 @@ class History { } else { _assert(write_history(histfile_.c_str()) == 0); } - } + } catch (const CYException &error) { + CYPool pool; + std::cout << error.PoolCString(pool) << std::endl; + } } void operator +=(std::string command) { + if (HIST_ENTRY *entry = history_get(where_history())) + if (command == entry->line) + return; add_history(command.c_str()); ++histlines_; } }; +template +static Type_ *CYmemrchr(Type_ *data, Type_ value, size_t size) { + while (size != 0) + if (data[--size] == value) + return data + size; + return NULL; +} + +static void _lblcall(int (*command)(int, int), int count, int key) { + int last(_rl_last_c_pos); + // rl_rubout crashes in _rl_erase_at_end_of_line if _rl_last_c_pos != 0 + if (command == &rl_rubout) + _rl_last_c_pos = 0; + for (int i(0); i != count; ++i) + if (command(1, key) != 0) + _assert(false); + _rl_last_c_pos = last; +} + static int CYConsoleKeyReturn(int count, int key) { - rl_insert(count, '\n'); + if (rl_point != rl_end) { + if (memchr(rl_line_buffer, '\n', rl_end) == NULL) { + _lblcall(&rl_newline, count, key); + return 0; + } + + insert: + char *before(CYmemrchr(rl_line_buffer, '\n', rl_point)); + if (before == NULL) + before = rl_line_buffer; + + int space(before + 1 - rl_line_buffer); + while (space != rl_point && rl_line_buffer[space] == ' ') + ++space; + + int adjust(rl_line_buffer + space - 1 - before); + if (space == rl_point && adjust != 0) + _lblcall(&rl_rubout, adjust, '\b'); + + _lblcall(&rl_insert, count, '\n'); + if (adjust != 0) + _lblcall(&rl_insert, adjust, ' '); + + return 0; + } bool done(false); - if (rl_end != 0 && rl_point == rl_end && rl_line_buffer[0] == '?') + if (rl_line_buffer[0] == '?') done = true; - else if (rl_point == rl_end) { + else { std::string command(rl_line_buffer, rl_end); - std::istringstream stream(command); + command += '\n'; + std::stringbuf stream(command); size_t last(std::string::npos); for (size_t i(0); i != std::string::npos; i = command.find('\n', i + 1)) @@ -407,64 +478,167 @@ static int CYConsoleKeyReturn(int count, int key) { done = true; } - if (done) - return rl_newline(count, key); - return 0; -} + if (done) { + _lblcall(&rl_newline, count, key); + return 0; + } -template -static Type_ *CYmemrchr(Type_ *data, Type_ value, size_t size) { - while (size != 0) - if (data[--size] == value) - return data + size; - return NULL; + // XXX: this was the most obvious fix, but is seriously dumb + goto insert; } static int CYConsoleKeyUp(int count, int key) { - char *after(CYmemrchr(rl_line_buffer, '\n', rl_point)); - if (after == NULL) { - if (int value = rl_get_previous_history(count, key)) - return value; - return 0; - } + for (; count != 0; --count) { + char *after(CYmemrchr(rl_line_buffer, '\n', rl_point)); + if (after == NULL) { + if (int value = rl_get_previous_history(1, key)) + return value; + continue; + } - char *before(CYmemrchr(rl_line_buffer, '\n', after - rl_line_buffer)); - if (before == NULL) - before = rl_line_buffer - 1; + char *before(CYmemrchr(rl_line_buffer, '\n', after - rl_line_buffer)); + if (before == NULL) + before = rl_line_buffer - 1; - ptrdiff_t offset(rl_line_buffer + rl_point - after); - if (offset > after - before) - rl_point = after - 1 - rl_line_buffer; - else - rl_point = before + offset - rl_line_buffer; + ptrdiff_t offset(rl_line_buffer + rl_point - after); + if (offset > after - before) + rl_point = after - rl_line_buffer; + else + rl_point = before + offset - rl_line_buffer; + } return 0; } static int CYConsoleKeyDown(int count, int key) { - char *after(static_cast(memchr(rl_line_buffer + rl_point, '\n', rl_end - rl_point))); - if (after == NULL) { - if (int value = rl_get_next_history(count, key)) - return value; - rl_point = 0; - return 0; + for (; count != 0; --count) { + char *after(static_cast(memchr(rl_line_buffer + rl_point, '\n', rl_end - rl_point))); + if (after == NULL) { + int where(where_history()); + if (int value = rl_get_next_history(1, key)) + return value; + if (where != where_history()) { + char *first(static_cast(memchr(rl_line_buffer, '\n', rl_end))); + if (first != NULL) + rl_point = first - 1 - rl_line_buffer; + } + continue; + } + + char *before(CYmemrchr(rl_line_buffer, '\n', rl_point)); + if (before == NULL) + before = rl_line_buffer - 1; + + char *next(static_cast(memchr(after + 1, '\n', rl_line_buffer + rl_end - after - 1))); + if (next == NULL) + next = rl_line_buffer + rl_end; + + ptrdiff_t offset(rl_line_buffer + rl_point - before); + if (offset > next - after) + rl_point = next - rl_line_buffer; + else + rl_point = after + offset - rl_line_buffer; } - char *before(CYmemrchr(rl_line_buffer, '\n', rl_point)); - if (before == NULL) - before = rl_line_buffer - 1; + return 0; +} - ptrdiff_t offset(rl_line_buffer + rl_point - before); - if (offset > rl_line_buffer + rl_end - after) - rl_point = rl_end; - else - rl_point = after + offset - rl_line_buffer; +static int CYConsoleLineBegin(int count, int key) { + while (rl_point != 0 && rl_line_buffer[rl_point - 1] != '\n') + --rl_point; + return 0; +} + +static int CYConsoleLineEnd(int count, int key) { + while (rl_point != rl_end && rl_line_buffer[rl_point] != '\n') + ++rl_point; + if (rl_point != rl_end && rl_editing_mode == 0) + --rl_point; + return 0; +} + +static int CYConsoleKeyBack(int count, int key) { + for (; count != 0; --count) { + if (rl_point == 0) + return 1; + + char *before(CYmemrchr(rl_line_buffer, '\n', rl_point)); + if (before == NULL) { + int adjust(std::min(count, rl_point)); + _lblcall(&rl_rubout, adjust, key); + count -= adjust - 1; + continue; + } + + int start(before + 1 - rl_line_buffer); + if (start == rl_point) rubout: { + _lblcall(&rl_rubout, 1, key); + continue; + } + + for (int i(start); i != rl_point; ++i) + if (rl_line_buffer[i] != ' ') + goto rubout; + _lblcall(&rl_rubout, (rl_point - start) % 4 ?: 4, key); + } return 0; } +static int CYConsoleKeyTab(int count, int key) { + char *before(CYmemrchr(rl_line_buffer, '\n', rl_point)); + if (before == NULL) complete: + return rl_complete_internal(rl_completion_mode(&CYConsoleKeyTab)); + int start(before + 1 - rl_line_buffer); + for (int i(start); i != rl_point; ++i) + if (rl_line_buffer[i] != ' ') + goto complete; + _lblcall(&rl_insert, 4 - (rl_point - start) % 4, ' '); + return 0; +} + +static void CYConsoleRemapBind(Keymap map, rl_command_func_t *from, rl_command_func_t *to) { + char **keyseqs(rl_invoking_keyseqs_in_map(from, map)); + if (keyseqs == NULL) + return; + for (char **keyseq(keyseqs); *keyseq != NULL; ++keyseq) { + rl_bind_keyseq_in_map(*keyseq, to, map); + free(*keyseq); + } + free(keyseqs); +} + +static void CYConsoleRemapKeys(Keymap map) { + CYConsoleRemapBind(map, &rl_beg_of_line, &CYConsoleLineBegin); + CYConsoleRemapBind(map, &rl_end_of_line, &CYConsoleLineEnd); + + CYConsoleRemapBind(map, &rl_get_previous_history, &CYConsoleKeyUp); + CYConsoleRemapBind(map, &rl_get_next_history, &CYConsoleKeyDown); + + CYConsoleRemapBind(map, &rl_rubout, &CYConsoleKeyBack); + CYConsoleRemapBind(map, &rl_complete, &CYConsoleKeyTab); +} + +static void CYConsolePrepTerm(int meta) { + rl_prep_terminal(meta); + + CYConsoleRemapKeys(emacs_standard_keymap); + CYConsoleRemapKeys(emacs_meta_keymap); + CYConsoleRemapKeys(emacs_ctlx_keymap); + CYConsoleRemapKeys(vi_insertion_keymap); + CYConsoleRemapKeys(vi_movement_keymap); +} + +static void CYOutputRun(const std::string &code, bool expand = false, bool reparse = false) { + CYPool pool; + Output(Run(pool, client_, code), &std::cout, expand, reparse); +} + static void Console(CYOptions &options) { std::string basedir; +#ifdef __ANDROID__ + basedir = "/data/local/tmp"; +#else if (const char *home = getenv("HOME")) basedir = home; else { @@ -475,6 +649,7 @@ static void Console(CYOptions &options) { passwd = getpwuid(getuid()); basedir = passwd->pw_dir; } +#endif basedir += "/.cycript"; mkdir(basedir.c_str(), 0700); @@ -488,47 +663,40 @@ static void Console(CYOptions &options) { bool debug(false); bool expand(false); bool lower(true); + bool reparse(false); out_ = &std::cout; rl_completer_word_break_characters = break_; rl_attempted_completion_function = &Complete; - rl_bind_key('\t', rl_complete); - - rl_redisplay_function = CYDisplayUpdate; -#if defined (__MSDOS__) - rl_bind_keyseq("\033[0A", &CYConsoleKeyUp); - rl_bind_keyseq("\033[0D", &CYConsoleKeyDown); -#endif - rl_bind_keyseq("\033[A", &CYConsoleKeyUp); - rl_bind_keyseq("\033[B", &CYConsoleKeyDown); - rl_bind_keyseq("\033OA", &CYConsoleKeyUp); - rl_bind_keyseq("\033OB", &CYConsoleKeyDown); -#if defined (__MINGW32__) - rl_bind_keyseq("\340H", &CYConsoleKeyUp); - rl_bind_keyseq("\340P", &CYConsoleKeyDown); - rl_bind_keyseq("\\000H", &CYConsoleKeyUp); - rl_bind_keyseq("\\000P", &CYConsoleKeyDown); -#endif + if (cur_term != NULL) { + rl_redisplay_function = CYDisplayUpdate; + rl_prep_term_function = CYConsolePrepTerm; + } - struct sigaction action; - sigemptyset(&action.sa_mask); - action.sa_handler = &sigint; - action.sa_flags = 0; - sigaction(SIGINT, &action, NULL); + CYOutputRun(""); for (;;) { + struct sigaction action; + sigemptyset(&action.sa_mask); + action.sa_handler = &sigint; + action.sa_flags = 0; + sigaction(SIGINT, &action, NULL); + if (setjmp(ctrlc_) != 0) { mode_ = Working; *out_ << std::endl; continue; } - if (bypass) + if (bypass) { rl_bind_key('\r', &rl_newline); - else + rl_bind_key('\n', &rl_newline); + } else { rl_bind_key('\r', &CYConsoleKeyReturn); + rl_bind_key('\n', &CYConsoleKeyReturn); + } mode_ = Parsing; char *line(readline("cy# ")); @@ -541,11 +709,9 @@ static void Console(CYOptions &options) { std::string command(line); free(line); - _assert(!command.empty()); - _assert(command[command.size() - 1] == '\n'); - command.resize(command.size() - 1); if (command.empty()) continue; + history += command; if (command[0] == '?') { std::string data(command.substr(1)); @@ -569,17 +735,19 @@ static void Console(CYOptions &options) { } else if (data == "lower") { lower = !lower; *out_ << "lower == " << (lower ? "true" : "false") << std::endl; + } else if (data == "reparse") { + reparse = !reparse; + *out_ << "reparse == " << (reparse ? "true" : "false") << std::endl; } - history += command; continue; } std::string code; if (bypass) code = command; - else { - std::istringstream stream(command); + else try { + std::stringbuf stream(command); CYPool pool; CYDriver driver(pool, stream); @@ -607,7 +775,6 @@ static void Console(CYOptions &options) { std::cerr << " | "; std::cerr << error->message_ << std::endl; - history += command; break; } @@ -622,18 +789,19 @@ static void Console(CYOptions &options) { Setup(out, driver, options, lower); out << *driver.script_; code = str.str(); + } catch (const CYException &error) { + CYPool pool; + std::cout << error.PoolCString(pool) << std::endl; + continue; } - history += command; - if (debug) { std::cout << "cy= "; CYLexerHighlight(code.c_str(), code.size(), std::cout); std::cout << std::endl; } - CYPool pool; - Output(Run(pool, client_, code), &std::cout, expand); + CYOutputRun(code, expand, reparse); } } @@ -664,6 +832,8 @@ int Main(int argc, char * const argv[], char const * const envp[]) { const char *host(NULL); const char *port(NULL); + const char *argv0(argv[0]); + optind = 1; for (;;) { @@ -842,15 +1012,18 @@ int Main(int argc, char * const argv[], char const * const envp[]) { if (argc == 0) script = NULL; else { -#ifdef CY_EXECUTE - // XXX: const_cast?! wtf gcc :( - CYSetArgs(argc - 1, const_cast(argv + 1)); -#endif script = argv[0]; if (strcmp(script, "-") == 0) script = NULL; + --argc; + ++argv; } +#ifdef CY_EXECUTE + // XXX: const_cast?! wtf gcc :( + CYSetArgs(argv0, script, argc, const_cast(argv)); +#endif + #ifdef CY_ATTACH if (pid == _not(pid_t)) client_ = -1; @@ -899,7 +1072,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) { } } file(address.sun_path); - _syscall(bind(server, reinterpret_cast(&address), SUN_LEN(&address))); + _syscall(bind(server, reinterpret_cast(&address), sizeof(address))); _syscall(chmod(address.sun_path, 0777)); _syscall(listen(server, 1)); @@ -964,7 +1137,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) { stream = new std::istringstream(buffer.str()); CYPool pool; - CYDriver driver(pool, *stream, script); + CYDriver driver(pool, *stream->rdbuf(), script); Setup(driver); uint64_t begin(CYGetTime()); @@ -990,7 +1163,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) { } CYPool pool; - CYDriver driver(pool, *stream, script); + CYDriver driver(pool, *stream->rdbuf(), script); Setup(driver); bool failed(driver.Parse()); @@ -998,6 +1171,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) { if (failed || !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; + return 1; } else if (driver.script_ != NULL) { std::stringbuf str; CYOutput out(str, options); @@ -1020,7 +1194,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) { return 0; } -int main(int argc, char * const argv[], char const * const envp[]) { +_visible int main(int argc, char * const argv[], char const * const envp[]) { try { return Main(argc, argv, envp); } catch (const CYException &error) {