-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2015 Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016 Jay Freeman (saurik)
*/
/* GNU Affero General Public License, Version 3 {{{ */
**/
/* }}} */
+#include <typeinfo>
+
#include "cycript.hpp"
#include "Driver.hpp"
-#include "Cycript.tab.hh"
#include "Replace.hpp"
#include "String.hpp"
static CYExpression *ParseExpression(CYPool &pool, CYUTF8String code) {
std::stringstream stream;
stream << '(' << code << ')';
- CYDriver driver(pool, stream);
-
- cy::parser parser(driver);
- if (parser.parse() != 0 || !driver.errors_.empty())
+ CYDriver driver(pool, *stream.rdbuf());
+ if (driver.Parse() || !driver.errors_.empty())
return NULL;
CYOptions options;
_visible char **CYComplete(const char *word, const std::string &line, CYUTF8String (*run)(CYPool &pool, const std::string &)) {
CYLocalPool pool;
- std::istringstream stream(line);
+ std::stringbuf stream(line);
CYDriver driver(pool, stream);
driver.auto_ = true;
- cy::parser parser(driver);
- if (parser.parse() != 0 || !driver.errors_.empty())
+ if (driver.Parse() || !driver.errors_.empty())
return NULL;
if (driver.mode_ == CYDriver::AutoNone)
case CYDriver::AutoMessage: {
CYDriver::Context &thing(driver.contexts_.back());
- expression = $M($C1($V("object_getClass"), thing.context_), $S("messages"));
+ expression = $M($C1($V("object_getClass"), thing.context_), $S("prototype"));
for (CYDriver::Context::Words::const_iterator part(thing.words_.begin()); part != thing.words_.end(); ++part)
prefix << (*part)->word_ << ':';
} break;
+ case CYDriver::AutoResolve:
+ expression = $M(driver.context_, $S("$cyr"));
+ break;
+
+ case CYDriver::AutoStruct:
+ expression = $ CYThis();
+ prefix << "$cys";
+ break;
+
+ case CYDriver::AutoEnum:
+ expression = $ CYThis();
+ prefix << "$cye";
+ break;
+
default:
_assert(false);
}
std::string begin(prefix.str());
- driver.script_ = $ CYScript($ CYExpress($C3(ParseExpression(pool,
- " function(object, prefix, word) {\n"
+ CYBoolean *message;
+ if (driver.mode_ == CYDriver::AutoMessage)
+ message = $ CYTrue();
+ else
+ message = $ CYFalse();
+
+ driver.script_ = $ CYScript($ CYExpress($C4(ParseExpression(pool,
+ " function(value, prefix, word, message) {\n"
+ " var object = value;\n"
" var names = [];\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"
+ " if (false) {\n"
+ " for (var name in object)\n"
+ " if (name.substring(0, entire) == prefix)\n"
+ " names.push(name);\n"
+ " } else do {\n"
+ " if (object.hasOwnProperty(\"cy$complete\"))\n"
+ " names = names.concat(object.cy$complete.call(value, prefix, message));\n"
+ " try {\n"
+ " var local = Object.getOwnPropertyNames(object);\n"
+ " } catch (e) {\n"
+ " continue;\n"
+ " }\n"
+ " for (var name of local)\n"
+ " if (name.substring(0, entire) == prefix)\n"
+ " names.push(name);\n"
+ " } while (object = typeof object === 'object' ? Object.getPrototypeOf(object) : object.__proto__);\n"
" return names;\n"
" }\n"
- ), expression, $S(begin.c_str()), $S(word))));
+ ), expression, $S(begin.c_str()), $S(word), message)));
driver.script_->Replace(context);
return NULL;
// XXX: use an std::set?
- typedef std::vector<std::string> Completions;
+ typedef std::vector<CYUTF8String> Completions;
Completions completions;
std::string common;
_assert(value != NULL);
element = value->next_;
- CYString *string(dynamic_cast<CYString *>(value->value_));
- _assert(string != NULL);
+ _assert(value->value_ != NULL);
+ CYString *string(value->value_->String(context));
+ if (string == NULL)
+ CYThrow("string was actually %s", typeid(*value->value_).name());
- std::string completion;
+ CYUTF8String completion;
if (string->size_ != 0)
- completion.assign(string->value_, string->size_);
+ completion = {string->value_, string->size_};
else if (driver.mode_ == CYDriver::AutoMessage)
completion = "]";
else
continue;
+ completion.data += begin.size();
+ completion.size -= begin.size();
+
+ if (CYStartsWith(completion, "$cy"))
+ continue;
completions.push_back(completion);
if (!rest) {
common = completion;
rest = true;
} else {
- size_t limit(completion.size()), size(common.size());
+ size_t limit(completion.size), size(common.size());
if (size > limit)
common = common.substr(0, limit);
else
limit = size;
for (limit = 0; limit != size; ++limit)
- if (common[limit] != completion[limit])
+ if (common[limit] != completion.data[limit])
break;
if (limit != size)
common = common.substr(0, limit);
results[0] = strdup(common.c_str());
size_t index(0);
for (Completions::const_iterator i(completions.begin()); i != completions.end(); ++i)
- results[++index] = strdup(i->c_str());
+ results[++index] = strdup(i->data);
results[count + 1] = NULL;
return results;
projects / cycript.git / blobdiff