X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/c3d9dbc7522c2ba685074d9ab5672e3e023e5f5d..cfcbf601798082a68a1f3e46788773bf62f9708a:/Console.cpp diff --git a/Console.cpp b/Console.cpp index e01dd07..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,9 +394,15 @@ 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_; } @@ -389,10 +416,23 @@ static Type_ *CYmemrchr(Type_ *data, Type_ value, size_t 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) { if (rl_point != rl_end) { - if (memchr(rl_line_buffer, '\n', rl_end) == NULL) - return rl_newline(count, key); + 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)); @@ -405,11 +445,11 @@ static int CYConsoleKeyReturn(int count, int key) { int adjust(rl_line_buffer + space - 1 - before); if (space == rl_point && adjust != 0) - rl_rubout(adjust, '\b'); + _lblcall(&rl_rubout, adjust, '\b'); - rl_insert(count, '\n'); + _lblcall(&rl_insert, count, '\n'); if (adjust != 0) - rl_insert(adjust, ' '); + _lblcall(&rl_insert, adjust, ' '); return 0; } @@ -438,15 +478,17 @@ static int CYConsoleKeyReturn(int count, int key) { done = true; } - if (done) - return rl_newline(count, key); + if (done) { + _lblcall(&rl_newline, count, key); + return 0; + } // XXX: this was the most obvious fix, but is seriously dumb goto insert; } static int CYConsoleKeyUp(int count, int key) { - while (count-- != 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)) @@ -469,7 +511,7 @@ static int CYConsoleKeyUp(int count, int key) { } static int CYConsoleKeyDown(int count, int key) { - while (count-- != 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()); @@ -516,21 +558,28 @@ static int CYConsoleLineEnd(int count, int key) { } static int CYConsoleKeyBack(int count, int key) { - while (count-- != 0) { + for (; count != 0; --count) { + if (rl_point == 0) + return 1; + char *before(CYmemrchr(rl_line_buffer, '\n', rl_point)); - if (before == NULL) - return rl_rubout(count, key); + 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: { - rl_rubout(1, key); + _lblcall(&rl_rubout, 1, key); continue; } for (int i(start); i != rl_point; ++i) if (rl_line_buffer[i] != ' ') goto rubout; - rl_rubout((rl_point - start) % 4 ?: 4, key); + _lblcall(&rl_rubout, (rl_point - start) % 4 ?: 4, key); } return 0; @@ -544,7 +593,8 @@ static int CYConsoleKeyTab(int count, int key) { for (int i(start); i != rl_point; ++i) if (rl_line_buffer[i] != ' ') goto complete; - return rl_insert(4 - (rl_point - start) % 4, ' '); + _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) { @@ -579,8 +629,16 @@ static void CYConsolePrepTerm(int meta) { 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 { @@ -591,6 +649,7 @@ static void Console(CYOptions &options) { passwd = getpwuid(getuid()); basedir = passwd->pw_dir; } +#endif basedir += "/.cycript"; mkdir(basedir.c_str(), 0700); @@ -604,22 +663,27 @@ 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_redisplay_function = CYDisplayUpdate; - rl_prep_term_function = CYConsolePrepTerm; + 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; @@ -671,6 +735,9 @@ 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; } continue; @@ -734,8 +801,7 @@ static void Console(CYOptions &options) { std::cout << std::endl; } - CYPool pool; - Output(Run(pool, client_, code), &std::cout, expand); + CYOutputRun(code, expand, reparse); } } @@ -766,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 (;;) { @@ -944,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; @@ -1001,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)); @@ -1123,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) {