X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/bc1e87aa9169654208f6ee87281108143792d981..2c4a8bb6222b88ff96fbf25372179646ce15f706:/Console.cpp diff --git a/Console.cpp b/Console.cpp index 7f4f454..2f24e58 100644 --- a/Console.cpp +++ b/Console.cpp @@ -1,40 +1,22 @@ -/* Cycript - Inlining/Optimizing JavaScript Compiler - * Copyright (C) 2009 Jay Freeman (saurik) +/* Cycript - The Truly Universal Scripting Language + * Copyright (C) 2009-2016 Jay Freeman (saurik) */ -/* Modified BSD License {{{ */ +/* GNU Affero General Public License, Version 3 {{{ */ /* - * Redistribution and use in source and binary - * forms, with or without modification, are permitted - * provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the - * above copyright notice, this list of conditions - * and the following disclaimer. - * 2. Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the - * distribution. - * 3. The name of the author may not be used to endorse - * or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ + * 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 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 <http://www.gnu.org/licenses/>. +**/ /* }}} */ #include "cycript.hpp" @@ -44,10 +26,10 @@ #endif #include <cstdio> +#include <complex> +#include <fstream> #include <sstream> -#include <setjmp.h> - #ifdef HAVE_READLINE_H #include <readline.h> #else @@ -60,28 +42,166 @@ #include <readline/history.h> #endif -#include <sys/mman.h> - #include <errno.h> +#include <getopt.h> +#include <setjmp.h> +#include <signal.h> #include <unistd.h> +#include <sys/socket.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> +#include <netdb.h> -#include "Cycript.tab.hh" - +#include <sys/ioctl.h> #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <sys/un.h> + +#include <dlfcn.h> #include <pwd.h> +#include <term.h> + +#ifdef __APPLE__ +#include <mach/mach_time.h> +#endif -#include <apr_getopt.h> +#include "Code.hpp" +#include "Driver.hpp" +#include "Error.hpp" +#include "Highlight.hpp" +#include "Syntax.hpp" -#include <dlfcn.h> +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<int> 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<char *>("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()); -#include "Replace.hpp" + 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, @@ -100,7 +220,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: @@ -108,521 +231,710 @@ 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(driver.pool_, 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; +class CYRemote { + public: + virtual CYUTF8String Run(CYPool &pool, CYUTF8String code) = 0; + + inline CYUTF8String Run(CYPool &pool, const std::string &code) { + return Run(pool, CYUTF8String(code.c_str(), code.size())); + } +}; + +class CYLocalRemote : + public CYRemote +{ + public: + virtual CYUTF8String Run(CYPool &pool, CYUTF8String code) { + const char *json; + uint32_t size; - if (client == -1) { mode_ = Running; #ifdef CY_EXECUTE - json = CYExecute(pool, code.data); + json = CYExecute(CYGetJSContext(), pool, code); #else json = NULL; #endif mode_ = Working; - if (json != NULL) + if (json == NULL) + size = 0; + else size = strlen(json); - } else { + + return CYUTF8String(json, size); + } +}; + +class CYSocketRemote : + public CYRemote +{ + private: + int socket_; + + public: + CYSocketRemote(const char *host, const char *port) { + struct addrinfo hints; + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_protocol = 0; + hints.ai_flags = 0; + + struct addrinfo *infos; + _syscall(getaddrinfo(host, port, &hints, &infos)); + + _assert(infos != NULL); try { + for (struct addrinfo *info(infos); info != NULL; info = info->ai_next) { + socket_ = _syscall(socket(info->ai_family, info->ai_socktype, info->ai_protocol)); try { + _syscall(connect(socket_, info->ai_addr, info->ai_addrlen)); + break; + } catch (...) { + _syscall(close(socket_)); + throw; + } + } + } catch (...) { + freeaddrinfo(infos); + throw; + } + } + + virtual CYUTF8String Run(CYPool &pool, CYUTF8String code) { + const char *json; + uint32_t size; + mode_ = Sending; - CYSendAll(client, &size, sizeof(size)); - CYSendAll(client, code.data, size); + size = code.size; + _assert(CYSendAll(socket_, &size, sizeof(size))); + _assert(CYSendAll(socket_, code.data, code.size)); mode_ = Waiting; - CYRecvAll(client, &size, sizeof(size)); - if (size == _not(size_t)) + _assert(CYRecvAll(socket_, &size, sizeof(size))); + if (size == _not(uint32_t)) { + size = 0; json = NULL; - else { + } else { char *temp(new(pool) char[size + 1]); - CYRecvAll(client, temp, size); + _assert(CYRecvAll(socket_, temp, size)); temp[size] = '\0'; json = temp; } mode_ = Working; + + return CYUTF8String(json, size); } +}; - return CYUTF8String(json, size); -} +void InjectLibrary(pid_t, std::ostream &stream, int, const char *const []); -static CYUTF8String Run(CYPool &pool, int client, const std::string &code) { - return Run(pool, client, CYUTF8String(code.c_str(), code.size())); -} +class CYInjectRemote : + public CYRemote +{ + private: + int pid_; -void Run(int client, const char *data, size_t size, FILE *fout = NULL, bool expand = false) { - CYPool pool; - CYUTF8String json(Run(pool, client, CYUTF8String(data, size))); - - data = json.data; - size = json.size; - - if (data != NULL && fout != NULL) { - if (!expand || data[0] != '"' && data[0] != '\'') - fputs(data, fout); - else for (size_t i(0); i != size; ++i) - if (data[i] != '\\') - fputc(data[i], fout); - else switch(data[++i]) { - case '\0': goto done; - case '\\': fputc('\\', fout); break; - case '\'': fputc('\'', fout); break; - case '"': fputc('"', fout); break; - case 'b': fputc('\b', fout); break; - case 'f': fputc('\f', fout); break; - case 'n': fputc('\n', fout); break; - case 'r': fputc('\r', fout); break; - case 't': fputc('\t', fout); break; - case 'v': fputc('\v', fout); break; - default: fputc('\\', fout); --i; break; - } + public: + CYInjectRemote(int pid) : + pid_(pid) + { + // XXX: wait + } - done: - fputs("\n", fout); - fflush(fout); + virtual CYUTF8String Run(CYPool &pool, CYUTF8String code) { + std::ostringstream stream; + const char *args[2] = {"-e", code.data}; + InjectLibrary(pid_, stream, 2, args); + std::string json(stream.str()); + if (!json.empty() && json[json.size() - 1] == '\n') + json.resize(json.size() - 1); + return CYUTF8String(strdup(json.c_str()), json.size()); } -} +}; + +static std::ostream *out_; + +static void Output(CYUTF8String json, std::ostream *out, bool reparse = false) { + CYPool pool; -static void Run(int client, std::string &code, FILE *fout = NULL, bool expand = false) { - Run(client, code.c_str(), code.size(), fout, expand); + 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); + + if (size == 0 || out == NULL) + return; + + CYLexerHighlight(data, size, *out); + *out << std::endl; } int (*append_history$)(int, const char *); static std::string command_; -static CYExpression *ParseExpression(CYPool &pool, CYUTF8String code) { - std::ostringstream str; - str << '(' << code << ')'; - std::string string(str.str()); - - CYDriver driver(pool); - driver.data_ = string.c_str(); - driver.size_ = string.size(); - - cy::parser parser(driver); - Setup(driver, parser); +static CYRemote *remote_; - if (parser.parse() != 0 || !driver.errors_.empty()) - _assert(false); +static CYUTF8String Run(CYPool &pool, const std::string &code) { + return remote_->Run(pool, code); +} - CYExpress *express(dynamic_cast<CYExpress *>(driver.program_->statements_)); - _assert(express != NULL); - return express->expression_; +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; } -static int client_; +// 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'; + } -static char **Complete(const char *word, int start, int end) { - rl_attempted_completion_over = TRUE; + ~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'; - CYPool pool; + 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) { + if (HIST_ENTRY *entry = history_get(where_history())) + if (command == entry->line) + return; + add_history(command.c_str()); + ++histlines_; + } +}; + +template <typename Type_> +static Type_ *CYmemrchr(Type_ *data, Type_ value, size_t size) { + while (size != 0) + if (data[--size] == value) + return data + size; + return NULL; +} - CYDriver driver(pool); - cy::parser parser(driver); - Setup(driver, parser); +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; +} - std::string line(rl_line_buffer, start); - std::string command(command_ + line); +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; + } - driver.data_ = command.c_str(); - driver.size_ = command.size(); + 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; - if (parser.parse() != 0 || !driver.errors_.empty()) - return NULL; + int adjust(rl_line_buffer + space - 1 - before); + if (space == rl_point && adjust != 0) + _lblcall(&rl_rubout, adjust, '\b'); - if (driver.mode_ == CYDriver::AutoNone) - return NULL; + _lblcall(&rl_insert, count, '\n'); + if (adjust != 0) + _lblcall(&rl_insert, adjust, ' '); - CYExpression *expression; + return 0; + } - CYOptions options; - CYContext context(driver.pool_, options); + 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); - std::ostringstream prefix; + size_t last(std::string::npos); + for (size_t i(0); i != std::string::npos; i = command.find('\n', i + 1)) + ++last; - switch (driver.mode_) { - case CYDriver::AutoPrimary: - expression = $ CYThis(); - break; + 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; + } - case CYDriver::AutoDirect: - expression = driver.context_; - break; + if (done) { + _lblcall(&rl_newline, count, key); + return 0; + } - case CYDriver::AutoIndirect: - expression = $ CYIndirect(driver.context_); - break; + // XXX: this was the most obvious fix, but is seriously dumb + goto insert; +} - case CYDriver::AutoMessage: { - CYDriver::Context &thing(driver.contexts_.back()); - expression = $M($M($ CYIndirect(thing.context_), $S("isa")), $S("messages")); - for (CYDriver::Context::Words::const_iterator part(thing.words_.begin()); part != thing.words_.end(); ++part) - prefix << (*part)->word_ << ':'; - } 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; + } - default: - _assert(false); - } + char *before(CYmemrchr(rl_line_buffer, '\n', after - rl_line_buffer)); + if (before == NULL) + before = rl_line_buffer - 1; - std::string begin(prefix.str() + word); + 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; + } - driver.program_ = $ CYProgram($ CYExpress($C2(ParseExpression(pool, - " function(object, prefix) {\n" - " var names = [];\n" - " var pattern = '^' + prefix;\n" - " for (name in object)\n" - " if (name.match(pattern) != null)\n" - " names.push(name);\n" - " return names;\n" - " }\n" - ), expression, $S(begin.c_str())))); + return 0; +} - driver.program_->Replace(context); +static int CYConsoleKeyDown(int count, int key) { + for (; count != 0; --count) { + char *after(static_cast<char *>(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<char *>(memchr(rl_line_buffer, '\n', rl_end))); + if (first != NULL) + rl_point = first - 1 - rl_line_buffer; + } + continue; + } - std::ostringstream str; - CYOutput out(str, options); - out << *driver.program_; + char *before(CYmemrchr(rl_line_buffer, '\n', rl_point)); + if (before == NULL) + before = rl_line_buffer - 1; - std::string code(str.str()); - CYUTF8String json(Run(pool, client_, code)); + char *next(static_cast<char *>(memchr(after + 1, '\n', rl_line_buffer + rl_end - after - 1))); + if (next == NULL) + next = rl_line_buffer + rl_end; - CYExpression *result(ParseExpression(pool, json)); - CYArray *array(dynamic_cast<CYArray *>(result)); - _assert(array != 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; + } - // XXX: use an std::set? - typedef std::vector<std::string> Completions; - Completions completions; + return 0; +} - std::string common; - bool rest(false); +static int CYConsoleLineBegin(int count, int key) { + while (rl_point != 0 && rl_line_buffer[rl_point - 1] != '\n') + --rl_point; + return 0; +} - for (CYElement *element(array->elements_); element != NULL; element = element->next_) { - CYString *string(dynamic_cast<CYString *>(element->value_)); - _assert(string != NULL); +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; +} - std::string completion(string->value_, string->size_); - completions.push_back(completion); +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; + } - 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); + 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; +} - if (!common.empty()) { - size_t size(prefix.str().size()); - _assert(common.size() >= size); - common = common.substr(size); +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); +} - size_t colon(common.find(':')); - if (colon != std::string::npos) - common = common.substr(0, colon + 1); +static void CYConsoleRemapKeys(Keymap map) { + CYConsoleRemapBind(map, &rl_beg_of_line, &CYConsoleLineBegin); + CYConsoleRemapBind(map, &rl_end_of_line, &CYConsoleLineEnd); - char **results(reinterpret_cast<char **>(malloc(sizeof(char *) * (count + 2)))); + CYConsoleRemapBind(map, &rl_get_previous_history, &CYConsoleKeyUp); + CYConsoleRemapBind(map, &rl_get_next_history, &CYConsoleKeyDown); - 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_rubout, &CYConsoleKeyBack); + CYConsoleRemapBind(map, &rl_complete, &CYConsoleKeyTab); +} + +static void CYConsolePrepTerm(int meta) { + rl_prep_terminal(meta); - return results; + CYConsoleRemapKeys(emacs_standard_keymap); + CYConsoleRemapKeys(emacs_meta_keymap); + CYConsoleRemapKeys(emacs_ctlx_keymap); + CYConsoleRemapKeys(vi_insertion_keymap); + CYConsoleRemapKeys(vi_movement_keymap); } -// need char *, not const char * -static char name_[] = "cycript"; -static char break_[] = " \t\n\"\\'`@$><=;|&{(" ".:"; +static void CYOutputRun(const std::string &code, bool reparse = false) { + CYPool pool; + Output(Run(pool, code), &std::cout, reparse); +} -static void Console(apr_pool_t *pool, CYOptions &options) { - 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(apr_psprintf(pool, "%s/.cycript", passwd->pw_dir)); - const char *histfile(apr_psprintf(pool, "%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); - - FILE *fout(stdout); + bool lower(true); + bool reparse(false); - // rl_completer_word_break_characters is broken in libedit - rl_basic_word_break_characters = break_; + out_ = &std::cout; rl_completer_word_break_characters = break_; rl_attempted_completion_function = &Complete; - rl_bind_key('\t', rl_complete); - struct sigaction action; - sigemptyset(&action.sa_mask); - action.sa_handler = &sigint; - action.sa_flags = 0; - sigaction(SIGINT, &action, NULL); + if (cur_term != NULL) { + rl_redisplay_function = CYDisplayUpdate; + rl_prep_term_function = CYConsolePrepTerm; + } - restart: for (;;) { - command_.clear(); - std::vector<std::string> lines; + CYOutputRun(""); - bool extra(false); - const char *prompt("cy# "); + 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; - fputs("\n", fout); - fflush(fout); - goto restart; + *out_ << std::endl; + continue; + } + + 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); } - read: 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; - fprintf(fout, "bypass == %s\n", bypass ? "true" : "false"); - fflush(fout); - } else if (data == "debug") { - debug = !debug; - fprintf(fout, "debug == %s\n", debug ? "true" : "false"); - fflush(fout); - } else if (data == "expand") { - expand = !expand; - fprintf(fout, "expand == %s\n", expand ? "true" : "false"); - fflush(fout); - } - 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 == "lower") { + lower = !lower; + *out_ << "lower == " << (lower ? "true" : "false") << std::endl; + } else if (data == "reparse") { + reparse = !reparse; + *out_ << "reparse == " << (reparse ? "true" : "false") << std::endl; + } - char *begin(line), *end(line + strlen(line)); - while (char *nl = reinterpret_cast<char *>(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 { - CYDriver driver; - cy::parser parser(driver); - Setup(driver, parser); + code = command; + else try { + std::stringbuf stream(command); - driver.data_ = command_.c_str(); - driver.size_ = command_.size(); + 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 - 1 != 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 - 1; ++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) - std::cout << code << std::endl; - - Run(client_, code, fout, expand); - } + if (debug) { + std::cout << "cy= "; + CYLexerHighlight(code.c_str(), code.size(), std::cout); + std::cout << std::endl; + } - if (append_history$ != NULL) { - _syscall(close(_syscall(open(histfile, O_CREAT | O_WRONLY, 0600)))); - (*append_history$)(histlines, histfile); - } else { - write_history(histfile); + CYOutputRun(code, reparse); } - - fputs("\n", fout); - fflush(fout); } -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 *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$ = reinterpret_cast<int (*)(int, const char *)>(dlsym(RTLD_DEFAULT, "append_history")); + append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history")); -#ifdef CY_ATTACH 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; + const char *argv0(argv[0]); + + optind = 1; - apr_status_t status(apr_getopt(state, - "cg:n:" -#ifdef CY_ATTACH + for (;;) { + int option(getopt_long(argc, argv, + "c" + "g:" + "n:" "p:" -#endif + "r:" "s" - , &opt, &arg)); - - switch (status) { - case APR_EOF: + , (const struct option[]) { + {NULL, no_argument, NULL, 'c'}, + {NULL, required_argument, NULL, 'g'}, + {NULL, required_argument, NULL, 'n'}, + {NULL, required_argument, NULL, 'p'}, + {NULL, required_argument, NULL, 'r'}, + {NULL, no_argument, NULL, 's'}, + {0, 0, 0, 0}}, NULL)); + + switch (option) { + case -1: goto getopt; - case APR_BADCH: - case APR_BADARG: + + case ':': + case '?': fprintf(stderr, "usage: cycript [-c]" -#ifdef CY_ATTACH " [-p <pid|name>]" -#endif + " [-r <host:port>]" " [<script> [<arg>...]]\n" ); return 1; - default: - _aprcall(status); - } - switch (opt) { + target: + if (!target) + target = true; + else { + fprintf(stderr, "only one of -[cpr] may be used at a time\n"); + return 1; + } + break; + case 'c': compile = true; - break; + goto target; case 'g': if (false); - else if (strcmp(arg, "rename") == 0) + else if (strcmp(optarg, "rename") == 0) options.verbose_ = true; -#if YYDEBUG - else if (strcmp(arg, "bison") == 0) + 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; @@ -631,7 +943,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { case 'n': if (false); - else if (strcmp(arg, "minify") == 0) + else if (strcmp(optarg, "minify") == 0) pretty_ = true; else { fprintf(stderr, "invalid name for -n\n"); @@ -639,15 +951,17 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { } break; -#ifdef CY_ATTACH case 'p': { - size_t size(strlen(arg)); + size_t size(strlen(optarg)); char *end; - pid = strtoul(arg, &end, 0); - if (arg + size != end) { + pid = strtoul(optarg, &end, 0); + if (optarg + size != end) { // XXX: arg needs to be escaped in some horrendous way of doom - const char *command(apr_psprintf(pool, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^%s /{s/^[^ ]* //;q;};};d'", arg)); + // XXX: this is a memory leak now because I just don't care enough + char *command; + 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]; @@ -659,10 +973,8 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { break; else { size += read; - if (size == sizeof(value)) { - pid = _not(pid_t); + if (size == sizeof(value)) goto fail; - } } } @@ -683,147 +995,161 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { } if (pid == _not(pid_t)) { - fprintf(stderr, "invalid pid for -p\n"); + fprintf(stderr, "unable to find process `%s' using ps\n", optarg); return 1; } } - } break; -#endif + } goto target; + + case 'r': { + //size_t size(strlen(optarg)); + + char *colon(strrchr(optarg, ':')); + if (colon == NULL) { + fprintf(stderr, "missing colon in hostspec\n"); + return 1; + } + + /*char *end; + port = strtoul(colon + 1, &end, 10); + if (end != optarg + size) { + fprintf(stderr, "invalid port in hostspec\n"); + return 1; + }*/ + + host = optarg; + *colon = '\0'; + port = colon + 1; + } goto target; case 's': strict_ = true; break; + + default: + _assert(false); } - } getopt:; + } + + getopt: + argc -= optind; + argv += optind; const char *script; - int ind(state->ind); -#ifdef CY_ATTACH - if (pid != _not(pid_t) && ind < argc - 1) { + if (pid != _not(pid_t) && argc > 1) { fprintf(stderr, "-p cannot set argv\n"); return 1; } - if (pid != _not(pid_t) && compile) { - fprintf(stderr, "-p conflicts with -c\n"); - return 1; - } -#endif - - if (ind == argc) + if (argc == 0) script = NULL; else { -#ifdef CY_EXECUTE - // XXX: const_cast?! wtf gcc :( - CYSetArgs(argc - ind - 1, const_cast<const char **>(argv + ind + 1)); -#endif - script = argv[ind]; + script = argv[0]; if (strcmp(script, "-") == 0) script = NULL; + --argc; + ++argv; } -#ifdef CY_ATTACH - if (pid != _not(pid_t) && script == NULL && !tty) { - fprintf(stderr, "non-terminal attaching to remote console\n"); - return 1; - } +#ifdef CY_EXECUTE + // XXX: const_cast?! wtf gcc :( + CYSetArgs(argv0, script, argc, const_cast<const char **>(argv)); #endif -#ifdef CY_ATTACH - if (pid == _not(pid_t)) - client_ = -1; - else { - int server(_syscall(socket(PF_UNIX, SOCK_STREAM, 0))); try { - struct sockaddr_un address; - memset(&address, 0, sizeof(address)); - address.sun_family = AF_UNIX; - - sprintf(address.sun_path, "/tmp/.s.cy.%u", getpid()); - - _syscall(bind(server, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address))); - _syscall(chmod(address.sun_path, 0777)); - - try { - _syscall(listen(server, 1)); - InjectLibrary(pid); - client_ = _syscall(accept(server, NULL, NULL)); - } catch (...) { - // XXX: exception? - unlink(address.sun_path); - throw; - } - } catch (...) { - _syscall(close(server)); - throw; - } - } -#else - client_ = -1; -#endif + if (remote_ == NULL && pid != _not(pid_t)) + remote_ = new CYInjectRemote(pid); + + if (remote_ == NULL && host != NULL && port != NULL) + remote_ = new CYSocketRemote(host, port); + + if (remote_ == NULL) + remote_ = new CYLocalRemote(); if (script == NULL && tty) - Console(pool, options); + Console(options); else { - CYDriver driver(pool, script ?: "<stdin>"); - cy::parser parser(driver); - Setup(driver, parser); + std::istream *stream; + if (script == NULL) { + stream = &std::cin; + script = "<stdin>"; + } else { + stream = new std::fstream(script, std::ios::in | std::ios::binary); + _assert(!stream->fail()); + } - char *start, *end; + if (timing_) { + std::stringbuf buffer; + stream->get(buffer, '\0'); + _assert(!stream->fail()); - if (script == NULL) { - start = NULL; - end = NULL; + double average(0); + int samples(-50); + uint64_t start(CYGetTime()); - driver.file_ = stdin; - } else { - size_t size; - start = reinterpret_cast<char *>(Map(script, &size)); - end = start + size; + 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 (size >= 2 && start[0] == '#' && start[1] == '!') { - start += 2; + delete stream; - if (void *line = memchr(start, '\n', end - start)) - start = reinterpret_cast<char *>(line); - else - start = end; + 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; } - driver.data_ = start; - driver.size_ = end - start; + stream = new std::istringstream(buffer.str()); + std::cin.get(); } - if (parser.parse() != 0 || !driver.errors_.empty()) { + 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) - if (client_ != -1) { - std::string code(start, end-start); - Run(client_, code, stdout); - } else { - std::ostringstream str; - CYOutput out(str, options); - Setup(out, driver, options); - out << *driver.program_; - std::string code(str.str()); - if (compile) - std::cout << code; - else - Run(client_, code, stdout); + return 1; + } else if (driver.script_ != NULL) { + std::stringbuf str; + CYOutput out(str, options); + Setup(out, driver, options, true); + out << *driver.script_; + std::string code(str.str()); + if (compile) + std::cout << code; + else { + CYUTF8String json(Run(pool, code)); + if (CYStartsWith(json, "throw ")) { + CYLexerHighlight(json.data, json.size, std::cerr); + std::cerr << std::endl; + return 1; + } } + } } return 0; } -int main(int argc, char const * const argv[], char const * const envp[]) { - apr_status_t status(apr_app_initialize(&argc, &argv, &envp)); - - if (status != APR_SUCCESS) { - fprintf(stderr, "apr_app_initialize() != APR_SUCCESS\n"); - return 1; - } else try { +_visible int main(int argc, char * const argv[], char const * const envp[]) { + try { return Main(argc, argv, envp); } catch (const CYException &error) { CYPool pool;