X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/911f7f17b2ff1e28a645abefea8bf9cbd03fe821..0b5f88f67491643e48cfb14b28a4e894296ae98f:/Execute.cpp?ds=inline diff --git a/Execute.cpp b/Execute.cpp index 4f9d18d..375facf 100644 --- a/Execute.cpp +++ b/Execute.cpp @@ -1,5 +1,5 @@ -/* 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 {{{ */ @@ -41,6 +41,7 @@ #include "sig/parse.hpp" #include "sig/ffi_type.hpp" +#include "Bridge.hpp" #include "Code.hpp" #include "Decode.hpp" #include "Error.hpp" @@ -94,7 +95,12 @@ void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, J CYSetProperty(context, object, name, JSObjectMakeFunctionWithCallback(context, name, callback), attributes); } +JSObjectRef CYGetPrototype(JSContextRef context, JSObjectRef object) { + return CYCastJSObject(context, JSObjectGetPrototype(context, object)); +} + void CYSetPrototype(JSContextRef context, JSObjectRef object, JSValueRef value) { + _assert(!JSValueIsUndefined(context, value)); JSObjectSetPrototype(context, object, value); _assert(CYIsStrictEqual(context, JSObjectGetPrototype(context, object), value)); } @@ -111,15 +117,19 @@ JSStringRef CYCopyJSString(JSStringRef value) { JSStringRef CYCopyJSString(CYUTF8String value) { if (memchr(value.data, '\0', value.size) != NULL) { CYPool pool; - return CYCopyJSString(pool.memdup(value.data, value.size)); + return CYCopyJSString(CYPoolUTF16String(pool, value)); } else if (value.data[value.size] != '\0') { CYPool pool; - return CYCopyJSString(CYPoolUTF16String(pool, value)); + return CYCopyJSString(pool.strmemdup(value.data, value.size)); } else { return CYCopyJSString(value.data); } } +JSStringRef CYCopyJSString(const std::string &value) { + return CYCopyJSString(CYUTF8String(value.c_str(), value.size())); +} + JSStringRef CYCopyJSString(CYUTF16String value) { return JSStringCreateWithCharacters(value.data, value.size); } @@ -130,10 +140,22 @@ JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value) { return _jsccall(JSValueToStringCopy, context, value); } -static CYUTF16String CYCastUTF16String(JSStringRef value) { +CYUTF16String CYCastUTF16String(JSStringRef value) { return CYUTF16String(JSStringGetCharactersPtr(value), JSStringGetLength(value)); } +const char *CYPoolCString(CYPool &pool, CYUTF8String utf8) { + return pool.strndup(utf8.data, utf8.size); +} + +CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF8String utf8) { + return {pool.strndup(utf8.data, utf8.size), utf8.size}; +} + +_visible CYUTF8String CYPoolUTF8String(CYPool &pool, const std::string &value) { + return {pool.strndup(value.data(), value.size()), value.size()}; +} + CYUTF8String CYPoolUTF8String(CYPool &pool, JSContextRef context, JSStringRef value) { return CYPoolUTF8String(pool, CYCastUTF16String(value)); } @@ -156,7 +178,7 @@ 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[]) { +JSObjectRef CYObjectMakeArray(JSContextRef context, size_t length, const JSValueRef values[]) { if (JSObjectMakeArray$ != NULL) return _jsccall(*JSObjectMakeArray$, context, length, values); else { @@ -167,16 +189,14 @@ static JSObjectRef CYObjectMakeArray(JSContextRef context, size_t length, const } static JSClassRef All_; -static JSClassRef Context_; -static JSClassRef CString_; JSClassRef Functor_; static JSClassRef Global_; -static JSClassRef Pointer_; -static JSClassRef Struct_; JSStringRef Array_s; +JSStringRef constructor_s; JSStringRef cy_s; JSStringRef cyi_s; +JSStringRef cyt_s; JSStringRef length_s; JSStringRef message_s; JSStringRef name_s; @@ -201,28 +221,13 @@ 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; - +sig::Type *Structor_(CYPool &pool, sig::Aggregate *aggregate) { //_assert(false); + return aggregate; } -JSClassRef Type_privateData::Class_; - struct Context : - CYData + CYPrivate { JSGlobalContextRef context_; @@ -232,65 +237,83 @@ struct Context : } }; +struct CArray : + CYValue +{ + CYProtect owner_; + Type_privateData *type_; + size_t length_; + + CArray(void *value, size_t length, const sig::Type &type, ffi_type *ffi, JSContextRef context, JSObjectRef owner) : + CYValue(value), + owner_(context, owner), + type_(new(*pool_) Type_privateData(type, ffi)), + length_(length) + { + if (owner == NULL) { + size_t size(ffi->size * length); + void *copy(pool_->malloc(size, ffi->alignment)); + memcpy(copy, value_, size); + value_ = copy; + } + } +}; + struct CString : - CYOwned + CYValue { + CYProtect owner_; + CString(char *value, JSContextRef context, JSObjectRef owner) : - CYOwned(value, context, owner) + CYValue(value), + owner_(context, owner) { + if (owner == NULL) + value_ = pool_->strdup(value_); } }; struct Pointer : - CYOwned + CYValue { + CYProtect owner_; Type_privateData *type_; - size_t length_; - Pointer(void *value, JSContextRef context, JSObjectRef owner, size_t length, sig::Type *type) : - CYOwned(value, context, owner), - type_(new(*pool_) Type_privateData(type)), - length_(length) + Pointer(void *value, const sig::Type &type, JSContextRef context, JSObjectRef owner) : + CYValue(value), + owner_(context, owner), + type_(new(*pool_) Type_privateData(type)) { } - 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) + Pointer(void *value, const char *encoding, JSContextRef context, JSObjectRef owner) : + CYValue(value), + owner_(context, owner), + type_(new(*pool_) Type_privateData(encoding)) { } }; struct Struct_privateData : - CYOwned + CYValue { + CYProtect owner_; Type_privateData *type_; - Struct_privateData(JSContextRef context, JSObjectRef owner) : - CYOwned(NULL, context, owner) + Struct_privateData(void *value, const sig::Type &type, ffi_type *ffi, JSContextRef context, JSObjectRef owner) : + CYValue(value), + owner_(context, owner), + type_(new(*pool_) Type_privateData(type, ffi)) { + if (owner == NULL) { + size_t size(ffi->size); + void *copy(pool_->malloc(size, ffi->alignment)); + memcpy(copy, value_, size); + value_ = copy; + } } }; -JSObjectRef CYMakeStruct(JSContextRef context, void *data, 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)); - internal->type_ = typical; - - if (owner != NULL) - internal->value_ = data; - else { - size_t size(typical->GetFFI()->size); - void *copy(internal->pool_->malloc(size)); - memcpy(copy, data, size); - internal->value_ = copy; - } - - return JSObjectMake(context, Struct_, internal); -} - static void *CYCastSymbol(const char *name) { for (CYHook *hook : GetHooks()) if (hook->CastSymbol != NULL) @@ -313,12 +336,19 @@ JSValueRef CYCastJSValue(JSContextRef context, double value) { return JSValueMakeNumber(context, static_cast(value)); \ } -CYCastJSValue_(int) +CYCastJSValue_(signed short int) +CYCastJSValue_(unsigned short int) +CYCastJSValue_(signed int) CYCastJSValue_(unsigned int) -CYCastJSValue_(long int) -CYCastJSValue_(long unsigned int) -CYCastJSValue_(long long int) -CYCastJSValue_(long long unsigned int) +CYCastJSValue_(signed long int) +CYCastJSValue_(unsigned long int) +CYCastJSValue_(signed long long int) +CYCastJSValue_(unsigned long long int) + +#ifdef __SIZEOF_INT128__ +CYCastJSValue_(signed __int128) +CYCastJSValue_(unsigned __int128) +#endif JSValueRef CYJSUndefined(JSContextRef context) { return JSValueMakeUndefined(context); @@ -372,11 +402,13 @@ 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); } static JSValueRef System_print(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -403,8 +435,7 @@ _visible void CYGarbageCollect(JSContextRef 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)); + CYUTF8String after(CYPoolCode(pool, before)); return CYCastJSValue(context, CYJSString(after)); } CYCatch_(NULL, "SyntaxError") } @@ -487,6 +518,22 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object, std::ostringstream str; + JSValueRef value(CYGetProperty(context, object, constructor_s)); + if (JSValueIsObject(context, value)) { + JSObjectRef constructor(CYCastJSObject(context, value)); + JSValueRef theory(CYGetProperty(context, constructor, prototype_s)); + JSValueRef practice(JSObjectGetPrototype(context, object)); + + if (CYIsStrictEqual(context, theory, practice)) { + JSValueRef name(CYGetProperty(context, constructor, name_s)); + if (!JSValueIsUndefined(context, name)) { + auto utf8(CYPoolUTF8String(pool, context, CYJSString(context, name))); + if (utf8 != "Object") + str << "new" << ' ' << utf8; + } + } + } + str << '{'; // XXX: this is, sadly, going to leak @@ -583,36 +630,28 @@ 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) { - Pointer *internal(new Pointer(pointer, context, owner, length, type)); - return JSObjectMake(context, Pointer_, internal); +JSObjectRef CYMakePointer(JSContextRef context, void *pointer, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) { + return Pointer::Make(context, pointer, type, context, owner); } -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 JSValueRef CYMakeFunctor(JSContextRef context, void (*function)(), bool variadic, const sig::Signature &signature) { + if (function == NULL) + return CYJSNull(context); + return JSObjectMake(context, Functor_, new cy::Functor(function, variadic, signature)); } +// XXX: remove this, as it is really stupid 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)); + cy::Functor *internal(new cy::Functor(function, encoding)); ++internal->count_; return JSObjectMake(context, Functor_, internal); } -static bool CYGetOffset(CYPool &pool, JSContextRef context, JSStringRef value, ssize_t &index) { +bool CYGetOffset(CYPool &pool, JSContextRef context, JSStringRef value, ssize_t &index) { return CYGetOffset(CYPoolCString(pool, context, value), index); } @@ -624,7 +663,7 @@ void *CYCastPointer_(JSContextRef context, JSValueRef value, bool *guess) { return NULL; case kJSTypeObject: { JSObjectRef object((JSObjectRef) value); - if (JSValueIsObjectOfClass(context, value, Pointer_)) { + if (JSValueIsObjectOfClass(context, value, Pointer::Class_)) { Pointer *internal(reinterpret_cast(JSObjectGetPrivate(object))); return internal->value_; } @@ -650,179 +689,241 @@ void *CYCastPointer_(JSContextRef context, JSValueRef value, bool *guess) { } } -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; +// XXX: this is somehow not quite a template :/ - case sig::string_P: { - bool guess(false); - *reinterpret_cast(data) = CYCastPointer(context, value, &guess); - if (guess && pool != NULL) - *reinterpret_cast(data) = CYPoolCString(*pool, context, value); - } break; +template <> +void Primitive::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + *reinterpret_cast(data) = JSValueToBoolean(context, value); +} - 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; +#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); \ +} - case sig::void_P: - break; +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) - default: - for (CYHook *hook : GetHooks()) - if (hook->PoolFFI != NULL) - if ((*hook->PoolFFI)(pool, context, type, ffi, data, value)) - return; +#ifdef __SIZEOF_INT128__ +CYPoolFFI_(signed __int128) +CYPoolFFI_(unsigned __int128) +#endif + +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); +} + +static void CYArrayCopy(CYPool *pool, JSContextRef context, uint8_t *base, size_t length, const sig::Type &type, ffi_type *ffi, JSValueRef value, JSObjectRef object) { + for (size_t index(0); index != length; ++index) { + JSValueRef rhs; + if (object == NULL) + rhs = value; + else { + rhs = CYGetProperty(context, object, index); + if (JSValueIsUndefined(context, rhs)) + throw CYJSError(context, "unable to extract array value"); + } - CYThrow("unimplemented signature code: '%c''\n", type->primitive); + type.PoolFFI(pool, context, ffi, base, rhs); + base += ffi->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 *pointer = *reinterpret_cast(data)) - return CYMakeCString(context, pointer, owner); - 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 Pointer::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 || !JSValueIsObject(context, value)) + return; + JSObjectRef object(CYCastJSObject(context, value)); + if (CYHasProperty(context, object, length_s)) { + size_t length(CYArrayLength(context, object)); + ffi_type *element(type.GetFFI(*pool)); + size_t size(element->size * length); + uint8_t *base(pool->malloc(size, element->alignment)); + CYArrayCopy(pool, context, base, length, type, element, value, object); + *reinterpret_cast(data) = base; + } +} + +void Array::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + if (size == 0) + return; + uint8_t *base(reinterpret_cast(data)); + JSObjectRef object(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL); + CYArrayCopy(pool, context, base, size, type, ffi->elements[0], value, object); +} + +void Enum::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + return type.PoolFFI(pool, context, ffi, data, value); +} - CYThrow("unimplemented signature code: '%c''\n", type->primitive); +void Aggregate::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + _assert(!overlap); + _assert(signature.count != _not(size_t)); + + size_t offset(0); + 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"); + } + } + + element->type->PoolFFI(pool, context, field, base + offset, rhs); + offset += field->size; + CYAlign(offset, field->alignment); } } +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) + +#ifdef __SIZEOF_INT128__ +CYFromFFI_(signed __int128) +CYFromFFI_(unsigned __int128) +#endif + +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 CString::Make(context, value, context, 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, type, NULL, owner); + return CYJSNull(context); +} + +JSValueRef Array::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + return CArray::Make(context, data, size, type, ffi->elements[0], context, owner); +} + +JSValueRef Enum::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + return type.FromFFI(context, ffi, data, initialize, owner); +} + +JSValueRef Aggregate::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + _assert(!overlap); + _assert(signature.count != _not(size_t)); + return Struct_privateData::Make(context, data, *this, ffi, context, owner); +} + +JSValueRef Function::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + return CYMakeFunctor(context, reinterpret_cast(data), variadic, signature); +} + +} + void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg) { Closure_privateData *internal(reinterpret_cast(arg)); - JSContextRef context(internal->context_); + JSContextRef context(internal->function_); size_t count(internal->cif_.nargs); 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) { return CYCallAsFunction(context, function, NULL, count, values); } +#if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__)) +static void CYFreeFunctor(void *data) { + ffi_closure_free(data); +} +#else +static void CYFreeFunctor(void *data) { + _syscall(munmap(data, sizeof(ffi_closure))); +} +#endif + Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const sig::Signature &signature, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef)) { // XXX: in case of exceptions this will leak - // XXX: in point of fact, this may /need/ to leak :( Closure_privateData *internal(new Closure_privateData(context, function, adapter, signature)); #if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__)) @@ -832,7 +933,8 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, ffi_status status(ffi_prep_closure_loc(writable, &internal->cif_, &CYExecuteClosure, internal, executable)); _assert(status == FFI_OK); - internal->value_ = executable; + internal->pool_->atexit(&CYFreeFunctor, writable); + internal->value_ = reinterpret_cast(executable); #else ffi_closure *closure((ffi_closure *) _syscall(mmap( NULL, sizeof(ffi_closure), @@ -845,7 +947,8 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, _syscall(mprotect(closure, sizeof(*closure), PROT_READ | PROT_EXEC)); - internal->value_ = closure; + internal->pool_->atexit(&CYFreeFunctor, closure); + internal->value_ = reinterpret_cast(closure); #endif return internal; @@ -867,7 +970,7 @@ JSObjectRef CYGetCachedObject(JSContextRef context, JSStringRef name) { return CYCastJSObject(context, CYGetCachedValue(context, name)); } -static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const sig::Signature &signature) { +static JSValueRef CYMakeFunctor(JSContextRef context, JSValueRef value, bool variadic, const sig::Signature &signature) { JSObjectRef Function(CYGetCachedObject(context, CYJSString("Function"))); bool function(_jsccall(JSValueIsInstanceOfConstructor, context, value, Function)); @@ -876,39 +979,41 @@ static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const s return CYMakeFunctor(context, function, signature); } else { void (*function)()(CYCastPointer(context, value)); - return CYMakeFunctor(context, function, signature); + return CYMakeFunctor(context, function, variadic, signature); } } 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)) + if (JSStringIsEqualToUTF8CString(property, "$cyi")) + offset = 0; + else if (!CYGetOffset(pool, context, property, offset)) return NULL; - return CYCastJSValue(context, CYJSString(CYUTF8String(&string[offset], 1))); + return CYCastJSValue(context, CYJSString(CYUTF8String(&internal->value_[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)) + if (JSStringIsEqualToUTF8CString(property, "$cyi")) + offset = 0; + else if (!CYGetOffset(pool, context, property, offset)) return false; const char *data(CYPoolCString(pool, context, value)); - string[offset] = *data; + internal->value_[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; @@ -916,13 +1021,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]); @@ -952,69 +1057,89 @@ static bool Index_(CYPool &pool, JSContextRef context, Struct_privateData *inter return true; } -static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { - CYPool pool; - Pointer *internal(reinterpret_cast(JSObjectGetPrivate(object))); - - if (JSStringIsEqual(property, length_s)) - return internal->length_ == _not(size_t) ? CYJSUndefined(context) : CYCastJSValue(context, internal->length_); - - Type_privateData *typical(internal->type_); - if (typical->type_ == NULL) - return NULL; - sig::Type &type(*typical->type_); - +static void *Offset_(CYPool &pool, JSContextRef context, JSStringRef property, void *data, ffi_type *ffi) { ssize_t offset; if (JSStringIsEqualToUTF8CString(property, "$cyi")) offset = 0; else if (!CYGetOffset(pool, context, property, offset)) return NULL; + return reinterpret_cast(data) + ffi->size * offset; +} - if (type.primitive == sig::function_P) - return CYMakeFunctor(context, reinterpret_cast(internal->value_), type.data.signature); +static JSValueRef Offset_getProperty(CYPool &pool, JSContextRef context, JSStringRef property, void *data, Type_privateData *typical, JSObjectRef owner) { + ffi_type *ffi(typical->GetFFI()); + void *base(Offset_(pool, context, property, data, ffi)); + if (base == NULL) + return NULL; + return typical->type_->FromFFI(context, ffi, base, false, owner); +} +static bool Offset_setProperty(CYPool &pool, JSContextRef context, JSStringRef property, void *data, Type_privateData *typical, JSValueRef value) { ffi_type *ffi(typical->GetFFI()); + void *base(Offset_(pool, context, property, data, ffi)); + if (base == NULL) + return false; - uint8_t *base(reinterpret_cast(internal->value_)); - base += ffi->size * offset; + typical->type_->PoolFFI(NULL, context, ffi, base, value); + return true; +} - JSObjectRef owner(internal->GetOwner() ?: object); - return CYFromFFI(context, &type, ffi, base, false, owner); +static JSValueRef CArray_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + CYPool pool; + CArray *internal(reinterpret_cast(JSObjectGetPrivate(object))); + if (JSStringIsEqual(property, length_s)) + return CYCastJSValue(context, internal->length_); + Type_privateData *typical(internal->type_); + JSObjectRef owner(internal->owner_ ?: object); + return Offset_getProperty(pool, context, property, internal->value_, typical, owner); } CYCatch(NULL) } -static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { +static bool CArray_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { CYPool pool; Pointer *internal(reinterpret_cast(JSObjectGetPrivate(object))); Type_privateData *typical(internal->type_); + return Offset_setProperty(pool, context, property, internal->value_, typical, value); +} CYCatch(false) } - if (typical->type_ == NULL) - return false; +static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + CYPool pool; + Pointer *internal(reinterpret_cast(JSObjectGetPrivate(object))); - ssize_t offset; - if (JSStringIsEqualToUTF8CString(property, "$cyi")) - offset = 0; - else if (!CYGetOffset(pool, context, property, offset)) - return false; + Type_privateData *typical(internal->type_); - ffi_type *ffi(typical->GetFFI()); + if (sig::Function *function = dynamic_cast(typical->type_)) { + if (!JSStringIsEqualToUTF8CString(property, "$cyi")) + return NULL; + return CYMakeFunctor(context, reinterpret_cast(internal->value_), function->variadic, function->signature); + } - uint8_t *base(reinterpret_cast(internal->value_)); - base += ffi->size * offset; + JSObjectRef owner(internal->owner_ ?: object); + return Offset_getProperty(pool, context, property, internal->value_, typical, owner); +} CYCatch(NULL) } - CYPoolFFI(NULL, context, typical->type_, ffi, base, value); - return true; +static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { + CYPool pool; + Pointer *internal(reinterpret_cast(JSObjectGetPrivate(object))); + Type_privateData *typical(internal->type_); + return Offset_setProperty(pool, context, property, internal->value_, typical, value); } 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_, *typical->type_, typical->ffi_, _this); +} CYCatch(NULL) } + +static JSValueRef Struct_getProperty_$cyt(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; @@ -1022,15 +1147,16 @@ static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, J if (!Index_(pool, context, internal, property, index, base)) return NULL; - JSObjectRef owner(internal->GetOwner() ?: object); + JSObjectRef owner(internal->owner_ ?: 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; @@ -1038,20 +1164,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]; @@ -1068,27 +1194,65 @@ static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JS } } +static sig::Void Void_; +static sig::Pointer PointerToVoid_(Void_); + +static sig::Type *CYGetType(CYPool &pool, JSContextRef context, JSValueRef value) { + if (JSValueIsNull(context, value)) + return &PointerToVoid_; + JSObjectRef object(CYCastJSObject(context, value)); + JSObjectRef type(CYCastJSObject(context, CYGetProperty(context, object, cyt_s))); + _assert(JSValueIsObjectOfClass(context, type, Type_privateData::Class_)); + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(type))); + return internal->type_; +} + void CYCallFunction(CYPool &pool, JSContextRef context, ffi_cif *cif, void (*function)(), void *value, void **values) { ffi_call(cif, function, value, values); } -JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, sig::Signature *signature, ffi_cif *cif, void (*function)()) { - if (setups + count != signature->count - 1) - throw CYJSError(context, "incorrect number of arguments to ffi function"); +JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, bool variadic, const sig::Signature &signature, ffi_cif *cif, void (*function)()) { + size_t have(setups + count); + size_t need(signature.count - 1); + + if (have < need) + throw CYJSError(context, "insufficient number of arguments to ffi function"); + + ffi_cif corrected; + sig::Element *elements(signature.elements); - size_t size(setups + count); - void *values[size]; + if (have > need) { + if (!variadic) + throw CYJSError(context, "exorbitant number of arguments to ffi function"); + + elements = new (pool) sig::Element[have + 1]; + memcpy(elements, signature.elements, sizeof(sig::Element) * (need + 1)); + + for (size_t index(need); index != have; ++index) { + sig::Element &element(elements[index + 1]); + element.name = NULL; + element.offset = _not(size_t); + element.type = CYGetType(pool, context, arguments[index - setups]); + } + + sig::Signature extended; + extended.elements = elements; + extended.count = have + 1; + sig::sig_ffi_cif(pool, signature.count, extended, &corrected); + cif = &corrected; + } + + void *values[have]; memcpy(values, setup, sizeof(void *) * setups); - for (size_t index(setups); index != size; ++index) { - sig::Element *element(&signature->elements[index + 1]); + for (size_t index(setups); index != have; ++index) { + sig::Element &element(elements[index + 1]); 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]); + values[index] = pool.malloc(ffi->size, ffi->alignment); + element.type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]); } - uint8_t value[cif->rtype->size]; + uint8_t *value(pool.malloc(std::max(cif->rtype->size, sizeof(ffi_arg)), std::max(cif->rtype->alignment, alignof(ffi_arg)))); void (*call)(CYPool &, JSContextRef, ffi_cif *, void (*)(), void *, void **) = &CYCallFunction; // XXX: this only supports one hook, but it is a bad idea anyway @@ -1097,44 +1261,25 @@ 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 { CYPool pool; cy::Functor *internal(reinterpret_cast(JSObjectGetPrivate(object))); - return CYCallFunction(pool, context, 0, NULL, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue()); + return CYCallFunction(pool, context, 0, NULL, count, arguments, false, internal->variadic_, internal->signature_, &internal->cif_, internal->value_); } CYCatch(NULL) } 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 (internal->type_->type_->primitive != sig::function_P) + 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, const char *encoding) { - Type_privateData *internal(new Type_privateData(encoding)); - return JSObjectMake(context, Type_privateData::Class_, internal); -} - -JSObjectRef CYMakeType(JSContextRef context, 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::Type type; - type.name = NULL; - type.flags = 0; - - type.primitive = sig::function_P; - sig::Copy(pool, type.data.signature, *signature); - - return CYMakeType(context, &type); +JSObjectRef CYMakeType(JSContextRef context, const sig::Type &type) { + return Type_privateData::Make(context, type); } extern "C" bool CYBridgeHash(CYPool &pool, CYUTF8String name, const char *&code, unsigned &flags) { @@ -1206,14 +1351,45 @@ static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSSt const char *code; unsigned flags; if (CYBridgeHash(pool, CYPoolUTF8String(pool, context, property), code, flags)) { - JSValueRef result(_jsccall(JSEvaluateScript, context, CYJSString(CYPoolCode(pool, code)), NULL, NULL, 0)); + 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)); + } - if (flags == 0) { - JSObjectRef cache(CYGetCachedObject(context, CYJSString("cache"))); - CYSetProperty(context, cache, property, result); + JSObjectRef cache(CYGetCachedObject(context, CYJSString("cache"))); + + JSObjectRef stub; + if (flags == CYBridgeType) { + stub = CYMakeType(context, sig::Void()); + CYSetProperty(context, cache, property, stub); + } else + stub = NULL; + + JSValueRef value(_jsccall(JSEvaluateScript, context, CYJSString(parsed), NULL, NULL, 0)); + + switch (flags) { + case CYBridgeVoid: { + } break; + + case CYBridgeHold: { + CYSetProperty(context, cache, property, value); + } break; + + case CYBridgeType: { + JSObjectRef swap(CYCastJSObject(context, value)); + void *source(JSObjectGetPrivate(swap)); + _assert(source != NULL); + void *target(JSObjectGetPrivate(stub)); + _assert(JSObjectSetPrivate(swap, target)); + _assert(JSObjectSetPrivate(stub, source)); + value = stub; + } break; } - return result; + return value; } return NULL; @@ -1224,27 +1400,45 @@ static JSValueRef All_complete_callAsFunction(JSContextRef context, JSObjectRef CYPool pool; CYUTF8String prefix(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0]))); - std::vector values; + JSObjectRef array(NULL); - sqlite3_stmt *statement; + { + CYArrayBuilder<1024> values(context, array); - _sqlcall(sqlite3_prepare(database_, - "select " - "\"cache\".\"name\" " - "from \"cache\" " - "where" - " \"cache\".\"system\" & " CY_SYSTEM " == " CY_SYSTEM " and" - " \"cache\".\"name\" like ? || '%'" - , -1, &statement, NULL)); + sqlite3_stmt *statement; - _sqlcall(sqlite3_bind_text(statement, 1, prefix.data, prefix.size, SQLITE_STATIC)); + 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.push_back(CYCastJSValue(context, CYJSString(sqlite3_column_string(statement, 0)))); + values(CYCastJSValue(context, CYJSString(sqlite3_column_string(statement, 0)))); _sqlcall(sqlite3_finalize(statement)); + } - return CYObjectMakeArray(context, values.size(), values.data()); + return array; } CYCatch(NULL) } static void All_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { @@ -1261,26 +1455,16 @@ static void All_getPropertyNames(JSContextRef context, JSObjectRef object, JSPro } } +static JSObjectRef CArray_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + _assert(false); +} CYCatch(NULL) } + 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); + _assert(false); } 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"); - - CYPool pool; - - void *value(CYCastPointer(context, arguments[0])); - const char *type(CYPoolCString(pool, context, arguments[1])); - - sig::Signature signature; - sig::Parse(pool, &signature, type, &Structor_); - - return CYMakePointer(context, value, _not(size_t), signature.elements[0].type, NULL, NULL); + _assert(false); } CYCatch(NULL) } static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1288,24 +1472,34 @@ static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t cou if (false) { } else if (count == 1) { - const char *type(CYPoolCString(pool, context, arguments[0])); - return CYMakeType(context, type); + switch (JSValueGetType(context, arguments[0])) { + case kJSTypeString: { + const char *encoding(CYPoolCString(pool, context, arguments[0])); + sig::Signature signature; + sig::Parse(pool, &signature, encoding, &Structor_); + return CYMakeType(context, *signature.elements[0].type); + } break; + + case kJSTypeObject: { + // XXX: accept a set of enum constants and /guess/ at their size + _assert(false); + } break; + + default: + throw CYJSError(context, "incorrect kind of argument to new Type"); + } } else if (count == 2) { JSObjectRef types(CYCastJSObject(context, arguments[0])); size_t count(CYArrayLength(context, types)); JSObjectRef names(CYCastJSObject(context, arguments[1])); - sig::Type type; - type.name = NULL; - type.flags = 0; - - type.primitive = sig::struct_P; - type.data.signature.elements = new(pool) sig::Element[count]; - type.data.signature.count = count; + 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.data.signature.elements[i]); + sig::Element &element(type.signature.elements[i]); element.offset = _not(size_t); JSValueRef name(CYArrayGet(context, names, i)); @@ -1318,33 +1512,29 @@ static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t cou _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_)); Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); element.type = internal->type_; + _assert(element.type != NULL); } - return CYMakeType(context, &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); @@ -1355,7 +1545,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 { @@ -1368,19 +1558,17 @@ 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); +#ifdef CY_OBJECTIVEC + sig::Block type; + return Type_callAsFunction_$With(context, object, _this, count, arguments, type, exception); +#else + _assert(false); +#endif } static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1388,85 +1576,47 @@ 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); + CYPool pool; + sig::Type *type(internal->type_->Copy(pool)); + 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"); +static JSValueRef Type_callAsFunction_enumFor(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 1) + throw CYJSError(context, "incorrect number of arguments to Type.enumFor"); 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))); + CYPool pool; - sig::Type type(*internal->type_); + JSObjectRef constants(CYCastJSObject(context, arguments[0])); - 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) } + // XXX: this is, sadly, going to leak + JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context, constants)); -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))); + size_t count(JSPropertyNameArrayGetCount(names)); - sig::Type type(*internal->type_); + sig::Enum type(*internal->type_, count); + type.constants = new(pool) sig::Constant[count]; - 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"); + for (size_t index(0); index != count; ++index) { + JSStringRef name(JSPropertyNameArrayGetNameAtIndex(names, index)); + JSValueRef value(CYGetProperty(context, constants, name)); + _assert(JSValueGetType(context, value) == kJSTypeNumber); + CYUTF8String string(CYPoolUTF8String(pool, context, name)); + type.constants[index].name = string.data; + type.constants[index].value = CYCastDouble(context, value); } - 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"); - } + JSPropertyNameArrayRelease(names); - return CYMakeType(context, &type); + 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); + bool variadic(count != 0 && JSValueIsNull(context, arguments[count - 1])); + sig::Function type(variadic); + return Type_callAsFunction_$With(context, object, _this, variadic ? count - 1 : count, arguments, type, exception); } static JSValueRef Type_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1474,22 +1624,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 { @@ -1498,11 +1636,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 { @@ -1510,40 +1644,48 @@ 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->variadic, function->signature); + + CYPool pool; 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); + void *data(pool.malloc(ffi->size, ffi->alignment)); + + type->PoolFFI(&pool, context, ffi, data, arguments[0]); + JSValueRef value(type->FromFFI(context, ffi, data)); + + if (JSValueGetType(context, value) == kJSTypeNumber) { + JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("Number")), 1, &value)); + CYSetProperty(context, typed, cyt_s, object, kJSPropertyAttributeDontEnum); + value = typed; + } + + return value; } CYCatch(NULL) } static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (count != 0) + if (count > 1) throw CYJSError(context, "incorrect number of arguments to Type allocator"); Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); + JSObjectRef pointer(CYMakePointer(context, NULL, *internal->type_, NULL, NULL)); + Pointer *value(reinterpret_cast(JSObjectGetPrivate(pointer))); + sig::Type *type(internal->type_); - size_t length; + ffi_type *ffi(internal->GetFFI()); + value->value_ = value->pool_->malloc(ffi->size, ffi->alignment); - if (type->primitive != sig::array_P) - length = _not(size_t); - else { - length = type->data.data.size; - type = type->data.data.type; - } + if (count == 0) + memset(value->value_, 0, ffi->size); + else + type->PoolFFI(value->pool_, context, ffi, value->value_, arguments[0]); - 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) } +// XXX: I don't even think the user should be allowed to do this static JSObjectRef Functor_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 Functor constructor"); @@ -1551,148 +1693,162 @@ static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t const char *encoding(CYPoolCString(pool, context, arguments[1])); sig::Signature signature; sig::Parse(pool, &signature, encoding, &Structor_); - return CYMakeFunctor(context, arguments[0], signature); + // XXX: this can try to return null, and I guess then it just fails + return CYCastJSObject(context, CYMakeFunctor(context, arguments[0], false, signature)); +} CYCatch(NULL) } + +static JSValueRef CArray_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + CArray *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + JSObjectRef owner(internal->owner_ ?: object); + return CYMakePointer(context, internal->value_, *internal->type_->type_, NULL, owner); } 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))); - - sig::Type type; - type.name = NULL; - type.flags = 0; - - type.primitive = sig::char_P; - type.data.data.type = NULL; - type.data.data.size = 0; - - return CYMakePointer(context, internal->value_, _not(size_t), &type, NULL, NULL); + JSObjectRef owner(internal->owner_ ?: object); + return CYMakePointer(context, internal->value_, sig::Primitive(), NULL, owner); } 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::Type type; - type.name = NULL; - type.flags = 0; - - type.primitive = sig::function_P; - sig::Copy(pool, type.data.signature, internal->signature_); + sig::Function type(internal->variadic_); + sig::Copy(pool, type.signature, internal->signature_); - return CYMakePointer(context, internal->value_, _not(size_t), &type, NULL, NULL); + return CYMakePointer(context, reinterpret_cast(internal->value_), 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))); +static JSValueRef CArray_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + CArray *internal(reinterpret_cast(JSObjectGetPrivate(_this))); return CYCastJSValue(context, reinterpret_cast(internal->value_)); } CYCatch(NULL) } -static JSValueRef CYValue_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { - return CYValue_callAsFunction_valueOf(context, object, _this, count, arguments, exception); -} +static JSValueRef Pointer_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + Pointer *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + return CYCastJSValue(context, reinterpret_cast(internal->value_)); +} CYCatch(NULL) } -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))); - 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()))); +static JSValueRef Functor_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + cy::Functor *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + return CYCastJSValue(context, reinterpret_cast(internal->value_)); } CYCatch(NULL) } -static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - std::set *objects(CYCastObjects(context, _this, count, arguments)); +static JSValueRef Functor_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + cy::Functor *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + uint8_t *value(reinterpret_cast(internal->value_)); - Pointer *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - if (internal->length_ != _not(size_t)) { - 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: { - CYLocalPool pool; + CYLocalPool pool; + + sig::Function function(internal->variadic_); + sig::Copy(pool, function.signature, internal->signature_); + + CYString *name; + + auto typed(CYDecodeType(pool, &function)); { std::ostringstream str; + Dl_info info; + if (internal->value_ == NULL) + str << "NULL"; + else if (dladdr(value, &info) == 0) + str << internal->value_; + else { + str << info.dli_sname; + off_t offset(value - reinterpret_cast(info.dli_saddr)); + if (offset != 0) + str << "+0x" << std::hex << offset; + } + + name = new(pool) CYString(pool.strdup(str.str().c_str())); + } - sig::Type type; - type.name = NULL; - type.flags = 0; + std::ostringstream str; + CYOptions options; + CYOutput output(*str.rdbuf(), options); + output.pretty_ = true; + (new(pool) CYExternalExpression(new(pool) CYString("C"), typed, name))->Output(output, CYNoFlags); + return CYCastJSValue(context, CYJSString(str.str())); +} CYCatch(NULL) } - type.primitive = sig::pointer_P; - type.data.data.type = internal->type_->type_; - type.data.data.size = 0; +static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + std::set *objects(CYCastObjects(context, _this, count, arguments)); - CYOptions options; - CYOutput output(*str.rdbuf(), options); - (new(pool) CYTypeExpression(Decode(pool, &type)))->Output(output, CYNoFlags); + Pointer *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - str << "(" << internal->value_ << ")"; - std::string value(str.str()); - return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size()))); - } else 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)); + return CYCastJSValue(context, strlen(internal->value_)); } CYCatch(NULL) } -static JSValueRef CString_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { - sig::Type type; - type.name = NULL; - type.flags = 0; - - type.primitive = sig::char_P; - type.data.data.type = NULL; - type.data.data.size = 0; +static JSValueRef CString_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + return CYMakeType(context, sig::String()); +} CYCatch(NULL) } - return CYMakeType(context, &type); +static JSValueRef CArray_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + CArray *internal(reinterpret_cast(JSObjectGetPrivate(object))); + sig::Array type(*internal->type_->type_, internal->length_); + return CYMakeType(context, type); } CYCatch(NULL) } -static JSValueRef Pointer_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { +static JSValueRef Pointer_getProperty_$cyt(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_)); + CString *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + const char *string(internal->value_); std::ostringstream str; - str << "&"; - CYStringify(str, string, strlen(string), true); + 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); + CString *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + return CYCastJSValue(context, internal->value_); } CYCatch(NULL) } -static JSValueRef Functor_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { +static JSValueRef Functor_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { cy::Functor *internal(reinterpret_cast(JSObjectGetPrivate(object))); - return CYMakeType(context, &internal->signature_); + CYPool pool; + sig::Function type(internal->variadic_); + sig::Copy(pool, type.signature, internal->signature_); + return CYMakeType(context, type); } CYCatch(NULL) } static JSValueRef Type_getProperty_alignment(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { @@ -1702,7 +1858,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 { @@ -1723,22 +1879,29 @@ static JSValueRef Type_callAsFunction_toCYON(JSContextRef context, JSObjectRef o std::stringbuf out; CYOptions options; CYOutput output(out, options); - (new(pool) CYTypeExpression(Decode(pool, internal->type_)))->Output(output, CYNoFlags); + output.pretty_ = true; + (new(pool) CYTypeExpression(CYDecodeType(pool, internal->type_->Copy(pool, ""))))->Output(output, CYNoFlags); return CYCastJSValue(context, CYJSString(out.str().c_str())); } CYCatch(NULL) } -static JSValueRef Type_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { - return Type_callAsFunction_toString(context, object, _this, count, arguments, exception); -} - static JSStaticFunction All_staticFunctions[2] = { {"cy$complete", &All_complete_callAsFunction, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} }; -static JSStaticFunction CString_staticFunctions[6] = { +static JSStaticFunction CArray_staticFunctions[3] = { + {"toPointer", &CArray_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"valueOf", &CArray_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, 0} +}; + +static JSStaticValue CArray_staticValues[2] = { + {"$cyt", &CArray_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, NULL, 0} +}; + +static JSStaticFunction CString_staticFunctions[5] = { {"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}, @@ -1747,20 +1910,19 @@ static JSStaticFunction CString_staticFunctions[6] = { static JSStaticValue CString_staticValues[3] = { {"length", &CString_getProperty_length, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"type", &CString_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"$cyt", &CString_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, NULL, 0} }; -static JSStaticFunction Pointer_staticFunctions[5] = { +static JSStaticFunction Pointer_staticFunctions[4] = { {"toCYON", &Pointer_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toPointer", &Pointer_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"valueOf", &Pointer_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} }; static JSStaticValue Pointer_staticValues[2] = { - {"type", &Pointer_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"$cyt", &Pointer_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, NULL, 0} }; @@ -1769,11 +1931,15 @@ static JSStaticFunction Struct_staticFunctions[2] = { {NULL, NULL, 0} }; -static JSStaticFunction Functor_staticFunctions[5] = { +static JSStaticValue Struct_staticValues[2] = { + {"$cyt", &Struct_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, NULL, 0} +}; + +static JSStaticFunction Functor_staticFunctions[4] = { {"$cya", &Functor_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"toCYON", &CYValue_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"toCYON", &Functor_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"valueOf", &Functor_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} }; @@ -1782,7 +1948,7 @@ namespace cy { } static JSStaticValue Functor_staticValues[2] = { - {"type", &Functor_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"$cyt", &Functor_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, NULL, 0} }; @@ -1797,20 +1963,16 @@ 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}, + {"enumFor", &Type_callAsFunction_enumFor, 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} }; @@ -1858,18 +2020,22 @@ class ExecutionHandle { } }; +#ifndef __ANDROID__ static volatile bool cancel_; static bool CYShouldTerminate(JSContextRef context, void *arg) { return cancel_; } +#endif _visible const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code) { ExecutionHandle handle(context); +#ifndef __ANDROID__ cancel_ = false; if (&JSContextGroupSetExecutionTimeLimit != NULL) JSContextGroupSetExecutionTimeLimit(JSContextGetGroup(context), 0.5, &CYShouldTerminate, NULL); +#endif try { JSValueRef result(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0)); @@ -1886,11 +2052,13 @@ _visible const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String } } +#ifndef __ANDROID__ _visible void CYCancel() { cancel_ = true; } +#endif -static const char *CYPoolLibraryPath(CYPool &pool); +const char *CYPoolLibraryPath(CYPool &pool); static bool initialized_ = false; @@ -1919,7 +2087,16 @@ void CYInitializeDynamic() { definition = kJSClassDefinitionEmpty; definition.className = "Context"; definition.finalize = &CYFinalize; - Context_ = JSClassCreate(&definition); + Context::Class_ = JSClassCreate(&definition); + + definition = kJSClassDefinitionEmpty; + definition.className = "CArray"; + definition.staticFunctions = CArray_staticFunctions; + definition.staticValues = CArray_staticValues; + definition.getProperty = &CArray_getProperty; + definition.setProperty = &CArray_setProperty; + definition.finalize = &CYFinalize; + CArray::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "CString"; @@ -1928,7 +2105,7 @@ void CYInitializeDynamic() { definition.getProperty = &CString_getProperty; definition.setProperty = &CString_setProperty; definition.finalize = &CYFinalize; - CString_ = JSClassCreate(&definition); + CString::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "Functor"; @@ -1946,16 +2123,17 @@ void CYInitializeDynamic() { definition.getProperty = &Pointer_getProperty; definition.setProperty = &Pointer_setProperty; definition.finalize = &CYFinalize; - Pointer_ = JSClassCreate(&definition); + Pointer::Class_ = JSClassCreate(&definition); 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; definition.finalize = &CYFinalize; - Struct_ = JSClassCreate(&definition); + Struct_privateData::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "Type"; @@ -1972,8 +2150,10 @@ void CYInitializeDynamic() { Global_ = JSClassCreate(&definition); Array_s = JSStringCreateWithUTF8CString("Array"); + constructor_s = JSStringCreateWithUTF8CString("constructor"); cy_s = JSStringCreateWithUTF8CString("$cy"); cyi_s = JSStringCreateWithUTF8CString("$cyi"); + cyt_s = JSStringCreateWithUTF8CString("$cyt"); length_s = JSStringCreateWithUTF8CString("length"); message_s = JSStringCreateWithUTF8CString("message"); name_s = JSStringCreateWithUTF8CString("name"); @@ -2038,18 +2218,47 @@ JSGlobalContextRef CYGetJSContext(JSContextRef context) { return reinterpret_cast(JSObjectGetPrivate(CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s))))->context_; } -static const char *CYPoolLibraryPath(CYPool &pool) { +#ifdef __ANDROID__ +char *CYPoolLibraryPath_(CYPool &pool) { + FILE *maps(fopen("/proc/self/maps", "r")); + struct F { FILE *f; F(FILE *f) : f(f) {} + ~F() { fclose(f); } } f(maps); + + size_t function(reinterpret_cast(&CYPoolLibraryPath)); + + for (;;) { + size_t start; size_t end; char flags[8]; unsigned long long offset; + int major; int minor; unsigned long long inode; char file[1024]; + int count(fscanf(maps, "%zx-%zx %7s %llx %x:%x %llu%[ ]%1024[^\n]\n", + &start, &end, flags, &offset, &major, &minor, &inode, file, file)); + if (count < 8) break; else if (start <= function && function < end) + return pool.strdup(file); + } + + _assert(false); +} +#else +char *CYPoolLibraryPath_(CYPool &pool) { Dl_info addr; _assert(dladdr(reinterpret_cast(&CYPoolLibraryPath), &addr) != 0); - char *lib(pool.strdup(addr.dli_fname)); + return pool.strdup(addr.dli_fname); +} +#endif + +const char *CYPoolLibraryPath(CYPool &pool) { + char *lib(CYPoolLibraryPath_(pool)); char *slash(strrchr(lib, '/')); - _assert(slash != NULL); + if (slash == NULL) + return "."; *slash = '\0'; slash = strrchr(lib, '/'); - if (slash != NULL && strcmp(slash, "/.libs") == 0) - *slash = '\0'; + if (slash != NULL) { + if (strcmp(slash, "/.libs") == 0) + *slash = '\0'; + } else if (strcmp(lib, ".libs") == 0) + return "."; return lib; } @@ -2058,17 +2267,43 @@ static JSValueRef require_callAsFunction(JSContextRef context, JSObjectRef objec _assert(count == 1); CYPool pool; - const char *name(CYPoolCString(pool, context, arguments[0])); - if (strchr(name, '/') == NULL && ( + CYUTF8String name(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0]))); + if (memchr(name.data, '/', name.size) == 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.data, ".framework/", name.data, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL || + dlopen(pool.strcat("/System/Library/PrivateFrameworks/", name.data, ".framework/", name.data, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL || #endif false)) return CYJSUndefined(context); - JSObjectRef resolve(CYCastJSObject(context, CYGetProperty(context, object, CYJSString("resolve")))); - CYJSString path(context, CYCallAsFunction(context, resolve, NULL, 1, arguments)); + CYJSString path; + CYUTF8String code; + + sqlite3_stmt *statement; + + _sqlcall(sqlite3_prepare(database_, + "select " + "\"module\".\"code\", " + "\"module\".\"flags\" " + "from \"module\" " + "where" + " \"module\".\"name\" = ?" + " limit 1" + , -1, &statement, NULL)); + + _sqlcall(sqlite3_bind_text(statement, 1, name.data, name.size, SQLITE_STATIC)); + + if (_sqlcall(sqlite3_step(statement)) != SQLITE_DONE) { + code.data = static_cast(sqlite3_column_blob(statement, 0)); + code.size = sqlite3_column_bytes(statement, 0); + path = CYJSString(name); + code = CYPoolUTF8String(pool, code); + } else { + JSObjectRef resolve(CYCastJSObject(context, CYGetProperty(context, object, CYJSString("resolve")))); + path = CYJSString(context, CYCallAsFunction(context, resolve, NULL, 1, arguments)); + } + + _sqlcall(sqlite3_finalize(statement)); CYJSString property("exports"); @@ -2080,11 +2315,13 @@ static JSValueRef require_callAsFunction(JSContextRef context, JSObjectRef objec JSObjectRef module(CYCastJSObject(context, cache)); result = CYGetProperty(context, module, property); } else { - CYUTF8String code(CYPoolFileUTF8String(pool, CYPoolCString(pool, context, path))); - _assert(code.data != NULL); + if (code.data == NULL) { + 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) { + size_t length(name.size); + if (length >= 5 && strncmp(name.data + length - 5, ".json", 5) == 0) { JSObjectRef JSON(CYGetCachedObject(context, CYJSString("JSON"))); JSObjectRef parse(CYCastJSObject(context, CYGetProperty(context, JSON, CYJSString("parse")))); JSValueRef arguments[1] = { CYCastJSValue(context, CYJSString(code)) }; @@ -2131,7 +2368,7 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { JSObjectRef global(CYGetGlobalObject(context)); - JSObjectRef cy(JSObjectMake(context, Context_, new Context(context))); + JSObjectRef cy(Context::Make(context, context)); CYSetProperty(context, global, cy_s, cy, kJSPropertyAttributeDontEnum); /* Cache Globals {{{ */ @@ -2189,7 +2426,11 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { CYSetProperty(context, cycript, CYJSString("compile"), &Cycript_compile_callAsFunction); CYSetProperty(context, cycript, CYJSString("gc"), &Cycript_gc_callAsFunction); - JSObjectRef CString(JSObjectMakeConstructor(context, CString_, &CString_new)); + JSObjectRef CArray(JSObjectMakeConstructor(context, CArray::Class_, &CArray_new)); + CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CArray, prototype_s)), Array_prototype); + CYSetProperty(context, cycript, CYJSString("CArray"), CArray); + + JSObjectRef CString(JSObjectMakeConstructor(context, CString::Class_, &CString_new)); CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CString, prototype_s)), String_prototype); CYSetProperty(context, cycript, CYJSString("CString"), CString); @@ -2197,7 +2438,7 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)), Function_prototype); CYSetProperty(context, cycript, CYJSString("Functor"), Functor); - CYSetProperty(context, cycript, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer_, &Pointer_new)); + CYSetProperty(context, cycript, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer::Class_, &Pointer_new)); CYSetProperty(context, cycript, CYJSString("Type"), JSObjectMakeConstructor(context, Type_privateData::Class_, &Type_new)); JSObjectRef modules(JSObjectMake(context, NULL, NULL)); @@ -2246,19 +2487,36 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { } #endif + CYSetProperty(context, String_prototype, cyt_s, CYMakeType(context, sig::String()), kJSPropertyAttributeDontEnum); + 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, "B"), kJSPropertyAttributeDontEnum); - CYSetProperty(context, cache, CYJSString("char"), CYMakeType(context, "c"), kJSPropertyAttributeDontEnum); - CYSetProperty(context, cache, CYJSString("short"), CYMakeType(context, "s"), kJSPropertyAttributeDontEnum); - CYSetProperty(context, cache, CYJSString("int"), CYMakeType(context, "i"), kJSPropertyAttributeDontEnum); - CYSetProperty(context, cache, CYJSString("long"), CYMakeType(context, "l"), kJSPropertyAttributeDontEnum); - CYSetProperty(context, cache, CYJSString("float"), CYMakeType(context, "f"), kJSPropertyAttributeDontEnum); - CYSetProperty(context, cache, CYJSString("double"), CYMakeType(context, "d"), 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); + +#ifdef __SIZEOF_INT128__ + CYSetProperty(context, cache, CYJSString("int128"), CYMakeType(context, sig::Primitive<__int128>()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("uint128"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); +#endif + + 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)