X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b799113bd4ec270504dd9f552142c1adfd6e583a..c9b965e40ad1ad73542865fb65990a8b59e3131b:/Console.cpp diff --git a/Console.cpp b/Console.cpp index 32e4c5f..8f8ff0a 100644 --- a/Console.cpp +++ b/Console.cpp @@ -1,21 +1,21 @@ -/* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2013 Jay Freeman (saurik) +/* Cycript - The Truly Universal Scripting Language + * Copyright (C) 2009-2016 Jay Freeman (saurik) */ -/* GNU General Public License, Version 3 {{{ */ +/* GNU Affero General Public License, Version 3 {{{ */ /* - * Cycript is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * Cycript is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Cycript. If not, see . + * GNU Affero General Public License for more details. + + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . **/ /* }}} */ @@ -26,10 +26,10 @@ #endif #include +#include +#include #include -#include - #ifdef HAVE_READLINE_H #include #else @@ -42,29 +42,165 @@ #include #endif -#include - #include +#include +#include +#include #include +#include #include #include #include +#include -#include "Cycript.tab.hh" - +#include #include #include #include #include + +#include #include +#include -#include +#ifdef __APPLE__ +#include +#endif -#include +#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; -#include "Replace.hpp" -#include "Display.hpp" +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, @@ -83,7 +219,10 @@ static void sigint(int) { case Parsing: longjmp(ctrlc_, 1); case Running: - throw "*** Ctrl-C"; +#ifndef __ANDROID__ + CYCancel(); +#endif + return; case Sending: return; case Waiting: @@ -91,35 +230,32 @@ 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) { +void Setup(CYOutput &out, CYDriver &driver, CYOptions &options, bool lower) { out.pretty_ = pretty_; - CYContext context(options); - driver.program_->Replace(context); + if (lower) + driver.Replace(options); } static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) { const char *json; - size_t size; + uint32_t size; if (client == -1) { mode_ = Running; #ifdef CY_EXECUTE - json = CYExecute(pool, code); + json = CYExecute(CYGetJSContext(), pool, code); #else json = NULL; #endif @@ -131,15 +267,15 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) { } else { mode_ = Sending; size = code.size; - CYSendAll(client, &size, sizeof(size)); - CYSendAll(client, code.data, code.size); + _assert(CYSendAll(client, &size, sizeof(size))); + _assert(CYSendAll(client, code.data, code.size)); mode_ = Waiting; - CYRecvAll(client, &size, sizeof(size)); - if (size == _not(size_t)) + _assert(CYRecvAll(client, &size, sizeof(size))); + if (size == _not(uint32_t)) json = NULL; else { char *temp(new(pool) char[size + 1]); - CYRecvAll(client, temp, size); + _assert(CYRecvAll(client, temp, size)); temp[size] = '\0'; json = temp; } @@ -155,14 +291,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); @@ -173,7 +302,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]; @@ -195,226 +324,335 @@ 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); +static int client_; - cy::parser parser(driver); - Setup(driver, parser); +static CYUTF8String Run(CYPool &pool, const std::string &code) { + return Run(pool, client_, code); +} - if (parser.parse() != 0 || !driver.errors_.empty()) - return NULL; +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; +} - CYOptions options; - CYContext context(options); +// need char *, not const char * +static char name_[] = "cycript"; +static char break_[] = " \t\n\"\\'`@><=;|&{(" ")}" ".:[]"; + +class History { + private: + std::string histfile_; + size_t histlines_; + + public: + History(std::string histfile) : + histfile_(histfile), + 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'; + } - // XXX: this could be replaced with a CYStatement::Primitive() - if (CYExpress *express = dynamic_cast(driver.program_->statements_)) - return express->expression_->Primitive(context); + ~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'; + 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); + } + } catch (const CYException &error) { + CYPool pool; + std::cout << error.PoolCString(pool) << std::endl; + } } + + 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 client_; - -static char **Complete(const char *word, int start, int end) { - rl_attempted_completion_over = TRUE; +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; +} - CYLocalPool pool; +static int CYConsoleKeyReturn(int count, int key) { + if (rl_point != rl_end) { + if (memchr(rl_line_buffer, '\n', rl_end) == NULL) { + _lblcall(&rl_newline, count, key); + return 0; + } - std::string line(rl_line_buffer, start); - std::istringstream stream(command_ + line); - CYDriver driver(stream); + insert: + char *before(CYmemrchr(rl_line_buffer, '\n', rl_point)); + if (before == NULL) + before = rl_line_buffer; - driver.auto_ = true; + int space(before + 1 - rl_line_buffer); + while (space != rl_point && rl_line_buffer[space] == ' ') + ++space; - cy::parser parser(driver); - Setup(driver, parser); + int adjust(rl_line_buffer + space - 1 - before); + if (space == rl_point && adjust != 0) + _lblcall(&rl_rubout, adjust, '\b'); - if (parser.parse() != 0 || !driver.errors_.empty()) - return NULL; + _lblcall(&rl_insert, count, '\n'); + if (adjust != 0) + _lblcall(&rl_insert, adjust, ' '); - if (driver.mode_ == CYDriver::AutoNone) - return NULL; + return 0; + } - CYExpression *expression; + 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); - CYOptions options; - CYContext context(options); + size_t last(std::string::npos); + for (size_t i(0); i != std::string::npos; i = command.find('\n', i + 1)) + ++last; - std::ostringstream prefix; + 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; + } - switch (driver.mode_) { - case CYDriver::AutoPrimary: - expression = $ CYThis(); - break; + if (done) { + _lblcall(&rl_newline, count, key); + return 0; + } - case CYDriver::AutoDirect: - expression = driver.context_; - break; + // XXX: this was the most obvious fix, but is seriously dumb + goto insert; +} - case CYDriver::AutoIndirect: - expression = $ CYIndirect(driver.context_); - break; +static int CYConsoleKeyUp(int count, int key) { + 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; + } - 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; + char *before(CYmemrchr(rl_line_buffer, '\n', after - rl_line_buffer)); + if (before == NULL) + before = rl_line_buffer - 1; - default: - _assert(false); + 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; } - 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 (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::ostringstream 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)); - - if (array == NULL) { - *out_ << '\n'; - Output(false, json, out_); - rl_forced_update_display(); - return NULL; - } + return 0; +} - // XXX: use an std::set? - typedef std::vector Completions; - Completions completions; +static int CYConsoleKeyDown(int count, int key) { + 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; + } - std::string common; - bool rest(false); + char *before(CYmemrchr(rl_line_buffer, '\n', rl_point)); + if (before == NULL) + before = rl_line_buffer - 1; - CYForEach (element, array->elements_) { - CYString *string(dynamic_cast(element->value_)); - _assert(string != NULL); + char *next(static_cast(memchr(after + 1, '\n', rl_line_buffer + rl_end - after - 1))); + if (next == NULL) + next = rl_line_buffer + rl_end; - std::string completion; - if (string->size_ != 0) - completion.assign(string->value_, string->size_); - else if (driver.mode_ == CYDriver::AutoMessage) - completion = "]"; + ptrdiff_t offset(rl_line_buffer + rl_point - before); + if (offset > next - after) + rl_point = next - rl_line_buffer; else - continue; + rl_point = after + offset - rl_line_buffer; + } - completions.push_back(completion); + return 0; +} - 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); +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); } - size_t count(completions.size()); - if (count == 0) - return NULL; + 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; +} - size_t colon(common.find(':')); - if (colon != std::string::npos) - common = common.substr(0, colon + 1); - if (completions.size() == 1) - common += ' '; +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); +} - char **results(reinterpret_cast(malloc(sizeof(char *) * (count + 2)))); +static void CYConsoleRemapKeys(Keymap map) { + CYConsoleRemapBind(map, &rl_beg_of_line, &CYConsoleLineBegin); + CYConsoleRemapBind(map, &rl_end_of_line, &CYConsoleLineEnd); - 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; + CYConsoleRemapBind(map, &rl_get_previous_history, &CYConsoleKeyUp); + CYConsoleRemapBind(map, &rl_get_next_history, &CYConsoleKeyDown); - return results; + CYConsoleRemapBind(map, &rl_rubout, &CYConsoleKeyBack); + CYConsoleRemapBind(map, &rl_complete, &CYConsoleKeyTab); } -// need char *, not const char * -static char name_[] = "cycript"; -static char break_[] = " \t\n\"\\'`@$><=;|&{(" ")}" ".:[]"; +static void CYConsolePrepTerm(int meta) { + rl_prep_terminal(meta); -static void Console(CYOptions &options) { + 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) { CYPool pool; + Output(Run(pool, client_, code), &std::cout, expand); +} - passwd *passwd; - if (const char *username = getenv("LOGNAME")) - passwd = getpwnam(username); - else - passwd = getpwuid(getuid()); +static void Console(CYOptions &options) { + std::string basedir; +#ifdef __ANDROID__ + basedir = "/data/local/tmp"; +#else + if (const char *home = getenv("HOME")) + basedir = home; + else { + passwd *passwd; + if (const char *username = getenv("LOGNAME")) + passwd = getpwnam(username); + else + passwd = getpwuid(getuid()); + basedir = passwd->pw_dir; + } +#endif - const char *basedir(pool.sprintf("%s/.cycript", passwd->pw_dir)); - const char *histfile(pool.sprintf("%s/history", basedir)); - size_t histlines(0); + basedir += "/.cycript"; + mkdir(basedir.c_str(), 0700); rl_initialize(); rl_readline_name = name_; - mkdir(basedir, 0700); - read_history(histfile); + History history(basedir + "/history"); bool bypass(false); bool debug(false); bool expand(false); - bool syntax(true); + bool lower(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); + + if (cur_term != NULL) { + rl_redisplay_function = CYDisplayUpdate; + rl_prep_term_function = CYConsolePrepTerm; + } + + CYOutputRun(""); struct sigaction action; sigemptyset(&action.sa_mask); @@ -422,184 +660,141 @@ 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_prep_term_function = CYDisplayStart; - rl_redisplay_function = CYDisplayUpdate; - rl_deprep_term_function = CYDisplayFinish; + if (bypass) { + rl_bind_key('\r', &rl_newline); + rl_bind_key('\n', &rl_newline); } else { - rl_prep_term_function = rl_prep_terminal; - rl_redisplay_function = rl_redisplay; - rl_deprep_term_function = rl_deprep_terminal; + rl_bind_key('\r', &CYConsoleKeyReturn); + rl_bind_key('\n', &CYConsoleKeyReturn); } -#endif mode_ = Parsing; - char *line(readline(prompt)); + char *line(readline("cy# ")); mode_ = Working; - if (line == NULL) + if (line == NULL) { + *out_ << std::endl; break; - 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 == "expand") { - expand = !expand; - *out_ << "expand == " << (expand ? "true" : "false") << std::endl; - } else if (data == "syntax") { - syntax = !syntax; - *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl; - } - add_history(line); - ++histlines; - goto restart; - } } - command_ += line; + 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; - - std::istringstream stream(command_); - CYDriver driver(stream); + code = command; + else try { + std::stringbuf stream(command); - cy::parser parser(driver); - Setup(driver, parser); + CYPool pool; + CYDriver driver(pool, stream); + Setup(driver); - 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) { - cy::position begin(error->location_.begin); - if (begin.line != lines.size() || begin.column < lines.back().size() || error->warning_) { - cy::position end(error->location_.end); + CYPosition begin(error->location_.begin); + 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; - add_history(command_.c_str()); - ++histlines; - goto restart; - } + break; } - driver.errors_.clear(); - - command_ += '\n'; - prompt = "cy> "; - goto read; + continue; } - if (driver.program_ == NULL) - goto restart; - - if (client_ != -1) - code = command_; - else { - std::ostringstream str; - CYOutput out(str, options); - Setup(out, driver, options); - out << *driver.program_; - code = str.str(); - } + if (driver.script_ == NULL) + 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; } - add_history(command_.c_str()); - ++histlines; - if (debug) { - Write(syntax, code.c_str(), code.size(), std::cout); + std::cout << "cy= "; + CYLexerHighlight(code.c_str(), code.size(), std::cout); std::cout << std::endl; } - Run(client_, syntax, code, out_, expand); - } - - if (append_history$ != NULL) { - _syscall(close(_syscall(open(histfile, O_CREAT | O_WRONLY, 0600)))); - (*append_history$)(histlines, histfile); - } else { - write_history(histfile); + CYOutputRun(code, expand); } - - *out_ << std::endl; } -static void *Map(const char *path, size_t *psize) { - int fd; - _syscall(fd = open(path, O_RDONLY)); - - struct stat stat; - _syscall(fstat(fd, &stat)); - size_t size(stat.st_size); - - *psize = size; +void InjectLibrary(pid_t, int, const char *const []); - void *base; - _syscall(base = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0)); - - _syscall(close(fd)); - return base; +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 } -void InjectLibrary(pid_t pid); - -int Main(int argc, char const * const argv[], char const * const envp[]) { +int Main(int argc, char * const argv[], char const * const envp[]) { bool tty(isatty(STDIN_FILENO)); bool compile(false); + bool target(false); CYOptions options; append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history")); @@ -608,52 +803,73 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { pid_t pid(_not(pid_t)); #endif - CYPool pool; - apr_getopt_t *state; - _aprcall(apr_getopt_init(&state, pool, argc, argv)); + const char *host(NULL); + const char *port(NULL); - for (;;) { - char opt; - const char *arg; + optind = 1; - apr_status_t status(apr_getopt(state, - "cg:n:" + for (;;) { + int option(getopt_long(argc, argv, + "c" + "g:" + "n:" #ifdef CY_ATTACH "p:" #endif + "r:" "s" - , &opt, &arg)); + , (const struct option[]) { + {NULL, no_argument, NULL, 'c'}, + {NULL, required_argument, NULL, 'g'}, + {NULL, required_argument, NULL, 'n'}, +#ifdef CY_ATTACH + {NULL, required_argument, NULL, 'p'}, +#endif + {NULL, required_argument, NULL, 'r'}, + {NULL, no_argument, NULL, 's'}, + {0, 0, 0, 0}}, NULL)); - switch (status) { - case APR_EOF: + switch (option) { + case -1: goto getopt; - case APR_BADCH: - case APR_BADARG: + + case ':': + case '?': fprintf(stderr, "usage: cycript [-c]" #ifdef CY_ATTACH " [-p ]" #endif + " [-r ]" " [