X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/a7d8b4130acfb550e437d8cf1f6d3d81cb0cf6ee..bd5734cc00d2257272e8f7702f9e9b6f64858907:/Console.cpp diff --git a/Console.cpp b/Console.cpp index a191fc0..e01dd07 100644 --- a/Console.cpp +++ b/Console.cpp @@ -26,11 +26,10 @@ #endif #include +#include #include #include -#include - #ifdef HAVE_READLINE_H #include #else @@ -45,6 +44,7 @@ #include #include +#include #include #include @@ -54,22 +54,153 @@ #include #include +#include #include #include #include #include -#include #include +#include +#include #ifdef __APPLE__ #include #endif -#include "Display.hpp" #include "Driver.hpp" +#include "Error.hpp" #include "Highlight.hpp" -#include "Replace.hpp" +#include "Syntax.hpp" + +extern "C" int rl_display_fixed; +extern "C" int _rl_vis_botlin; +extern "C" int _rl_last_c_pos; +extern "C" int _rl_last_v_pos; + +typedef std::complex CYCursor; + +static CYCursor current_; +static int width_; +static size_t point_; + +unsigned CYDisplayWidth() { + struct winsize info; + if (ioctl(1, TIOCGWINSZ, &info) != -1) + return info.ws_col; + return tgetnum(const_cast("co")); +} + +void CYDisplayOutput_(bool display, const char *&data) { + for (;; ++data) { + char next(*data); + if (next == '\0' || next == CYIgnoreEnd) + return; + if (display) + putchar(next); + } +} + +CYCursor CYDisplayOutput(bool display, int width, const char *data, ssize_t offset = 0) { + CYCursor point(current_); + + for (;;) { + if (offset-- == 0) + point = current_; + switch (char next = *data++) { + case '\0': + return point; + break; + + case CYIgnoreStart: + CYDisplayOutput_(display, data); + case CYIgnoreEnd: + ++offset; + break; + + default: + if (display) + putchar(next); + current_ += CYCursor(0, 1); + if (current_.imag() != width) + break; + current_ = CYCursor(current_.real() + 1, 0); + if (display) + putp(clr_eos); + break; + + case '\n': + current_ = CYCursor(current_.real() + 1, 4); + if (display) { + putp(clr_eol); + putchar('\n'); + putchar(' '); + putchar(' '); + putchar(' '); + putchar(' '); + } + break; + + } + } +} + +void CYDisplayMove_(char *negative, char *positive, int offset) { + if (offset < 0) + putp(tparm(negative, -offset)); + else if (offset > 0) + putp(tparm(positive, offset)); +} + +void CYDisplayMove(CYCursor target) { + CYCursor offset(target - current_); + + CYDisplayMove_(parm_up_cursor, parm_down_cursor, offset.real()); + + if (char *parm = tparm(column_address, target.imag())) + putp(parm); + else + CYDisplayMove_(parm_left_cursor, parm_right_cursor, offset.imag()); + + current_ = target; +} + +void CYDisplayUpdate() { + current_ = CYCursor(_rl_last_v_pos, _rl_last_c_pos); + + const char *prompt(rl_display_prompt); + + std::ostringstream stream; + CYLexerHighlight(rl_line_buffer, rl_end, stream, true); + std::string string(stream.str()); + const char *buffer(string.c_str()); + + int width(CYDisplayWidth()); + if (width_ != width) { + current_ = CYCursor(); + CYDisplayOutput(false, width, prompt); + current_ = CYDisplayOutput(false, width, buffer, point_); + } + + CYDisplayMove(CYCursor()); + CYDisplayOutput(true, width, prompt); + CYCursor target(CYDisplayOutput(true, width, stream.str().c_str(), rl_point)); + + _rl_vis_botlin = current_.real(); + + if (current_.imag() == 0) + CYDisplayOutput(true, width, " "); + putp(clr_eos); + + CYDisplayMove(target); + fflush(stdout); + + _rl_last_v_pos = current_.real(); + _rl_last_c_pos = current_.imag(); + + width_ = width; + point_ = rl_point; +} static volatile enum { Working, @@ -158,14 +289,7 @@ static CYUTF8String Run(CYPool &pool, int client, const std::string &code) { static std::ostream *out_; -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) { +static void Output(CYUTF8String json, std::ostream *out, bool expand = false) { const char *data(json.data); size_t size(json.size); @@ -176,7 +300,7 @@ static void Output(bool syntax, CYUTF8String json, std::ostream *out, bool expan data[0] != '@' && data[0] != '"' && data[0] != '\'' || data[0] == '@' && data[1] != '"' && data[1] != '\'' ) - Write(syntax, data, size, *out); + CYLexerHighlight(data, size, *out); else for (size_t i(0); i != size; ++i) if (data[i] != '\\') *out << data[i]; @@ -198,15 +322,6 @@ static void Output(bool syntax, CYUTF8String json, std::ostream *out, bool expan *out << std::endl; } -static void Run(int client, bool syntax, const char *data, size_t size, std::ostream *out = NULL, bool expand = false) { - CYPool pool; - Output(syntax, Run(pool, client, CYUTF8String(data, size)), out, 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 *); static std::string command_; @@ -220,7 +335,9 @@ static CYUTF8String Run(CYPool &pool, const std::string &code) { static char **Complete(const char *word, int start, int end) { rl_attempted_completion_over = ~0; std::string line(rl_line_buffer, start); - return CYComplete(word, command_ + line, &Run); + char **values(CYComplete(word, command_ + line, &Run)); + mode_ = Parsing; + return values; } // need char *, not const char * @@ -238,9 +355,17 @@ class History { histlines_(0) { read_history(histfile_.c_str()); + + for (HIST_ENTRY *history((history_set_pos(0), current_history())); history; history = next_history()) + for (char *character(history->line); *character; ++character) + if (*character == '\x01') *character = '\n'; } ~History() { + 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'; + if (append_history$ != NULL) { int fd(_syscall(open(histfile_.c_str(), O_CREAT | O_WRONLY, 0600))); _syscall(close(fd)); @@ -250,12 +375,210 @@ class History { } } - void operator +=(const std::string &command) { + void operator +=(std::string command) { 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 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); + + 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) + rl_rubout(adjust, '\b'); + + rl_insert(count, '\n'); + if (adjust != 0) + rl_insert(adjust, ' '); + + return 0; + } + + bool done(false); + if (rl_line_buffer[0] == '?') + done = true; + else { + std::string command(rl_line_buffer, rl_end); + 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)) + ++last; + + CYPool pool; + CYDriver driver(pool, stream); + if (driver.Parse() || !driver.errors_.empty()) + for (CYDriver::Errors::const_iterator error(driver.errors_.begin()); error != driver.errors_.end(); ++error) { + if (error->location_.begin.line != last + 1) + done = true; + break; + } + else + done = true; + } + + if (done) + return rl_newline(count, key); + + // XXX: this was the most obvious fix, but is seriously dumb + goto insert; +} + +static int CYConsoleKeyUp(int count, int key) { + while (count-- != 0) { + 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; + + 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) { + while (count-- != 0) { + 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; + } + + return 0; +} + +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) { + while (count-- != 0) { + char *before(CYmemrchr(rl_line_buffer, '\n', rl_point)); + if (before == NULL) + return rl_rubout(count, key); + + int start(before + 1 - rl_line_buffer); + if (start == rl_point) rubout: { + 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); + } + + 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; + return rl_insert(4 - (rl_point - start) % 4, ' '); +} + +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 Console(CYOptions &options) { std::string basedir; if (const char *home = getenv("HOME")) @@ -281,16 +604,14 @@ static void Console(CYOptions &options) { bool debug(false); bool expand(false); bool lower(true); - bool syntax(true); out_ = &std::cout; - // rl_completer_word_break_characters is broken in libedit - rl_basic_word_break_characters = break_; - rl_completer_word_break_characters = break_; rl_attempted_completion_function = &Complete; - rl_bind_key('\t', rl_complete); + + rl_redisplay_function = CYDisplayUpdate; + rl_prep_term_function = CYConsolePrepTerm; struct sigaction action; sigemptyset(&action.sa_mask); @@ -298,152 +619,123 @@ static void Console(CYOptions &options) { action.sa_flags = 0; sigaction(SIGINT, &action, NULL); - restart: for (;;) { - command_.clear(); - std::vector lines; - - bool extra(false); - const char *prompt("cy# "); - + for (;;) { if (setjmp(ctrlc_) != 0) { mode_ = Working; *out_ << std::endl; - goto restart; + continue; } - read: - -#if RL_READLINE_VERSION >= 0x0600 - if (syntax) - rl_redisplay_function = CYDisplayUpdate; - else - rl_redisplay_function = rl_redisplay; -#endif + if (bypass) { + rl_bind_key('\r', &rl_newline); + rl_bind_key('\n', &rl_newline); + } else { + rl_bind_key('\r', &CYConsoleKeyReturn); + rl_bind_key('\n', &CYConsoleKeyReturn); + } mode_ = Parsing; - char *line(readline(prompt)); + char *line(readline("cy# ")); mode_ = Working; if (line == NULL) { *out_ << std::endl; break; - } else if (line[0] == '\0') - goto read; - - if (!extra) { - extra = true; - if (line[0] == '?') { - std::string data(line + 1); - if (data == "bypass") { - bypass = !bypass; - *out_ << "bypass == " << (bypass ? "true" : "false") << std::endl; - } else if (data == "debug") { - debug = !debug; - *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; - *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; - } - command_ = line; - history += command_; - goto restart; - } } - command_ += line; - command_ += "\n"; + std::string command(line); + free(line); + if (command.empty()) + continue; + history += command; + + if (command[0] == '?') { + std::string data(command.substr(1)); + if (data == "bypass") { + bypass = !bypass; + *out_ << "bypass == " << (bypass ? "true" : "false") << std::endl; + } else if (data == "debug") { + debug = !debug; + *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; + *out_ << "expand == " << (expand ? "true" : "false") << std::endl; + } else if (data == "lower") { + lower = !lower; + *out_ << "lower == " << (lower ? "true" : "false") << std::endl; + } - 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; + continue; } - lines.push_back(begin); - - free(line); - std::string code; - if (bypass) - code = command_; - else { - std::istringstream stream(command_); + code = command; + else try { + std::stringbuf stream(command); CYPool pool; CYDriver driver(pool, stream); Setup(driver); - bool failed(driver.Parse()); - - if (failed || !driver.errors_.empty()) { + if (driver.Parse() || !driver.errors_.empty()) { for (CYDriver::Errors::const_iterator error(driver.errors_.begin()); error != driver.errors_.end(); ++error) { CYPosition begin(error->location_.begin); - if (begin.line != lines.size() + 1 || error->warning_) { - CYPosition end(error->location_.end); + CYPosition end(error->location_.end); - if (begin.line != lines.size()) { - std::cerr << " | "; - std::cerr << lines[begin.line - 1] << std::endl; - } + /*if (begin.line != lines2.size()) { + std::cerr << " | "; + std::cerr << lines2[begin.line - 1] << std::endl; + }*/ - std::cerr << "...."; - for (size_t i(0); i != begin.column; ++i) - std::cerr << '.'; - 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 << "...."; + for (size_t i(0); i != begin.column; ++i) + std::cerr << '.'; + 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; + std::cerr << " | "; + std::cerr << error->message_ << std::endl; - history += command_.substr(0, command_.size() - 1); - goto restart; - } + break; } - driver.errors_.clear(); - - prompt = "cy> "; - goto read; + continue; } if (driver.script_ == NULL) - goto restart; + continue; std::stringbuf str; CYOutput out(str, 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_.substr(0, command_.size() - 1); - if (debug) { std::cout << "cy= "; - Write(syntax, code.c_str(), code.size(), std::cout); + CYLexerHighlight(code.c_str(), code.size(), std::cout); std::cout << std::endl; } - Run(client_, syntax, code, out_, expand); + CYPool pool; + Output(Run(pool, client_, code), &std::cout, expand); } } @@ -774,7 +1066,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()); @@ -800,7 +1092,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()); @@ -808,6 +1100,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); @@ -816,8 +1109,14 @@ int Main(int argc, char * const argv[], char const * const envp[]) { std::string code(str.str()); if (compile) std::cout << code; - else - Run(client_, false, code, &std::cout); + else { + CYUTF8String json(Run(pool, client_, code)); + if (CYStartsWith(json, "throw ")) { + CYLexerHighlight(json.data, json.size, std::cerr); + std::cerr << std::endl; + return 1; + } + } } }