X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/ec18682d83264996954ab6473ea3d342ac8affc5..0559abf83c4cc9bbd896b69dfaae1e8422521479:/Execute.cpp diff --git a/Execute.cpp b/Execute.cpp index 89a796a..1624b29 100644 --- a/Execute.cpp +++ b/Execute.cpp @@ -19,37 +19,47 @@ **/ /* }}} */ -#include "Internal.hpp" +#include "cycript.hpp" + +#include +#include +#include +#include +#include +#include #include #include #include #include -#include "cycript.hpp" - -#include "sig/parse.hpp" -#include "sig/ffi_type.hpp" - -#include "Pooling.hpp" -#include "Execute.hpp" - #include #include -#include -#include -#include -#include -#include -#include +#include + +#include "sig/parse.hpp" +#include "sig/ffi_type.hpp" #include "Code.hpp" #include "Decode.hpp" #include "Error.hpp" +#include "Execute.hpp" +#include "Internal.hpp" #include "JavaScript.hpp" +#include "Pooling.hpp" #include "String.hpp" +const char *sqlite3_column_string(sqlite3_stmt *stmt, int n) { + return reinterpret_cast(sqlite3_column_text(stmt, n)); +} + +char *sqlite3_column_pooled(CYPool &pool, sqlite3_stmt *stmt, int n) { + if (const char *value = sqlite3_column_string(stmt, n)) + return pool.strdup(value); + else return NULL; +} + static std::vector &GetHooks() { static std::vector hooks; return hooks; @@ -99,8 +109,19 @@ JSStringRef CYCopyJSString(JSStringRef value) { } JSStringRef CYCopyJSString(CYUTF8String value) { - // XXX: this is very wrong; it needs to convert to UTF16 and then create from there - return CYCopyJSString(value.data); + if (memchr(value.data, '\0', value.size) != NULL) { + CYPool pool; + return CYCopyJSString(pool.memdup(value.data, value.size)); + } else if (value.data[value.size] != '\0') { + CYPool pool; + return CYCopyJSString(CYPoolUTF16String(pool, value)); + } else { + return CYCopyJSString(value.data); + } +} + +JSStringRef CYCopyJSString(CYUTF16String value) { + return JSStringCreateWithCharacters(value.data, value.size); } JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value) { @@ -133,8 +154,21 @@ size_t CYGetIndex(CYPool &pool, JSContextRef context, JSStringRef value) { } /* }}} */ +static JSObjectRef (*JSObjectMakeArray$)(JSContextRef, size_t, const JSValueRef[], JSValueRef *); + +static JSObjectRef CYObjectMakeArray(JSContextRef context, size_t length, const JSValueRef values[]) { + if (JSObjectMakeArray$ != NULL) + return _jsccall(*JSObjectMakeArray$, context, length, values); + else { + JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array"))); + JSValueRef value(CYCallAsFunction(context, Array, NULL, length, values)); + return CYCastJSObject(context, value); + } +} + static JSClassRef All_; static JSClassRef Context_; +static JSClassRef CString_; JSClassRef Functor_; static JSClassRef Global_; static JSClassRef Pointer_; @@ -156,6 +190,8 @@ JSStringRef toPointer_s; JSStringRef toString_s; JSStringRef weak_s; +static sqlite3 *database_; + static JSStringRef Result_; void CYFinalize(JSObjectRef object) { @@ -165,43 +201,9 @@ void CYFinalize(JSObjectRef object) { delete internal; } -void Structor_(CYPool &pool, sig::Type *&type) { - if ( - type->primitive == sig::pointer_P && - 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; - type->data.data.type = NULL; - return; - } - - if (type->primitive != sig::struct_P || type->name == NULL) - return; - - 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; - } - } +sig::Type *Structor_(CYPool &pool, sig::Aggregate *aggregate) { + //_assert(false); + return aggregate; } JSClassRef Type_privateData::Class_; @@ -217,18 +219,34 @@ struct Context : } }; +struct CString : + CYOwned +{ + CString(char *value, JSContextRef context, JSObjectRef owner) : + CYOwned(value, context, owner) + { + } +}; + struct Pointer : CYOwned { Type_privateData *type_; size_t length_; - Pointer(void *value, JSContextRef context, JSObjectRef owner, size_t length, sig::Type *type) : + Pointer(void *value, JSContextRef context, JSObjectRef owner, size_t length, const sig::Type &type) : CYOwned(value, context, owner), type_(new(*pool_) Type_privateData(type)), length_(length) { } + + Pointer(void *value, JSContextRef context, JSObjectRef owner, size_t length, const char *encoding) : + CYOwned(value, context, owner), + type_(new(*pool_) Type_privateData(encoding)), + length_(length) + { + } }; struct Struct_privateData : @@ -242,7 +260,7 @@ struct Struct_privateData : } }; -JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_type *ffi, JSObjectRef owner) { +JSObjectRef CYMakeStruct(JSContextRef context, void *data, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) { Struct_privateData *internal(new Struct_privateData(context, owner)); CYPool &pool(*internal->pool_); Type_privateData *typical(new(pool) Type_privateData(type, ffi)); @@ -278,6 +296,7 @@ JSValueRef CYCastJSValue(JSContextRef context, double value) { #define CYCastJSValue_(Type_) \ JSValueRef CYCastJSValue(JSContextRef context, Type_ value) { \ + _assert(static_cast(static_cast(value)) == value); \ return JSValueMakeNumber(context, static_cast(value)); \ } @@ -340,21 +359,64 @@ JSValueRef CYArrayGet(JSContextRef context, JSObjectRef array, size_t index) { return _jsccall(JSObjectGetPropertyAtIndex, context, array, index); } -void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) { - JSValueRef arguments[1]; - arguments[0] = value; +void CYArrayPush(JSContextRef context, JSObjectRef array, size_t length, const JSValueRef arguments[]) { JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype"))); - _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, push_s)), array, 1, arguments); + _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, push_s)), array, length, arguments); +} + +void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) { + return CYArrayPush(context, array, 1, &value); } +template +class CYArrayBuilder { + private: + JSContextRef context_; + JSObjectRef &array_; + size_t size_; + JSValueRef values_[Size_]; + + void flush() { + if (array_ == NULL) + array_ = CYObjectMakeArray(context_, size_, values_); + else + CYArrayPush(context_, array_, size_, values_); + } + + public: + CYArrayBuilder(JSContextRef context, JSObjectRef &array) : + context_(context), + array_(array), + size_(0) + { + } + + ~CYArrayBuilder() { + flush(); + } + + void operator ()(JSValueRef value) { + if (size_ == Size_) { + flush(); + size_ = 0; + } + + values_[size_++] = value; + } +}; + static JSValueRef System_print(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + FILE *file(stdout); + if (count == 0) - printf("\n"); + fputc('\n', file); else { CYPool pool; - printf("%s\n", CYPoolCString(pool, context, arguments[0])); + CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0]))); + fwrite(string.data, string.size, 1, file); } + fflush(file); return CYJSUndefined(context); } CYCatch(NULL) } @@ -364,6 +426,14 @@ _visible void CYGarbageCollect(JSContextRef context) { (JSSynchronousGarbageCollectForDebugging$ ?: &JSGarbageCollect)(context); } +static JSValueRef Cycript_compile_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + CYPool pool; + CYUTF8String before(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0]))); + std::stringbuf value(std::string(before.data, before.size)); + CYUTF8String after(CYPoolCode(pool, value)); + return CYCastJSValue(context, CYJSString(after)); +} CYCatch_(NULL, "SyntaxError") } + static JSValueRef Cycript_gc_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { CYGarbageCollect(context); return CYJSUndefined(context); @@ -539,28 +609,31 @@ static JSValueRef String_callAsFunction_toCYON(JSContextRef context, JSObjectRef return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size()))); } CYCatch(NULL) } -JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, sig::Type *type, ffi_type *ffi, JSObjectRef owner) { +JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) { Pointer *internal(new Pointer(pointer, context, owner, length, type)); return JSObjectMake(context, Pointer_, internal); } +JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, const char *encoding, JSObjectRef owner) { + Pointer *internal(new Pointer(pointer, context, owner, length, encoding)); + return JSObjectMake(context, Pointer_, internal); +} + +JSObjectRef CYMakeCString(JSContextRef context, char *pointer, JSObjectRef owner) { + CString *internal(new CString(pointer, context, owner)); + return JSObjectMake(context, CString_, internal); +} + static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const sig::Signature &signature) { return JSObjectMake(context, Functor_, new cy::Functor(signature, function)); } -static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *encoding, void **cache) { - cy::Functor *internal; - if (*cache != NULL) - internal = reinterpret_cast(*cache); - else { - void (*function)()(reinterpret_cast(CYCastSymbol(symbol))); - if (function == NULL) - return NULL; - - internal = new cy::Functor(encoding, function); - *cache = internal; - } +static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *encoding) { + void (*function)()(reinterpret_cast(CYCastSymbol(symbol))); + if (function == NULL) + return NULL; + cy::Functor *internal(new cy::Functor(encoding, function)); ++internal->count_; return JSObjectMake(context, Functor_, internal); } @@ -569,7 +642,7 @@ static bool CYGetOffset(CYPool &pool, JSContextRef context, JSStringRef value, s return CYGetOffset(CYPoolCString(pool, context, value), index); } -void *CYCastPointer_(JSContextRef context, JSValueRef value) { +void *CYCastPointer_(JSContextRef context, JSValueRef value, bool *guess) { if (value == NULL) return NULL; else switch (JSValueGetType(context, value)) { @@ -585,165 +658,191 @@ void *CYCastPointer_(JSContextRef context, JSValueRef value) { if (CYIsCallable(context, toPointer)) { JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toPointer, object, 0, NULL)); _assert(value != NULL); - return CYCastPointer_(context, value); + return CYCastPointer_(context, value, guess); } } default: + if (guess != NULL) + *guess = true; + case kJSTypeNumber: double number(CYCastDouble(context, value)); - if (std::isnan(number)) + if (!std::isnan(number)) + return reinterpret_cast(static_cast(static_cast(number))); + if (guess == NULL) throw CYJSError(context, "cannot convert value to pointer"); - return reinterpret_cast(static_cast(static_cast(number))); + else { + *guess = true; + return NULL; + } } } -void CYPoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { - switch (type->primitive) { - case sig::boolean_P: - *reinterpret_cast(data) = JSValueToBoolean(context, value); - break; - -#define CYPoolFFI_(primitive, native) \ - case sig::primitive ## _P: \ - *reinterpret_cast(data) = CYCastDouble(context, value); \ - break; - - CYPoolFFI_(uchar, unsigned char) - CYPoolFFI_(char, char) - CYPoolFFI_(ushort, unsigned short) - CYPoolFFI_(short, short) - CYPoolFFI_(ulong, unsigned long) - CYPoolFFI_(long, long) - CYPoolFFI_(uint, unsigned int) - CYPoolFFI_(int, int) - CYPoolFFI_(ulonglong, unsigned long long) - CYPoolFFI_(longlong, long long) - CYPoolFFI_(float, float) - CYPoolFFI_(double, double) - - case sig::array_P: { - uint8_t *base(reinterpret_cast(data)); - JSObjectRef aggregate(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL); - for (size_t index(0); index != type->data.data.size; ++index) { - ffi_type *field(ffi->elements[index]); - - JSValueRef rhs; - if (aggregate == NULL) - rhs = value; - else { - rhs = CYGetProperty(context, aggregate, index); - if (JSValueIsUndefined(context, rhs)) - throw CYJSError(context, "unable to extract array value"); - } - - CYPoolFFI(pool, context, type->data.data.type, field, base, rhs); - // XXX: alignment? - base += field->size; - } - } break; +namespace sig { - case sig::pointer_P: - *reinterpret_cast(data) = CYCastPointer(context, value); - break; - - case sig::string_P: - _assert(pool != NULL); - *reinterpret_cast(data) = CYPoolCString(*pool, context, value); - break; - - case sig::struct_P: { - uint8_t *base(reinterpret_cast(data)); - JSObjectRef aggregate(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL); - for (size_t index(0); index != type->data.signature.count; ++index) { - sig::Element *element(&type->data.signature.elements[index]); - ffi_type *field(ffi->elements[index]); - - JSValueRef rhs; - if (aggregate == NULL) - rhs = value; - else { - rhs = CYGetProperty(context, aggregate, index); - if (JSValueIsUndefined(context, rhs)) { - if (element->name != NULL) - rhs = CYGetProperty(context, aggregate, CYJSString(element->name)); - else - goto undefined; - if (JSValueIsUndefined(context, rhs)) undefined: - throw CYJSError(context, "unable to extract structure value"); - } - } - - CYPoolFFI(pool, context, element->type, field, base, rhs); - // XXX: alignment? - base += field->size; - } - } break; +// XXX: this is somehow not quite a template :/ - case sig::void_P: - break; +template <> +void Primitive::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + *reinterpret_cast(data) = JSValueToBoolean(context, value); +} - default: - for (CYHook *hook : GetHooks()) - if (hook->PoolFFI != NULL) - if ((*hook->PoolFFI)(pool, context, type, ffi, data, value)) - return; +#define CYPoolFFI_(Type_) \ +template <> \ +void Primitive::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { \ + *reinterpret_cast(data) = CYCastDouble(context, value); \ +} + +CYPoolFFI_(char) +CYPoolFFI_(double) +CYPoolFFI_(float) +CYPoolFFI_(signed char) +CYPoolFFI_(signed int) +CYPoolFFI_(signed long int) +CYPoolFFI_(signed long long int) +CYPoolFFI_(signed short int) +CYPoolFFI_(unsigned char) +CYPoolFFI_(unsigned int) +CYPoolFFI_(unsigned long int) +CYPoolFFI_(unsigned long long int) +CYPoolFFI_(unsigned short int) + +void Void::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + _assert(false); +} + +void Unknown::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + _assert(false); +} + +void String::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + bool guess(false); + *reinterpret_cast(data) = CYCastPointer(context, value, &guess); + if (guess && pool != NULL) + *reinterpret_cast(data) = CYPoolCString(*pool, context, value); +} + +void Bits::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + _assert(false); +} + +void Pointer::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + *reinterpret_cast(data) = CYCastPointer(context, value); +} + +void Array::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + uint8_t *base(reinterpret_cast(data)); + JSObjectRef aggregate(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL); + for (size_t index(0); index != size; ++index) { + ffi_type *field(ffi->elements[index]); - CYThrow("unimplemented signature code: '%c''\n", type->primitive); + JSValueRef rhs; + if (aggregate == NULL) + rhs = value; + else { + rhs = CYGetProperty(context, aggregate, index); + if (JSValueIsUndefined(context, rhs)) + throw CYJSError(context, "unable to extract array value"); + } + + type.PoolFFI(pool, context, field, base, rhs); + // XXX: alignment? + base += field->size; } } -JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) { - switch (type->primitive) { - case sig::boolean_P: - return CYCastJSValue(context, *reinterpret_cast(data)); - -#define CYFromFFI_(primitive, native) \ - case sig::primitive ## _P: \ - return CYCastJSValue(context, *reinterpret_cast(data)); \ - - CYFromFFI_(uchar, unsigned char) - CYFromFFI_(char, char) - CYFromFFI_(ushort, unsigned short) - CYFromFFI_(short, short) - CYFromFFI_(ulong, unsigned long) - CYFromFFI_(long, long) - CYFromFFI_(uint, unsigned int) - CYFromFFI_(int, int) - CYFromFFI_(ulonglong, unsigned long long) - CYFromFFI_(longlong, long long) - CYFromFFI_(float, float) - CYFromFFI_(double, double) - - case sig::array_P: - if (void *pointer = data) - return CYMakePointer(context, pointer, type->data.data.size, type->data.data.type, NULL, owner); - else goto null; - - case sig::pointer_P: - if (void *pointer = *reinterpret_cast(data)) - return CYMakePointer(context, pointer, _not(size_t), type->data.data.type, NULL, owner); - else goto null; - - case sig::string_P: - if (char *utf8 = *reinterpret_cast(data)) - return CYCastJSValue(context, utf8); - else goto null; - - case sig::struct_P: - return CYMakeStruct(context, data, type, ffi, owner); - case sig::void_P: - return CYJSUndefined(context); - - null: - return CYJSNull(context); - default: - for (CYHook *hook : GetHooks()) - if (hook->FromFFI != NULL) - if (JSValueRef value = (*hook->FromFFI)(context, type, ffi, data, initialize, owner)) - return value; +void Aggregate::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + _assert(!overlap); + + uint8_t *base(reinterpret_cast(data)); + JSObjectRef aggregate(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL); + for (size_t index(0); index != signature.count; ++index) { + sig::Element *element(&signature.elements[index]); + ffi_type *field(ffi->elements[index]); + + JSValueRef rhs; + if (aggregate == NULL) + rhs = value; + else { + rhs = CYGetProperty(context, aggregate, index); + if (JSValueIsUndefined(context, rhs)) { + if (element->name != NULL) + rhs = CYGetProperty(context, aggregate, CYJSString(element->name)); + else + goto undefined; + if (JSValueIsUndefined(context, rhs)) undefined: + throw CYJSError(context, "unable to extract structure value"); + } + } - CYThrow("unimplemented signature code: '%c''\n", type->primitive); + element->type->PoolFFI(pool, context, field, base, rhs); + // XXX: alignment? + base += field->size; } } +void Function::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + _assert(false); +} + +#define CYFromFFI_(Type_) \ +template <> \ +JSValueRef Primitive::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { \ + return CYCastJSValue(context, *reinterpret_cast(data)); \ +} + +CYFromFFI_(bool) +CYFromFFI_(char) +CYFromFFI_(double) +CYFromFFI_(float) +CYFromFFI_(signed char) +CYFromFFI_(signed int) +CYFromFFI_(signed long int) +CYFromFFI_(signed long long int) +CYFromFFI_(signed short int) +CYFromFFI_(unsigned char) +CYFromFFI_(unsigned int) +CYFromFFI_(unsigned long int) +CYFromFFI_(unsigned long long int) +CYFromFFI_(unsigned short int) + +JSValueRef Void::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + return CYJSUndefined(context); +} + +JSValueRef Unknown::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + _assert(false); +} + +JSValueRef String::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + if (char *value = *reinterpret_cast(data)) + return CYMakeCString(context, value, owner); + return CYJSNull(context); +} + +JSValueRef Bits::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + _assert(false); +} + +JSValueRef Pointer::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + if (void *value = *reinterpret_cast(data)) + return CYMakePointer(context, value, _not(size_t), type, NULL, owner); + return CYJSNull(context); +} + +JSValueRef Array::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + _assert(data != NULL); + return CYMakePointer(context, data, size, type, NULL, owner); +} + +JSValueRef Aggregate::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + return CYMakeStruct(context, data, *this, ffi, owner); +} + +JSValueRef Function::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + return CYMakeFunctor(context, reinterpret_cast(data), signature); +} + +} + void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg) { Closure_privateData *internal(reinterpret_cast(arg)); @@ -753,10 +852,11 @@ void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg) { JSValueRef values[count]; for (size_t index(0); index != count; ++index) - values[index] = CYFromFFI(context, internal->signature_.elements[1 + index].type, internal->cif_.arg_types[index], arguments[index]); + values[index] = internal->signature_.elements[1 + index].type->FromFFI(context, internal->cif_.arg_types[index], arguments[index]); JSValueRef value(internal->adapter_(context, count, values, internal->function_)); - CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value); + if (internal->cif_.rtype != &ffi_type_void) + internal->signature_.elements[0].type->PoolFFI(NULL, context, internal->cif_.rtype, result, value); } static JSValueRef FunctionAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) { @@ -823,9 +923,35 @@ static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const s } } +static JSValueRef CString_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + CYPool pool; + CString *internal(reinterpret_cast(JSObjectGetPrivate(object))); + char *string(static_cast(internal->value_)); + + ssize_t offset; + if (!CYGetOffset(pool, context, property, offset)) + return NULL; + + return CYCastJSValue(context, CYJSString(CYUTF8String(&string[offset], 1))); +} CYCatch(NULL) } + +static bool CString_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { + CYPool pool; + CString *internal(reinterpret_cast(JSObjectGetPrivate(object))); + char *string(static_cast(internal->value_)); + + ssize_t offset; + if (!CYGetOffset(pool, context, property, offset)) + return false; + + const char *data(CYPoolCString(pool, context, value)); + string[offset] = *data; + return true; +} CYCatch(false) } + static bool Index_(CYPool &pool, JSContextRef context, Struct_privateData *internal, JSStringRef property, ssize_t &index, uint8_t *&base) { Type_privateData *typical(internal->type_); - sig::Type *type(typical->type_); + sig::Aggregate *type(static_cast(typical->type_)); if (type == NULL) return false; @@ -833,13 +959,13 @@ static bool Index_(CYPool &pool, JSContextRef context, Struct_privateData *inter size_t length(strlen(name)); double number(CYCastDouble(name, length)); - size_t count(type->data.signature.count); + size_t count(type->signature.count); if (std::isnan(number)) { if (property == NULL) return false; - sig::Element *elements(type->data.signature.elements); + sig::Element *elements(type->signature.elements); for (size_t local(0); local != count; ++local) { sig::Element *element(&elements[local]); @@ -859,10 +985,13 @@ static bool Index_(CYPool &pool, JSContextRef context, Struct_privateData *inter base: ffi_type **elements(typical->GetFFI()->elements); - base = reinterpret_cast(internal->value_); - for (ssize_t local(0); local != index; ++local) - base += elements[local]->size; + size_t offset(0); + for (ssize_t local(0); local != index; ++local) { + offset += elements[local]->size; + CYAlign(offset, elements[local + 1]->alignment); + } + base = reinterpret_cast(internal->value_) + offset; return true; } @@ -876,7 +1005,12 @@ static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, Type_privateData *typical(internal->type_); if (typical->type_ == NULL) return NULL; - sig::Type &type(*typical->type_); + + if (sig::Function *function = dynamic_cast(typical->type_)) { + if (!JSStringIsEqualToUTF8CString(property, "$cyi")) + return NULL; + return CYMakeFunctor(context, reinterpret_cast(internal->value_), function->signature); + } ssize_t offset; if (JSStringIsEqualToUTF8CString(property, "$cyi")) @@ -884,16 +1018,13 @@ static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, else if (!CYGetOffset(pool, context, property, offset)) return NULL; - if (type.primitive == sig::function_P) - return CYMakeFunctor(context, reinterpret_cast(internal->value_), type.data.signature); - ffi_type *ffi(typical->GetFFI()); uint8_t *base(reinterpret_cast(internal->value_)); base += ffi->size * offset; JSObjectRef owner(internal->GetOwner() ?: object); - return CYFromFFI(context, &type, ffi, base, false, owner); + return typical->type_->FromFFI(context, ffi, base, false, owner); } CYCatch(NULL) } static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { @@ -915,20 +1046,26 @@ static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStri uint8_t *base(reinterpret_cast(internal->value_)); base += ffi->size * offset; - CYPoolFFI(NULL, context, typical->type_, ffi, base, value); + typical->type_->PoolFFI(NULL, context, ffi, base, value); return true; } CYCatch(false) } static JSValueRef Struct_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { Struct_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); Type_privateData *typical(internal->type_); - return CYMakePointer(context, internal->value_, _not(size_t), typical->type_, typical->ffi_, _this); + return CYMakePointer(context, internal->value_, _not(size_t), *typical->type_, typical->ffi_, _this); +} CYCatch(NULL) } + +static JSValueRef Struct_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + Struct_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); + return CYMakeType(context, *internal->type_->type_); } CYCatch(NULL) } static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { CYPool pool; Struct_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); Type_privateData *typical(internal->type_); + sig::Aggregate *type(static_cast(typical->type_)); ssize_t index; uint8_t *base; @@ -938,13 +1075,14 @@ static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, J JSObjectRef owner(internal->GetOwner() ?: object); - return CYFromFFI(context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, false, owner); + return type->signature.elements[index].type->FromFFI(context, typical->GetFFI()->elements[index], base, false, owner); } CYCatch(NULL) } static bool Struct_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { CYPool pool; Struct_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); Type_privateData *typical(internal->type_); + sig::Aggregate *type(static_cast(typical->type_)); ssize_t index; uint8_t *base; @@ -952,20 +1090,20 @@ static bool Struct_setProperty(JSContextRef context, JSObjectRef object, JSStrin if (!Index_(pool, context, internal, property, index, base)) return false; - CYPoolFFI(NULL, context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, value); + type->signature.elements[index].type->PoolFFI(NULL, context, typical->GetFFI()->elements[index], base, value); return true; } CYCatch(false) } static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { Struct_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); Type_privateData *typical(internal->type_); - sig::Type *type(typical->type_); + sig::Aggregate *type(static_cast(typical->type_)); if (type == NULL) return; - size_t count(type->data.signature.count); - sig::Element *elements(type->data.signature.elements); + size_t count(type->signature.count); + sig::Element *elements(type->signature.elements); char number[32]; @@ -999,7 +1137,7 @@ JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, voi ffi_type *ffi(cif->arg_types[index]); // XXX: alignment? values[index] = new(pool) uint8_t[ffi->size]; - CYPoolFFI(&pool, context, element->type, ffi, values[index], arguments[index - setups]); + element->type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]); } uint8_t value[cif->rtype->size]; @@ -1011,7 +1149,7 @@ JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, voi call = hook->CallFunction; call(pool, context, cif, function, value, values); - return CYFromFFI(context, signature->elements[0].type, cif->rtype, value, initialize); + return signature->elements[0].type->FromFFI(context, cif->rtype, value, initialize); } static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1020,30 +1158,59 @@ static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef objec return CYCallFunction(pool, context, 0, NULL, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue()); } CYCatch(NULL) } -JSObjectRef CYMakeType(JSContextRef context, const char *encoding) { - Type_privateData *internal(new Type_privateData(encoding)); - return JSObjectMake(context, Type_privateData::Class_, internal); -} +static JSValueRef Pointer_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + Pointer *internal(reinterpret_cast(JSObjectGetPrivate(object))); + if (dynamic_cast(internal->type_->type_) == NULL) + throw CYJSError(context, "cannot call a pointer to non-function"); + JSObjectRef functor(CYCastJSObject(context, CYGetProperty(context, object, cyi_s))); + return CYCallAsFunction(context, functor, _this, count, arguments); +} CYCatch(NULL) } -JSObjectRef CYMakeType(JSContextRef context, sig::Type *type) { +JSObjectRef CYMakeType(JSContextRef context, const sig::Type &type) { Type_privateData *internal(new Type_privateData(type)); return JSObjectMake(context, Type_privateData::Class_, internal); } JSObjectRef CYMakeType(JSContextRef context, sig::Signature *signature) { CYPool pool; + sig::Function type; + sig::Copy(pool, type.signature, *signature); + return CYMakeType(context, type); +} - sig::Type type; - type.name = NULL; - type.flags = 0; +extern "C" bool CYBridgeHash(CYPool &pool, CYUTF8String name, const char *&code, unsigned &flags) { + sqlite3_stmt *statement; - type.primitive = sig::function_P; - sig::Copy(pool, type.data.signature, *signature); + _sqlcall(sqlite3_prepare(database_, + "select " + "\"cache\".\"code\", " + "\"cache\".\"flags\" " + "from \"cache\" " + "where" + " \"cache\".\"system\" & " CY_SYSTEM " == " CY_SYSTEM " and" + " \"cache\".\"name\" = ?" + " limit 1" + , -1, &statement, NULL)); - return CYMakeType(context, &type); + _sqlcall(sqlite3_bind_text(statement, 1, name.data, name.size, SQLITE_STATIC)); + + bool success; + if (_sqlcall(sqlite3_step(statement)) == SQLITE_DONE) + success = false; + else { + success = true; + code = sqlite3_column_pooled(pool, statement, 0); + flags = sqlite3_column_int(statement, 1); + } + + _sqlcall(sqlite3_finalize(statement)); + return success; } static bool All_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { + if (JSStringIsEqualToUTF8CString(property, "errno")) + return true; + JSObjectRef global(CYGetGlobalObject(context)); JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript")))); JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls")))); @@ -1054,23 +1221,18 @@ static bool All_hasProperty(JSContextRef context, JSObjectRef object, JSStringRe return true; CYPool pool; - CYUTF8String name(CYPoolUTF8String(pool, context, property)); - - 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) { - keyed[0] = modes[i]; - if (CYBridgeHash(keyed, length + 1) != NULL) - return true; - } + const char *code; + unsigned flags; + if (CYBridgeHash(pool, CYPoolUTF8String(pool, context, property), code, flags)) + return true; return false; } static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + if (JSStringIsEqualToUTF8CString(property, "errno")) + return CYCastJSValue(context, errno); + JSObjectRef global(CYGetGlobalObject(context)); JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript")))); JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls")))); @@ -1082,44 +1244,76 @@ static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSSt return value; CYPool pool; - CYUTF8String name(CYPoolUTF8String(pool, context, property)); - - 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': - return CYMakeFunctor(context, name.data, entry->value_, &entry->cache_); - - 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_); - } + const char *code; + unsigned flags; + if (CYBridgeHash(pool, CYPoolUTF8String(pool, context, property), code, flags)) { + CYUTF8String parsed; + + try { + parsed = CYPoolCode(pool, code); + } catch (const CYException &error) { + CYThrow("%s", pool.strcat("error caching ", CYPoolCString(pool, context, property), ": ", error.PoolCString(pool), NULL)); + } + + JSValueRef result(_jsccall(JSEvaluateScript, context, CYJSString(parsed), NULL, NULL, 0)); + + if (flags == 0) { + JSObjectRef cache(CYGetCachedObject(context, CYJSString("cache"))); + CYSetProperty(context, cache, property, result); + } + + return result; } return NULL; } CYCatch(NULL) } +static JSValueRef All_complete_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + _assert(count == 1); + CYPool pool; + CYUTF8String prefix(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0]))); + + JSObjectRef array(NULL); + + { + CYArrayBuilder<1024> values(context, array); + + sqlite3_stmt *statement; + + if (prefix.size == 0) + _sqlcall(sqlite3_prepare(database_, + "select " + "\"cache\".\"name\" " + "from \"cache\" " + "where" + " \"cache\".\"system\" & " CY_SYSTEM " == " CY_SYSTEM + , -1, &statement, NULL)); + else { + _sqlcall(sqlite3_prepare(database_, + "select " + "\"cache\".\"name\" " + "from \"cache\" " + "where" + " \"cache\".\"name\" >= ? and \"cache\".\"name\" < ? and " + " \"cache\".\"system\" & " CY_SYSTEM " == " CY_SYSTEM + , -1, &statement, NULL)); + + _sqlcall(sqlite3_bind_text(statement, 1, prefix.data, prefix.size, SQLITE_STATIC)); + + char *after(pool.strndup(prefix.data, prefix.size)); + ++after[prefix.size - 1]; + _sqlcall(sqlite3_bind_text(statement, 2, after, prefix.size, SQLITE_STATIC)); + } + + while (_sqlcall(sqlite3_step(statement)) != SQLITE_DONE) + values(CYCastJSValue(context, CYJSString(sqlite3_column_string(statement, 0)))); + + _sqlcall(sqlite3_finalize(statement)); + } + + return array; +} CYCatch(NULL) } + static void All_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { JSObjectRef global(CYGetGlobalObject(context)); JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript")))); @@ -1134,6 +1328,13 @@ static void All_getPropertyNames(JSContextRef context, JSObjectRef object, JSPro } } +static JSObjectRef CString_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 1) + throw CYJSError(context, "incorrect number of arguments to CString constructor"); + char *value(CYCastPointer(context, arguments[0])); + return CYMakeCString(context, value, NULL); +} CYCatch(NULL) } + static JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 2) throw CYJSError(context, "incorrect number of arguments to Pointer constructor"); @@ -1146,36 +1347,64 @@ static JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t sig::Signature signature; sig::Parse(pool, &signature, type, &Structor_); - return CYMakePointer(context, value, _not(size_t), signature.elements[0].type, NULL, NULL); + return CYMakePointer(context, value, _not(size_t), *signature.elements[0].type, NULL, NULL); } CYCatch(NULL) } static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (count != 1) - throw CYJSError(context, "incorrect number of arguments to Type constructor"); CYPool pool; - const char *type(CYPoolCString(pool, context, arguments[0])); - return CYMakeType(context, type); + + if (false) { + } else if (count == 1) { + const char *encoding(CYPoolCString(pool, context, arguments[0])); + sig::Signature signature; + sig::Parse(pool, &signature, encoding, &Structor_); + return CYMakeType(context, *signature.elements[0].type); + } else if (count == 2) { + JSObjectRef types(CYCastJSObject(context, arguments[0])); + size_t count(CYArrayLength(context, types)); + + JSObjectRef names(CYCastJSObject(context, arguments[1])); + + sig::Aggregate type(false); + type.signature.elements = new(pool) sig::Element[count]; + type.signature.count = count; + + for (size_t i(0); i != count; ++i) { + sig::Element &element(type.signature.elements[i]); + element.offset = _not(size_t); + + JSValueRef name(CYArrayGet(context, names, i)); + if (JSValueIsUndefined(context, name)) + element.name = NULL; + else + element.name = CYPoolCString(pool, context, name); + + JSObjectRef object(CYCastJSObject(context, CYArrayGet(context, types, i))); + _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_)); + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); + element.type = internal->type_; + } + + return CYMakeType(context, type); + } else { + throw CYJSError(context, "incorrect number of arguments to Type constructor"); + } } CYCatch(NULL) } -static JSValueRef Type_callAsFunction_$With(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], sig::Primitive primitive, JSValueRef *exception) { CYTry { +static JSValueRef Type_callAsFunction_$With(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], sig::Callable &type, JSValueRef *exception) { CYTry { Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); CYPool pool; - sig::Type type; - type.name = NULL; - type.flags = 0; - - type.primitive = primitive; - type.data.signature.elements = new(pool) sig::Element[1 + count]; - type.data.signature.count = 1 + count; + type.signature.elements = new(pool) sig::Element[1 + count]; + type.signature.count = 1 + count; - type.data.signature.elements[0].name = NULL; - type.data.signature.elements[0].type = internal->type_; - type.data.signature.elements[0].offset = _not(size_t); + type.signature.elements[0].name = NULL; + type.signature.elements[0].type = internal->type_; + type.signature.elements[0].offset = _not(size_t); for (size_t i(0); i != count; ++i) { - sig::Element &element(type.data.signature.elements[i + 1]); + sig::Element &element(type.signature.elements[i + 1]); element.name = NULL; element.offset = _not(size_t); @@ -1186,7 +1415,7 @@ static JSValueRef Type_callAsFunction_$With(JSContextRef context, JSObjectRef ob element.type = internal->type_; } - return CYMakeType(context, &type); + return CYMakeType(context, type); } CYCatch(NULL) } static JSValueRef Type_callAsFunction_arrayOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1199,19 +1428,13 @@ static JSValueRef Type_callAsFunction_arrayOf(JSContextRef context, JSObjectRef if (index == _not(size_t)) throw CYJSError(context, "invalid array size used with Type.arrayOf"); - sig::Type type; - type.name = NULL; - type.flags = 0; - - type.primitive = sig::array_P; - type.data.data.type = internal->type_; - type.data.data.size = index; - - return CYMakeType(context, &type); + sig::Array type(*internal->type_, index); + return CYMakeType(context, type); } CYCatch(NULL) } static JSValueRef Type_callAsFunction_blockWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { - return Type_callAsFunction_$With(context, object, _this, count, arguments, sig::block_P, exception); + sig::Block type; + return Type_callAsFunction_$With(context, object, _this, count, arguments, type, exception); } static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1219,85 +1442,15 @@ static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef throw CYJSError(context, "incorrect number of arguments to Type.constant"); Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - sig::Type type(*internal->type_); - type.flags |= JOC_TYPE_CONST; - return CYMakeType(context, &type); -} CYCatch(NULL) } - -static JSValueRef Type_callAsFunction_long(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (count != 0) - throw CYJSError(context, "incorrect number of arguments to Type.long"); - Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - - sig::Type type(*internal->type_); - - switch (type.primitive) { - case sig::short_P: type.primitive = sig::int_P; break; - case sig::int_P: type.primitive = sig::long_P; break; - case sig::long_P: type.primitive = sig::longlong_P; break; - default: throw CYJSError(context, "invalid type argument to Type.long"); - } - - return CYMakeType(context, &type); -} CYCatch(NULL) } - -static JSValueRef Type_callAsFunction_short(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (count != 0) - throw CYJSError(context, "incorrect number of arguments to Type.short"); - Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - - sig::Type type(*internal->type_); - - switch (type.primitive) { - case sig::int_P: type.primitive = sig::short_P; break; - case sig::long_P: type.primitive = sig::int_P; break; - case sig::longlong_P: type.primitive = sig::long_P; break; - default: throw CYJSError(context, "invalid type argument to Type.short"); - } - - return CYMakeType(context, &type); -} CYCatch(NULL) } - -static JSValueRef Type_callAsFunction_signed(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (count != 0) - throw CYJSError(context, "incorrect number of arguments to Type.signed"); - Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - - sig::Type type(*internal->type_); - - switch (type.primitive) { - case sig::char_P: case sig::uchar_P: type.primitive = sig::char_P; break; - case sig::short_P: case sig::ushort_P: type.primitive = sig::short_P; break; - case sig::int_P: case sig::uint_P: type.primitive = sig::int_P; break; - case sig::long_P: case sig::ulong_P: type.primitive = sig::long_P; break; - case sig::longlong_P: case sig::ulonglong_P: type.primitive = sig::longlong_P; break; - default: throw CYJSError(context, "invalid type argument to Type.signed"); - } - - return CYMakeType(context, &type); -} CYCatch(NULL) } - -static JSValueRef Type_callAsFunction_unsigned(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (count != 0) - throw CYJSError(context, "incorrect number of arguments to Type.unsigned"); - Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - - sig::Type type(*internal->type_); - - switch (type.primitive) { - case sig::char_P: case sig::uchar_P: type.primitive = sig::uchar_P; break; - case sig::short_P: case sig::ushort_P: type.primitive = sig::ushort_P; break; - case sig::int_P: case sig::uint_P: type.primitive = sig::uint_P; break; - case sig::long_P: case sig::ulong_P: type.primitive = sig::ulong_P; break; - case sig::longlong_P: case sig::ulonglong_P: type.primitive = sig::ulonglong_P; break; - default: throw CYJSError(context, "invalid type argument to Type.unsigned"); - } - - return CYMakeType(context, &type); + CYPool pool; + sig::Type *type(internal->type_->Copy(pool)); + type->flags |= JOC_TYPE_CONST; + return CYMakeType(context, *type); } CYCatch(NULL) } static JSValueRef Type_callAsFunction_functionWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { - return Type_callAsFunction_$With(context, object, _this, count, arguments, sig::function_P, exception); + sig::Function type; + return Type_callAsFunction_$With(context, object, _this, count, arguments, type, exception); } static JSValueRef Type_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1305,22 +1458,10 @@ static JSValueRef Type_callAsFunction_pointerTo(JSContextRef context, JSObjectRe throw CYJSError(context, "incorrect number of arguments to Type.pointerTo"); Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - sig::Type type; - type.name = NULL; - - if (internal->type_->primitive == sig::char_P) { - type.flags = internal->type_->flags; - type.primitive = sig::string_P; - type.data.data.type = NULL; - type.data.data.size = 0; - } else { - type.flags = 0; - type.primitive = sig::pointer_P; - type.data.data.type = internal->type_; - type.data.data.size = 0; - } - - return CYMakeType(context, &type); + if (dynamic_cast *>(internal->type_) != NULL) + return CYMakeType(context, sig::String()); + else + return CYMakeType(context, sig::Pointer(*internal->type_)); } CYCatch(NULL) } static JSValueRef Type_callAsFunction_withName(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1329,11 +1470,7 @@ static JSValueRef Type_callAsFunction_withName(JSContextRef context, JSObjectRef Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); CYPool pool; - const char *name(CYPoolCString(pool, context, arguments[0])); - - sig::Type type(*internal->type_); - type.name = name; - return CYMakeType(context, &type); + return CYMakeType(context, *internal->type_->Copy(pool, CYPoolCString(pool, context, arguments[0]))); } CYCatch(NULL) } static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1341,16 +1478,16 @@ static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object, throw CYJSError(context, "incorrect number of arguments to type cast function"); Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); - if (internal->type_->primitive == sig::function_P) - return CYMakeFunctor(context, arguments[0], internal->type_->data.signature); + if (sig::Function *function = dynamic_cast(internal->type_)) + return CYMakeFunctor(context, arguments[0], function->signature); sig::Type *type(internal->type_); ffi_type *ffi(internal->GetFFI()); // XXX: alignment? uint8_t value[ffi->size]; CYPool pool; - CYPoolFFI(&pool, context, type, ffi, value, arguments[0]); - return CYFromFFI(context, type, ffi, value); + type->PoolFFI(&pool, context, ffi, value, arguments[0]); + return type->FromFFI(context, ffi, value); } CYCatch(NULL) } static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1359,17 +1496,13 @@ static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef obje Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); sig::Type *type(internal->type_); - size_t length; - - if (type->primitive != sig::array_P) - length = _not(size_t); - else { - length = type->data.data.size; - type = type->data.data.type; - } + size_t length(type->Translate(type)); - void *value(calloc(1, internal->GetFFI()->size)); - return CYMakePointer(context, value, length, type, NULL, NULL); + JSObjectRef pointer(CYMakePointer(context, NULL, length, *type, NULL, NULL)); + Pointer *value(reinterpret_cast(JSObjectGetPrivate(pointer))); + value->value_ = value->pool_->malloc(internal->GetFFI()->size); + memset(value->value_, 0, internal->GetFFI()->size); + return pointer; } CYCatch(NULL) } static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1382,6 +1515,25 @@ static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t return CYMakeFunctor(context, arguments[0], signature); } CYCatch(NULL) } +static JSValueRef CString_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + CString *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + return CYMakePointer(context, internal->value_, _not(size_t), sig::Primitive(), NULL, NULL); +} CYCatch(NULL) } + +static JSValueRef Functor_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + CYPool pool; + cy::Functor *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + + sig::Function type; + sig::Copy(pool, type.signature, internal->signature_); + + return CYMakePointer(context, internal->value_, _not(size_t), type, NULL, NULL); +} CYCatch(NULL) } + +static JSValueRef Pointer_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + return _this; +} CYCatch(NULL) } + static JSValueRef CYValue_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { CYValue *internal(reinterpret_cast(JSObjectGetPrivate(_this))); return CYCastJSValue(context, reinterpret_cast(internal->value_)); @@ -1393,9 +1545,20 @@ static JSValueRef CYValue_callAsFunction_toJSON(JSContextRef context, JSObjectRe static JSValueRef CYValue_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { CYValue *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - char string[32]; - sprintf(string, "%p", internal->value_); - return CYCastJSValue(context, string); + std::ostringstream str; + Dl_info info; + if (internal->value_ == NULL) + str << "NULL"; + else if (dladdr(internal->value_, &info) == 0) + str << internal->value_; + else { + str << info.dli_sname; + off_t offset(static_cast(internal->value_) - static_cast(info.dli_saddr)); + if (offset != 0) + str << "+0x" << std::hex << offset; + } + std::string value(str.str()); + return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size()))); } CYCatch(NULL) } static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1406,24 +1569,66 @@ static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRe JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype"))); JSObjectRef toCYON(CYCastJSObject(context, CYGetProperty(context, Array, toCYON_s))); return CYCallAsFunction(context, toCYON, _this, count, arguments); - } else if (internal->type_->type_ == NULL) pointer: { - char string[32]; - sprintf(string, "%p", internal->value_); - return CYCastJSValue(context, string); - } try { + } + + try { JSValueRef value(CYGetProperty(context, _this, cyi_s)); - if (JSValueIsUndefined(context, value)) - goto pointer; - CYPool pool; - return CYCastJSValue(context, pool.strcat("&", CYPoolCCYON(pool, context, value, objects), NULL)); + if (!JSValueIsUndefined(context, value)) { + CYPool pool; + return CYCastJSValue(context, pool.strcat("&", CYPoolCCYON(pool, context, value, objects), NULL)); + } } catch (const CYException &e) { - goto pointer; + // XXX: it might be interesting to include this error } + + CYLocalPool pool; + std::ostringstream str; + + sig::Pointer type(*internal->type_->type_); + + CYOptions options; + CYOutput output(*str.rdbuf(), options); + (new(pool) CYTypeExpression(CYDecodeType(pool, &type)))->Output(output, CYNoFlags); + + str << "(" << internal->value_ << ")"; + std::string value(str.str()); + return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size()))); +} CYCatch(NULL) } + +static JSValueRef CString_getProperty_length(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + CString *internal(reinterpret_cast(JSObjectGetPrivate(object))); + char *string(static_cast(internal->value_)); + return CYCastJSValue(context, strlen(string)); +} CYCatch(NULL) } + +static JSValueRef CString_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + return CYMakeType(context, sig::String()); } CYCatch(NULL) } static JSValueRef Pointer_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Pointer *internal(reinterpret_cast(JSObjectGetPrivate(object))); - return CYMakeType(context, internal->type_->type_); + sig::Pointer type(*internal->type_->type_); + return CYMakeType(context, type); +} CYCatch(NULL) } + +static JSValueRef CString_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + Pointer *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + const char *string(static_cast(internal->value_)); + std::ostringstream str; + if (string == NULL) + str << "NULL"; + else { + str << "&"; + CYStringify(str, string, strlen(string), true); + } + std::string value(str.str()); + return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size()))); +} CYCatch(NULL) } + +static JSValueRef CString_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + Pointer *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + const char *string(static_cast(internal->value_)); + return CYCastJSValue(context, string); } CYCatch(NULL) } static JSValueRef Functor_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { @@ -1438,7 +1643,7 @@ static JSValueRef Type_getProperty_alignment(JSContextRef context, JSObjectRef o static JSValueRef Type_getProperty_name(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); - return CYCastJSValue(context, internal->type_->name); + return CYCastJSValue(context, internal->type_->GetName()); } CYCatch(NULL) } static JSValueRef Type_getProperty_size(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { @@ -1459,7 +1664,7 @@ static JSValueRef Type_callAsFunction_toCYON(JSContextRef context, JSObjectRef o std::stringbuf out; CYOptions options; CYOutput output(out, options); - (new(pool) CYEncodedType(Decode(pool, internal->type_)))->Output(output, CYNoFlags); + (new(pool) CYTypeExpression(CYDecodeType(pool, internal->type_)))->Output(output, CYNoFlags); return CYCastJSValue(context, CYJSString(out.str().c_str())); } CYCatch(NULL) } @@ -1467,9 +1672,30 @@ static JSValueRef Type_callAsFunction_toJSON(JSContextRef context, JSObjectRef o return Type_callAsFunction_toString(context, object, _this, count, arguments, exception); } -static JSStaticFunction Pointer_staticFunctions[4] = { +static JSStaticFunction All_staticFunctions[2] = { + {"cy$complete", &All_complete_callAsFunction, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, 0} +}; + +static JSStaticFunction CString_staticFunctions[6] = { + {"toCYON", &CString_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"toPointer", &CString_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"toString", &CString_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"valueOf", &CString_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, 0} +}; + +static JSStaticValue CString_staticValues[3] = { + {"length", &CString_getProperty_length, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"type", &CString_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, NULL, 0} +}; + +static JSStaticFunction Pointer_staticFunctions[5] = { {"toCYON", &Pointer_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"toPointer", &Pointer_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} }; @@ -1484,7 +1710,13 @@ static JSStaticFunction Struct_staticFunctions[2] = { {NULL, NULL, 0} }; -static JSStaticFunction Functor_staticFunctions[4] = { +static JSStaticValue Struct_staticValues[2] = { + {"type", &Struct_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, NULL, 0} +}; + +static JSStaticFunction Functor_staticFunctions[5] = { + {"$cya", &Functor_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toCYON", &CYValue_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, @@ -1511,40 +1743,26 @@ static JSStaticValue Type_staticValues[4] = { {NULL, NULL, NULL, 0} }; -static JSStaticFunction Type_staticFunctions[14] = { +static JSStaticFunction Type_staticFunctions[10] = { {"arrayOf", &Type_callAsFunction_arrayOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"blockWith", &Type_callAsFunction_blockWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"constant", &Type_callAsFunction_constant, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"functionWith", &Type_callAsFunction_functionWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"long", &Type_callAsFunction_long, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"pointerTo", &Type_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"short", &Type_callAsFunction_short, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"signed", &Type_callAsFunction_signed, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"withName", &Type_callAsFunction_withName, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toCYON", &Type_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toJSON", &Type_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toString", &Type_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"unsigned", &Type_callAsFunction_unsigned, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} }; -static JSObjectRef (*JSObjectMakeArray$)(JSContextRef, size_t, const JSValueRef[], JSValueRef *); - _visible void CYSetArgs(int argc, const char *argv[]) { JSContextRef context(CYGetJSContext()); JSValueRef args[argc]; for (int i(0); i != argc; ++i) args[i] = CYCastJSValue(context, argv[i]); - JSObjectRef array; - if (JSObjectMakeArray$ != NULL) - array = _jsccall(*JSObjectMakeArray$, context, argc, args); - else { - JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array"))); - JSValueRef value(CYCallAsFunction(context, Array, NULL, argc, args)); - array = CYCastJSObject(context, value); - } - + JSObjectRef array(CYObjectMakeArray(context, argc, args)); JSObjectRef System(CYGetCachedObject(context, CYJSString("System"))); CYSetProperty(context, System, CYJSString("args"), array); } @@ -1589,37 +1807,33 @@ static bool CYShouldTerminate(JSContextRef context, void *arg) { } _visible const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code) { - JSValueRef exception(NULL); - if (false) error: - return CYPoolCString(pool, context, CYJSString(context, exception)); - ExecutionHandle handle(context); cancel_ = false; if (&JSContextGroupSetExecutionTimeLimit != NULL) JSContextGroupSetExecutionTimeLimit(JSContextGetGroup(context), 0.5, &CYShouldTerminate, NULL); - JSValueRef result(JSEvaluateScript(context, CYJSString(code), NULL, NULL, 0, &exception)); - if (exception != NULL) - goto error; - - if (JSValueIsUndefined(context, result)) - return NULL; - - std::set objects; - const char *json(CYPoolCCYON(pool, context, result, objects, &exception)); - if (exception != NULL) - goto error; + try { + JSValueRef result(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0)); + if (JSValueIsUndefined(context, result)) + return NULL; - CYSetProperty(context, CYGetGlobalObject(context), Result_, result); + std::set objects; + const char *json(_jsccall(CYPoolCCYON, pool, context, result, objects)); + CYSetProperty(context, CYGetGlobalObject(context), Result_, result); - return json; + return json; + } catch (const CYException &error) { + return pool.strcat("throw ", error.PoolCString(pool), NULL); + } } _visible void CYCancel() { cancel_ = true; } +static const char *CYPoolLibraryPath(CYPool &pool); + static bool initialized_ = false; void CYInitializeDynamic() { @@ -1627,6 +1841,10 @@ void CYInitializeDynamic() { initialized_ = true; else return; + CYPool pool; + const char *db(pool.strcat(CYPoolLibraryPath(pool), "/libcycript.db", NULL)); + _sqlcall(sqlite3_open_v2(db, &database_, SQLITE_OPEN_READONLY, NULL)); + JSObjectMakeArray$ = reinterpret_cast(dlsym(RTLD_DEFAULT, "JSObjectMakeArray")); JSSynchronousGarbageCollectForDebugging$ = reinterpret_cast(dlsym(RTLD_DEFAULT, "JSSynchronousGarbageCollectForDebugging")); @@ -1634,6 +1852,7 @@ void CYInitializeDynamic() { definition = kJSClassDefinitionEmpty; definition.className = "All"; + definition.staticFunctions = All_staticFunctions; definition.hasProperty = &All_hasProperty; definition.getProperty = &All_getProperty; definition.getPropertyNames = &All_getPropertyNames; @@ -1644,6 +1863,15 @@ void CYInitializeDynamic() { definition.finalize = &CYFinalize; Context_ = JSClassCreate(&definition); + definition = kJSClassDefinitionEmpty; + definition.className = "CString"; + definition.staticFunctions = CString_staticFunctions; + definition.staticValues = CString_staticValues; + definition.getProperty = &CString_getProperty; + definition.setProperty = &CString_setProperty; + definition.finalize = &CYFinalize; + CString_ = JSClassCreate(&definition); + definition = kJSClassDefinitionEmpty; definition.className = "Functor"; definition.staticFunctions = cy::Functor::StaticFunctions; @@ -1656,6 +1884,7 @@ void CYInitializeDynamic() { definition.className = "Pointer"; definition.staticFunctions = Pointer_staticFunctions; definition.staticValues = Pointer_staticValues; + definition.callAsFunction = &Pointer_callAsFunction; definition.getProperty = &Pointer_getProperty; definition.setProperty = &Pointer_setProperty; definition.finalize = &CYFinalize; @@ -1664,6 +1893,7 @@ void CYInitializeDynamic() { definition = kJSClassDefinitionEmpty; definition.className = "Struct"; definition.staticFunctions = Struct_staticFunctions; + definition.staticValues = Struct_staticValues; definition.getProperty = &Struct_getProperty; definition.setProperty = &Struct_setProperty; definition.getPropertyNames = &Struct_getPropertyNames; @@ -1718,19 +1948,19 @@ const char *CYJSError::PoolCString(CYPool &pool) const { return CYPoolCCYON(pool, context_, value_, objects); } -JSValueRef CYJSError::CastJSValue(JSContextRef context) const { - // XXX: what if the context is different? +JSValueRef CYJSError::CastJSValue(JSContextRef context, const char *name) const { + // XXX: what if the context is different? or the name? I dunno. ("epic" :/) return value_; } -JSValueRef CYCastJSError(JSContextRef context, const char *message) { - JSObjectRef Error(CYGetCachedObject(context, CYJSString("Error"))); +JSValueRef CYCastJSError(JSContextRef context, const char *name, const char *message) { + JSObjectRef Error(CYGetCachedObject(context, CYJSString(name))); JSValueRef arguments[1] = {CYCastJSValue(context, message)}; return _jsccall(JSObjectCallAsConstructor, context, Error, 1, arguments); } -JSValueRef CYPoolError::CastJSValue(JSContextRef context) const { - return CYCastJSError(context, message_); +JSValueRef CYPoolError::CastJSValue(JSContextRef context, const char *name) const { + return CYCastJSError(context, name, message_); } CYJSError::CYJSError(JSContextRef context, const char *format, ...) { @@ -1744,91 +1974,98 @@ CYJSError::CYJSError(JSContextRef context, const char *format, ...) { const char *message(pool.vsprintf(64, format, args)); va_end(args); - value_ = CYCastJSError(context, message); + value_ = CYCastJSError(context, "Error", message); } JSGlobalContextRef CYGetJSContext(JSContextRef context) { return reinterpret_cast(JSObjectGetPrivate(CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s))))->context_; } -void *CYMapFile(const char *path, size_t *psize) { - int fd(_syscall_(open(path, O_RDONLY), 1, ENOENT)); - if (fd == -1) - return NULL; - - struct stat stat; - _syscall(fstat(fd, &stat)); - size_t size(stat.st_size); - - *psize = size; - - void *base; - _syscall(base = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0)); - - _syscall(close(fd)); - return base; -} - -static JSValueRef require(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - _assert(count == 1); - CYPool pool; - +static const char *CYPoolLibraryPath(CYPool &pool) { Dl_info addr; - _assert(dladdr(reinterpret_cast(&require), &addr) != 0); + _assert(dladdr(reinterpret_cast(&CYPoolLibraryPath), &addr) != 0); char *lib(pool.strdup(addr.dli_fname)); char *slash(strrchr(lib, '/')); _assert(slash != NULL); *slash = '\0'; - CYJSString property("exports"); - JSObjectRef module; - - const char *name(CYPoolCString(pool, context, arguments[0])); - const char *path(pool.strcat(lib, "/cycript0.9/", name, ".cy", NULL)); + slash = strrchr(lib, '/'); + if (slash != NULL && strcmp(slash, "/.libs") == 0) + *slash = '\0'; - CYJSString key(path); - JSObjectRef modules(CYGetCachedObject(context, CYJSString("modules"))); - JSValueRef cache(CYGetProperty(context, modules, key)); + return lib; +} - if (!JSValueIsUndefined(context, cache)) - module = CYCastJSObject(context, cache); - else { - CYUTF8String code; - code.data = reinterpret_cast(CYMapFile(path, &code.size)); +static JSValueRef require_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + _assert(count == 1); + CYPool pool; - if (code.data == NULL) { - if (strchr(name, '/') == NULL && ( + const char *name(CYPoolCString(pool, context, arguments[0])); + if (strchr(name, '/') == NULL && ( #ifdef __APPLE__ - dlopen(pool.strcat("/System/Library/Frameworks/", name, ".framework/", name, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL || - dlopen(pool.strcat("/System/Library/PrivateFrameworks/", name, ".framework/", name, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL || + dlopen(pool.strcat("/System/Library/Frameworks/", name, ".framework/", name, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL || + dlopen(pool.strcat("/System/Library/PrivateFrameworks/", name, ".framework/", name, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL || #endif - false)) - return CYJSUndefined(NULL); + false)) + return CYJSUndefined(context); - CYThrow("Can't find module: %s", name); - } - - module = JSObjectMake(context, NULL, NULL); - CYSetProperty(context, modules, key, module); + JSObjectRef resolve(CYCastJSObject(context, CYGetProperty(context, object, CYJSString("resolve")))); + CYJSString path(context, CYCallAsFunction(context, resolve, NULL, 1, arguments)); - JSObjectRef exports(JSObjectMake(context, NULL, NULL)); - CYSetProperty(context, module, property, exports); - - std::stringstream wrap; - wrap << "(function (exports, require, module) { " << code << "\n});"; - code = CYPoolCode(pool, wrap); + CYJSString property("exports"); - JSValueRef value(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0)); - JSObjectRef function(CYCastJSObject(context, value)); + JSObjectRef modules(CYGetCachedObject(context, CYJSString("modules"))); + JSValueRef cache(CYGetProperty(context, modules, path)); - JSValueRef arguments[3] = { exports, JSObjectMakeFunctionWithCallback(context, CYJSString("require"), &require), module }; - CYCallAsFunction(context, function, NULL, 3, arguments); + JSValueRef result; + if (!JSValueIsUndefined(context, cache)) { + JSObjectRef module(CYCastJSObject(context, cache)); + result = CYGetProperty(context, module, property); + } else { + CYUTF8String code(CYPoolFileUTF8String(pool, CYPoolCString(pool, context, path))); + _assert(code.data != NULL); + + size_t length(strlen(name)); + if (length >= 5 && strcmp(name + length - 5, ".json") == 0) { + JSObjectRef JSON(CYGetCachedObject(context, CYJSString("JSON"))); + JSObjectRef parse(CYCastJSObject(context, CYGetProperty(context, JSON, CYJSString("parse")))); + JSValueRef arguments[1] = { CYCastJSValue(context, CYJSString(code)) }; + result = CYCallAsFunction(context, parse, JSON, 1, arguments); + } else { + JSObjectRef module(JSObjectMake(context, NULL, NULL)); + CYSetProperty(context, modules, path, module); + + JSObjectRef exports(JSObjectMake(context, NULL, NULL)); + CYSetProperty(context, module, property, exports); + + std::stringstream wrap; + wrap << "(function (exports, require, module, __filename) { " << code << "\n});"; + code = CYPoolCode(pool, *wrap.rdbuf()); + + JSValueRef value(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0)); + JSObjectRef function(CYCastJSObject(context, value)); + + JSValueRef arguments[4] = { exports, object, module, CYCastJSValue(context, path) }; + CYCallAsFunction(context, function, NULL, 4, arguments); + result = CYGetProperty(context, module, property); + } } - return CYGetProperty(context, module, property); + return result; } CYCatch(NULL) } +static bool CYRunScript(JSGlobalContextRef context, const char *path) { + CYPool pool; + CYUTF8String code(CYPoolFileUTF8String(pool, pool.strcat(CYPoolLibraryPath(pool), path, NULL))); + if (code.data == NULL) + return false; + + code = CYPoolCode(pool, code); + _jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0); + return true; +} + extern "C" void CYDestroyWeak(JSWeakObjectMapRef weak, void *data) { } @@ -1862,6 +2099,9 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { JSObjectRef Function_prototype(CYCastJSObject(context, CYGetProperty(context, Function, prototype_s))); CYSetProperty(context, cy, CYJSString("Function_prototype"), Function_prototype); + JSObjectRef JSON(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("JSON")))); + CYSetProperty(context, cy, CYJSString("JSON"), JSON); + JSObjectRef Number(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Number")))); CYSetProperty(context, cy, CYJSString("Number"), Number); @@ -1879,6 +2119,9 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { JSObjectRef String_prototype(CYCastJSObject(context, CYGetProperty(context, String, prototype_s))); CYSetProperty(context, cy, CYJSString("String_prototype"), String_prototype); + + JSObjectRef SyntaxError(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("SyntaxError")))); + CYSetProperty(context, cy, CYJSString("SyntaxError"), SyntaxError); /* }}} */ CYSetProperty(context, Array_prototype, toCYON_s, &Array_callAsFunction_toCYON, kJSPropertyAttributeDontEnum); @@ -1886,8 +2129,13 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { JSObjectRef cycript(JSObjectMake(context, NULL, NULL)); CYSetProperty(context, global, CYJSString("Cycript"), cycript); + CYSetProperty(context, cycript, CYJSString("compile"), &Cycript_compile_callAsFunction); CYSetProperty(context, cycript, CYJSString("gc"), &Cycript_gc_callAsFunction); + JSObjectRef CString(JSObjectMakeConstructor(context, CString_, &CString_new)); + CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CString, prototype_s)), String_prototype); + CYSetProperty(context, cycript, CYJSString("CString"), CString); + JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new)); CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)), Function_prototype); CYSetProperty(context, cycript, CYJSString("Functor"), Functor); @@ -1901,6 +2149,10 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { JSObjectRef all(JSObjectMake(context, All_, NULL)); CYSetProperty(context, cycript, CYJSString("all"), all); + JSObjectRef cache(JSObjectMake(context, NULL, NULL)); + CYSetProperty(context, cy, CYJSString("cache"), cache); + CYSetPrototype(context, cache, all); + JSObjectRef alls(_jsccall(JSObjectCallAsConstructor, context, Array, 0, NULL)); CYSetProperty(context, cycript, CYJSString("alls"), alls); @@ -1916,19 +2168,20 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { next = JSObjectGetPrototype(context, curr); } - CYSetPrototype(context, last, all); + CYSetPrototype(context, last, cache); } JSObjectRef System(JSObjectMake(context, NULL, NULL)); CYSetProperty(context, cy, CYJSString("System"), System); - CYSetProperty(context, all, CYJSString("require"), &require, kJSPropertyAttributeDontEnum); + CYSetProperty(context, global, CYJSString("require"), &require_callAsFunction, kJSPropertyAttributeDontEnum); CYSetProperty(context, global, CYJSString("system"), System); CYSetProperty(context, System, CYJSString("args"), CYJSNull(context)); - //CYSetProperty(context, System, CYJSString("global"), global); CYSetProperty(context, System, CYJSString("print"), &System_print); + CYSetProperty(context, global, CYJSString("global"), global); + #ifdef __APPLE__ if (&JSWeakObjectMapCreate != NULL) { JSWeakObjectMapRef weak(JSWeakObjectMapCreate(context, NULL, &CYDestroyWeak)); @@ -1936,14 +2189,37 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { } #endif - if (CYBridgeEntry *entry = CYBridgeHash("1dlerror", 8)) - entry->cache_ = new cy::Functor(entry->value_, reinterpret_cast(&dlerror)); + CYSetProperty(context, cache, CYJSString("dlerror"), CYMakeFunctor(context, "dlerror", "*"), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("RTLD_DEFAULT"), CYCastJSValue(context, reinterpret_cast(RTLD_DEFAULT)), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("dlsym"), CYMakeFunctor(context, "dlsym", "^v^v*"), kJSPropertyAttributeDontEnum); + + CYSetProperty(context, cache, CYJSString("NULL"), CYJSNull(context), kJSPropertyAttributeDontEnum); + + CYSetProperty(context, cache, CYJSString("bool"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("char"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("schar"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("uchar"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + + CYSetProperty(context, cache, CYJSString("short"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("int"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("long"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("longlong"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + + CYSetProperty(context, cache, CYJSString("ushort"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("uint"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("ulong"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("ulonglong"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + + CYSetProperty(context, cache, CYJSString("float"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("double"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); for (CYHook *hook : GetHooks()) if (hook->SetupContext != NULL) (*hook->SetupContext)(context); CYArrayPush(context, alls, cycript); + + CYRunScript(context, "/libcycript.cy"); } static JSGlobalContextRef context_;