*/
/* }}} */
-#include <sqlite3.h>
-
#include "Internal.hpp"
#include <dlfcn.h>
#include "sig/ffi_type.hpp"
#include "Pooling.hpp"
+#include "Execute.hpp"
#include <sys/mman.h>
#include "JavaScript.hpp"
#include "String.hpp"
-char *sqlite3_column_pooled(apr_pool_t *pool, sqlite3_stmt *stmt, int n) {
- if (const unsigned char *value = sqlite3_column_text(stmt, n))
- return apr_pstrdup(pool, (const char *) value);
- else return NULL;
-}
-
struct CYHooks *hooks_;
/* JavaScript Properties {{{ */
JSStringRef splice_s;
JSStringRef toCYON_s;
JSStringRef toJSON_s;
+JSStringRef toPointer_s;
static JSStringRef Result_;
-sqlite3 *Bridge_;
-
void CYFinalize(JSObjectRef object) {
- delete reinterpret_cast<CYData *>(JSObjectGetPrivate(object));
+ CYData *internal(reinterpret_cast<CYData *>(JSObjectGetPrivate(object)));
+ if (--internal->count_ == 0)
+ delete internal;
}
-struct CStringMapLess :
- std::binary_function<const char *, const char *, bool>
-{
- _finline bool operator ()(const char *lhs, const char *rhs) const {
- return strcmp(lhs, rhs) < 0;
- }
-};
-
void Structor_(apr_pool_t *pool, sig::Type *&type) {
if (
type->primitive == sig::pointer_P &&
type->data.data.type != NULL &&
type->data.data.type->primitive == sig::struct_P &&
+ type->data.data.type->name != NULL &&
strcmp(type->data.data.type->name, "_objc_class") == 0
) {
type->primitive = sig::typename_P;
if (type->primitive != sig::struct_P || type->name == NULL)
return;
- sqlite3_stmt *statement;
-
- _sqlcall(sqlite3_prepare(Bridge_,
- "select "
- "\"bridge\".\"mode\", "
- "\"bridge\".\"value\" "
- "from \"bridge\" "
- "where"
- " \"bridge\".\"mode\" in (3, 4) and"
- " \"bridge\".\"name\" = ?"
- " limit 1"
- , -1, &statement, NULL));
-
- _sqlcall(sqlite3_bind_text(statement, 1, type->name, -1, SQLITE_STATIC));
-
- int mode;
- const char *value;
-
- if (_sqlcall(sqlite3_step(statement)) == SQLITE_DONE) {
- mode = -1;
- value = NULL;
- } else {
- mode = sqlite3_column_int(statement, 0);
- value = sqlite3_column_pooled(pool, statement, 1);
- }
-
- _sqlcall(sqlite3_finalize(statement));
-
- switch (mode) {
- default:
- _assert(false);
- case -1:
- break;
-
- case 3: {
- sig::Parse(pool, &type->data.signature, value, &Structor_);
- } break;
-
- case 4: {
- sig::Signature signature;
- sig::Parse(pool, &signature, value, &Structor_);
- type = signature.elements[0].type;
- } break;
+ size_t length(strlen(type->name));
+ char keyed[length + 2];
+ memcpy(keyed + 1, type->name, length + 1);
+
+ static const char *modes = "34";
+ for (size_t i(0); i != 2; ++i) {
+ char mode(modes[i]);
+ keyed[0] = mode;
+
+ if (CYBridgeEntry *entry = CYBridgeHash(keyed, length + 1))
+ switch (mode) {
+ case '3':
+ sig::Parse(pool, &type->data.signature, entry->value_, &Structor_);
+ break;
+
+ case '4': {
+ sig::Signature signature;
+ sig::Parse(pool, &signature, entry->value_, &Structor_);
+ type = signature.elements[0].type;
+ } break;
+ }
}
}
}
};
-typedef std::map<const char *, Type_privateData *, CStringMapLess> TypeMap;
+typedef std::map<const char *, Type_privateData *, CYCStringLess> TypeMap;
static TypeMap Types_;
JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
return JSObjectMake(context, Pointer_, internal);
}
-static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const char *type) {
- cy::Functor *internal(new cy::Functor(type, function));
+static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const char *type, void **cache = NULL) {
+ cy::Functor *internal;
+
+ if (cache != NULL && *cache != NULL) {
+ internal = reinterpret_cast<cy::Functor *>(*cache);
+ ++internal->count_;
+ } else {
+ internal = new cy::Functor(type, function);
+
+ if (cache != NULL) {
+ *cache = internal;
+ ++internal->count_;
+ }
+ }
+
return JSObjectMake(context, Functor_, internal);
}
switch (JSValueGetType(context, value)) {
case kJSTypeNull:
return NULL;
- /*case kJSTypeObject:
+ case kJSTypeObject: {
+ JSObjectRef object((JSObjectRef) value);
if (JSValueIsObjectOfClass(context, value, Pointer_)) {
- Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate((JSObjectRef) value)));
+ Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
return internal->value_;
- }*/
- default:
+ }
+ JSValueRef toPointer(CYGetProperty(context, object, toPointer_s));
+ if (CYIsCallable(context, toPointer)) {
+ JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toPointer, object, 0, NULL));
+ _assert(value != NULL);
+ return CYCastPointer_(context, value);
+ }
+ } default:
double number(CYCastDouble(context, value));
if (std::isnan(number))
throw CYJSError(context, "cannot convert value to pointer");
if (JSValueRef value = (*hooks_->RuntimeProperty)(context, name))
return value;
- sqlite3_stmt *statement;
-
- _sqlcall(sqlite3_prepare(Bridge_,
- "select "
- "\"bridge\".\"mode\", "
- "\"bridge\".\"value\" "
- "from \"bridge\" "
- "where"
- " \"bridge\".\"name\" = ?"
- " limit 1"
- , -1, &statement, NULL));
-
- _sqlcall(sqlite3_bind_text(statement, 1, name.data, name.size, SQLITE_STATIC));
-
- int mode;
- const char *value;
-
- if (_sqlcall(sqlite3_step(statement)) == SQLITE_DONE) {
- mode = -1;
- value = NULL;
- } else {
- mode = sqlite3_column_int(statement, 0);
- value = sqlite3_column_pooled(pool, statement, 1);
+ size_t length(name.size);
+ char keyed[length + 2];
+ memcpy(keyed + 1, name.data, length + 1);
+
+ static const char *modes = "0124";
+ for (size_t i(0); i != 4; ++i) {
+ char mode(modes[i]);
+ keyed[0] = mode;
+
+ if (CYBridgeEntry *entry = CYBridgeHash(keyed, length + 1))
+ switch (mode) {
+ case '0':
+ return JSEvaluateScript(CYGetJSContext(context), CYJSString(entry->value_), NULL, NULL, 0, NULL);
+
+ case '1':
+ if (void (*symbol)() = reinterpret_cast<void (*)()>(CYCastSymbol(name.data)))
+ return CYMakeFunctor(context, symbol, entry->value_, &entry->cache_);
+ else return NULL;
+
+ case '2':
+ if (void *symbol = CYCastSymbol(name.data)) {
+ // XXX: this is horrendously inefficient
+ sig::Signature signature;
+ sig::Parse(pool, &signature, entry->value_, &Structor_);
+ ffi_cif cif;
+ sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
+ return CYFromFFI(context, signature.elements[0].type, cif.rtype, symbol);
+ } else return NULL;
+
+ // XXX: implement case 3
+ case '4':
+ return CYMakeType(context, entry->value_);
+ }
}
- _sqlcall(sqlite3_finalize(statement));
-
- switch (mode) {
- default:
- CYThrow("invalid mode from bridge table: %d", mode);
- case -1:
- return NULL;
-
- case 0:
- return JSEvaluateScript(CYGetJSContext(context), CYJSString(value), NULL, NULL, 0, NULL);
-
- case 1:
- if (void (*symbol)() = reinterpret_cast<void (*)()>(CYCastSymbol(name.data)))
- return CYMakeFunctor(context, symbol, value);
- else return NULL;
-
- case 2:
- if (void *symbol = CYCastSymbol(name.data)) {
- // XXX: this is horrendously inefficient
- sig::Signature signature;
- sig::Parse(pool, &signature, value, &Structor_);
- ffi_cif cif;
- sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
- return CYFromFFI(context, signature.elements[0].type, cif.rtype, symbol);
- } else return NULL;
-
- // XXX: implement case 3
- case 4:
- return CYMakeType(context, value);
- }
+ return NULL;
} CYCatch }
static JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
return JSContextGetGlobalObject(context);
}
-const char *CYExecute(apr_pool_t *pool, const char *code) {
+const char *CYExecute(apr_pool_t *pool, CYUTF8String code) {
JSContextRef context(CYGetJSContext());
JSValueRef exception(NULL), result;
CYInitializeStatic();
- _sqlcall(sqlite3_open("/usr/lib/libcycript.db", &Bridge_));
-
JSObjectMakeArray$ = reinterpret_cast<JSObjectRef (*)(JSContextRef, size_t, const JSValueRef[], JSValueRef *)>(dlsym(RTLD_DEFAULT, "JSObjectMakeArray"));
JSClassDefinition definition;
Type_privateData::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
+ definition.className = "Global";
//definition.getProperty = &Global_getProperty;
Global_ = JSClassCreate(&definition);
splice_s = JSStringCreateWithUTF8CString("splice");
toCYON_s = JSStringCreateWithUTF8CString("toCYON");
toJSON_s = JSStringCreateWithUTF8CString("toJSON");
+ toPointer_s = JSStringCreateWithUTF8CString("toPointer");
Result_ = JSStringCreateWithUTF8CString("_");
JSObjectRef all(JSObjectMake(context, All_, NULL));
CYSetProperty(context, cycript, CYJSString("all"), all);
- JSObjectRef last(NULL), curr(global);
+ if (true) {
+ JSObjectRef last(NULL), curr(global);
- goto next; for (JSValueRef next;;) {
- if (JSValueIsNull(context, next))
- break;
- last = curr;
- curr = CYCastJSObject(context, next);
- next:
- next = JSObjectGetPrototype(context, curr);
- }
+ goto next; for (JSValueRef next;;) {
+ if (JSValueIsNull(context, next))
+ break;
+ last = curr;
+ curr = CYCastJSObject(context, next);
+ next:
+ next = JSObjectGetPrototype(context, curr);
+ }
- JSObjectSetPrototype(context, last, all);
+ JSObjectSetPrototype(context, last, all);
+ }
- CYSetProperty(context, global, CYJSString("$cyq"), &$cyq);
+ CYSetProperty(context, global, CYJSString("$cyq"), &$cyq, kJSPropertyAttributeDontEnum);
JSObjectRef System(JSObjectMake(context, NULL, NULL));
- CYSetProperty(context, cy, CYJSString("System"), Function);
+ CYSetProperty(context, cy, CYJSString("System"), System);
CYSetProperty(context, global, CYJSString("system"), System);
CYSetProperty(context, System, CYJSString("args"), CYJSNull(context));
projects / cycript.git / blobdiff