-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009 Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2012 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 <http://www.gnu.org/licenses/>.
+**/
/* }}} */
#include "cycript.hpp"
void Setup(CYOutput &out, CYDriver &driver, CYOptions &options) {
out.pretty_ = pretty_;
- CYContext context(driver.pool_, options);
+ CYContext context(options);
driver.program_->Replace(context);
}
json = NULL;
#endif
mode_ = Working;
- if (json != NULL)
+ if (json == NULL)
+ size = 0;
+ else
size = strlen(json);
} else {
mode_ = Sending;
if (data == NULL || fout == NULL)
return;
- if (!expand || data[0] != '"' && data[0] != '\'')
+ if (!expand ||
+ data[0] != '@' && data[0] != '"' && data[0] != '\'' ||
+ data[0] == '@' && data[1] != '"' && data[1] != '\''
+ )
fputs(data, fout);
else for (size_t i(0); i != size; ++i)
if (data[i] != '\\')
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();
Setup(driver, parser);
if (parser.parse() != 0 || !driver.errors_.empty())
- _assert(false);
+ return NULL;
+
+ CYOptions options;
+ CYContext context(options);
- CYExpress *express(dynamic_cast<CYExpress *>(driver.program_->statements_));
- _assert(express != NULL);
- return express->expression_;
+ // 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_;
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);
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;
_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 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);\n"
+ " if (name.substring(0, entire) == prefix)\n"
+ " names.push(name.substr(before));\n"
" return names;\n"
" }\n"
- ), expression, $S(begin.c_str()))));
+ ), expression, $S(begin.c_str()), $S(word))));
driver.program_->Replace(context);
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<CYArray *>(result));
if (array == 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);
- 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) {
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<char **>(malloc(sizeof(char *) * (count + 2))));
// 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);
if (bypass)
code = command_;
else {
+ CYLocalPool pool;
CYDriver driver;
cy::parser parser(driver);
Setup(driver, parser);
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 << '^';
bool compile(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
if (script == NULL && tty)
- Console(pool, options);
+ Console(options);
else {
- CYDriver driver(pool, script ?: "<stdin>");
+ CYLocalPool pool;
+ CYDriver driver(script ?: "<stdin>");
cy::parser parser(driver);
Setup(driver, parser);
projects / cycript.git / blobdiff