X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/bf76f58056b53ca590b619a7488a1648e554fcb4..5587a93f98c158ab5e71c1f1c6b318690271d335:/ObjectiveC/Library.mm diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm index b6410c7..fe8933c 100644 --- a/ObjectiveC/Library.mm +++ b/ObjectiveC/Library.mm @@ -40,6 +40,7 @@ #include #endif +#include "Code.hpp" #include "Error.hpp" #include "JavaScript.hpp" #include "String.hpp" @@ -129,6 +130,8 @@ static void (*$objc_setAssociatedObject)(id object, void *key, id value, objc_As static id (*$objc_getAssociatedObject)(id object, void *key); static void (*$objc_removeAssociatedObjects)(id object); +@class NSBlock; + struct BlockLiteral { Class isa; int flags; @@ -273,7 +276,9 @@ bool CYGetOffset(CYPool &pool, JSContextRef context, NSString *value, ssize_t &i static JSClassRef Instance_; static JSClassRef ArrayInstance_; +static JSClassRef BooleanInstance_; static JSClassRef FunctionInstance_; +static JSClassRef NumberInstance_; static JSClassRef ObjectInstance_; static JSClassRef StringInstance_; @@ -294,6 +299,7 @@ static JSClassRef ObjectiveC_Images_; #endif #ifdef __APPLE__ +static Class __NSMallocBlock__; static Class NSCFBoolean_; static Class NSCFType_; static Class NSGenericDeallocHandler_; @@ -307,6 +313,7 @@ static Class NSBoolNumber_; static Class NSArray_; static Class NSBlock_; static Class NSDictionary_; +static Class NSNumber_; static Class NSString_; static Class Object_; @@ -343,10 +350,18 @@ JSValueRef CYGetClassPrototype(JSContextRef context, Class self, bool meta) { JSClassRef _class(NULL); JSValueRef prototype; - if (self == NSArray_) +#ifdef __APPLE__ + if (self == NSCFBoolean_) +#else + if (self == NSBoolNumber_) +#endif + prototype = CYGetCachedObject(context, CYJSString("BooleanInstance_prototype")); + else if (self == NSArray_) prototype = CYGetCachedObject(context, CYJSString("ArrayInstance_prototype")); else if (self == NSBlock_) prototype = CYGetCachedObject(context, CYJSString("FunctionInstance_prototype")); + else if (self == NSNumber_) + prototype = CYGetCachedObject(context, CYJSString("NumberInstance_prototype")); else if (self == NSDictionary_) prototype = CYGetCachedObject(context, CYJSString("ObjectInstance_prototype")); else if (self == NSString_) @@ -382,17 +397,22 @@ JSObjectRef Super::Make(JSContextRef context, id object, Class _class) { return value; } } +bool CYIsKindOfClass(id object, Class _class) { + for (Class isa(object_getClass(object)); isa != NULL; isa = class_getSuperclass(isa)) + if (isa == _class) + return true; + return false; +} + JSObjectRef Instance::Make(JSContextRef context, id object, Flags flags) { - JSObjectRef value(JSObjectMake(context, Instance_, new Instance(object, flags))); + JSObjectRef value(JSObjectMake(context, CYIsKindOfClass(object, NSBlock_) ? FunctionInstance_ : Instance_, new Instance(object, flags))); JSObjectSetPrototype(context, value, CYGetClassPrototype(context, object_getClass(object))); return value; } Instance::~Instance() { if ((flags_ & Transient) == 0) - // XXX: does this handle background threads correctly? - // XXX: this simply does not work on the console because I'm stupid - [GetValue() performSelector:@selector(release) withObject:nil afterDelay:0]; + [GetValue() release]; } struct Message_privateData : @@ -631,7 +651,7 @@ struct PropertyAttributes { /* }}} */ _finline bool CYJSValueIsNSObject(JSContextRef context, JSValueRef value) { - return JSValueIsObjectOfClass(context, value, Instance_); + return JSValueIsObjectOfClass(context, value, Instance_) || JSValueIsObjectOfClass(context, value, FunctionInstance_); } _finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) { @@ -661,7 +681,8 @@ static void BlockClosure_(ffi_cif *cif, void *result, void **arguments, void *ar CYExecuteClosure(cif, result, arguments, arg, &BlockAdapter_); } -NSObject *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature &signature) { +NSBlock *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature &signature) { + _assert(__NSMallocBlock__ != Nil); BlockLiteral *literal(reinterpret_cast(malloc(sizeof(BlockLiteral)))); CYBlockDescriptor *descriptor(new CYBlockDescriptor); @@ -670,7 +691,7 @@ NSObject *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature descriptor->internal_ = CYMakeFunctor_(context, function, signature, &BlockClosure_); literal->invoke = reinterpret_cast(descriptor->internal_->GetValue()); - literal->isa = objc_getClass("__NSMallocBlock__"); + literal->isa = __NSMallocBlock__; literal->flags = BLOCK_HAS_SIGNATURE | BLOCK_HAS_COPY_DISPOSE | BLOCK_IS_GLOBAL; literal->reserved = 0; literal->descriptor = descriptor; @@ -679,7 +700,7 @@ NSObject *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature descriptor->d_.two_.dispose_helper = &CYDisposeBlock; descriptor->d_.three_.signature = sig::Unparse(*descriptor->internal_->pool_, &signature); - return reinterpret_cast(literal); + return reinterpret_cast(literal); } NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSObjectRef object) { @@ -1066,7 +1087,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) { } - (NSString *) cy$toCYON:(bool)objective { - return [[self description] cy$toCYON:objective]; + return [@"#" stringByAppendingString:[[self description] cy$toCYON:true]]; } - (bool) cy$hasProperty:(NSString *)name { @@ -1107,6 +1128,19 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) { return [[self description] cy$toCYON:objective]; } +@end +/* }}} */ +/* Bridge: NSSet {{{ */ +@implementation NSSet (Cycript) + +- (NSString *) cy$toCYON:(bool)objective { + NSMutableString *json([[[NSMutableString alloc] init] autorelease]); + [json appendString:@"[NSSet setWithArray:"]; + [json appendString:CYCastNSCYON([self allObjects], true)]; + [json appendString:@"]]"]; + return json; +} + @end /* }}} */ /* Bridge: NSString {{{ */ @@ -1462,30 +1496,49 @@ static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void ( ffi_call(cif, function, value, values); } CYSadCatch() } -static bool CYObjectiveC_PoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry { - // XXX: assigning to an indirect id * works for return values, but not for properties and fields +static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef value, sig::Signature *signature) { + if (JSValueIsNull(context, value)) + return nil; + JSObjectRef object(CYCastJSObject(context, value)); - switch (type->primitive) { - case sig::block_P: { - _assert(type->data.signature.count != 0); - sig::Signature signature; - sig::Copy(*pool, signature, type->data.signature); + if (JSValueIsObjectOfClass(context, object, FunctionInstance_)) + return reinterpret_cast(JSObjectGetPrivate(object))->GetValue(); + + if (JSValueIsObjectOfClass(context, object, Instance_)) { + _assert(reinterpret_cast(JSObjectGetPrivate(object))->GetValue() == nil); + return nil; + } + + _assert(JSObjectIsFunction(context, object)); - sig::Element *elements(new(*pool) sig::Element[++signature.count]); - elements[0] = signature.elements[0]; - memcpy(elements + 2, signature.elements + 1, sizeof(sig::Element) * (signature.count - 2)); - signature.elements = elements; + _assert(signature != NULL); + _assert(signature->count != 0); - elements[1].name = NULL; - elements[1].type = new(*pool) sig::Type(); - elements[1].offset = _not(size_t); + sig::Signature modified; + modified.count = signature->count + 1; + modified.elements = new(pool) sig::Element[modified.count]; - memset(elements[1].type, 0, sizeof(sig::Type)); - elements[1].type->primitive = sig::object_P; + modified.elements[0] = signature->elements[0]; + memcpy(modified.elements + 2, signature->elements + 1, sizeof(sig::Element) * (signature->count - 1)); - JSObjectRef function(CYCastJSObject(context, value)); - *reinterpret_cast(data) = CYMakeBlock(context, function, signature); - } break; + modified.elements[1].name = NULL; + modified.elements[1].type = new(pool) sig::Type(); + modified.elements[1].offset = _not(size_t); + + memset(modified.elements[1].type, 0, sizeof(sig::Type)); + modified.elements[1].type->primitive = sig::object_P; + + return CYMakeBlock(context, object, modified); +} + +static bool CYObjectiveC_PoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry { + // XXX: assigning to an indirect id * works for return values, but not for properties and fields + + switch (type->primitive) { + case sig::block_P: + // XXX: this function might not handle the idea of a null pool + *reinterpret_cast(data) = CYCastNSBlock(*pool, context, value, &type->data.signature); + break; case sig::object_P: case sig::typename_P: @@ -1624,11 +1677,8 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr CYPool pool; const char *name(CYPoolCString(pool, context, property)); - SEL sel(sel_registerName(name)); - objc_method *method(class_getInstanceMethod(_class, sel)); - const char *type; IMP imp; @@ -1637,10 +1687,30 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr type = sig::Unparse(pool, &message->signature_); imp = reinterpret_cast(message->GetValue()); } else { + objc_method *method(class_getInstanceMethod(_class, sel)); type = CYPoolTypeEncoding(pool, context, sel, method); imp = CYMakeMessage(context, value, type); } + objc_method *method(NULL); +#if OBJC_API_VERSION >= 2 + unsigned int size; + objc_method **methods(class_copyMethodList(_class, &size)); + for (size_t i(0); i != size; ++i) + if (sel_isEqual(method_getName(methods[i]), sel)) { + method = methods[i]; + break; + } + free(methods); +#else + for (objc_method_list *methods(_class->methods); methods != NULL; methods = methods->method_next) + for (int i(0); i != methods->method_count; ++i) + if (sel_isEqual(method_getName(&methods->method_list[i]), sel)) { + method = &methods->method_list[i]; + break; + } +#endif + if (method != NULL) method_setImplementation(method, imp); else { @@ -1903,42 +1973,37 @@ static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef return value; } CYCatch(NULL) } -static JSValueRef Instance_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - id self(internal->GetValue()); - - if (![self isKindOfClass:NSBlock_]) - CYThrow("non-NSBlock object is not a function"); - // XXX: replace above logic with the following assertion - //_assert([self isKindOfClass:NSBlock_]); - // to do this, make it so FunctionInstance_ is the class of blocks - // to do /that/, generalize the various "is exactly Instance_" checks - // then, move Instance_callAsFunction to only be on FunctionInstance - +static const char *CYBlockEncoding(NSBlock *self) { BlockLiteral *literal(reinterpret_cast(self)); + if ((literal->flags & BLOCK_HAS_SIGNATURE) == 0) + return NULL; + uint8_t *descriptor(reinterpret_cast(literal->descriptor)); + descriptor += sizeof(BlockDescriptor1); + if ((literal->flags & BLOCK_HAS_COPY_DISPOSE) != 0) + descriptor += sizeof(BlockDescriptor2); + BlockDescriptor3 *descriptor3(reinterpret_cast(descriptor)); + return descriptor3->signature; +} - if ((literal->flags & BLOCK_HAS_SIGNATURE) != 0) { - uint8_t *descriptor(reinterpret_cast(literal->descriptor)); - descriptor += sizeof(BlockDescriptor1); - if ((literal->flags & BLOCK_HAS_COPY_DISPOSE) != 0) - descriptor += sizeof(BlockDescriptor2); - BlockDescriptor3 *descriptor3(reinterpret_cast(descriptor)); +static JSValueRef FunctionInstance_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); + id self(internal->GetValue()); - if (const char *type = descriptor3->signature) { - CYPool pool; + if (const char *encoding = CYBlockEncoding(self)) { + CYPool pool; - void *setup[1]; - setup[0] = &self; + void *setup[1]; + setup[0] = &self; - sig::Signature signature; - sig::Parse(pool, &signature, type, &Structor_); + sig::Signature signature; + sig::Parse(pool, &signature, encoding, &Structor_); - ffi_cif cif; - sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif); + ffi_cif cif; + sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif); - void (*function)() = reinterpret_cast(literal->invoke); - return CYCallFunction(pool, context, 1, setup, count, arguments, false, &signature, &cif, function); - } + BlockLiteral *literal(reinterpret_cast(self)); + void (*function)() = reinterpret_cast(literal->invoke); + return CYCallFunction(pool, context, 1, setup, count, arguments, false, &signature, &cif, function); } if (count != 0) @@ -2100,6 +2165,11 @@ static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef return internal->GetOwner(); } CYCatch(NULL) } +static bool ObjectiveC_Classes_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { + CYPool pool; + return objc_getClass(CYPoolCString(pool, context, property)) != Nil; +} + static JSValueRef ObjectiveC_Classes_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { CYPool pool; NSString *name(CYCastNSString(&pool, context, property)); @@ -2279,8 +2349,9 @@ static void choose_(task_t task, void *baton, unsigned type, vm_range_t *ranges, if (result == choice->query_.end()) continue; - // XXX: if (size < class_getInstanceSize(*result)) - if ((class_getInstanceSize(*result) + 15) / 16 * 16 != size) + size_t needed(class_getInstanceSize(*result)); + // XXX: if (size < needed) + if (needed <= 496 && (needed + 15) / 16 * 16 != size || needed > 496 && (needed + 511) / 512 * 512 != size) continue; CYArrayPush(context, choice->results_, CYCastJSValue(context, reinterpret_cast(data))); } @@ -2290,6 +2361,8 @@ static JSValueRef choose(JSContextRef context, JSObjectRef object, JSObjectRef _ if (count != 1) throw CYJSError(context, "choose() takes a class argument"); + CYGarbageCollect(context); + CYPool pool; Class _class(CYCastNSObject(&pool, context, arguments[0])); @@ -2491,7 +2564,7 @@ static JSValueRef Message_callAsFunction(JSContextRef context, JSObjectRef objec static JSObjectRef Super_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 Super constructor"); + throw CYJSError(context, "incorrect number of arguments to objc_super constructor"); CYPool pool; id self(CYCastNSObject(&pool, context, arguments[0])); Class _class(CYCastClass(pool, context, arguments[1])); @@ -2536,6 +2609,18 @@ static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef return CYMakePointer(context, &internal->value_, _not(size_t), type, ffi, object); } CYCatch(NULL) } +static JSValueRef FunctionInstance_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); + const char *encoding(CYBlockEncoding(internal->GetValue())); + if (encoding == NULL) + return CYJSNull(context); + // XXX: this should be stored on a FunctionInstance private value subclass + CYPool pool; + sig::Signature signature; + sig::Parse(pool, &signature, encoding, &Structor_); + return CYMakeType(context, &signature); +} CYCatch(NULL) } + static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); return Instance::Make(context, (id) object_getClass(internal->GetValue())); @@ -2695,6 +2780,7 @@ static JSStaticValue Selector_staticValues[2] = { {NULL, NULL, NULL, 0} }; +// XXX: this is sadly duplicated in FunctionInstance_staticValues static JSStaticValue Instance_staticValues[5] = { {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"messages", &Instance_getProperty_messages, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, @@ -2703,6 +2789,16 @@ static JSStaticValue Instance_staticValues[5] = { {NULL, NULL, NULL, 0} }; +static JSStaticValue FunctionInstance_staticValues[6] = { + {"type", &FunctionInstance_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + // XXX: this is sadly a duplicate of Instance_staticValues + {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"messages", &Instance_getProperty_messages, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"prototype", &Instance_getProperty_prototype, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, NULL, 0} +}; + static JSStaticFunction Instance_staticFunctions[7] = { {"$cya", &CYValue_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toCYON", &Instance_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, @@ -2750,10 +2846,13 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { NSArray_ = objc_getClass("NSArray"); NSBlock_ = objc_getClass("NSBlock"); NSDictionary_ = objc_getClass("NSDictionary"); + NSNumber_ = objc_getClass("NSNumber"); NSString_ = objc_getClass("NSString"); Object_ = objc_getClass("Object"); #ifdef __APPLE__ + __NSMallocBlock__ = objc_getClass("__NSMallocBlock__"); + // XXX: apparently, iOS now has both of these NSCFBoolean_ = objc_getClass("__NSCFBoolean"); if (NSCFBoolean_ == nil) @@ -2784,7 +2883,6 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition.deleteProperty = &Instance_deleteProperty; definition.getPropertyNames = &Instance_getPropertyNames; definition.callAsConstructor = &Instance_callAsConstructor; - definition.callAsFunction = &Instance_callAsFunction; definition.hasInstance = &Instance_hasInstance; definition.finalize = &CYFinalize; Instance_ = JSClassCreate(&definition); @@ -2792,8 +2890,11 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition.className = "ArrayInstance"; ArrayInstance_ = JSClassCreate(&definition); - definition.className = "FunctionInstance"; - FunctionInstance_ = JSClassCreate(&definition); + definition.className = "BooleanInstance"; + BooleanInstance_ = JSClassCreate(&definition); + + definition.className = "NumberInstance"; + NumberInstance_ = JSClassCreate(&definition); definition.className = "ObjectInstance"; ObjectInstance_ = JSClassCreate(&definition); @@ -2801,6 +2902,11 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition.className = "StringInstance"; StringInstance_ = JSClassCreate(&definition); + definition.className = "FunctionInstance"; + definition.staticValues = FunctionInstance_staticValues; + definition.callAsFunction = &FunctionInstance_callAsFunction; + FunctionInstance_ = JSClassCreate(&definition); + definition = kJSClassDefinitionEmpty; definition.className = "Class"; definition.staticFunctions = Class_staticFunctions; @@ -2819,6 +2925,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition = kJSClassDefinitionEmpty; definition.className = "Message"; definition.staticFunctions = cy::Functor::StaticFunctions; + definition.staticValues = cy::Functor::StaticValues; definition.callAsFunction = &Message_callAsFunction; definition.finalize = &CYFinalize; Message_ = JSClassCreate(&definition); @@ -2851,6 +2958,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition = kJSClassDefinitionEmpty; definition.className = "ObjectiveC::Classes"; + definition.hasProperty = &ObjectiveC_Classes_hasProperty; definition.getProperty = &ObjectiveC_Classes_getProperty; definition.getPropertyNames = &ObjectiveC_Classes_getPropertyNames; ObjectiveC_Classes_ = JSClassCreate(&definition); @@ -2932,12 +3040,24 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry { JSObjectRef Array_prototype(CYGetCachedObject(context, CYJSString("Array_prototype"))); JSObjectSetPrototype(context, ArrayInstance_prototype, Array_prototype); + JSObjectRef BooleanInstance(JSObjectMakeConstructor(context, BooleanInstance_, NULL)); + JSObjectRef BooleanInstance_prototype(CYCastJSObject(context, CYGetProperty(context, BooleanInstance, prototype_s))); + CYSetProperty(context, cy, CYJSString("BooleanInstance_prototype"), BooleanInstance_prototype); + JSObjectRef Boolean_prototype(CYGetCachedObject(context, CYJSString("Boolean_prototype"))); + JSObjectSetPrototype(context, BooleanInstance_prototype, Boolean_prototype); + JSObjectRef FunctionInstance(JSObjectMakeConstructor(context, FunctionInstance_, NULL)); JSObjectRef FunctionInstance_prototype(CYCastJSObject(context, CYGetProperty(context, FunctionInstance, prototype_s))); CYSetProperty(context, cy, CYJSString("FunctionInstance_prototype"), FunctionInstance_prototype); JSObjectRef Function_prototype(CYGetCachedObject(context, CYJSString("Function_prototype"))); JSObjectSetPrototype(context, FunctionInstance_prototype, Function_prototype); + JSObjectRef NumberInstance(JSObjectMakeConstructor(context, NumberInstance_, NULL)); + JSObjectRef NumberInstance_prototype(CYCastJSObject(context, CYGetProperty(context, NumberInstance, prototype_s))); + CYSetProperty(context, cy, CYJSString("NumberInstance_prototype"), NumberInstance_prototype); + JSObjectRef Number_prototype(CYGetCachedObject(context, CYJSString("Number_prototype"))); + JSObjectSetPrototype(context, NumberInstance_prototype, Number_prototype); + JSObjectRef ObjectInstance(JSObjectMakeConstructor(context, ObjectInstance_, NULL)); JSObjectRef ObjectInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ObjectInstance, prototype_s))); CYSetProperty(context, cy, CYJSString("ObjectInstance_prototype"), ObjectInstance_prototype); @@ -2956,10 +3076,10 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry { CYSetProperty(context, cycript, CYJSString("Instance"), Instance); CYSetProperty(context, cycript, CYJSString("Selector"), Selector); - CYSetProperty(context, cycript, CYJSString("Super"), Super); + CYSetProperty(context, cycript, CYJSString("objc_super"), Super); JSObjectRef box(JSObjectMakeFunctionWithCallback(context, CYJSString("box"), &Instance_box_callAsFunction)); - CYSetProperty(context, Instance, CYJSString("box"), box); + CYSetProperty(context, Instance, CYJSString("box"), box, kJSPropertyAttributeDontEnum); #ifdef __APPLE__ CYSetProperty(context, all, CYJSString("choose"), &choose, kJSPropertyAttributeDontEnum); @@ -2997,7 +3117,8 @@ extern "C" void CydgetMemoryParse(const uint16_t **data, size_t *size) { try { CYPool pool; CYUTF8String utf8(CYPoolUTF8String(pool, CYUTF16String(*data, *size))); - utf8 = CYPoolCode(pool, utf8); + CYStream stream(utf8.data, utf8.data + utf8.size); + utf8 = CYPoolCode(pool, stream); CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(utf8.data, utf8.size))); size_t bytes(utf16.size * sizeof(uint16_t));