-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009 Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2013 Jay Freeman (saurik)
*/
-/* Modified BSD License {{{ */
+/* GNU 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:
+ * 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.
*
- * 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.
+ * 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.
*
- * 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.
-*/
+ * You should have received a copy of the GNU General Public License
+ * along with Cycript. If not, see <http://www.gnu.org/licenses/>.
+**/
/* }}} */
#include "cycript.hpp"
#endif
#include <cstdio>
+#include <fstream>
#include <sstream>
#include <setjmp.h>
#include <readline/history.h>
#endif
-#include <sys/mman.h>
-
#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,
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);
+ CYContext context(options);
+ if (lower)
+ driver.program_->Replace(context);
}
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
mode_ = Working;
- if (json != NULL)
+ if (json == NULL)
+ size = 0;
+ else
size = strlen(json);
} 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 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(CYUTF8String json, FILE *fout, bool expand = false) {
+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(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();
+static CYExpression *ParseExpression(CYUTF8String code) {
+ std::stringstream stream;
+ stream << '(' << code << ')';
+ CYDriver driver(stream);
cy::parser parser(driver);
Setup(driver, parser);
if (parser.parse() != 0 || !driver.errors_.empty())
- _assert(false);
+ return NULL;
+
+ CYOptions options;
+ CYContext context(options);
+
+ CYStatement *statement(driver.program_->statements_);
+ _assert(statement != NULL);
+ _assert(statement->next_ == NULL);
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 = TRUE;
- CYPool pool;
-
- CYDriver driver(pool);
- cy::parser parser(driver);
- Setup(driver, parser);
+ CYLocalPool pool;
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;
CYExpression *expression;
CYOptions options;
- CYContext context(driver.pool_, options);
+ CYContext context(options);
std::ostringstream prefix;
case CYDriver::AutoMessage: {
CYDriver::Context &thing(driver.contexts_.back());
- expression = $M($M($ CYIndirect(thing.context_), $S("isa")), $S("messages"));
+ 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;
std::string begin(prefix.str());
- driver.program_ = $ CYProgram($ CYExpress($C3(ParseExpression(pool,
+ driver.program_ = $ CYProgram($ CYExpress($C3(ParseExpression(
" function(object, prefix, word) {\n"
" var names = [];\n"
- " var pattern = '^' + prefix + word;\n"
- " var length = prefix.length;\n"
- " for (name in object)\n"
- " if (name.match(pattern) != null)\n"
- " names.push(name.substr(length));\n"
+ " var before = prefix.length;\n"
+ " prefix += word;\n"
+ " var entire = prefix.length;\n"
+ " for (var name in object)\n"
+ " if (name.substring(0, entire) == prefix)\n"
+ " names.push(name.substr(before));\n"
" return names;\n"
" }\n"
), expression, $S(begin.c_str()), $S(word))));
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(pool, json));
- CYArray *array(dynamic_cast<CYArray *>(result));
+ CYExpression *result(ParseExpression(json));
+ if (result == NULL)
+ return NULL;
+ CYArray *array(dynamic_cast<CYArray *>(result->Primitive(context)));
if (array == NULL) {
- fprintf(fout_, "\n");
- Output(json, fout_);
+ *out_ << '\n';
+ Output(false, json, out_);
rl_forced_update_display();
return NULL;
}
std::string common;
bool rest(false);
- for (CYElement *element(array->elements_); element != NULL; element = element->next_) {
+ CYForEach (element, array->elements_) {
CYString *string(dynamic_cast<CYString *>(element->value_));
_assert(string != NULL);
static char name_[] = "cycript";
static char break_[] = " \t\n\"\\'`@$><=;|&{(" ")}" ".:[]";
-static void Console(apr_pool_t *pool, CYOptions &options) {
+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;
+
passwd *passwd;
if (const char *username = getenv("LOGNAME"))
passwd = getpwnam(username);
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 lower(true);
+ 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_redisplay_function = CYDisplayUpdate;
+ else
+ rl_redisplay_function = rl_redisplay;
+#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 == "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;
- fprintf(fout_, "expand == %s\n", expand ? "true" : "false");
- fflush(fout_);
+ *out_ << "expand == " << (expand ? "true" : "false") << std::endl;
+ } else if (data == "lower") {
+ lower = !lower;
+ *out_ << "lower == " << (lower ? "true" : "false") << std::endl;
+ } else if (data == "syntax") {
+ syntax = !syntax;
+ *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl;
}
- add_history(line);
- ++histlines;
+ command_ = line;
+ history += command_;
goto restart;
}
}
if (bypass)
code = command_;
else {
- CYDriver driver;
+ CYLocalPool pool;
+
+ 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);
- if (begin.line != lines.size() || begin.column - 1 != lines.back().size() || error->warning_) {
+ if (begin.line != lines.size() || begin.column < lines.back().size() || error->warning_) {
cy::position end(error->location_.end);
if (begin.line != lines.size()) {
}
std::cerr << "....";
- for (size_t i(0); i != begin.column - 1; ++i)
+ for (size_t i(0); i != begin.column; ++i)
std::cerr << '.';
if (begin.line != end.line || begin.column == end.column)
std::cerr << '^';
std::cerr << " | ";
std::cerr << error->message_ << std::endl;
- add_history(command_.c_str());
- ++histlines;
+ history += command_;
goto restart;
}
}
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();
- }
+ std::ostringstream str;
+ CYOutput out(str, options);
+ Setup(out, driver, options, lower);
+ out << *driver.program_;
+ code = str.str();
}
- add_history(command_.c_str());
- ++histlines;
-
- if (debug)
- std::cout << code << std::endl;
+ history += command_;
- Run(client_, code, fout_, expand);
- }
+ if (debug) {
+ std::cout << "cy= ";
+ 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) {
- 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;
}
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);
+ 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;
+ const char *host(NULL);
+ const char *port(NULL);
+
apr_getopt_t *state;
_aprcall(apr_getopt_init(&state, pool, argc, argv));
for (;;) {
- char opt;
+ int opt;
const char *arg;
- apr_status_t status(apr_getopt(state,
- "cg:n:"
+ apr_status_t status(apr_getopt_long(state, (apr_getopt_option_t[]) {
+ {NULL, 'c', false, NULL},
+ {NULL, 'g', true, NULL},
+ {NULL, 'n', true, NULL},
#ifdef CY_ATTACH
- "p:"
+ {NULL, 'p', true, NULL},
#endif
- "s"
- , &opt, &arg));
+ {NULL, 'r', true, NULL},
+ {NULL, 's', false, NULL},
+ {0, 0, 0, 0}}, &opt, &arg));
switch (status) {
case APR_EOF:
#ifdef CY_ATTACH
" [-p <pid|name>]"
#endif
+ " [-r <host:port>]"
" [<script> [<arg>...]]\n"
);
return 1;
}
switch (opt) {
+ target:
+ if (!target)
+ target = true;
+ else {
+ fprintf(stderr, "only one of -[c"
+#ifdef CY_ATTACH
+ "p"
+#endif
+ "r] may be used at a time\n");
+ return 1;
+ }
+ break;
+
case 'c':
compile = true;
- break;
+ goto target;
case 'g':
if (false);
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;
else {
size += read;
- if (size == sizeof(value)) {
- pid = _not(pid_t);
+ if (size == sizeof(value))
goto fail;
- }
}
}
}
if (pid == _not(pid_t)) {
- fprintf(stderr, "invalid pid for -p\n");
+ fprintf(stderr, "unable to find process `%s' using ps\n", arg);
return 1;
}
}
- } break;
+ } goto target;
#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;
+ } goto target;
+
case 's':
strict_ = true;
break;
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)
script = NULL;
}
-#ifdef CY_ATTACH
- if (pid != _not(pid_t) && script == NULL && !tty) {
- fprintf(stderr, "non-terminal attaching to remote console\n");
- return 1;
- }
-#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;
+ struct Socket {
+ int fd_;
+
+ Socket(int fd) :
+ fd_(fd)
+ {
}
- } catch (...) {
- _syscall(close(server));
- throw;
- }
+
+ ~Socket() {
+ close(fd_);
+ }
+
+ operator int() {
+ return fd_;
+ }
+ } server(_syscall(socket(PF_UNIX, SOCK_STREAM, 0)));
+
+ struct sockaddr_un address;
+ memset(&address, 0, sizeof(address));
+ address.sun_family = AF_UNIX;
+
+ sprintf(address.sun_path, "/tmp/.s.cy.%u", getpid());
+ unlink(address.sun_path);
+
+ struct File {
+ const char *path_;
+
+ File(const char *path) :
+ path_(path)
+ {
+ }
+
+ ~File() {
+ unlink(path_);
+ }
+ } file(address.sun_path);
+
+ _syscall(bind(server, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
+ _syscall(chmod(address.sun_path, 0777));
+
+ _syscall(listen(server, 1));
+ InjectLibrary(pid);
+ client_ = _syscall(accept(server, NULL, NULL));
}
#else
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(pool, options);
+ Console(options);
else {
- CYDriver driver(pool, script ?: "<stdin>");
- cy::parser parser(driver);
- Setup(driver, parser);
-
- char *start, *end;
+ CYLocalPool pool;
+ std::istream *stream;
if (script == NULL) {
- start = NULL;
- end = NULL;
-
- driver.file_ = stdin;
+ stream = &std::cin;
+ script = "<stdin>";
} else {
- size_t size;
- start = reinterpret_cast<char *>(Map(script, &size));
- end = start + size;
-
- if (size >= 2 && start[0] == '#' && start[1] == '!') {
- start += 2;
-
- if (void *line = memchr(start, '\n', end - start))
- start = reinterpret_cast<char *>(line);
- else
- start = end;
- }
-
- driver.data_ = start;
- driver.size_ = end - start;
+ stream = new std::fstream(script, std::ios::in | std::ios::binary);
+ _assert(!stream->fail());
}
+ CYDriver driver(*stream, script);
+ 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) {
- 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);
- }
+ } else if (driver.program_ != NULL) {
+ std::ostringstream str;
+ CYOutput out(str, options);
+ Setup(out, driver, options, true);
+ out << *driver.program_;
+ std::string code(str.str());
+ if (compile)
+ std::cout << code;
+ else
+ Run(client_, false, code, &std::cout);
+ }
}
+ apr_pool_destroy(pool);
+
return 0;
}
projects / cycript.git / blobdiff