X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/996c7c0ce2f75b82b32c43d64c350fd71b05e0cd..c8a0500b2fc78101e1a7f3b2c99939f88a33aa4d:/Console.cpp?ds=sidebyside
diff --git a/Console.cpp b/Console.cpp
index 3fe2310..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);
}
@@ -141,7 +123,9 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
json = NULL;
#endif
mode_ = Working;
- if (json != NULL)
+ if (json == NULL)
+ size = 0;
+ else
size = strlen(json);
} else {
mode_ = Sending;
@@ -214,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();
@@ -227,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);
@@ -239,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);
@@ -262,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;
@@ -281,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;
@@ -292,7 +275,7 @@ static char **Complete(const char *word, int start, int end) {
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"
@@ -313,7 +296,10 @@ 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));
if (array == NULL) {
@@ -330,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) {
@@ -379,7 +372,9 @@ static char **Complete(const char *word, int start, int end) {
static char name_[] = "cycript";
static char break_[] = " \t\n\"\\'`@$><=;|&{(" ")}" ".:[]";
-static void Console(apr_pool_t *pool, CYOptions &options) {
+static void Console(CYOptions &options) {
+ CYPool pool;
+
passwd *passwd;
if (const char *username = getenv("LOGNAME"))
passwd = getpwnam(username);
@@ -479,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);
@@ -489,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()) {
@@ -498,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 << '^';
@@ -580,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));
@@ -772,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);