X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/7e5391fd937dd287b3aef363e641f2d3abc5f422..c8a0500b2fc78101e1a7f3b2c99939f88a33aa4d:/Console.cpp
diff --git a/Console.cpp b/Console.cpp
index 4a27c64..c6e13cb 100644
--- a/Console.cpp
+++ b/Console.cpp
@@ -1,40 +1,22 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009 Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2010 Jay Freeman (saurik)
*/
-/* Modified BSD License {{{ */
+/* GNU Lesser 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 Lesser 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 Lesser 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 Lesser General Public License
+ * along with Cycript. If not, see .
+**/
/* }}} */
#include "cycript.hpp"
@@ -125,7 +107,7 @@ void Setup(CYDriver &driver, cy::parser &parser) {
void Setup(CYOutput &out, CYDriver &driver, CYOptions &options) {
out.pretty_ = pretty_;
- CYContext context(driver.pool_, options);
+ CYContext context(options);
driver.program_->Replace(context);
}
@@ -136,17 +118,20 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
if (client == -1) {
mode_ = Running;
#ifdef CY_EXECUTE
- json = CYExecute(pool, code.data);
+ json = CYExecute(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, size);
+ CYSendAll(client, code.data, code.size);
mode_ = Waiting;
CYRecvAll(client, &size, sizeof(size));
if (size == _not(size_t))
@@ -167,37 +152,42 @@ static CYUTF8String Run(CYPool &pool, int client, const std::string &code) {
return Run(pool, client, CYUTF8String(code.c_str(), code.size()));
}
-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;
- }
+FILE *fout_;
+
+static void Output(CYUTF8String json, FILE *fout, bool expand = false) {
+ const char *data(json.data);
+ size_t size(json.size);
+
+ if (data == NULL || fout == NULL)
+ return;
+
+ 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;
+ }
- done:
- fputs("\n", fout);
- fflush(fout);
- }
+ done:
+ fputs("\n", fout);
+ fflush(fout);
+}
+
+static void Run(int client, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
+ CYPool pool;
+ Output(Run(pool, client, CYUTF8String(data, size)), fout, expand);
}
static void Run(int client, std::string &code, FILE *fout = NULL, bool expand = false) {
@@ -208,12 +198,12 @@ int (*append_history$)(int, const char *);
static std::string command_;
-static CYExpression *ParseExpression(CYPool &pool, CYUTF8String code) {
+static CYExpression *ParseExpression(CYUTF8String code) {
std::ostringstream str;
str << '(' << code << ')';
std::string string(str.str());
- CYDriver driver(pool);
+ CYDriver driver;
driver.data_ = string.c_str();
driver.size_ = string.size();
@@ -221,7 +211,7 @@ static CYExpression *ParseExpression(CYPool &pool, CYUTF8String code) {
Setup(driver, parser);
if (parser.parse() != 0 || !driver.errors_.empty())
- _assert(false);
+ return NULL;
CYExpress *express(dynamic_cast(driver.program_->statements_));
_assert(express != NULL);
@@ -233,9 +223,8 @@ static int client_;
static char **Complete(const char *word, int start, int end) {
rl_attempted_completion_over = TRUE;
- CYPool pool;
-
- CYDriver driver(pool);
+ CYLocalPool pool;
+ CYDriver driver;
cy::parser parser(driver);
Setup(driver, parser);
@@ -256,7 +245,7 @@ static char **Complete(const char *word, int start, int end) {
CYExpression *expression;
CYOptions options;
- CYContext context(driver.pool_, options);
+ CYContext context(options);
std::ostringstream prefix;
@@ -275,7 +264,7 @@ static char **Complete(const char *word, int start, int end) {
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;
@@ -284,18 +273,19 @@ static char **Complete(const char *word, int start, int end) {
_assert(false);
}
- std::string begin(prefix.str() + word);
+ std::string begin(prefix.str());
- driver.program_ = $ CYProgram($ CYExpress($C2(ParseExpression(pool,
- " function(object, prefix) {\n"
+ driver.program_ = $ CYProgram($ CYExpress($C3(ParseExpression(
+ " function(object, prefix, word) {\n"
" var names = [];\n"
- " var pattern = '^' + prefix;\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);\n"
+ " names.push(name.substr(length));\n"
" return names;\n"
" }\n"
- ), expression, $S(begin.c_str()))));
+ ), expression, $S(begin.c_str()), $S(word))));
driver.program_->Replace(context);
@@ -306,9 +296,18 @@ static char **Complete(const char *word, int start, int end) {
std::string code(str.str());
CYUTF8String json(Run(pool, client_, code));
- CYExpression *result(ParseExpression(pool, json));
+ CYExpression *result(ParseExpression(json));
+ if (result == NULL)
+ return NULL;
+
CYArray *array(dynamic_cast(result));
- _assert(array != NULL);
+
+ if (array == NULL) {
+ fprintf(fout_, "\n");
+ Output(json, fout_);
+ rl_forced_update_display();
+ return NULL;
+ }
// XXX: use an std::set?
typedef std::vector Completions;
@@ -317,11 +316,18 @@ static char **Complete(const char *word, int start, int end) {
std::string common;
bool rest(false);
- for (CYElement *element(array->elements_); element != NULL; element = element->next_) {
+ CYForEach (element, array->elements_) {
CYString *string(dynamic_cast(element->value_));
_assert(string != NULL);
- std::string completion(string->value_, string->size_);
+ std::string completion;
+ if (string->size_ != 0)
+ completion.assign(string->value_, string->size_);
+ else if (driver.mode_ == CYDriver::AutoMessage)
+ completion = "]";
+ else
+ continue;
+
completions.push_back(completion);
if (!rest) {
@@ -345,11 +351,11 @@ static char **Complete(const char *word, int start, int end) {
if (count == 0)
return NULL;
- if (!common.empty()) {
- size_t size(prefix.str().size());
- _assert(common.size() >= size);
- common = common.substr(size);
- }
+ size_t colon(common.find(':'));
+ if (colon != std::string::npos)
+ common = common.substr(0, colon + 1);
+ if (completions.size() == 1)
+ common += ' ';
char **results(reinterpret_cast(malloc(sizeof(char *) * (count + 2))));
@@ -364,9 +370,11 @@ static char **Complete(const char *word, int start, int end) {
// need char *, not const char *
static char name_[] = "cycript";
-static char break_[] = " \t\n\"\\'`@$><=;|&{(" ".:";
+static char break_[] = " \t\n\"\\'`@$><=;|&{(" ")}" ".:[]";
+
+static void Console(CYOptions &options) {
+ CYPool pool;
-static void Console(apr_pool_t *pool, CYOptions &options) {
passwd *passwd;
if (const char *username = getenv("LOGNAME"))
passwd = getpwnam(username);
@@ -387,10 +395,12 @@ static void Console(apr_pool_t *pool, CYOptions &options) {
bool debug(false);
bool expand(false);
- FILE *fout(stdout);
+ fout_ = stdout;
// rl_completer_word_break_characters is broken in libedit
rl_basic_word_break_characters = break_;
+
+ rl_completer_word_break_characters = break_;
rl_attempted_completion_function = &Complete;
rl_bind_key('\t', rl_complete);
@@ -409,8 +419,8 @@ static void Console(apr_pool_t *pool, CYOptions &options) {
if (setjmp(ctrlc_) != 0) {
mode_ = Working;
- fputs("\n", fout);
- fflush(fout);
+ fputs("\n", fout_);
+ fflush(fout_);
goto restart;
}
@@ -429,16 +439,16 @@ static void Console(apr_pool_t *pool, CYOptions &options) {
std::string data(line + 1);
if (data == "bypass") {
bypass = !bypass;
- fprintf(fout, "bypass == %s\n", bypass ? "true" : "false");
- fflush(fout);
+ 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);
+ 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);
+ fprintf(fout_, "expand == %s\n", expand ? "true" : "false");
+ fflush(fout_);
}
add_history(line);
++histlines;
@@ -464,6 +474,7 @@ static void Console(apr_pool_t *pool, CYOptions &options) {
if (bypass)
code = command_;
else {
+ CYLocalPool pool;
CYDriver driver;
cy::parser parser(driver);
Setup(driver, parser);
@@ -474,7 +485,7 @@ static void Console(apr_pool_t *pool, CYOptions &options) {
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()) {
@@ -483,7 +494,7 @@ static void Console(apr_pool_t *pool, CYOptions &options) {
}
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 << '^';
@@ -527,7 +538,7 @@ static void Console(apr_pool_t *pool, CYOptions &options) {
if (debug)
std::cout << code << std::endl;
- Run(client_, code, fout, expand);
+ Run(client_, code, fout_, expand);
}
if (append_history$ != NULL) {
@@ -537,8 +548,8 @@ static void Console(apr_pool_t *pool, CYOptions &options) {
write_history(histfile);
}
- fputs("\n", fout);
- fflush(fout);
+ fputs("\n", fout_);
+ fflush(fout_);
}
static void *Map(const char *path, size_t *psize) {
@@ -565,7 +576,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
bool compile(false);
CYOptions options;
- append_history$ = reinterpret_cast(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));
@@ -757,9 +768,10 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
#endif
if (script == NULL && tty)
- Console(pool, options);
+ Console(options);
else {
- CYDriver driver(pool, script ?: "");
+ CYLocalPool pool;
+ CYDriver driver(script ?: "");
cy::parser parser(driver);
Setup(driver, parser);