X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/9567837688897dd742899612a9701fc590f54326..61c7112146ed7cc27b0a921843efdaaa7878d449:/Console.cpp
diff --git a/Console.cpp b/Console.cpp
index 77e9759..93df749 100644
--- a/Console.cpp
+++ b/Console.cpp
@@ -1,70 +1,206 @@
-/* Cycript - Remove Execution Server and Disassembler
- * Copyright (C) 2009 Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2015 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 .
+**/
/* }}} */
#include "cycript.hpp"
+#ifdef CY_EXECUTE
+#include "JavaScript.hpp"
+#endif
+
#include
+#include
+#include
#include
-#include
-
+#ifdef HAVE_READLINE_H
+#include
+#else
#include
-#include
+#endif
-#include
+#ifdef HAVE_HISTORY_H
+#include
+#else
+#include
+#endif
#include
+#include
+#include
+#include
#include
+#include
#include
#include
#include
+#include
-#include "Cycript.tab.hh"
-
+#include
#include
#include
#include
#include
+
+#include
#include
+#include
+
+#ifdef __APPLE__
+#include
+#endif
+
+#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;
-#include
+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,
@@ -83,7 +219,8 @@ static void sigint(int) {
case Parsing:
longjmp(ctrlc_, 1);
case Running:
- throw "*** Ctrl-C";
+ CYCancel();
+ return;
case Sending:
return;
case Waiting:
@@ -91,110 +228,396 @@ 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) {
+void Setup(CYOutput &out, CYDriver &driver, CYOptions &options, bool lower) {
out.pretty_ = pretty_;
-
- CYContext context(driver.pool_);
- driver.program_->Replace(context);
+ if (lower)
+ driver.Replace(options);
}
-void Run(int client, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
- CYPool pool;
-
+static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
const char *json;
+ uint32_t size;
+
if (client == -1) {
mode_ = Running;
#ifdef CY_EXECUTE
- json = CYExecute(pool, 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 {
mode_ = Sending;
- CYSendAll(client, &size, sizeof(size));
- CYSendAll(client, data, size);
+ size = 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;
}
mode_ = Working;
}
- if (json != NULL && fout != NULL) {
- if (!expand || json[0] != '"' && json[0] != '\'')
- fputs(json, fout);
- else for (size_t i(0); i != size; ++i)
- if (json[i] != '\\')
- fputc(json[i], fout);
- else switch(json[++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;
+ return CYUTF8String(json, size);
+}
+
+static CYUTF8String Run(CYPool &pool, int client, const std::string &code) {
+ return Run(pool, client, CYUTF8String(code.c_str(), code.size()));
+}
+
+static std::ostream *out_;
+
+static void Output(CYUTF8String json, std::ostream *out, bool expand = false) {
+ const char *data(json.data);
+ size_t size(json.size);
+
+ if (data == NULL || out == NULL)
+ return;
+
+ if (!expand ||
+ data[0] != '@' && data[0] != '"' && data[0] != '\'' ||
+ data[0] == '@' && data[1] != '"' && data[1] != '\''
+ )
+ CYLexerHighlight(data, size, *out);
+ else for (size_t i(0); i != size; ++i)
+ if (data[i] != '\\')
+ *out << data[i];
+ else switch(data[++i]) {
+ case '\0': goto done;
+ case '\\': *out << '\\'; break;
+ case '\'': *out << '\''; break;
+ case '"': *out << '"'; break;
+ case 'b': *out << '\b'; break;
+ case 'f': *out << '\f'; break;
+ case 'n': *out << '\n'; break;
+ case 'r': *out << '\r'; break;
+ case 't': *out << '\t'; break;
+ case 'v': *out << '\v'; break;
+ default: *out << '\\'; --i; break;
+ }
+
+ done:
+ *out << std::endl;
+}
+
+int (*append_history$)(int, const char *);
+
+static std::string command_;
+
+static int client_;
+
+static CYUTF8String Run(CYPool &pool, const std::string &code) {
+ return Run(pool, client_, code);
+}
+
+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;
+}
+
+// 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';
+ }
+
+ ~History() {
+ for (HIST_ENTRY *history((history_set_pos(0), current_history())); history; history = next_history())
+ for (char *character(history->line); *character; ++character)
+ if (*character == '\n') *character = '\x01';
+
+ if (append_history$ != NULL) {
+ int fd(_syscall(open(histfile_.c_str(), O_CREAT | O_WRONLY, 0600)));
+ _syscall(close(fd));
+ _assert((*append_history$)(histlines_, histfile_.c_str()) == 0);
+ } else {
+ _assert(write_history(histfile_.c_str()) == 0);
+ }
+ }
+
+ 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 CYConsoleKeyBypass(int count, int key) {
+ rl_point = rl_end;
+ rl_insert(count, '\n');
+ return rl_newline(count, key);
+}
+
+static int CYConsoleKeyReturn(int count, int key) {
+ if (rl_point != rl_end) {
+ if (memchr(rl_line_buffer, '\n', rl_end) == NULL)
+ return CYConsoleKeyBypass(count, key);
+
+ char *before(CYmemrchr(rl_line_buffer, '\n', rl_point));
+ if (before == NULL)
+ before = rl_line_buffer;
+
+ int space(before + 1 - rl_line_buffer);
+ while (space != rl_point && rl_line_buffer[space] == ' ')
+ ++space;
+
+ int adjust(rl_line_buffer + space - 1 - before);
+ if (space == rl_point && adjust != 0)
+ rl_rubout(adjust, '\b');
+
+ rl_insert(count, '\n');
+ if (adjust != 0)
+ rl_insert(adjust, ' ');
+
+ return 0;
+ }
+
+ rl_insert(count, '\n');
+
+ bool done(false);
+ if (rl_line_buffer[0] == '?')
+ done = true;
+ else {
+ std::string command(rl_line_buffer, rl_end);
+ std::istringstream stream(command);
+
+ size_t last(std::string::npos);
+ for (size_t i(0); i != std::string::npos; i = command.find('\n', i + 1))
+ ++last;
+
+ CYPool pool;
+ CYDriver driver(pool, stream);
+ if (driver.Parse() || !driver.errors_.empty())
+ for (CYDriver::Errors::const_iterator error(driver.errors_.begin()); error != driver.errors_.end(); ++error) {
+ if (error->location_.begin.line != last + 1)
+ done = true;
+ break;
}
+ else
+ done = true;
+ }
- done:
- fputs("\n", fout);
- fflush(fout);
+ if (done)
+ return rl_newline(count, key);
+ return 0;
+}
+
+static int CYConsoleKeyUp(int count, int key) {
+ while (count-- != 0) {
+ char *after(CYmemrchr(rl_line_buffer, '\n', rl_point));
+ if (after == NULL) {
+ if (int value = rl_get_previous_history(1, key))
+ return value;
+ continue;
+ }
+
+ char *before(CYmemrchr(rl_line_buffer, '\n', after - rl_line_buffer));
+ if (before == NULL)
+ before = rl_line_buffer - 1;
+
+ ptrdiff_t offset(rl_line_buffer + rl_point - after);
+ if (offset > after - before)
+ rl_point = after - rl_line_buffer;
+ else
+ rl_point = before + offset - rl_line_buffer;
}
+
+ return 0;
}
-void Run(int client, std::string &code, FILE *fout = NULL, bool expand = false) {
- Run(client, code.c_str(), code.size(), fout, expand);
+static int CYConsoleKeyDown(int count, int key) {
+ while (count-- != 0) {
+ char *after(static_cast(memchr(rl_line_buffer + rl_point, '\n', rl_end - rl_point)));
+ if (after == NULL) {
+ int where(where_history());
+ if (int value = rl_get_next_history(1, key))
+ return value;
+ if (where != where_history()) {
+ char *first(static_cast(memchr(rl_line_buffer, '\n', rl_end)));
+ if (first != NULL)
+ rl_point = first - 1 - rl_line_buffer;
+ }
+ continue;
+ }
+
+ char *before(CYmemrchr(rl_line_buffer, '\n', rl_point));
+ if (before == NULL)
+ before = rl_line_buffer - 1;
+
+ char *next(static_cast(memchr(after + 1, '\n', rl_line_buffer + rl_end - after - 1)));
+ if (next == NULL)
+ next = rl_line_buffer + rl_end;
+
+ ptrdiff_t offset(rl_line_buffer + rl_point - before);
+ if (offset > next - after)
+ rl_point = next - rl_line_buffer;
+ else
+ rl_point = after + offset - rl_line_buffer;
+ }
+
+ return 0;
}
-static void Console(apr_pool_t *pool, int client) {
- passwd *passwd;
- if (const char *username = getenv("LOGNAME"))
- passwd = getpwnam(username);
- else
- passwd = getpwuid(getuid());
+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;
+ return 0;
+}
+
+static int CYConsoleKeyBack(int count, int key) {
+ while (count-- != 0) {
+ char *before(CYmemrchr(rl_line_buffer, '\n', rl_point));
+ if (before == NULL)
+ return rl_rubout(count, key);
+
+ int start(before + 1 - rl_line_buffer);
+ if (start == rl_point) rubout: {
+ rl_rubout(1, key);
+ continue;
+ }
+
+ for (int i(start); i != rl_point; ++i)
+ if (rl_line_buffer[i] != ' ')
+ goto rubout;
+ rl_rubout((rl_point - start) % 4 ?: 4, key);
+ }
+
+ return 0;
+}
+
+static int CYConsoleKeyTab(int count, int key) {
+ char *before(CYmemrchr(rl_line_buffer, '\n', rl_point));
+ if (before == NULL) complete:
+ return rl_complete_internal(rl_completion_mode(&CYConsoleKeyTab));
+ int start(before + 1 - rl_line_buffer);
+ for (int i(start); i != rl_point; ++i)
+ if (rl_line_buffer[i] != ' ')
+ goto complete;
+ return rl_insert(4 - (rl_point - start) % 4, ' ');
+}
+
+static void CYConsoleRemapBind(rl_command_func_t *from, rl_command_func_t *to) {
+ char **keyseqs(rl_invoking_keyseqs(from));
+ if (keyseqs == NULL)
+ return;
+ for (char **keyseq(keyseqs); *keyseq != NULL; ++keyseq) {
+ rl_bind_keyseq(*keyseq, to);
+ free(*keyseq);
+ }
+ free(keyseqs);
+}
+
+static void CYConsolePrepTerm(int meta) {
+ rl_prep_terminal(meta);
+
+ CYConsoleRemapBind(&rl_beg_of_line, &CYConsoleLineBegin);
+ CYConsoleRemapBind(&rl_end_of_line, &CYConsoleLineEnd);
+ CYConsoleRemapBind(&rl_rubout, &CYConsoleKeyBack);
+}
+
+static void Console(CYOptions &options) {
+ std::string basedir;
+ 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;
+ }
- 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);
- mkdir(basedir, 0700);
- read_history(histfile);
+ rl_initialize();
+ rl_readline_name = name_;
+
+ History history(basedir + "/history");
bool bypass(false);
bool debug(false);
bool expand(false);
+ bool lower(true);
+
+ out_ = &std::cout;
+
+ rl_completer_word_break_characters = break_;
+ rl_attempted_completion_function = &Complete;
- FILE *fout(stdout);
+ rl_bind_key(TAB, &CYConsoleKeyTab);
- rl_bind_key('\t', rl_insert);
+ rl_redisplay_function = CYDisplayUpdate;
+ rl_prep_term_function = CYConsolePrepTerm;
+
+#if defined (__MSDOS__)
+ rl_bind_keyseq("\033[0A", &CYConsoleKeyUp);
+ rl_bind_keyseq("\033[0D", &CYConsoleKeyDown);
+#endif
+ rl_bind_keyseq("\033[A", &CYConsoleKeyUp);
+ rl_bind_keyseq("\033[B", &CYConsoleKeyDown);
+ rl_bind_keyseq("\033OA", &CYConsoleKeyUp);
+ rl_bind_keyseq("\033OB", &CYConsoleKeyDown);
+#if defined (__MINGW32__)
+ rl_bind_keyseq("\340H", &CYConsoleKeyUp);
+ rl_bind_keyseq("\340P", &CYConsoleKeyDown);
+ rl_bind_keyseq("\\000H", &CYConsoleKeyUp);
+ rl_bind_keyseq("\\000P", &CYConsoleKeyDown);
+#endif
struct sigaction action;
sigemptyset(&action.sa_mask);
@@ -202,212 +625,219 @@ static void Console(apr_pool_t *pool, int client) {
action.sa_flags = 0;
sigaction(SIGINT, &action, NULL);
- restart: for (;;) {
- std::string command;
- std::vector lines;
-
- bool extra(false);
- const char *prompt("cy# ");
-
+ for (;;) {
if (setjmp(ctrlc_) != 0) {
mode_ = Working;
- fputs("\n", fout);
- fflush(fout);
- goto restart;
+ *out_ << std::endl;
+ continue;
+ }
+
+ if (bypass) {
+ rl_bind_key('\r', &CYConsoleKeyBypass);
+ rl_bind_key('\n', &CYConsoleKeyBypass);
+ } 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)
- break;
- 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;
- }
+ if (line == NULL) {
+ *out_ << std::endl;
+ break;
}
- command += line;
+ std::string command(line);
+ free(line);
+ _assert(!command.empty());
+ _assert(command[command.size() - 1] == '\n');
+ command.resize(command.size() - 1);
+ if (command.empty())
+ continue;
+
+ 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;
+ history += command;
+ continue;
}
- lines.push_back(begin);
-
- free(line);
-
std::string code;
-
if (bypass)
code = command;
else {
- CYDriver driver("");
- cy::parser parser(driver);
- Setup(driver, parser);
+ std::istringstream 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);
-
- if (begin.line != lines.size()) {
- std::cerr << " | ";
- std::cerr << lines[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;
+ CYPosition begin(error->location_.begin);
+ CYPosition end(error->location_.end);
+ /*if (begin.line != lines2.size()) {
std::cerr << " | ";
- std::cerr << error->message_ << std::endl;
-
- add_history(command.c_str());
- ++histlines;
- goto restart;
- }
+ 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 << " | ";
+ std::cerr << error->message_ << std::endl;
+
+ history += command;
+ break;
}
- driver.errors_.clear();
-
- command += '\n';
- prompt = "cy> ";
- goto read;
+ continue;
}
- if (driver.program_ == NULL)
- goto restart;
+ if (driver.script_ == NULL)
+ continue;
- if (client != -1)
- code = command;
- else {
- std::ostringstream str;
- CYOutput out(str);
- Setup(out, driver);
- out << *driver.program_;
- code = str.str();
- }
+ std::stringbuf str;
+ CYOutput out(str, options);
+ Setup(out, driver, options, lower);
+ out << *driver.script_;
+ code = str.str();
}
- add_history(command.c_str());
- ++histlines;
+ history += command;
- if (debug)
- std::cout << code << std::endl;
+ if (debug) {
+ std::cout << "cy= ";
+ CYLexerHighlight(code.c_str(), code.size(), std::cout);
+ std::cout << std::endl;
+ }
- Run(client, code, fout, expand);
+ CYPool pool;
+ Output(Run(pool, client_, code), &std::cout, expand);
}
-
- _syscall(close(_syscall(open(histfile, O_CREAT | O_WRONLY, 0600))));
- append_history(histlines, histfile);
-
- 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));
+void InjectLibrary(pid_t, int, const char *const []);
- _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"));
#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;
+ 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 ]"
" [