X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/6265f0de51456b03f8f81d29a445958a73dcf47c..d82e4c2ae6a0f62a34aad66263c28f846c33953d:/Console.cpp diff --git a/Console.cpp b/Console.cpp index 6239c35..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,19 +54,153 @@ #include #include +#include #include #include #include #include -#include #include +#include +#include -#include "Display.hpp" -#include "Replace.hpp" +#ifdef __APPLE__ +#include +#endif -#include "Cycript.tab.hh" #include "Driver.hpp" +#include "Error.hpp" +#include "Highlight.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, @@ -94,26 +228,22 @@ static void sigint(int) { } } -#if YYDEBUG static bool bison_; -#endif +static bool timing_; static bool strict_; static bool pretty_; -void Setup(CYDriver &driver, cy::parser &parser) { -#if YYDEBUG +void Setup(CYDriver &driver) { if (bison_) - parser.set_debug_level(1); -#endif + driver.debug_ = 1; if (strict_) driver.strict_ = true; } void Setup(CYOutput &out, CYDriver &driver, CYOptions &options, bool lower) { out.pretty_ = pretty_; - CYContext context(options); if (lower) - driver.program_->Replace(context); + driver.Replace(options); } static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) { @@ -159,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); @@ -177,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]; @@ -199,227 +322,262 @@ 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_; -static CYExpression *ParseExpression(CYUTF8String code) { - std::stringstream stream; - stream << '(' << code << ')'; - CYDriver driver(stream); - - cy::parser parser(driver); - Setup(driver, parser); - - if (parser.parse() != 0 || !driver.errors_.empty()) - return NULL; - - CYOptions options; - CYContext context(options); - - CYStatement *statement(driver.program_->code_); - _assert(statement != NULL); - _assert(statement->next_ == NULL); - - CYExpress *express(dynamic_cast(driver.program_->code_)); - _assert(express != NULL); - - CYParenthetical *parenthetical(dynamic_cast(express->expression_)); - _assert(parenthetical != NULL); +static int client_; - return parenthetical->expression_; +static CYUTF8String Run(CYPool &pool, const std::string &code) { + return Run(pool, client_, code); } -static int client_; - static char **Complete(const char *word, int start, int end) { rl_attempted_completion_over = ~0; + std::string line(rl_line_buffer, start); + char **values(CYComplete(word, command_ + line, &Run)); + mode_ = Parsing; + return values; +} - CYLocalPool pool; +// need char *, not const char * +static char name_[] = "cycript"; +static char break_[] = " \t\n\"\\'`@><=;|&{(" ")}" ".:[]"; - std::string line(rl_line_buffer, start); - std::istringstream stream(command_ + line); - CYDriver driver(stream); +class History { + private: + std::string histfile_; + size_t histlines_; - driver.auto_ = true; + public: + History(std::string histfile) : + histfile_(histfile), + histlines_(0) + { + read_history(histfile_.c_str()); - cy::parser parser(driver); - Setup(driver, parser); + 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'; + } - if (parser.parse() != 0 || !driver.errors_.empty()) - return NULL; + ~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 (driver.mode_ == CYDriver::AutoNone) - return NULL; + if (append_history$ != NULL) { + int fd(_syscall(open(histfile_.c_str(), O_CREAT | O_WRONLY, 0600))); + _syscall(close(fd)); + _assert((*append_history$)(histlines_, histfile_.c_str()) == 0); + } else { + _assert(write_history(histfile_.c_str()) == 0); + } + } - CYExpression *expression; + void operator +=(std::string command) { + add_history(command.c_str()); + ++histlines_; + } +}; - CYOptions options; - CYContext context(options); +template +static Type_ *CYmemrchr(Type_ *data, Type_ value, size_t size) { + while (size != 0) + if (data[--size] == value) + return data + size; + return NULL; +} - std::ostringstream prefix; +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); - switch (driver.mode_) { - case CYDriver::AutoPrimary: - expression = $ CYThis(); - break; + insert: + char *before(CYmemrchr(rl_line_buffer, '\n', rl_point)); + if (before == NULL) + before = rl_line_buffer; - case CYDriver::AutoDirect: - expression = driver.context_; - break; + int space(before + 1 - rl_line_buffer); + while (space != rl_point && rl_line_buffer[space] == ' ') + ++space; - case CYDriver::AutoIndirect: - expression = $ CYIndirect(driver.context_); - break; + int adjust(rl_line_buffer + space - 1 - before); + if (space == rl_point && adjust != 0) + rl_rubout(adjust, '\b'); - 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; + rl_insert(count, '\n'); + if (adjust != 0) + rl_insert(adjust, ' '); - default: - _assert(false); + return 0; } - 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 (var 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::stringbuf str; - CYOutput out(str, options); - out << *driver.program_; - - std::string code(str.str()); - CYUTF8String json(Run(pool, client_, code)); - // XXX: if this fails we should not try to parse it - - CYExpression *result(ParseExpression(json)); - if (result == NULL) - return NULL; - - CYArray *array(dynamic_cast(result->Primitive(context))); - if (array == NULL) { - *out_ << '\n'; - Output(false, json, out_); - rl_forced_update_display(); - return NULL; - } + 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); - // XXX: use an std::set? - typedef std::vector Completions; - Completions completions; + size_t last(std::string::npos); + for (size_t i(0); i != std::string::npos; i = command.find('\n', i + 1)) + ++last; - std::string common; - bool rest(false); + 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; + } - CYForEach (element, array->elements_) { - CYString *string(dynamic_cast(element->value_)); - _assert(string != NULL); + if (done) + return rl_newline(count, key); - std::string completion; - if (string->size_ != 0) - completion.assign(string->value_, string->size_); - else if (driver.mode_ == CYDriver::AutoMessage) - completion = "]"; - else + // 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; + } - completions.push_back(completion); + char *before(CYmemrchr(rl_line_buffer, '\n', after - rl_line_buffer)); + if (before == NULL) + before = rl_line_buffer - 1; - 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); - } + 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; } - size_t count(completions.size()); - if (count == 0) - return NULL; + 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; + } - size_t colon(common.find(':')); - if (colon != std::string::npos) - common = common.substr(0, colon + 1); - if (completions.size() == 1) - common += ' '; + char *before(CYmemrchr(rl_line_buffer, '\n', rl_point)); + if (before == NULL) + before = rl_line_buffer - 1; - char **results(reinterpret_cast(malloc(sizeof(char *) * (count + 2)))); + char *next(static_cast(memchr(after + 1, '\n', rl_line_buffer + rl_end - after - 1))); + if (next == NULL) + next = rl_line_buffer + rl_end; - 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; + 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 results; + return 0; } -// need char *, not const char * -static char name_[] = "cycript"; -static char break_[] = " \t\n\"\\'`@><=;|&{(" ")}" ".:[]"; +static int CYConsoleLineBegin(int count, int key) { + while (rl_point != 0 && rl_line_buffer[rl_point - 1] != '\n') + --rl_point; + return 0; +} -class History { - private: - std::string histfile_; - size_t histlines_; +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; +} - public: - History(std::string histfile) : - histfile_(histfile), - histlines_(0) - { - read_history(histfile_.c_str()); - } +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); - ~History() { - if (append_history$ != NULL) { - int fd(_syscall(open(histfile_.c_str(), O_CREAT | O_WRONLY, 0600))); - _syscall(close(fd)); - _assert((*append_history$)(histlines_, histfile_.c_str()) == 0); - } else { - _assert(write_history(histfile_.c_str()) == 0); + 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); } - void operator +=(const std::string &command) { - add_history(command.c_str()); - ++histlines_; + 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; @@ -446,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); @@ -463,156 +619,137 @@ 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 { - CYLocalPool pool; + code = command; + else try { + std::stringbuf stream(command); - std::istringstream stream(command_); - CYDriver driver(stream); + CYPool pool; + CYDriver driver(pool, stream); + Setup(driver); - cy::parser parser(driver); - Setup(driver, parser); - - if (parser.parse() != 0 || !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.program_ == NULL) - goto restart; + if (driver.script_ == NULL) + continue; std::stringbuf str; CYOutput out(str, options); Setup(out, driver, options, lower); - out << *driver.program_; + 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); } } -void InjectLibrary(pid_t, int, const char *[]); +void InjectLibrary(pid_t, int, const char *const []); + +static uint64_t CYGetTime() { +#ifdef __APPLE__ + return mach_absolute_time(); +#else + struct timespec spec; + clock_gettime(CLOCK_MONOTONIC, &spec); + return spec.tv_sec * UINT64_C(1000000000) + spec.tv_nsec; +#endif +} int Main(int argc, char * const argv[], char const * const envp[]) { bool tty(isatty(STDIN_FILENO)); @@ -689,10 +826,10 @@ int Main(int argc, char * const argv[], char const * const envp[]) { if (false); else if (strcmp(optarg, "rename") == 0) options.verbose_ = true; -#if YYDEBUG else if (strcmp(optarg, "bison") == 0) bison_ = true; -#endif + else if (strcmp(optarg, "timing") == 0) + timing_ = true; else { fprintf(stderr, "invalid name for -g\n"); return 1; @@ -719,7 +856,8 @@ int Main(int argc, char * const argv[], char const * const envp[]) { // XXX: arg needs to be escaped in some horrendous way of doom // XXX: this is a memory leak now because I just don't care enough char *command; - asprintf(&command, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^%s /{s/^[^ ]* //;q;};};d'", optarg); + int writ(asprintf(&command, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^%s /{s/^[^ ]* //;q;};};d'", optarg)); + _assert(writ != -1); if (FILE *pids = popen(command, "r")) { char value[32]; @@ -867,7 +1005,8 @@ int Main(int argc, char * const argv[], char const * const envp[]) { _syscall(chmod(address.sun_path, 0777)); _syscall(listen(server, 1)); - InjectLibrary(pid, 1, (const char *[]) {address.sun_path, NULL}); + const char *const argv[] = {address.sun_path, NULL}; + InjectLibrary(pid, 1, argv); client_ = _syscall(accept(server, NULL, NULL)); } #else @@ -905,8 +1044,6 @@ int Main(int argc, char * const argv[], char const * const envp[]) { if (script == NULL && tty) Console(options); else { - CYLocalPool pool; - std::istream *stream; if (script == NULL) { stream = &std::cin; @@ -916,23 +1053,70 @@ int Main(int argc, char * const argv[], char const * const envp[]) { _assert(!stream->fail()); } - CYDriver driver(*stream, script); - cy::parser parser(driver); - Setup(driver, parser); + if (timing_) { + std::stringbuf buffer; + stream->get(buffer, '\0'); + _assert(!stream->fail()); + + double average(0); + int samples(-50); + uint64_t start(CYGetTime()); + + for (;;) { + stream = new std::istringstream(buffer.str()); + + CYPool pool; + CYDriver driver(pool, *stream->rdbuf(), script); + Setup(driver); + + uint64_t begin(CYGetTime()); + driver.Parse(); + uint64_t end(CYGetTime()); - if (parser.parse() != 0 || !driver.errors_.empty()) { + delete stream; + + average += (end - begin - average) / ++samples; + + uint64_t now(CYGetTime()); + if (samples == 0) + average = 0; + else if ((now - start) / 1000000000 >= 1) + std::cout << std::fixed << average << '\t' << (end - begin) << '\t' << samples << std::endl; + else continue; + + start = now; + } + + stream = new std::istringstream(buffer.str()); + std::cin.get(); + } + + CYPool pool; + CYDriver driver(pool, *stream->rdbuf(), script); + Setup(driver); + + bool failed(driver.Parse()); + + 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; - } else if (driver.program_ != NULL) { + return 1; + } else if (driver.script_ != NULL) { std::stringbuf str; CYOutput out(str, options); Setup(out, driver, options, true); - out << *driver.program_; + out << *driver.script_; 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; + } + } } }