/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2012 Jay Freeman (saurik)
+ * Copyright (C) 2009-2013 Jay Freeman (saurik)
*/
-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */
/*
- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser 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 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 MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
+ * Cycript 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
* along with Cycript. If not, see <http://www.gnu.org/licenses/>.
**/
/* }}} */
#include <errno.h>
#include <unistd.h>
+#include <sys/socket.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-
-#include "Cycript.tab.hh"
+#include <netdb.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <pwd.h>
#include <apr_getopt.h>
+#include <apr_pools.h>
+#include <apr_strings.h>
#include <dlfcn.h>
+#include "Display.hpp"
#include "Replace.hpp"
+#include "Cycript.tab.hh"
+#include "Driver.hpp"
+
static volatile enum {
Working,
Parsing,
static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
const char *json;
- size_t size;
+ uint32_t size;
if (client == -1) {
mode_ = Running;
} 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;
}
return Run(pool, client, CYUTF8String(code.c_str(), code.size()));
}
-FILE *fout_;
+static std::ostream *out_;
-static void Output(CYUTF8String json, FILE *fout, bool expand = false) {
+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) {
const char *data(json.data);
size_t size(json.size);
- if (data == NULL || fout == NULL)
+ if (data == NULL || out == NULL)
return;
- if (!expand || data[0] != '"' && data[0] != '\'')
- fputs(data, fout);
+ if (!expand ||
+ data[0] != '@' && data[0] != '"' && data[0] != '\'' ||
+ data[0] == '@' && data[1] != '"' && data[1] != '\''
+ )
+ Write(syntax, data, size, *out);
else for (size_t i(0); i != size; ++i)
if (data[i] != '\\')
- fputc(data[i], fout);
+ *out << data[i];
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;
+ 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:
- fputs("\n", fout);
- fflush(fout);
+ *out << std::endl;
}
-static void Run(int client, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
+static void Run(int client, bool syntax, const char *data, size_t size, std::ostream *out = NULL, bool expand = false) {
CYPool pool;
- Output(Run(pool, client, CYUTF8String(data, size)), fout, expand);
+ Output(syntax, Run(pool, client, CYUTF8String(data, size)), out, expand);
}
-static void Run(int client, std::string &code, FILE *fout = NULL, bool expand = false) {
- Run(client, code.c_str(), code.size(), fout, 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::ostringstream str;
- str << '(' << code << ')';
- std::string string(str.str());
-
- CYDriver driver;
- driver.data_ = string.c_str();
- driver.size_ = string.size();
+ std::stringstream stream;
+ stream << '(' << code << ')';
+ CYDriver driver(stream);
cy::parser parser(driver);
Setup(driver, parser);
if (parser.parse() != 0 || !driver.errors_.empty())
return NULL;
- CYExpress *express(dynamic_cast<CYExpress *>(driver.program_->statements_));
- _assert(express != NULL);
- return express->expression_;
+ CYOptions options;
+ CYContext context(options);
+
+ // XXX: this could be replaced with a CYStatement::Primitive()
+ if (CYExpress *express = dynamic_cast<CYExpress *>(driver.program_->statements_))
+ return express->expression_->Primitive(context);
+
+ return NULL;
}
static int client_;
rl_attempted_completion_over = TRUE;
CYLocalPool pool;
- CYDriver driver;
- cy::parser parser(driver);
- Setup(driver, parser);
std::string line(rl_line_buffer, start);
- std::string command(command_ + line);
-
- driver.data_ = command.c_str();
- driver.size_ = command.size();
+ std::istringstream stream(command_ + line);
+ CYDriver driver(stream);
driver.auto_ = true;
+ cy::parser parser(driver);
+ Setup(driver, parser);
+
if (parser.parse() != 0 || !driver.errors_.empty())
return NULL;
driver.program_ = $ CYProgram($ CYExpress($C3(ParseExpression(
" function(object, prefix, word) {\n"
" var names = [];\n"
- " var pattern = '^' + prefix + word;\n"
- " var length = prefix.length;\n"
+ " var before = prefix.length;\n"
+ " prefix += word;\n"
+ " var entire = prefix.length;\n"
" for (name in object)\n"
- " if (name.match(pattern) != null)\n"
- " names.push(name.substr(length));\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))));
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)
CYArray *array(dynamic_cast<CYArray *>(result));
if (array == NULL) {
- fprintf(fout_, "\n");
- Output(json, fout_);
+ *out_ << '\n';
+ Output(false, json, out_);
rl_forced_update_display();
return NULL;
}
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());
+ }
+
+ ~History() {
+ if (append_history$ != NULL) {
+ _syscall(close(_syscall(open(histfile_.c_str(), O_CREAT | O_WRONLY, 0600))));
+ _assert((*append_history$)(histlines_, histfile_.c_str()) == 0);
+ } else {
+ _assert(write_history(histfile_.c_str()) == 0);
+ }
+ }
+
+ void operator +=(const std::string &command) {
+ add_history(command_.c_str());
+ ++histlines_;
+ }
+};
+
static void Console(CYOptions &options) {
CYPool pool;
else
passwd = getpwuid(getuid());
- const char *basedir(apr_psprintf(pool, "%s/.cycript", passwd->pw_dir));
- const char *histfile(apr_psprintf(pool, "%s/history", basedir));
- size_t histlines(0);
+ std::string basedir(passwd->pw_dir);
+ 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);
- fout_ = stdout;
+ out_ = &std::cout;
// rl_completer_word_break_characters is broken in libedit
rl_basic_word_break_characters = break_;
if (setjmp(ctrlc_) != 0) {
mode_ = Working;
- fputs("\n", fout_);
- fflush(fout_);
+ *out_ << std::endl;
goto restart;
}
read:
+
+#if RL_READLINE_VERSION >= 0x0600
+ if (syntax) {
+ rl_prep_term_function = CYDisplayStart;
+ rl_redisplay_function = CYDisplayUpdate;
+ rl_deprep_term_function = CYDisplayFinish;
+ } else {
+ rl_prep_term_function = rl_prep_terminal;
+ rl_redisplay_function = rl_redisplay;
+ rl_deprep_term_function = rl_deprep_terminal;
+ }
+#endif
+
mode_ = Parsing;
char *line(readline(prompt));
mode_ = Working;
- if (line == NULL)
+
+ if (line == NULL) {
+ *out_ << std::endl;
break;
- if (line[0] == '\0')
+ } else if (line[0] == '\0')
goto read;
if (!extra) {
std::string data(line + 1);
if (data == "bypass") {
bypass = !bypass;
- fprintf(fout_, "bypass == %s\n", bypass ? "true" : "false");
- fflush(fout_);
+ *out_ << "bypass == " << (bypass ? "true" : "false") << std::endl;
} else if (data == "debug") {
debug = !debug;
- fprintf(fout_, "debug == %s\n", debug ? "true" : "false");
- fflush(fout_);
+ *out_ << "debug == " << (debug ? "true" : "false") << std::endl;
} else if (data == "expand") {
expand = !expand;
- fprintf(fout_, "expand == %s\n", expand ? "true" : "false");
- fflush(fout_);
+ *out_ << "expand == " << (expand ? "true" : "false") << std::endl;
+ } else if (data == "syntax") {
+ syntax = !syntax;
+ *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl;
}
- add_history(line);
- ++histlines;
+ history += line;
goto restart;
}
}
code = command_;
else {
CYLocalPool pool;
- CYDriver driver;
+
+ std::istringstream stream(command_);
+ CYDriver driver(stream);
+
cy::parser parser(driver);
Setup(driver, parser);
- driver.data_ = command_.c_str();
- driver.size_ = command_.size();
-
if (parser.parse() != 0 || !driver.errors_.empty()) {
for (CYDriver::Errors::const_iterator error(driver.errors_.begin()); error != driver.errors_.end(); ++error) {
cy::position begin(error->location_.begin);
std::cerr << " | ";
std::cerr << error->message_ << std::endl;
- add_history(command_.c_str());
- ++histlines;
+ history += command_;
goto restart;
}
}
}
}
- add_history(command_.c_str());
- ++histlines;
+ history += command_;
- if (debug)
- std::cout << code << std::endl;
-
- Run(client_, code, fout_, expand);
- }
+ if (debug) {
+ Write(syntax, 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);
+ Run(client_, syntax, code, out_, expand);
}
-
- fputs("\n", fout_);
- fflush(fout_);
}
static void *Map(const char *path, size_t *psize) {
void InjectLibrary(pid_t pid);
int Main(int argc, char const * const argv[], char const * const envp[]) {
+ _aprcall(apr_initialize());
+
+ apr_pool_t *pool;
+ apr_pool_create(&pool, NULL);
+
bool tty(isatty(STDIN_FILENO));
bool compile(false);
CYOptions options;
pid_t pid(_not(pid_t));
#endif
- CYPool pool;
+ const char *host(NULL);
+ const char *port(NULL);
+
apr_getopt_t *state;
_aprcall(apr_getopt_init(&state, pool, argc, argv));
#ifdef CY_ATTACH
"p:"
#endif
+ "r:"
"s"
, &opt, &arg));
#ifdef CY_ATTACH
" [-p <pid|name>]"
#endif
+ " [-r <host:port>]"
" [<script> [<arg>...]]\n"
);
return 1;
pid = strtoul(arg, &end, 0);
if (arg + 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));
+ const char *command(apr_pstrcat(pool, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^", arg, " /{s/^[^ ]* //;q;};};d'", NULL));
if (FILE *pids = popen(command, "r")) {
char value[32];
} break;
#endif
+ case 'r': {
+ //size_t size(strlen(arg));
+
+ char *colon(strrchr(arg, ':'));
+ if (colon == NULL) {
+ fprintf(stderr, "missing colon in hostspec\n");
+ return 1;
+ }
+
+ /*char *end;
+ port = strtoul(colon + 1, &end, 10);
+ if (end != arg + size) {
+ fprintf(stderr, "invalid port in hostspec\n");
+ return 1;
+ }*/
+
+ host = arg;
+ *colon = '\0';
+ port = colon + 1;
+ } break;
+
case 's':
strict_ = true;
break;
client_ = -1;
#endif
+ if (client_ == -1 && host != NULL && port != NULL) {
+ 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) {
+ int client(_syscall(socket(info->ai_family, info->ai_socktype, info->ai_protocol))); try {
+ _syscall(connect(client, info->ai_addr, info->ai_addrlen));
+ client_ = client;
+ break;
+ } catch (...) {
+ _syscall(close(client));
+ throw;
+ }
+ }
+ } catch (...) {
+ freeaddrinfo(infos);
+ throw;
+ }
+ }
+
if (script == NULL && tty)
Console(options);
else {
CYLocalPool pool;
- CYDriver driver(script ?: "<stdin>");
- cy::parser parser(driver);
- Setup(driver, parser);
char *start, *end;
+ std::istream *indirect;
if (script == NULL) {
start = NULL;
end = NULL;
-
- driver.file_ = stdin;
+ indirect = &std::cin;
} else {
size_t size;
start = reinterpret_cast<char *>(Map(script, &size));
start = end;
}
- driver.data_ = start;
- driver.size_ = end - start;
+ indirect = NULL;
}
+ CYStream direct(start, end);
+ std::istream &stream(indirect == NULL ? direct : *indirect);
+ CYDriver driver(stream, script ?: "<stdin>");
+
+ cy::parser parser(driver);
+ Setup(driver, parser);
+
if (parser.parse() != 0 || !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) {
+ // XXX: this code means that you can't pipe to another process
std::string code(start, end-start);
- Run(client_, code, stdout);
+ Run(client_, false, code, &std::cout);
} else {
std::ostringstream str;
CYOutput out(str, options);
if (compile)
std::cout << code;
else
- Run(client_, code, stdout);
+ Run(client_, false, code, &std::cout);
}
}
+ apr_pool_destroy(pool);
+
return 0;
}
projects / cycript.git / blobdiff