X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b3378a02d0a811be38e530933fb9a57a3012a823..51b6165e0dd24e4d40ff80e504922f705ddd7b62:/ObjectiveC/Library.mm diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm index b8699cd..742e3ef 100644 --- a/ObjectiveC/Library.mm +++ b/ObjectiveC/Library.mm @@ -1,39 +1,29 @@ /* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2010 Jay Freeman (saurik) + * Copyright (C) 2009-2013 Jay Freeman (saurik) */ -/* GNU Lesser General Public License, Version 3 {{{ */ +/* GNU General Public License, Version 3 {{{ */ /* - * Cycript is free software: you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. + * Cycript is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * - * Cycript is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. + * Cycript is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU General Public License * along with Cycript. If not, see . **/ /* }}} */ -#if defined(__APPLE__) && defined(__arm__) -#include -#else -#include -#endif - -#ifdef __APPLE__ -#include "Struct.hpp" -#endif - #include #include "ObjectiveC/Internal.hpp" -#include +#include #include "cycript.hpp" @@ -42,7 +32,12 @@ #ifdef __APPLE__ #include #include -#include +#include +#endif + +#ifdef __APPLE__ +#include +#include #endif #include "Error.hpp" @@ -52,15 +47,18 @@ #include #include +#include -#define CYObjectiveTry_(context) { \ - JSContextRef context_(context); \ +#include + +#define CYObjectiveTry_ { \ try #define CYObjectiveTry { \ + JSContextRef context(context_); \ try #define CYObjectiveCatch \ catch (const CYException &error) { \ - @throw CYCastNSObject(NULL, context_, error.CastJSValue(context_)); \ + @throw CYCastNSObject(NULL, context, error.CastJSValue(context)); \ } \ } @@ -127,42 +125,76 @@ #define protocol_getName(protocol) [(protocol) name] #endif -JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception); +static void (*$objc_setAssociatedObject)(id object, void *key, id value, objc_AssociationPolicy policy); +static id (*$objc_getAssociatedObject)(id object, void *key); +static void (*$objc_removeAssociatedObjects)(id object); + +struct BlockLiteral { + Class isa; + int flags; + int reserved; + void (*invoke)(void *, ...); + void *descriptor; +}; + +struct BlockDescriptor1 { + unsigned long int reserved; + unsigned long int size; +}; + +struct BlockDescriptor2 { + void (*copy_helper)(BlockLiteral *dst, BlockLiteral *src); + void (*dispose_helper)(BlockLiteral *src); +}; + +struct BlockDescriptor3 { + const char *signature; + const char *layout; +}; + +enum { + BLOCK_DEALLOCATING = 0x0001, + BLOCK_REFCOUNT_MASK = 0xfffe, + BLOCK_NEEDS_FREE = 1 << 24, + BLOCK_HAS_COPY_DISPOSE = 1 << 25, + BLOCK_HAS_CTOR = 1 << 26, + BLOCK_IS_GC = 1 << 27, + BLOCK_IS_GLOBAL = 1 << 28, + BLOCK_HAS_STRET = 1 << 29, + BLOCK_HAS_SIGNATURE = 1 << 30, +}; + +JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize); /* Objective-C Pool Release {{{ */ -apr_status_t CYPoolRelease_(void *data) { +void CYPoolRelease_(void *data) { id object(reinterpret_cast(data)); [object release]; - return APR_SUCCESS; } -id CYPoolRelease_(apr_pool_t *pool, id object) { +id CYPoolRelease_(CYPool *pool, id object) { if (object == nil) return nil; else if (pool == NULL) return [object autorelease]; else { - apr_pool_cleanup_register(pool, object, &CYPoolRelease_, &apr_pool_cleanup_null); + pool->atexit(CYPoolRelease_); return object; } } template -Type_ CYPoolRelease(apr_pool_t *pool, Type_ object) { +Type_ CYPoolRelease(CYPool *pool, Type_ object) { return (Type_) CYPoolRelease_(pool, (id) object); } /* }}} */ /* Objective-C Strings {{{ */ -const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, NSString *value) { - if (pool == NULL) - return [value UTF8String]; - else { - size_t size([value maximumLengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1); - char *string(new(pool) char[size]); - if (![value getCString:string maxLength:size encoding:NSUTF8StringEncoding]) - throw CYJSError(context, "[NSString getCString:maxLength:encoding:] == NO"); - return string; - } +const char *CYPoolCString(CYPool &pool, JSContextRef context, NSString *value) { + size_t size([value maximumLengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1); + char *string(new(pool) char[size]); + if (![value getCString:string maxLength:size encoding:NSUTF8StringEncoding]) + throw CYJSError(context, "[NSString getCString:maxLength:encoding:] == NO"); + return string; } JSStringRef CYCopyJSString(JSContextRef context, NSString *value) { @@ -203,16 +235,16 @@ NSString *CYCopyNSString(JSContextRef context, JSValueRef value) { return CYCopyNSString(context, CYJSString(context, value)); } -NSString *CYCastNSString(apr_pool_t *pool, const CYUTF8String &value) { +NSString *CYCastNSString(CYPool *pool, const CYUTF8String &value) { return CYPoolRelease(pool, CYCopyNSString(value)); } -NSString *CYCastNSString(apr_pool_t *pool, SEL sel) { +NSString *CYCastNSString(CYPool *pool, SEL sel) { const char *name(sel_getName(sel)); return CYPoolRelease(pool, CYCopyNSString(CYUTF8String(name, strlen(name)))); } -NSString *CYCastNSString(apr_pool_t *pool, JSContextRef context, JSStringRef value) { +NSString *CYCastNSString(CYPool *pool, JSContextRef context, JSStringRef value) { return CYPoolRelease(pool, CYCopyNSString(context, value)); } @@ -234,19 +266,26 @@ size_t CYGetIndex(NSString *value) { return CYGetIndex(CYCastUTF8String(value)); } -bool CYGetOffset(apr_pool_t *pool, JSContextRef context, NSString *value, ssize_t &index) { +bool CYGetOffset(CYPool &pool, JSContextRef context, NSString *value, ssize_t &index) { return CYGetOffset(CYPoolCString(pool, context, value), index); } static JSClassRef Instance_; + +static JSClassRef ArrayInstance_; +static JSClassRef FunctionInstance_; +static JSClassRef ObjectInstance_; +static JSClassRef StringInstance_; + +static JSClassRef Class_; static JSClassRef Internal_; static JSClassRef Message_; static JSClassRef Messages_; static JSClassRef Selector_; -static JSClassRef StringInstance_; static JSClassRef Super_; static JSClassRef ObjectiveC_Classes_; +static JSClassRef ObjectiveC_Constants_; static JSClassRef ObjectiveC_Protocols_; #ifdef __APPLE__ @@ -255,15 +294,19 @@ static JSClassRef ObjectiveC_Images_; #endif #ifdef __APPLE__ +static Class __NSMallocBlock__; static Class NSCFBoolean_; static Class NSCFType_; -static Class NSMessageBuilder_; +static Class NSGenericDeallocHandler_; static Class NSZombie_; + +static std::set banned_; #else static Class NSBoolNumber_; #endif static Class NSArray_; +static Class NSBlock_; static Class NSDictionary_; static Class NSString_; static Class Object_; @@ -281,9 +324,11 @@ Type_privateData *Selector_privateData::GetType() const { static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception); -JSValueRef CYGetClassPrototype(JSContextRef context, id self) { +JSValueRef CYGetClassPrototype(JSContextRef context, Class self, bool meta) { if (self == nil) return CYGetCachedObject(context, CYJSString("Instance_prototype")); + else if (meta && !class_isMetaClass(self)) + return CYGetCachedObject(context, CYJSString("Class_prototype")); JSObjectRef global(CYGetGlobalObject(context)); JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s))); @@ -300,13 +345,15 @@ JSValueRef CYGetClassPrototype(JSContextRef context, id self) { JSValueRef prototype; if (self == NSArray_) - prototype = CYGetCachedObject(context, CYJSString("Array_prototype")); + prototype = CYGetCachedObject(context, CYJSString("ArrayInstance_prototype")); + else if (self == NSBlock_) + prototype = CYGetCachedObject(context, CYJSString("FunctionInstance_prototype")); else if (self == NSDictionary_) - prototype = CYGetCachedObject(context, CYJSString("Object_prototype")); + prototype = CYGetCachedObject(context, CYJSString("ObjectInstance_prototype")); else if (self == NSString_) prototype = CYGetCachedObject(context, CYJSString("StringInstance_prototype")); else - prototype = CYGetClassPrototype(context, class_getSuperclass(self)); + prototype = CYGetClassPrototype(context, class_getSuperclass(self), meta); JSObjectRef object(JSObjectMake(context, _class, NULL)); JSObjectSetPrototype(context, object, prototype); @@ -315,14 +362,14 @@ JSValueRef CYGetClassPrototype(JSContextRef context, id self) { return object; } -JSObjectRef Messages::Make(JSContextRef context, Class _class, bool array) { +_finline JSValueRef CYGetClassPrototype(JSContextRef context, Class self) { + return CYGetClassPrototype(context, self, class_isMetaClass(self)); +} + +JSObjectRef Messages::Make(JSContextRef context, Class _class) { JSObjectRef value(JSObjectMake(context, Messages_, new Messages(_class))); - if (_class == NSArray_) - array = true; if (Class super = class_getSuperclass(_class)) - JSObjectSetPrototype(context, value, Messages::Make(context, super, array)); - /*else if (array) - JSObjectSetPrototype(context, value, Array_prototype_);*/ + JSObjectSetPrototype(context, value, Messages::Make(context, super)); return value; } @@ -380,15 +427,15 @@ JSObjectRef CYMakeInstance(JSContextRef context, id object, bool transient) { @interface NSObject (Cycript) -- (JSValueRef) cy$JSValueInContext:(JSContextRef)context; +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context; - (JSType) cy$JSType; -- (NSObject *) cy$toJSON:(NSString *)key; -- (NSString *) cy$toCYON; -- (NSString *) cy$toKey; +- (JSValueRef) cy$toJSON:(NSString *)key inContext:(JSContextRef)context; +- (NSString *) cy$toCYON:(bool)objective; - (bool) cy$hasProperty:(NSString *)name; - (NSObject *) cy$getProperty:(NSString *)name; +- (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context; - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value; - (bool) cy$deleteProperty:(NSString *)name; - (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context; @@ -398,23 +445,24 @@ JSObjectRef CYMakeInstance(JSContextRef context, id object, bool transient) { @end @protocol Cycript -- (JSValueRef) cy$JSValueInContext:(JSContextRef)context; +- (id) cy$box; +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context; @end -NSString *CYCastNSCYON(id value) { +NSString *CYCastNSCYON(id value, bool objective) { NSString *string; if (value == nil) string = @"nil"; else { Class _class(object_getClass(value)); - SEL sel(@selector(cy$toCYON)); + SEL sel(@selector(cy$toCYON:)); if (objc_method *toCYON = class_getInstanceMethod(_class, sel)) - string = reinterpret_cast(method_getImplementation(toCYON))(value, sel); + string = reinterpret_cast(method_getImplementation(toCYON))(value, sel, objective); else if (objc_method *methodSignatureForSelector = class_getInstanceMethod(_class, @selector(methodSignatureForSelector:))) { if (reinterpret_cast(method_getImplementation(methodSignatureForSelector))(value, @selector(methodSignatureForSelector:), sel) != nil) - string = [value cy$toCYON]; + string = [value cy$toCYON:objective]; else goto fail; } else fail: { if (false); @@ -424,7 +472,7 @@ NSString *CYCastNSCYON(id value) { else if (_class == NSZombie_) string = [NSString stringWithFormat:@"<_NSZombie_: %p>", value]; // XXX: frowny /in/ the pants - else if (value == NSMessageBuilder_ || value == Object_) + else if (banned_.find(value) != banned_.end()) string = nil; #endif else @@ -473,7 +521,9 @@ struct PropertyAttributes { name = property_getName(property); const char *attributes(property_getAttributes(property)); - for (char *state, *token(apr_strtok(apr_pstrdup(pool_, attributes), ",", &state)); token != NULL; token = apr_strtok(NULL, ",", &state)) { + for (char *token(pool_.strdup(attributes)), *next; token != NULL; token = next) { + if ((next = strchr(token, ',')) != NULL) + *next++ = '\0'; switch (*token) { case 'R': readonly = true; break; case 'C': copy = true; break; @@ -498,7 +548,7 @@ struct PropertyAttributes { const char *Getter() { if (getter_ == NULL) - getter_ = apr_pstrdup(pool_, name); + getter_ = pool_.strdup(name); return getter_; } @@ -527,13 +577,6 @@ struct PropertyAttributes { }; #endif -#ifdef __APPLE__ -NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) { - return [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease]; -} -#endif - -#ifndef __APPLE__ @interface CYWebUndefined : NSObject { } @@ -551,18 +594,15 @@ NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) { @end #define WebUndefined CYWebUndefined -#endif /* Bridge: CYJSObject {{{ */ @interface CYJSObject : NSMutableDictionary { JSObjectRef object_; - JSContextRef context_; + JSGlobalContextRef context_; } - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context; -- (NSObject *) cy$toJSON:(NSString *)key; - - (NSUInteger) count; - (id) objectForKey:(id)key; - (NSEnumerator *) keyEnumerator; @@ -574,7 +614,7 @@ NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) { /* Bridge: CYJSArray {{{ */ @interface CYJSArray : NSMutableArray { JSObjectRef object_; - JSContextRef context_; + JSGlobalContextRef context_; } - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context; @@ -591,22 +631,68 @@ NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) { @end /* }}} */ -NSObject *CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) { - JSObjectRef Array(CYGetCachedObject(context, Array_s)); - JSValueRef exception(NULL); - bool array(JSValueIsInstanceOfConstructor(context, object, Array, &exception)); - CYThrow(context, exception); - id value(array ? [CYJSArray alloc] : [CYJSObject alloc]); - return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]); +_finline bool CYJSValueIsNSObject(JSContextRef context, JSValueRef value) { + return JSValueIsObjectOfClass(context, value, Instance_); } -NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSObjectRef object) { - if (!JSValueIsObjectOfClass(context, object, Instance_)) - return CYCastNSObject_(pool, context, object); - else { +_finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) { + return _jsccall(JSValueIsInstanceOfConstructor, context, value, CYGetCachedObject(context, cache)); +} + +struct CYBlockDescriptor { + struct { + BlockDescriptor1 one_; + BlockDescriptor2 two_; + BlockDescriptor3 three_; + } d_; + + Closure_privateData *internal_; +}; + +void CYDisposeBlock(BlockLiteral *literal) { + delete reinterpret_cast(literal->descriptor)->internal_; +} + +static JSValueRef BlockAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) { + JSObjectRef _this(CYCastJSObject(context, values[0])); + return CYCallAsFunction(context, function, _this, count - 1, values + 1); +} + +static void BlockClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) { + CYExecuteClosure(cif, result, arguments, arg, &BlockAdapter_); +} + +NSObject *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature &signature) { + _assert(__NSMallocBlock__ != Nil); + BlockLiteral *literal(reinterpret_cast(malloc(sizeof(BlockLiteral)))); + + CYBlockDescriptor *descriptor(new CYBlockDescriptor); + memset(&descriptor->d_, 0, sizeof(descriptor->d_)); + + descriptor->internal_ = CYMakeFunctor_(context, function, signature, &BlockClosure_); + literal->invoke = reinterpret_cast(descriptor->internal_->GetValue()); + + literal->isa = __NSMallocBlock__; + literal->flags = BLOCK_HAS_SIGNATURE | BLOCK_HAS_COPY_DISPOSE | BLOCK_IS_GLOBAL; + literal->reserved = 0; + literal->descriptor = descriptor; + + descriptor->d_.one_.size = sizeof(descriptor->d_); + descriptor->d_.two_.dispose_helper = &CYDisposeBlock; + descriptor->d_.three_.signature = sig::Unparse(*descriptor->internal_->pool_, &signature); + + return reinterpret_cast(literal); +} + +NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSObjectRef object) { + if (CYJSValueIsNSObject(context, object)) { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); return internal->GetValue(); } + + bool array(CYJSValueIsInstanceOfCachedConstructor(context, object, Array_s)); + id value(array ? [CYJSArray alloc] : [CYJSObject alloc]); + return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]); } NSNumber *CYCopyNSNumber(JSContextRef context, JSValueRef value) { @@ -619,7 +705,7 @@ NSNumber *CYCopyNSNumber(JSContextRef context, JSValueRef value) { @end #endif -id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cast) { +id CYNSObject(CYPool *pool, JSContextRef context, JSValueRef value, bool cast) { id object; bool copy; @@ -672,20 +758,24 @@ id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cas return [object retain]; } -NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) { +NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSValueRef value) { return CYNSObject(pool, context, value, true); } -NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) { - return CYNSObject(pool, context, value, false); +NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) { + return CYNSObject(&pool, context, value, false); } /* Bridge: NSArray {{{ */ @implementation NSArray (Cycript) -- (NSString *) cy$toCYON { +- (id) cy$box { + return [[self mutableCopy] autorelease]; +} + +- (NSString *) cy$toCYON:(bool)objective { NSMutableString *json([[[NSMutableString alloc] init] autorelease]); - [json appendString:@"["]; + [json appendString:@"@["]; bool comma(false); #ifdef __APPLE__ @@ -699,7 +789,7 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu else comma = true; if (object == nil || [object cy$JSType] != kJSTypeUndefined) - [json appendString:CYCastNSCYON(object)]; + [json appendString:CYCastNSCYON(object, true)]; else { [json appendString:@","]; comma = false; @@ -722,15 +812,6 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu } - (NSObject *) cy$getProperty:(NSString *)name { - if ([name isEqualToString:@"length"]) { - NSUInteger count([self count]); -#ifdef __APPLE__ - return [NSNumber numberWithUnsignedInteger:count]; -#else - return [NSNumber numberWithUnsignedInt:count]; -#endif - } - size_t index(CYGetIndex(name)); if (index == _not(size_t) || index >= [self count]) return [super cy$getProperty:name]; @@ -738,6 +819,15 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return [self objectAtIndex:index]; } +- (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context { + CYObjectiveTry_ { + if ([name isEqualToString:@"length"]) + return CYCastJSValue(context, [self count]); + } CYObjectiveCatch + + return [super cy$getProperty:name inContext:context]; +} + - (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context { [super cy$getPropertyNames:names inContext:context]; @@ -757,6 +847,13 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu @end /* }}} */ +/* Bridge: NSBlock {{{ */ +#ifdef __APPLE__ +@interface NSBlock +- (void) invoke; +@end +#endif +/* }}} */ /* Bridge: NSBoolNumber {{{ */ #ifndef __APPLE__ @implementation NSBoolNumber (Cycript) @@ -765,15 +862,12 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return kJSTypeBoolean; } -- (NSObject *) cy$toJSON:(NSString *)key { - return self; -} - -- (NSString *) cy$toCYON { - return [self boolValue] ? @"true" : @"false"; +- (NSString *) cy$toCYON:(bool)objective { + NSString *value([self boolValue] ? @"true" : @"false"); + return objective ? value : [NSString stringWithFormat:@"@%@", value]; } -- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) { +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ { return CYCastJSValue(context, (bool) [self boolValue]); } CYObjectiveCatch } @@ -783,9 +877,13 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu /* Bridge: NSDictionary {{{ */ @implementation NSDictionary (Cycript) -- (NSString *) cy$toCYON { +- (id) cy$box { + return [[self mutableCopy] autorelease]; +} + +- (NSString *) cy$toCYON:(bool)objective { NSMutableString *json([[[NSMutableString alloc] init] autorelease]); - [json appendString:@"{"]; + [json appendString:@"@{"]; bool comma(false); #ifdef __APPLE__ @@ -798,10 +896,10 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu [json appendString:@","]; else comma = true; - [json appendString:[key cy$toKey]]; + [json appendString:CYCastNSCYON(key, true)]; [json appendString:@":"]; NSObject *object([self objectForKey:key]); - [json appendString:CYCastNSCYON(object)]; + [json appendString:CYCastNSCYON(object, true)]; } [json appendString:@"}"]; @@ -921,16 +1019,13 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return kJSTypeNumber; } -- (NSObject *) cy$toJSON:(NSString *)key { - return self; -} - -- (NSString *) cy$toCYON { - return [self cy$JSType] != kJSTypeBoolean ? [self stringValue] : [self boolValue] ? @"true" : @"false"; +- (NSString *) cy$toCYON:(bool)objective { + NSString *value([self cy$JSType] != kJSTypeBoolean ? [self stringValue] : [self boolValue] ? @"true" : @"false"); + return objective ? value : [NSString stringWithFormat:@"@%@", value]; } -- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) { - return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, [self boolValue]); +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ { + return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, static_cast([self boolValue])); } CYObjectiveCatch } @end @@ -942,37 +1037,38 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return kJSTypeNull; } -- (NSObject *) cy$toJSON:(NSString *)key { - return self; +- (NSString *) cy$toCYON:(bool)objective { + NSString *value(@"null"); + return objective ? value : [NSString stringWithFormat:@"@%@", value]; } -- (NSString *) cy$toCYON { - return @"null"; -} +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ { + return CYJSNull(context); +} CYObjectiveCatch } @end /* }}} */ /* Bridge: NSObject {{{ */ @implementation NSObject (Cycript) -- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) { - return CYMakeInstance(context, self, false); -} CYObjectiveCatch } - -- (JSType) cy$JSType { - return kJSTypeObject; +- (id) cy$box { + return self; } -- (NSObject *) cy$toJSON:(NSString *)key { - return [self description]; +- (JSValueRef) cy$toJSON:(NSString *)key inContext:(JSContextRef)context { + return [self cy$valueOfInContext:context]; } -- (NSString *) cy$toCYON { - return [[self cy$toJSON:@""] cy$toCYON]; +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ { + return NULL; +} CYObjectiveCatch } + +- (JSType) cy$JSType { + return kJSTypeObject; } -- (NSString *) cy$toKey { - return [self cy$toCYON]; +- (NSString *) cy$toCYON:(bool)objective { + return [@"#" stringByAppendingString:[[self description] cy$toCYON:true]]; } - (bool) cy$hasProperty:(NSString *)name { @@ -983,6 +1079,12 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return nil; } +- (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context { CYObjectiveTry_ { + if (NSObject *value = [self cy$getProperty:name]) + return CYCastJSValue(context, value); + return NULL; +} CYObjectiveCatch } + - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value { return false; } @@ -1003,12 +1105,21 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu /* Bridge: NSProxy {{{ */ @implementation NSProxy (Cycript) -- (NSObject *) cy$toJSON:(NSString *)key { - return [self description]; +- (NSString *) cy$toCYON:(bool)objective { + return [[self description] cy$toCYON:objective]; } -- (NSString *) cy$toCYON { - return [[self cy$toJSON:@""] cy$toCYON]; +@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 @@ -1016,32 +1127,25 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu /* Bridge: NSString {{{ */ @implementation NSString (Cycript) -- (JSType) cy$JSType { - return kJSTypeString; +- (id) cy$box { + return [[self copy] autorelease]; } -- (NSObject *) cy$toJSON:(NSString *)key { - return self; +- (JSType) cy$JSType { + return kJSTypeString; } -- (NSString *) cy$toCYON { +- (NSString *) cy$toCYON:(bool)objective { std::ostringstream str; + if (!objective) + str << '@'; CYUTF8String string(CYCastUTF8String(self)); CYStringify(str, string.data, string.size); std::string value(str.str()); return CYCastNSString(NULL, CYUTF8String(value.c_str(), value.size())); } -- (NSString *) cy$toKey { - if (CYIsKey(CYCastUTF8String(self))) - return self; - return [self cy$toCYON]; -} - - (bool) cy$hasProperty:(NSString *)name { - if ([name isEqualToString:@"length"]) - return true; - size_t index(CYGetIndex(name)); if (index == _not(size_t) || index >= [self length]) return [super cy$hasProperty:name]; @@ -1050,15 +1154,6 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu } - (NSObject *) cy$getProperty:(NSString *)name { - if ([name isEqualToString:@"length"]) { - NSUInteger count([self length]); -#ifdef __APPLE__ - return [NSNumber numberWithUnsignedInteger:count]; -#else - return [NSNumber numberWithUnsignedInt:count]; -#endif - } - size_t index(CYGetIndex(name)); if (index == _not(size_t) || index >= [self length]) return [super cy$getProperty:name]; @@ -1076,10 +1171,9 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu } } -// XXX: this might be overly restrictive for NSString; I think I need a half-way between /injecting/ implicit properties and /accepting/ implicit properties -+ (bool) cy$hasImplicitProperties { - return false; -} +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ { + return CYCastJSValue(context, CYJSString(context, self)); +} CYObjectiveCatch } @end /* }}} */ @@ -1090,15 +1184,13 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return kJSTypeUndefined; } -- (NSObject *) cy$toJSON:(NSString *)key { - return self; -} - -- (NSString *) cy$toCYON { - return @"undefined"; +- (NSString *) cy$toCYON:(bool)objective { + NSString *value(@"undefined"); + return value; // XXX: maybe use the below code, adding @undefined? + //return objective ? value : [NSString stringWithFormat:@"@%@", value]; } -- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) { +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ { return CYJSUndefined(context); } CYObjectiveCatch } @@ -1107,15 +1199,14 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu static bool CYIsClass(id self) { #ifdef __APPLE__ - // XXX: this is a lame object_isClass - return class_getInstanceMethod(object_getClass(self), @selector(alloc)) != NULL; + return class_isMetaClass(object_getClass(self)); #else return GSObjCIsClass(self); #endif } -Class CYCastClass(apr_pool_t *pool, JSContextRef context, JSValueRef value) { - id self(CYCastNSObject(pool, context, value)); +Class CYCastClass(CYPool &pool, JSContextRef context, JSValueRef value) { + id self(CYCastNSObject(&pool, context, value)); if (CYIsClass(self)) return (Class) self; throw CYJSError(context, "got something that is not a Class"); @@ -1127,231 +1218,229 @@ NSArray *CYCastNSArray(JSContextRef context, JSPropertyNameArrayRef names) { size_t size(JSPropertyNameArrayGetCount(names)); NSMutableArray *array([NSMutableArray arrayWithCapacity:size]); for (size_t index(0); index != size; ++index) - [array addObject:CYCastNSString(pool, context, JSPropertyNameArrayGetNameAtIndex(names, index))]; + [array addObject:CYCastNSString(&pool, context, JSPropertyNameArrayGetNameAtIndex(names, index))]; return array; } JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { if (value == nil) return CYJSNull(context); - else if ([value respondsToSelector:@selector(cy$JSValueInContext:)]) - return [value cy$JSValueInContext:context]; else return CYMakeInstance(context, value, false); } CYPoolCatch(NULL) return /*XXX*/ NULL; } @implementation CYJSObject -- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry { +- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry_ { if ((self = [super init]) != nil) { object_ = object; context_ = CYGetJSContext(context); - //XXX:JSGlobalContextRetain(context_); + JSGlobalContextRetain(context_); JSValueProtect(context_, object_); } return self; } CYObjectiveCatch } - (void) dealloc { CYObjectiveTry { JSValueUnprotect(context_, object_); - //XXX:JSGlobalContextRelease(context_); + JSGlobalContextRelease(context_); [super dealloc]; } CYObjectiveCatch } -- (NSObject *) cy$toJSON:(NSString *)key { CYObjectiveTry { - JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_s)); - if (!CYIsCallable(context_, toJSON)) - return [super cy$toJSON:key]; - else { - JSValueRef arguments[1] = {CYCastJSValue(context_, key)}; - JSValueRef value(CYCallAsFunction(context_, (JSObjectRef) toJSON, object_, 1, arguments)); - // XXX: do I really want an NSNull here?! - return CYCastNSObject(NULL, context_, value) ?: [NSNull null]; - } -} CYObjectiveCatch } - -- (NSString *) cy$toCYON { CYObjectiveTry { +- (NSString *) cy$toCYON:(bool)objective { CYObjectiveTry { CYPool pool; - JSValueRef exception(NULL); - const char *cyon(CYPoolCCYON(pool, context_, object_)); - CYThrow(context_, exception); + const char *cyon(CYPoolCCYON(pool, context, object_)); if (cyon == NULL) - return [super cy$toCYON]; + return [super cy$toCYON:objective]; else return [NSString stringWithUTF8String:cyon]; } CYObjectiveCatch } - (NSUInteger) count { CYObjectiveTry { - JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context_, object_)); + JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context, object_)); size_t size(JSPropertyNameArrayGetCount(names)); JSPropertyNameArrayRelease(names); return size; } CYObjectiveCatch } - (id) objectForKey:(id)key { CYObjectiveTry { - JSValueRef value(CYGetProperty(context_, object_, CYJSString(context_, (NSObject *) key))); - if (JSValueIsUndefined(context_, value)) + JSValueRef value(CYGetProperty(context, object_, CYJSString(context, (NSObject *) key))); + if (JSValueIsUndefined(context, value)) return nil; - return CYCastNSObject(NULL, context_, value) ?: [NSNull null]; + return CYCastNSObject(NULL, context, value) ?: [NSNull null]; } CYObjectiveCatch } - (NSEnumerator *) keyEnumerator { CYObjectiveTry { - JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context_, object_)); - NSEnumerator *enumerator([CYCastNSArray(context_, names) objectEnumerator]); + JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context, object_)); + NSEnumerator *enumerator([CYCastNSArray(context, names) objectEnumerator]); JSPropertyNameArrayRelease(names); return enumerator; } CYObjectiveCatch } - (void) setObject:(id)object forKey:(id)key { CYObjectiveTry { - CYSetProperty(context_, object_, CYJSString(context_, (NSObject *) key), CYCastJSValue(context_, (NSString *) object)); + CYSetProperty(context, object_, CYJSString(context, (NSObject *) key), CYCastJSValue(context, (NSString *) object)); } CYObjectiveCatch } - (void) removeObjectForKey:(id)key { CYObjectiveTry { - JSValueRef exception(NULL); - (void) JSObjectDeleteProperty(context_, object_, CYJSString(context_, (NSObject *) key), &exception); - CYThrow(context_, exception); + (void) _jsccall(JSObjectDeleteProperty, context, object_, CYJSString(context, (NSObject *) key)); } CYObjectiveCatch } @end @implementation CYJSArray -- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry { +- (NSString *) cy$toCYON:(bool)objective { CYObjectiveTry { + CYPool pool; + return [NSString stringWithUTF8String:CYPoolCCYON(pool, context, object_)]; +} CYObjectiveCatch } + +- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry_ { if ((self = [super init]) != nil) { object_ = object; context_ = CYGetJSContext(context); - //XXX:JSGlobalContextRetain(context_); + JSGlobalContextRetain(context_); JSValueProtect(context_, object_); } return self; } CYObjectiveCatch } - (void) dealloc { CYObjectiveTry { JSValueUnprotect(context_, object_); - //XXX:JSGlobalContextRelease(context_); + JSGlobalContextRelease(context_); [super dealloc]; } CYObjectiveCatch } - (NSUInteger) count { CYObjectiveTry { - return CYCastDouble(context_, CYGetProperty(context_, object_, length_s)); + return CYArrayLength(context, object_); } CYObjectiveCatch } - (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry { size_t bounds([self count]); if (index >= bounds) - @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray objectAtIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil]; - JSValueRef exception(NULL); - JSValueRef value(JSObjectGetPropertyAtIndex(context_, object_, index, &exception)); - CYThrow(context_, exception); - return CYCastNSObject(NULL, context_, value) ?: [NSNull null]; + @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray objectAtIndex:]: index (%zu) beyond bounds (%zu)", static_cast(index), bounds] userInfo:nil]; + JSValueRef value(_jsccall(JSObjectGetPropertyAtIndex, context, object_, index)); + return CYCastNSObject(NULL, context, value) ?: [NSNull null]; } CYObjectiveCatch } - (void) addObject:(id)object { CYObjectiveTry { - JSValueRef exception(NULL); - JSValueRef arguments[1]; - arguments[0] = CYCastJSValue(context_, (NSObject *) object); - JSObjectRef Array(CYGetCachedObject(context_, Array_s)); - JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, push_s)), object_, 1, arguments, &exception); - CYThrow(context_, exception); + CYArrayPush(context, object_, CYCastJSValue(context, (NSObject *) object)); } CYObjectiveCatch } - (void) insertObject:(id)object atIndex:(NSUInteger)index { CYObjectiveTry { size_t bounds([self count] + 1); if (index >= bounds) - @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray insertObject:atIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil]; - JSValueRef exception(NULL); + @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray insertObject:atIndex:]: index (%zu) beyond bounds (%zu)", static_cast(index), bounds] userInfo:nil]; JSValueRef arguments[3]; - arguments[0] = CYCastJSValue(context_, index); - arguments[1] = CYCastJSValue(context_, 0); - arguments[2] = CYCastJSValue(context_, (NSObject *) object); - JSObjectRef Array(CYGetCachedObject(context_, Array_s)); - JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 3, arguments, &exception); - CYThrow(context_, exception); + arguments[0] = CYCastJSValue(context, index); + arguments[1] = CYCastJSValue(context, 0); + arguments[2] = CYCastJSValue(context, (NSObject *) object); + JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype"))); + _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, splice_s)), object_, 3, arguments); } CYObjectiveCatch } - (void) removeLastObject { CYObjectiveTry { - JSValueRef exception(NULL); - JSObjectRef Array(CYGetCachedObject(context_, Array_s)); - JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, pop_s)), object_, 0, NULL, &exception); - CYThrow(context_, exception); + JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype"))); + _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, pop_s)), object_, 0, NULL); } CYObjectiveCatch } - (void) removeObjectAtIndex:(NSUInteger)index { CYObjectiveTry { size_t bounds([self count]); if (index >= bounds) - @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray removeObjectAtIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil]; - JSValueRef exception(NULL); + @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray removeObjectAtIndex:]: index (%zu) beyond bounds (%zu)", static_cast(index), bounds] userInfo:nil]; JSValueRef arguments[2]; - arguments[0] = CYCastJSValue(context_, index); - arguments[1] = CYCastJSValue(context_, 1); - JSObjectRef Array(CYGetCachedObject(context_, Array_s)); - JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 2, arguments, &exception); - CYThrow(context_, exception); + arguments[0] = CYCastJSValue(context, index); + arguments[1] = CYCastJSValue(context, 1); + JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype"))); + _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, splice_s)), object_, 2, arguments); } CYObjectiveCatch } - (void) replaceObjectAtIndex:(NSUInteger)index withObject:(id)object { CYObjectiveTry { size_t bounds([self count]); if (index >= bounds) - @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray replaceObjectAtIndex:withObject:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil]; - CYSetProperty(context_, object_, index, CYCastJSValue(context_, (NSObject *) object)); + @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray replaceObjectAtIndex:withObject:]: index (%zu) beyond bounds (%zu)", static_cast(index), bounds] userInfo:nil]; + CYSetProperty(context, object_, index, CYCastJSValue(context, (NSObject *) object)); } CYObjectiveCatch } @end -// XXX: use objc_getAssociatedObject and objc_setAssociatedObject on 10.6 -struct CYInternal : - CYData -{ +// XXX: inherit from or replace with CYJSObject +@interface CYInternal : NSObject { + JSGlobalContextRef context_; JSObjectRef object_; +} - CYInternal() : - object_(NULL) - { - } +@end - ~CYInternal() { - // XXX: delete object_? ;( - } +@implementation CYInternal - static CYInternal *Get(id self) { - CYInternal *internal(NULL); - if (object_getInstanceVariable(self, "cy$internal_", reinterpret_cast(&internal)) == NULL) { - // XXX: do something epic? ;P - } +- (void) dealloc { CYObjectiveTry { + JSValueUnprotect(context_, object_); + JSGlobalContextRelease(context_); + [super dealloc]; +} CYObjectiveCatch } - return internal; - } +- (id) initInContext:(JSContextRef)context { CYObjectiveTry_ { + if ((self = [super init]) != nil) { + context_ = CYGetJSContext(context); + JSGlobalContextRetain(context_); + } return self; +} CYObjectiveCatch } - static CYInternal *Set(id self) { - CYInternal *internal(NULL); - if (objc_ivar *ivar = object_getInstanceVariable(self, "cy$internal_", reinterpret_cast(&internal))) { - if (internal == NULL) { - internal = new CYInternal(); - object_setIvar(self, ivar, reinterpret_cast(internal)); - } - } else { - // XXX: do something epic? ;P - } +- (bool) hasProperty:(JSStringRef)name inContext:(JSContextRef)context { + if (object_ == NULL) + return false; - return internal; - } + return JSObjectHasProperty(context, object_, name); +} - bool HasProperty(JSContextRef context, JSStringRef name) { - if (object_ == NULL) - return false; - return JSObjectHasProperty(context, object_, name); +- (JSValueRef) getProperty:(JSStringRef)name inContext:(JSContextRef)context { + if (object_ == NULL) + return NULL; + + return CYGetProperty(context, object_, name); +} + +- (void) setProperty:(JSStringRef)name toValue:(JSValueRef)value inContext:(JSContextRef)context { + @synchronized (self) { + if (object_ == NULL) { + object_ = JSObjectMake(context, NULL, NULL); + JSValueProtect(context, object_); + } } - JSValueRef GetProperty(JSContextRef context, JSStringRef name) { - if (object_ == NULL) - return NULL; - return CYGetProperty(context, object_, name); + CYSetProperty(context, object_, name, value); +} + ++ (CYInternal *) get:(id)object { + if ($objc_getAssociatedObject == NULL) + return nil; + + @synchronized (object) { + if (CYInternal *internal = $objc_getAssociatedObject(object, @selector(cy$internal))) + return internal; } - void SetProperty(JSContextRef context, JSStringRef name, JSValueRef value) { - if (object_ == NULL) - object_ = JSObjectMake(context, NULL, NULL); - CYSetProperty(context, object_, name, value); + return nil; +} + ++ (CYInternal *) set:(id)object inContext:(JSContextRef)context { + if ($objc_getAssociatedObject == NULL) + return nil; + + @synchronized (object) { + if (CYInternal *internal = $objc_getAssociatedObject(object, @selector(cy$internal))) + return internal; + + if ($objc_setAssociatedObject == NULL) + return nil; + + CYInternal *internal([[[CYInternal alloc] initInContext:context] autorelease]); + objc_setAssociatedObject(object, @selector(cy$internal), internal, OBJC_ASSOCIATION_RETAIN_NONATOMIC); + return internal; } -}; + + return nil; +} + +@end static JSObjectRef CYMakeSelector(JSContextRef context, SEL sel) { Selector_privateData *internal(new Selector_privateData(sel)); @@ -1388,10 +1477,31 @@ static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void ( ffi_call(cif, function, value, values); } CYSadCatch() } -static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry { +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) { - // XXX: do something epic about blocks - case sig::block_P: + case sig::block_P: { + _assert(type->data.signature.count != 0); + sig::Signature signature; + sig::Copy(*pool, signature, type->data.signature); + + 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; + + elements[1].name = NULL; + elements[1].type = new(*pool) sig::Type(); + elements[1].offset = _not(size_t); + + memset(elements[1].type, 0, sizeof(sig::Type)); + elements[1].type->primitive = sig::object_P; + + JSObjectRef function(CYCastJSObject(context, value)); + *reinterpret_cast(data) = CYMakeBlock(context, function, signature); + } break; + case sig::object_P: case sig::typename_P: *reinterpret_cast(data) = CYCastNSObject(pool, context, value); @@ -1435,7 +1545,7 @@ static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ff } } CYPoolCatch(NULL) return /*XXX*/ NULL; } -static bool CYImplements(id object, Class _class, SEL selector, bool devoid) { +static bool CYImplements(id object, Class _class, SEL selector, bool devoid = false) { if (objc_method *method = class_getInstanceMethod(_class, selector)) { if (!devoid) return true; @@ -1453,7 +1563,7 @@ static bool CYImplements(id object, Class _class, SEL selector, bool devoid) { return false; } -static const char *CYPoolTypeEncoding(apr_pool_t *pool, JSContextRef context, SEL sel, objc_method *method) { +static const char *CYPoolTypeEncoding(CYPool &pool, JSContextRef context, SEL sel, objc_method *method) { if (method != NULL) return method_getTypeEncoding(method); @@ -1471,21 +1581,13 @@ static const char *CYPoolTypeEncoding(apr_pool_t *pool, JSContextRef context, SE return NULL; } -static void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) { - Closure_privateData *internal(reinterpret_cast(arg)); - - JSContextRef context(internal->context_); - - 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]); - +static JSValueRef MessageAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) { JSObjectRef _this(CYCastJSObject(context, values[0])); + return CYCallAsFunction(context, function, _this, count - 2, values + 2); +} - JSValueRef value(CYCallAsFunction(context, internal->function_, _this, count - 2, values + 2)); - CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value); +static void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) { + CYExecuteClosure(cif, result, arguments, arg, &MessageAdapter_); } static JSObjectRef CYMakeMessage(JSContextRef context, SEL sel, IMP imp, const char *type) { @@ -1493,9 +1595,12 @@ static JSObjectRef CYMakeMessage(JSContextRef context, SEL sel, IMP imp, const c return JSObjectMake(context, Message_, internal); } -static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *type) { +static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *encoding) { JSObjectRef function(CYCastJSObject(context, value)); - Closure_privateData *internal(CYMakeFunctor_(context, function, type, &MessageClosure_)); + CYPool pool; + sig::Signature signature; + sig::Parse(pool, &signature, encoding, &Structor_); + Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &MessageClosure_)); // XXX: see notes in Library.cpp about needing to leak return reinterpret_cast(internal->GetValue()); } @@ -1514,7 +1619,7 @@ static bool Messages_hasProperty(JSContextRef context, JSObjectRef object, JSStr return false; } -static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { +static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Messages *internal(reinterpret_cast(JSObjectGetPrivate(object))); Class _class(internal->GetValue()); @@ -1526,9 +1631,9 @@ static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, return CYMakeMessage(context, sel, method_getImplementation(method), method_getTypeEncoding(method)); return NULL; -} +} CYCatch(NULL) } -static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { +static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { Messages *internal(reinterpret_cast(JSObjectGetPrivate(object))); Class _class(internal->GetValue()); @@ -1565,10 +1670,10 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr } return true; -} +} CYCatch(false) } #if 0 && OBJC_API_VERSION < 2 -static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { +static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Messages *internal(reinterpret_cast(JSObjectGetPrivate(object))); Class _class(internal->GetValue()); @@ -1583,7 +1688,7 @@ static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JS } return false; -} +} CYCatch(false) } #endif static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { @@ -1605,7 +1710,7 @@ static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, static bool CYHasImplicitProperties(Class _class) { // XXX: this is an evil hack to deal with NSProxy; fix elsewhere - if (!CYImplements(_class, object_getClass(_class), @selector(cy$hasImplicitProperties), false)) + if (!CYImplements(_class, object_getClass(_class), @selector(cy$hasImplicitProperties))) return true; return [_class cy$hasImplicitProperties]; } @@ -1618,17 +1723,17 @@ static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStr return true; CYPool pool; - NSString *name(CYCastNSString(pool, context, property)); + NSString *name(CYCastNSString(&pool, context, property)); - if (CYInternal *internal = CYInternal::Get(self)) - if (internal->HasProperty(context, property)) + if (CYInternal *internal = [CYInternal get:self]) + if ([internal hasProperty:property inContext:context]) return true; Class _class(object_getClass(self)); CYPoolTry { // XXX: this is an evil hack to deal with NSProxy; fix elsewhere - if (CYImplements(self, _class, @selector(cy$hasProperty:), false)) + if (CYImplements(self, _class, @selector(cy$hasProperty:))) if ([self cy$hasProperty:name]) return true; } CYPoolCatch(false) @@ -1656,15 +1761,15 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object, return Internal::Make(context, self, object); CYPool pool; - NSString *name(CYCastNSString(pool, context, property)); + NSString *name(CYCastNSString(&pool, context, property)); - if (CYInternal *internal = CYInternal::Get(self)) - if (JSValueRef value = internal->GetProperty(context, property)) + if (CYInternal *internal = [CYInternal get:self]) + if (JSValueRef value = [internal getProperty:property inContext:context]) return value; CYPoolTry { - if (NSObject *data = [self cy$getProperty:name]) - return CYCastJSValue(context, data); + if (JSValueRef value = [self cy$getProperty:name inContext:context]) + return value; } CYPoolCatch(NULL) const char *string(CYPoolCString(pool, context, name)); @@ -1674,17 +1779,17 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object, if (objc_property_t property = class_getProperty(_class, string)) { PropertyAttributes attributes(property); SEL sel(sel_registerName(attributes.Getter())); - return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception); + return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false); } #endif if (CYHasImplicitProperties(_class)) if (SEL sel = sel_getUid(string)) if (CYImplements(self, _class, sel, true)) - return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception); + return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false); return NULL; -} CYCatch } +} CYCatch(NULL) } static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); @@ -1692,13 +1797,13 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr CYPool pool; - NSString *name(CYCastNSString(pool, context, property)); - NSObject *data(CYCastNSObject(pool, context, value)); + NSString *name(CYCastNSString(&pool, context, property)); + NSObject *data(CYCastNSObject(&pool, context, value)); CYPoolTry { if ([self cy$setProperty:name to:data]) return true; - } CYPoolCatch(NULL) + } CYPoolCatch(false) const char *string(CYPoolCString(pool, context, name)); Class _class(object_getClass(self)); @@ -1709,7 +1814,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr if (const char *setter = attributes.Setter()) { SEL sel(sel_registerName(setter)); JSValueRef arguments[1] = {value}; - CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception); + CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false); return true; } } @@ -1732,18 +1837,19 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr set[length + 4] = '\0'; if (SEL sel = sel_getUid(set)) - if (CYImplements(self, _class, sel, false)) { + if (CYImplements(self, _class, sel)) { JSValueRef arguments[1] = {value}; - CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception); + CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false); + return true; } - if (CYInternal *internal = CYInternal::Set(self)) { - internal->SetProperty(context, property, value); + if (CYInternal *internal = [CYInternal set:self inContext:context]) { + [internal setProperty:property toValue:value inContext:context]; return true; } return false; -} CYCatch } +} CYCatch(false) } static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); @@ -1752,8 +1858,8 @@ static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JS CYPoolTry { NSString *name(CYCastNSString(NULL, context, property)); return [self cy$deleteProperty:name]; - } CYPoolCatch(NULL) -} CYCatch return /*XXX*/ NULL; } + } CYPoolCatch(false) +} CYCatch(false) return /*XXX*/ false; } static void Instance_getPropertyNames_message(JSPropertyNameAccumulatorRef names, objc_method *method) { const char *name(sel_getName(method_getName(method))); @@ -1801,7 +1907,7 @@ static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, CYPoolTry { // XXX: this is an evil hack to deal with NSProxy; fix elsewhere - if (CYImplements(self, _class, @selector(cy$getPropertyNames:inContext:), false)) + if (CYImplements(self, _class, @selector(cy$getPropertyNames:inContext:))) [self cy$getPropertyNames:names inContext:context]; } CYPoolCatch() } @@ -1810,7 +1916,55 @@ static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); JSObjectRef value(Instance::Make(context, [internal->GetValue() alloc], Instance::Uninitialized)); return value; -} CYCatch } +} 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 + + BlockLiteral *literal(reinterpret_cast(self)); + + 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)); + + if (const char *type = descriptor3->signature) { + CYPool pool; + + void *setup[1]; + setup[0] = &self; + + sig::Signature signature; + sig::Parse(pool, &signature, type, &Structor_); + + 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); + } + } + + if (count != 0) + CYThrow("NSBlock without signature field passed arguments"); + + CYPoolTry { + [self invoke]; + } CYPoolCatch(NULL); + + return NULL; +} CYCatch(NULL) } static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) constructor))); @@ -1818,14 +1972,24 @@ static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, if (!CYIsClass(_class)) return false; - if (JSValueIsObjectOfClass(context, instance, Instance_)) { + if (CYJSValueIsNSObject(context, instance)) { Instance *linternal(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) instance))); // XXX: this isn't always safe return [linternal->GetValue() isKindOfClass:_class]; } return false; -} CYCatch } +} CYCatch(false) } + +static JSValueRef Instance_box_callAsFunction(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 Instance"); + CYPool pool; + id value(CYCastNSObject(&pool, context, arguments[0])); + if (value == nil) + value = [NSNull null]; + return CYCastJSValue(context, [value cy$box]); +} CYCatch(NULL) } static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { Internal *internal(reinterpret_cast(JSObjectGetPrivate(object))); @@ -1840,6 +2004,23 @@ static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStr return false; } +static void CYBitField(unsigned &length, unsigned &shift, id self, Ivar ivar, const char *encoding, unsigned offset) { + length = CYCastDouble(encoding + 1); + shift = 0; + + unsigned int size; + objc_ivar **ivars(class_copyIvarList(object_getClass(self), &size)); + for (size_t i(0); i != size; ++i) + if (ivars[i] == ivar) + break; + else if (ivar_getOffset(ivars[i]) == offset) { + const char *encoding(ivar_getTypeEncoding(ivars[i])); + _assert(encoding[0] == 'b'); + shift += CYCastDouble(encoding + 1); + } + free(ivars); +} + static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Internal *internal(reinterpret_cast(JSObjectGetPrivate(object))); CYPool pool; @@ -1847,14 +2028,31 @@ static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object, id self(internal->GetValue()); const char *name(CYPoolCString(pool, context, property)); +#ifdef __arm64__ + if (strcmp(name, "isa") == 0) + return CYCastJSValue(context, object_getClass(self)); +#endif + if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) { - Type_privateData type(pool, ivar_getTypeEncoding(ivar)); - // XXX: if this fails and throws an exception the person we are throwing it to gets the wrong exception - return CYFromFFI(context, type.type_, type.GetFFI(), reinterpret_cast(self) + ivar_getOffset(ivar)); + ptrdiff_t offset(ivar_getOffset(ivar)); + void *data(reinterpret_cast(self) + offset); + + const char *encoding(ivar_getTypeEncoding(ivar)); + if (encoding[0] == 'b') { + unsigned length, shift; + CYBitField(length, shift, self, ivar, encoding, offset); + _assert(shift + length <= sizeof(uintptr_t) * 8); + uintptr_t &field(*reinterpret_cast(data)); + uintptr_t mask((1 << length) - 1); + return CYCastJSValue(context, (field >> shift) & mask); + } else { + Type_privateData type(pool, ivar_getTypeEncoding(ivar)); + return CYFromFFI(context, type.type_, type.GetFFI(), data); + } } return NULL; -} CYCatch } +} CYCatch(NULL) } static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { Internal *internal(reinterpret_cast(JSObjectGetPrivate(object))); @@ -1864,13 +2062,26 @@ static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStr const char *name(CYPoolCString(pool, context, property)); if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) { - Type_privateData type(pool, ivar_getTypeEncoding(ivar)); - CYPoolFFI(pool, context, type.type_, type.GetFFI(), reinterpret_cast(self) + ivar_getOffset(ivar), value); - return true; + ptrdiff_t offset(ivar_getOffset(ivar)); + void *data(reinterpret_cast(self) + offset); + + const char *encoding(ivar_getTypeEncoding(ivar)); + if (encoding[0] == 'b') { + unsigned length, shift; + CYBitField(length, shift, self, ivar, encoding, offset); + _assert(shift + length <= sizeof(uintptr_t) * 8); + uintptr_t &field(*reinterpret_cast(data)); + uintptr_t mask((1 << length) - 1); + field = field & ~(mask << shift) | (uintptr_t(CYCastDouble(context, value)) & mask) << shift; + } else { + Type_privateData type(pool, ivar_getTypeEncoding(ivar)); + CYPoolFFI(&pool, context, type.type_, type.GetFFI(), reinterpret_cast(self) + ivar_getOffset(ivar), value); + return true; + } } return false; -} CYCatch } +} CYCatch(false) } static void Internal_getPropertyNames_(Class _class, JSPropertyNameAccumulatorRef names) { if (Class super = class_getSuperclass(_class)) @@ -1899,39 +2110,51 @@ static void Internal_getPropertyNames(JSContextRef context, JSObjectRef object, Internal_getPropertyNames_(_class, names); } -static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { +static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { Internal *internal(reinterpret_cast(JSObjectGetPrivate(object))); return internal->GetOwner(); -} +} CYCatch(NULL) } static JSValueRef ObjectiveC_Classes_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { CYPool pool; - NSString *name(CYCastNSString(pool, context, property)); + NSString *name(CYCastNSString(&pool, context, property)); if (Class _class = NSClassFromString(name)) return CYMakeInstance(context, _class, true); return NULL; -} CYCatch } +} CYCatch(NULL) } -static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { #ifdef __APPLE__ - size_t size(objc_getClassList(NULL, 0)); +static Class *CYCopyClassList(size_t &size) { + size = objc_getClassList(NULL, 0); Class *data(reinterpret_cast(malloc(sizeof(Class) * size))); - get: - size_t writ(objc_getClassList(data, size)); - if (size < writ) { + for (;;) { + size_t writ(objc_getClassList(data, size)); + if (writ <= size) { + size = writ; + return data; + } + + Class *copy(reinterpret_cast(realloc(data, sizeof(Class) * writ))); + if (copy == NULL) { + free(data); + return NULL; + } + + data = copy; size = writ; - if (Class *copy = reinterpret_cast(realloc(data, sizeof(Class) * writ))) { - data = copy; - goto get; - } else goto done; } +} +#endif - for (size_t i(0); i != writ; ++i) - JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(data[i]))); - - done: - free(data); +static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { +#ifdef __APPLE__ + size_t size; + if (Class *data = CYCopyClassList(size)) { + for (size_t i(0); i != size; ++i) + JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(data[i]))); + free(data); + } #else void *state(NULL); while (Class _class = objc_next_class(&state)) @@ -1960,7 +2183,7 @@ static JSValueRef ObjectiveC_Image_Classes_getProperty(JSContextRef context, JSO free: free(data); return value; -} CYCatch } +} CYCatch(NULL) } static void ObjectiveC_Image_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { const char *internal(reinterpret_cast(JSObjectGetPrivate(object))); @@ -1989,7 +2212,7 @@ static JSValueRef ObjectiveC_Images_getProperty(JSContextRef context, JSObjectRe JSObjectRef value(JSObjectMake(context, NULL, NULL)); CYSetProperty(context, value, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Image_Classes_, const_cast(name))); return value; -} CYCatch } +} CYCatch(NULL) } static void ObjectiveC_Images_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { unsigned int size; @@ -2006,7 +2229,7 @@ static JSValueRef ObjectiveC_Protocols_getProperty(JSContextRef context, JSObjec if (Protocol *protocol = objc_getProtocol(name)) return CYMakeInstance(context, protocol, true); return NULL; -} CYCatch } +} CYCatch(NULL) } static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { #if OBJC_API_VERSION >= 2 @@ -2020,7 +2243,124 @@ static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObject #endif } +static JSValueRef ObjectiveC_Constants_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + CYPool pool; + CYUTF8String name(CYPoolUTF8String(pool, context, property)); + if (name == "nil") + return Instance::Make(context, nil); + return NULL; +} CYCatch(NULL) } + +static void ObjectiveC_Constants_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { + JSPropertyNameAccumulatorAddName(names, CYJSString("nil")); +} + +#ifdef __APPLE__ +static kern_return_t CYReadMemory(task_t task, vm_address_t address, vm_size_t size, void **data) { + *data = reinterpret_cast(address); + return KERN_SUCCESS; +} + +struct CYChoice { + std::set query_; + JSContextRef context_; + JSObjectRef results_; +}; + +struct CYObjectStruct { + Class isa_; +}; + +static void choose_(task_t task, void *baton, unsigned type, vm_range_t *ranges, unsigned count) { + CYChoice *choice(reinterpret_cast(baton)); + JSContextRef context(choice->context_); + + for (unsigned i(0); i != count; ++i) { + vm_range_t &range(ranges[i]); + void *data(reinterpret_cast(range.address)); + size_t size(range.size); + + if (size < sizeof(CYObjectStruct)) + continue; + + uintptr_t *pointers(reinterpret_cast(data)); +#ifdef __arm64__ + Class isa(reinterpret_cast(pointers[0] & 0x1fffffff8)); +#else + Class isa(reinterpret_cast(pointers[0])); +#endif + + std::set::const_iterator result(choice->query_.find(isa)); + if (result == choice->query_.end()) + continue; + + // XXX: if (size < class_getInstanceSize(*result)) + if ((class_getInstanceSize(*result) + 15) / 16 * 16 != size) + continue; + CYArrayPush(context, choice->results_, CYCastJSValue(context, reinterpret_cast(data))); + } +} + +static JSValueRef choose(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 1) + throw CYJSError(context, "choose() takes a class argument"); + + CYPool pool; + Class _class(CYCastNSObject(&pool, context, arguments[0])); + + vm_address_t *zones(NULL); + unsigned size(0); + kern_return_t error(malloc_get_all_zones(0, &CYReadMemory, &zones, &size)); + _assert(error == KERN_SUCCESS); + + JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array"))); + JSObjectRef results(_jsccall(JSObjectCallAsConstructor, context, Array, 0, NULL)); + + CYChoice choice; + choice.context_ = context; + choice.results_ = results; + + size_t number; + Class *classes(CYCopyClassList(number)); + _assert(classes != NULL); + + for (size_t i(0); i != number; ++i) + for (Class current(classes[i]); current != Nil; current = class_getSuperclass(current)) + if (current == _class) { + choice.query_.insert(classes[i]); + break; + } + + free(classes); + + for (unsigned i(0); i != size; ++i) { + const malloc_zone_t *zone(reinterpret_cast(zones[i])); + if (zone == NULL || zone->introspect == NULL) + continue; + + zone->introspect->enumerator(mach_task_self(), &choice, MALLOC_PTR_IN_USE_RANGE_TYPE, zones[i], &CYReadMemory, &choose_); + } + + return results; +} CYCatch(NULL) } +#endif + #ifdef __APPLE__ +#if defined(__i386__) || defined(__x86_64__) +#define OBJC_MAX_STRUCT_BY_VALUE 8 +static int struct_forward_array[] = { + 0, 0, 0, 1, 0, 1, 1, 1, 0 }; +#elif defined(__arm__) +#define OBJC_MAX_STRUCT_BY_VALUE 1 +static int struct_forward_array[] = { + 0, 0 }; +#elif defined(__arm64__) +#define CY_NO_STRET +#else +#error missing objc-runtime-info +#endif + +#ifndef CY_NO_STRET static bool stret(ffi_type *ffi_type) { return ffi_type->type == FFI_TYPE_STRUCT && ( ffi_type->size > OBJC_MAX_STRUCT_BY_VALUE || @@ -2028,8 +2368,9 @@ static bool stret(ffi_type *ffi_type) { ); } #endif +#endif -JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class _class, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception) { CYTry { +JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _class, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize) { const char *type; if (_class == NULL) @@ -2058,14 +2399,36 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class sig::Signature signature; sig::Parse(pool, &signature, type, &Structor_); + size_t used(count + 3); + if (used > signature.count) { + sig::Element *elements(new (pool) sig::Element[used]); + memcpy(elements, signature.elements, used * sizeof(sig::Element)); + + for (size_t index(signature.count); index != used; ++index) { + sig::Element *element(&elements[index]); + element->name = NULL; + element->offset = _not(size_t); + + sig::Type *type(new (pool) sig::Type); + memset(type, 0, sizeof(*type)); + type->primitive = sig::object_P; + element->type = type; + } + + signature.elements = elements; + signature.count = used; + } + ffi_cif cif; sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif); if (imp == NULL) { #ifdef __APPLE__ +#ifndef CY_NO_STRET if (stret(cif.rtype)) imp = class_getMethodImplementation_stret(_class, _cmd); else +#endif imp = class_getMethodImplementation(_class, _cmd); #else objc_super super = {self, _class}; @@ -2074,10 +2437,10 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class } void (*function)() = reinterpret_cast(imp); - return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, exception, &signature, &cif, function); -} CYCatch } + return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, &signature, &cif, function); +} -static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { +static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[]) { if (count < 2) throw CYJSError(context, "too few arguments to objc_msgSend"); @@ -2094,7 +2457,7 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje self = internal->GetValue(); _class = internal->class_;; uninitialized = false; - } else if (JSValueIsObjectOfClass(context, arguments[0], Instance_)) { + } else if (CYJSValueIsNSObject(context, arguments[0])) { Instance *internal(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) arguments[0]))); self = internal->GetValue(); _class = nil; @@ -2102,7 +2465,7 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje if (uninitialized) internal->value_ = nil; } else { - self = CYCastNSObject(pool, context, arguments[0]); + self = CYCastNSObject(&pool, context, arguments[0]); _class = nil; uninitialized = false; } @@ -2112,75 +2475,43 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje _cmd = CYCastSEL(context, arguments[1]); - return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized, exception); -} CYCatch } - -/* Hook: objc_registerClassPair {{{ */ -#if defined(__APPLE__) && defined(__arm__) -// XXX: replace this with associated objects - -MSHook(void, CYDealloc, id self, SEL sel) { - CYInternal *internal; - object_getInstanceVariable(self, "cy$internal_", reinterpret_cast(&internal)); - if (internal != NULL) - delete internal; - _CYDealloc(self, sel); -} - -MSHook(void, objc_registerClassPair, Class _class) { - Class super(class_getSuperclass(_class)); - if (super == NULL || class_getInstanceVariable(super, "cy$internal_") == NULL) { - class_addIvar(_class, "cy$internal_", sizeof(CYInternal *), log2(sizeof(CYInternal *)), "^{CYInternal}"); - MSHookMessage(_class, @selector(dealloc), MSHake(CYDealloc)); - } - - _objc_registerClassPair(_class); + return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized); } -static JSValueRef objc_registerClassPair_(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 objc_registerClassPair"); - CYPool pool; - NSObject *value(CYCastNSObject(pool, context, arguments[0])); - if (value == NULL || !CYIsClass(value)) - throw CYJSError(context, "incorrect number of arguments to objc_registerClassPair"); - Class _class((Class) value); - $objc_registerClassPair(_class); - return CYJSUndefined(context); -} CYCatch } -#endif -/* }}} */ +static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + return $objc_msgSend(context, object, _this, count, arguments); +} CYCatch(NULL) } -static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { +static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { JSValueRef setup[count + 2]; setup[0] = _this; setup[1] = object; memcpy(setup + 2, arguments, sizeof(JSValueRef) * count); - return $objc_msgSend(context, NULL, NULL, count + 2, setup, exception); -} + return $objc_msgSend(context, NULL, NULL, count + 2, setup); +} CYCatch(NULL) } -static JSValueRef Message_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { +static JSValueRef Message_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { CYPool pool; Message_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); // XXX: handle Instance::Uninitialized? - id self(CYCastNSObject(pool, context, _this)); + id self(CYCastNSObject(&pool, context, _this)); void *setup[2]; setup[0] = &self; setup[1] = &internal->sel_; - return CYCallFunction(pool, context, 2, setup, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue()); -} + return CYCallFunction(pool, context, 2, setup, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue()); +} CYCatch(NULL) } 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])); + id self(CYCastNSObject(&pool, context, arguments[0])); Class _class(CYCastClass(pool, context, arguments[1])); return cy::Super::Make(context, self, _class); -} CYCatch } +} CYCatch(NULL) } static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 1) @@ -2188,21 +2519,21 @@ static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t CYPool pool; const char *name(CYPoolCString(pool, context, arguments[0])); return CYMakeSelector(context, sel_registerName(name)); -} CYCatch } +} CYCatch(NULL) } static JSObjectRef Instance_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 Instance constructor"); id self(count == 0 ? nil : CYCastPointer(context, arguments[0])); return CYMakeInstance(context, self, false); -} CYCatch } +} CYCatch(NULL) } -static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { +static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { CYValue *internal(reinterpret_cast(JSObjectGetPrivate(object))); return CYCastJSValue(context, reinterpret_cast(internal->value_)); -} +} CYCatch(NULL) } -static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { +static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { CYValue *internal(reinterpret_cast(JSObjectGetPrivate(_this))); Type_privateData *typical(internal->GetType()); @@ -2218,42 +2549,43 @@ static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef } return CYMakePointer(context, &internal->value_, _not(size_t), type, ffi, object); -} +} CYCatch(NULL) } -static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { +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())); -} +} CYCatch(NULL) } -static JSValueRef Instance_getProperty_protocol(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { +static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); id self(internal->GetValue()); if (!CYIsClass(self)) return CYJSUndefined(context); return CYGetClassPrototype(context, self); -} CYCatch } +} CYCatch(NULL) } -static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { +static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); id self(internal->GetValue()); if (!CYIsClass(self)) return CYJSUndefined(context); return Messages::Make(context, (Class) self); -} +} CYCatch(NULL) } static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (!JSValueIsObjectOfClass(context, _this, Instance_)) + if (!CYJSValueIsNSObject(context, _this)) return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue()))); -} CYCatch } + return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue(), false))); +} CYCatch(NULL) } static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (!JSValueIsObjectOfClass(context, _this, Instance_)) + if (!CYJSValueIsNSObject(context, _this)) return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + id value(internal->GetValue()); CYPoolTry { NSString *key; @@ -2261,50 +2593,80 @@ static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectR key = nil; else key = CYCastNSString(NULL, context, CYJSString(context, arguments[0])); - // XXX: check for support of cy$toJSON? - return CYCastJSValue(context, CYJSString(context, [internal->GetValue() cy$toJSON:key])); + + if (!CYImplements(value, object_getClass(value), @selector(cy$toJSON:inContext:))) + return CYJSUndefined(context); + else if (JSValueRef json = [value cy$toJSON:key inContext:context]) + return json; + else + return CYCastJSValue(context, CYJSString(context, [value description])); } CYPoolCatch(NULL) -} CYCatch return /*XXX*/ NULL; } +} CYCatch(NULL) return /*XXX*/ NULL; } -#if 0 static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (!JSValueIsObjectOfClass(context, _this, Instance_)) + if (!CYJSValueIsNSObject(context, _this)) return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - return CYCastJSValue(context, reinterpret_cast(internal->GetValue())); -} CYCatch return /*XXX*/ NULL; } -#endif + id value(internal->GetValue()); + + if (![value respondsToSelector:@selector(cy$valueOfInContext:)]) + return _this; + + if (JSValueRef result = [value cy$valueOfInContext:context]) + return result; + + return _this; +} CYCatch(NULL) return /*XXX*/ NULL; } static JSValueRef Instance_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (!JSValueIsObjectOfClass(context, _this, Instance_)) + if (!CYJSValueIsNSObject(context, _this)) return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); // XXX: but... but... THIS ISN'T A POINTER! :( return CYCastJSValue(context, reinterpret_cast(internal->GetValue())); -} CYCatch return /*XXX*/ NULL; } +} CYCatch(NULL) return /*XXX*/ NULL; } static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (!JSValueIsObjectOfClass(context, _this, Instance_)) + if (!CYJSValueIsNSObject(context, _this)) return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - id value(internal->GetValue()); - if (value == nil) - return CYCastJSValue(context, "nil"); CYPoolTry { // XXX: this seems like a stupid implementation; what if it crashes? why not use the CYONifier backend? - return CYCastJSValue(context, CYJSString(context, [internal->GetValue() description])); + return CYCastJSValue(context, CYJSString(context, [value description])); + } CYPoolCatch(NULL) +} CYCatch(NULL) return /*XXX*/ NULL; } + +static JSValueRef Class_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (!CYJSValueIsNSObject(context, _this)) + return NULL; + + Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + id value(internal->GetValue()); + + if (!CYIsClass(value)) + CYThrow("non-Class object cannot be used as Type"); + + // XXX: this is a very silly implementation + + std::ostringstream type; + type << "@\""; + type << class_getName(value); + type << "\""; + + CYPoolTry { + return CYMakeType(context, type.str().c_str()); } CYPoolCatch(NULL) -} CYCatch return /*XXX*/ NULL; } +} CYCatch(NULL) return /*XXX*/ NULL; } static JSValueRef Selector_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { Selector_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); return CYCastJSValue(context, sel_getName(internal->GetValue())); -} CYCatch } +} CYCatch(NULL) } static JSValueRef Selector_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { return Selector_callAsFunction_toString(context, object, _this, count, arguments, exception); @@ -2318,7 +2680,7 @@ static JSValueRef Selector_callAsFunction_toCYON(JSContextRef context, JSObjectR NSString *string([NSString stringWithFormat:@"@selector(%s)", name]); return CYCastJSValue(context, CYJSString(context, string)); } CYPoolCatch(NULL) -} CYCatch return /*XXX*/ NULL; } +} CYCatch(NULL) return /*XXX*/ NULL; } static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 1) @@ -2334,11 +2696,14 @@ static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef else method = NULL; - if (const char *type = CYPoolTypeEncoding(pool, context, sel, method)) - return CYCastJSValue(context, CYJSString(type)); + const char *encoding(CYPoolTypeEncoding(pool, context, sel, method)); + if (encoding == NULL) + return CYJSNull(context); - return CYJSNull(context); -} CYCatch } + sig::Signature signature; + sig::Parse(pool, &signature, encoding, &Structor_); + return CYMakeType(context, &signature); +} CYCatch(NULL) } static JSStaticValue Selector_staticValues[2] = { {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete}, @@ -2348,21 +2713,26 @@ static JSStaticValue Selector_staticValues[2] = { static JSStaticValue Instance_staticValues[5] = { {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"messages", &Instance_getProperty_messages, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"prototype", &Instance_getProperty_protocol, 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[6] = { +static JSStaticFunction Instance_staticFunctions[7] = { {"$cya", &CYValue_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toCYON", &Instance_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toJSON", &Instance_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - //{"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toPointer", &Instance_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toString", &Instance_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} }; +static JSStaticFunction Class_staticFunctions[2] = { + {"pointerTo", &Class_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, 0} +}; + static JSStaticFunction Internal_staticFunctions[2] = { {"$cya", &Internal_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} @@ -2376,32 +2746,49 @@ static JSStaticFunction Selector_staticFunctions[5] = { {NULL, NULL, 0} }; -static JSStaticFunction StringInstance_staticFunctions[2] = { - //{"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"toString", &Instance_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {NULL, NULL, 0} -}; +#ifdef __APPLE__ +JSValueRef NSCFType$cy$toJSON$inContext$(id self, SEL sel, JSValueRef key, JSContextRef context) { CYObjectiveTry_ { + return CYCastJSValue(context, [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease]); +} CYObjectiveCatch } +#endif void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { - apr_pool_t *pool(CYGetGlobalPool()); + $objc_setAssociatedObject = reinterpret_cast(dlsym(RTLD_DEFAULT, "objc_setAssociatedObject")); + $objc_getAssociatedObject = reinterpret_cast(dlsym(RTLD_DEFAULT, "objc_getAssociatedObject")); + $objc_removeAssociatedObjects = reinterpret_cast(dlsym(RTLD_DEFAULT, "objc_removeAssociatedObjects")); + + CYPool &pool(CYGetGlobalPool()); Object_type = new(pool) Type_privateData("@"); Selector_type = new(pool) Type_privateData(":"); + NSArray_ = objc_getClass("NSArray"); + NSBlock_ = objc_getClass("NSBlock"); + NSDictionary_ = objc_getClass("NSDictionary"); + NSString_ = objc_getClass("NSString"); + Object_ = objc_getClass("Object"); + #ifdef __APPLE__ - NSCFBoolean_ = objc_getClass("NSCFBoolean"); + __NSMallocBlock__ = objc_getClass("__NSMallocBlock__"); + + // XXX: apparently, iOS now has both of these + NSCFBoolean_ = objc_getClass("__NSCFBoolean"); + if (NSCFBoolean_ == nil) + NSCFBoolean_ = objc_getClass("NSCFBoolean"); + NSCFType_ = objc_getClass("NSCFType"); - NSMessageBuilder_ = objc_getClass("NSMessageBuilder"); + NSZombie_ = objc_getClass("_NSZombie_"); + + banned_.insert(Object_); + banned_.insert(objc_getClass("__NSAtom")); + banned_.insert(objc_getClass("__NSGenericDeallocHandler")); + banned_.insert(objc_getClass("NSMessageBuilder")); + banned_.insert(objc_getClass("__NSMessageBuilder")); #else NSBoolNumber_ = objc_getClass("NSBoolNumber"); #endif - NSArray_ = objc_getClass("NSArray"); - NSDictionary_ = objc_getClass("NSDictionary"); - NSString_ = objc_getClass("NSString"); - Object_ = objc_getClass("Object"); - JSClassDefinition definition; definition = kJSClassDefinitionEmpty; @@ -2414,10 +2801,28 @@ 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); + definition.className = "ArrayInstance"; + ArrayInstance_ = JSClassCreate(&definition); + + definition.className = "FunctionInstance"; + FunctionInstance_ = JSClassCreate(&definition); + + definition.className = "ObjectInstance"; + ObjectInstance_ = JSClassCreate(&definition); + + definition.className = "StringInstance"; + StringInstance_ = JSClassCreate(&definition); + + definition = kJSClassDefinitionEmpty; + definition.className = "Class"; + definition.staticFunctions = Class_staticFunctions; + Class_ = JSClassCreate(&definition); + definition = kJSClassDefinitionEmpty; definition.className = "Internal"; definition.staticFunctions = Internal_staticFunctions; @@ -2455,11 +2860,6 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition.finalize = &CYFinalize; Selector_ = JSClassCreate(&definition); - definition = kJSClassDefinitionEmpty; - definition.className = "StringInstance"; - definition.staticFunctions = StringInstance_staticFunctions; - StringInstance_ = JSClassCreate(&definition); - definition = kJSClassDefinitionEmpty; definition.className = "Super"; definition.staticFunctions = Internal_staticFunctions; @@ -2472,6 +2872,12 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition.getPropertyNames = &ObjectiveC_Classes_getPropertyNames; ObjectiveC_Classes_ = JSClassCreate(&definition); + definition = kJSClassDefinitionEmpty; + definition.className = "ObjectiveC::Constants"; + definition.getProperty = &ObjectiveC_Constants_getProperty; + definition.getPropertyNames = &ObjectiveC_Constants_getPropertyNames; + ObjectiveC_Constants_ = JSClassCreate(&definition); + #if OBJC_API_VERSION >= 2 definition = kJSClassDefinitionEmpty; definition.className = "ObjectiveC::Images"; @@ -2492,12 +2898,13 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames; ObjectiveC_Protocols_ = JSClassCreate(&definition); -#if defined(__APPLE__) && defined(__arm__) - MSHookFunction(&objc_registerClassPair, MSHake(objc_registerClassPair)); -#endif - #ifdef __APPLE__ - class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast(&NSCFType$cy$toJSON), "@12@0:4@8"); +// XXX: this is horrible; there has to be a better way to do this +#ifdef __LP64__ + class_addMethod(NSCFType_, @selector(cy$toJSON:inContext:), reinterpret_cast(&NSCFType$cy$toJSON$inContext$), "^{OpaqueJSValue=}32@0:8@16^{OpaqueJSContext=}24"); +#else + class_addMethod(NSCFType_, @selector(cy$toJSON:inContext:), reinterpret_cast(&NSCFType$cy$toJSON$inContext$), "^{OpaqueJSValue=}16@0:4@8^{OpaqueJSContext=}12"); +#endif #endif } CYPoolCatch() } @@ -2506,43 +2913,77 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry { JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s))); JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript")))); JSObjectRef all(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("all")))); + JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls")))); JSObjectRef ObjectiveC(JSObjectMake(context, NULL, NULL)); CYSetProperty(context, cycript, CYJSString("ObjectiveC"), ObjectiveC); - CYSetProperty(context, ObjectiveC, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Classes_, NULL)); - CYSetProperty(context, ObjectiveC, CYJSString("protocols"), JSObjectMake(context, ObjectiveC_Protocols_, NULL)); + JSObjectRef protocols(JSObjectMake(context, ObjectiveC_Protocols_, NULL)); + CYSetProperty(context, ObjectiveC, CYJSString("protocols"), protocols); + CYArrayPush(context, alls, protocols); + + JSObjectRef classes(JSObjectMake(context, ObjectiveC_Classes_, NULL)); + CYSetProperty(context, ObjectiveC, CYJSString("classes"), classes); + CYArrayPush(context, alls, classes); + + JSObjectRef constants(JSObjectMake(context, ObjectiveC_Constants_, NULL)); + CYSetProperty(context, ObjectiveC, CYJSString("constants"), constants); + CYArrayPush(context, alls, constants); #if OBJC_API_VERSION >= 2 CYSetProperty(context, ObjectiveC, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL)); #endif + JSObjectRef Class(JSObjectMakeConstructor(context, Class_, NULL)); JSObjectRef Instance(JSObjectMakeConstructor(context, Instance_, &Instance_new)); JSObjectRef Message(JSObjectMakeConstructor(context, Message_, NULL)); JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new)); - JSObjectRef StringInstance(JSObjectMakeConstructor(context, StringInstance_, NULL)); JSObjectRef Super(JSObjectMakeConstructor(context, Super_, &Super_new)); JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s))); CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype); + JSObjectRef ArrayInstance(JSObjectMakeConstructor(context, ArrayInstance_, NULL)); + JSObjectRef ArrayInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ArrayInstance, prototype_s))); + CYSetProperty(context, cy, CYJSString("ArrayInstance_prototype"), ArrayInstance_prototype); + JSObjectRef Array_prototype(CYGetCachedObject(context, CYJSString("Array_prototype"))); + JSObjectSetPrototype(context, ArrayInstance_prototype, Array_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 ObjectInstance(JSObjectMakeConstructor(context, ObjectInstance_, NULL)); + JSObjectRef ObjectInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ObjectInstance, prototype_s))); + CYSetProperty(context, cy, CYJSString("ObjectInstance_prototype"), ObjectInstance_prototype); + JSObjectRef Object_prototype(CYGetCachedObject(context, CYJSString("Object_prototype"))); + JSObjectSetPrototype(context, ObjectInstance_prototype, Object_prototype); + + JSObjectRef StringInstance(JSObjectMakeConstructor(context, StringInstance_, NULL)); JSObjectRef StringInstance_prototype(CYCastJSObject(context, CYGetProperty(context, StringInstance, prototype_s))); CYSetProperty(context, cy, CYJSString("StringInstance_prototype"), StringInstance_prototype); - JSObjectRef String_prototype(CYGetCachedObject(context, CYJSString("String_prototype"))); JSObjectSetPrototype(context, StringInstance_prototype, String_prototype); + JSObjectRef Class_prototype(CYCastJSObject(context, CYGetProperty(context, Class, prototype_s))); + CYSetProperty(context, cy, CYJSString("Class_prototype"), Class_prototype); + JSObjectSetPrototype(context, Class_prototype, Instance_prototype); + 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, kJSPropertyAttributeDontEnum); -#if defined(__APPLE__) && defined(__arm__) - CYSetProperty(context, all, CYJSString("objc_registerClassPair"), &objc_registerClassPair_, kJSPropertyAttributeDontEnum); +#ifdef __APPLE__ + CYSetProperty(context, all, CYJSString("choose"), &choose, kJSPropertyAttributeDontEnum); #endif CYSetProperty(context, all, CYJSString("objc_msgSend"), &$objc_msgSend, kJSPropertyAttributeDontEnum); - JSObjectRef Function_prototype(CYGetCachedObject(context, CYJSString("Function_prototype"))); JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Message, prototype_s)), Function_prototype); JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Selector, prototype_s)), Function_prototype); } CYPoolCatch() } @@ -2550,7 +2991,6 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry { static CYHooks CYObjectiveCHooks = { &CYObjectiveC_ExecuteStart, &CYObjectiveC_ExecuteEnd, - &CYObjectiveC_RuntimeProperty, &CYObjectiveC_CallFunction, &CYObjectiveC_Initialize, &CYObjectiveC_SetupContext, @@ -2565,3 +3005,25 @@ struct CYObjectiveC { _assert(hooks_ != NULL); } } CYObjectiveC; + +extern "C" void CydgetSetupContext(JSGlobalContextRef context) { CYObjectiveTry_ { + CYSetupContext(context); +} CYObjectiveCatch } + +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); + + CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(utf8.data, utf8.size))); + size_t bytes(utf16.size * sizeof(uint16_t)); + uint16_t *copy(reinterpret_cast(malloc(bytes))); + memcpy(copy, utf16.data, bytes); + + *data = copy; + *size = utf16.size; +} catch (const CYException &exception) { + CYPool pool; + @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"%s", exception.PoolCString(pool)] userInfo:nil]; +} }