X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/15024d7e7c224d837592094932a2da18d17ee015..77f56624a75e39b19c72e6076e46e230ce3abbb1:/ObjectiveC/Library.mm diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm index 8776ca0..a113779 100644 --- a/ObjectiveC/Library.mm +++ b/ObjectiveC/Library.mm @@ -1,48 +1,24 @@ -/* Cycript - Inlining/Optimizing JavaScript Compiler - * Copyright (C) 2009 Jay Freeman (saurik) +/* Cycript - Optimizing JavaScript Compiler/Runtime + * Copyright (C) 2009-2012 Jay Freeman (saurik) */ -/* Modified BSD License {{{ */ +/* GNU Lesser General Public License, Version 3 {{{ */ /* - * Redistribution and use in source and binary - * forms, with or without modification, are permitted - * provided that the following conditions are met: + * 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. * - * 1. Redistributions of source code must retain the - * above copyright notice, this list of conditions - * and the following disclaimer. - * 2. Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the - * distribution. - * 3. The name of the author may not be used to endorse - * or promote products derived from this software - * without specific prior written permission. + * 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. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ + * You should have received a copy of the GNU Lesser General Public License + * along with Cycript. If not, see . +**/ /* }}} */ -#if defined(__APPLE__) && defined(__arm__) -#include -#else -#include -#endif - #ifdef __APPLE__ #include "Struct.hpp" #endif @@ -51,7 +27,7 @@ #include "ObjectiveC/Internal.hpp" -#include +#include #include "cycript.hpp" @@ -61,6 +37,7 @@ #include #include #include +#include #endif #include "Error.hpp" @@ -71,6 +48,8 @@ #include #include +#include + #define CYObjectiveTry_(context) { \ JSContextRef context_(context); \ try @@ -131,6 +110,7 @@ #define object_getInstanceVariable(object, name, value) ({ \ objc_ivar *ivar(class_getInstanceVariable(object_getClass(object), name)); \ + _assert(value != NULL); \ if (ivar != NULL) \ GSObjCGetVariable(object, ivar_getOffset(ivar), sizeof(void *), value); \ ivar; \ @@ -144,6 +124,10 @@ #define protocol_getName(protocol) [(protocol) name] #endif +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); + JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception); /* Objective-C Pool Release {{{ */ @@ -256,6 +240,12 @@ bool CYGetOffset(apr_pool_t *pool, JSContextRef context, NSString *value, ssize_ } static JSClassRef Instance_; + +static JSClassRef ArrayInstance_; +static JSClassRef FunctionInstance_; +static JSClassRef ObjectInstance_; +static JSClassRef StringInstance_; + static JSClassRef Internal_; static JSClassRef Message_; static JSClassRef Messages_; @@ -263,6 +253,7 @@ static JSClassRef Selector_; static JSClassRef Super_; static JSClassRef ObjectiveC_Classes_; +static JSClassRef ObjectiveC_Constants_; static JSClassRef ObjectiveC_Protocols_; #ifdef __APPLE__ @@ -273,6 +264,7 @@ static JSClassRef ObjectiveC_Images_; #ifdef __APPLE__ static Class NSCFBoolean_; static Class NSCFType_; +static Class NSGenericDeallocHandler_; static Class NSMessageBuilder_; static Class NSZombie_; #else @@ -280,7 +272,9 @@ static Class NSBoolNumber_; #endif static Class NSArray_; +static Class NSBlock_; static Class NSDictionary_; +static Class NSString_; static Class Object_; static Type_privateData *Object_type; @@ -294,6 +288,8 @@ Type_privateData *Selector_privateData::GetType() const { return Selector_type; } +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) { if (self == nil) return CYGetCachedObject(context, CYJSString("Instance_prototype")); @@ -313,15 +309,20 @@ 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)); JSObjectRef object(JSObjectMake(context, _class, NULL)); JSObjectSetPrototype(context, object, prototype); CYSetProperty(context, cy, name, object); + return object; } @@ -390,12 +391,11 @@ 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; +- (NSString *) cy$toCYON:(bool)objective; - (bool) cy$hasProperty:(NSString *)name; - (NSObject *) cy$getProperty:(NSString *)name; @@ -403,26 +403,29 @@ JSObjectRef CYMakeInstance(JSContextRef context, id object, bool transient) { - (bool) cy$deleteProperty:(NSString *)name; - (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context; ++ (bool) cy$hasImplicitProperties; + @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); @@ -432,7 +435,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 (value == NSGenericDeallocHandler_ || value == NSMessageBuilder_ || value == Object_) string = nil; #endif else @@ -564,7 +567,7 @@ NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) { /* Bridge: CYJSObject {{{ */ @interface CYJSObject : NSMutableDictionary { JSObjectRef object_; - JSContextRef context_; + JSGlobalContextRef context_; } - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context; @@ -582,7 +585,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; @@ -599,22 +602,23 @@ 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)); +_finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) { JSValueRef exception(NULL); - bool array(JSValueIsInstanceOfConstructor(context, object, Array, &exception)); + JSObjectRef constructor(CYGetCachedObject(context, cache)); + bool is(JSValueIsInstanceOfConstructor(context, value, constructor, &exception)); CYThrow(context, exception); - id value(array ? [CYJSArray alloc] : [CYJSObject alloc]); - return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]); + return is; } NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSObjectRef object) { - if (!JSValueIsObjectOfClass(context, object, Instance_)) - return CYCastNSObject_(pool, context, object); - else { + if (JSValueIsObjectOfClass(context, object, Instance_)) { 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) { @@ -691,9 +695,13 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu /* 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__ @@ -707,7 +715,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; @@ -759,8 +767,19 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu } } ++ (bool) cy$hasImplicitProperties { + return false; +} + @end /* }}} */ +/* Bridge: NSBlock {{{ */ +#ifdef __APPLE__ +@interface NSBlock +- (void) invoke; +@end +#endif +/* }}} */ /* Bridge: NSBoolNumber {{{ */ #ifndef __APPLE__ @implementation NSBoolNumber (Cycript) @@ -773,11 +792,12 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu 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_(context) { return CYCastJSValue(context, (bool) [self boolValue]); } CYObjectiveCatch } @@ -787,9 +807,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__ @@ -802,10 +826,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:@"}"]; @@ -833,6 +857,10 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu } } ++ (bool) cy$hasImplicitProperties { + return false; +} + @end /* }}} */ /* Bridge: NSMutableArray {{{ */ @@ -925,12 +953,13 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu 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_(context) { + return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, static_cast([self boolValue])); } CYObjectiveCatch } @end @@ -946,8 +975,9 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return self; } -- (NSString *) cy$toCYON { - return @"null"; +- (NSString *) cy$toCYON:(bool)objective { + NSString *value(@"null"); + return objective ? value : [NSString stringWithFormat:@"@%@", value]; } @end @@ -955,8 +985,12 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu /* Bridge: NSObject {{{ */ @implementation NSObject (Cycript) -- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) { - return CYMakeInstance(context, self, false); +- (id) cy$box { + return self; +} + +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) { + return NULL; } CYObjectiveCatch } - (JSType) cy$JSType { @@ -967,12 +1001,8 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return [self description]; } -- (NSString *) cy$toCYON { - return [[self cy$toJSON:@""] cy$toCYON]; -} - -- (NSString *) cy$toKey { - return [self cy$toCYON]; +- (NSString *) cy$toCYON:(bool)objective { + return [[self cy$toJSON:@""] cy$toCYON:objective]; } - (bool) cy$hasProperty:(NSString *)name { @@ -994,6 +1024,10 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu - (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context { } ++ (bool) cy$hasImplicitProperties { + return true; +} + @end /* }}} */ /* Bridge: NSProxy {{{ */ @@ -1003,8 +1037,8 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return [self description]; } -- (NSString *) cy$toCYON { - return [[self cy$toJSON:@""] cy$toCYON]; +- (NSString *) cy$toCYON:(bool)objective { + return [[self cy$toJSON:@""] cy$toCYON:objective]; } @end @@ -1012,6 +1046,10 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu /* Bridge: NSString {{{ */ @implementation NSString (Cycript) +- (id) cy$box { + return [[self copy] autorelease]; +} + - (JSType) cy$JSType { return kJSTypeString; } @@ -1020,20 +1058,63 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return self; } -- (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]; + else + return true; +} + +- (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]; + else + return [self substringWithRange:NSMakeRange(index, 1)]; +} + +- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context { + [super cy$getPropertyNames:names inContext:context]; + + for (size_t index(0), length([self length]); index != length; ++index) { + char name[32]; + sprintf(name, "%zu", index); + JSPropertyNameAccumulatorAddName(names, CYJSString(name)); + } } +// 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_(context) { + return CYCastJSValue(context, CYJSString(context, self)); +} CYObjectiveCatch } + @end /* }}} */ /* Bridge: WebUndefined {{{ */ @@ -1048,10 +1129,12 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu } - (NSString *) cy$toCYON { - return @"undefined"; + 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_(context) { return CYJSUndefined(context); } CYObjectiveCatch } @@ -1087,8 +1170,6 @@ NSArray *CYCastNSArray(JSContextRef context, JSPropertyNameArrayRef names) { 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; } @@ -1099,14 +1180,14 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { 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 } @@ -1122,13 +1203,13 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { } } 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); if (cyon == NULL) - return [super cy$toCYON]; + return [super cy$toCYON:objective]; else return [NSString stringWithUTF8String:cyon]; } CYObjectiveCatch } @@ -1168,23 +1249,28 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { @implementation CYJSArray +- (NSString *) cy$toCYON:(bool)objective { + CYPool pool; + return [NSString stringWithUTF8String:CYPoolCCYON(pool, context_, object_)]; +} + - (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 { @@ -1198,12 +1284,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { } 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 { @@ -1215,14 +1296,14 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { arguments[0] = CYCastJSValue(context_, index); arguments[1] = CYCastJSValue(context_, 0); arguments[2] = CYCastJSValue(context_, (NSObject *) object); - JSObjectRef Array(CYGetCachedObject(context_, Array_s)); + JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype"))); JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 3, arguments, &exception); CYThrow(context_, exception); } CYObjectiveCatch } - (void) removeLastObject { CYObjectiveTry { JSValueRef exception(NULL); - JSObjectRef Array(CYGetCachedObject(context_, Array_s)); + JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype"))); JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, pop_s)), object_, 0, NULL, &exception); CYThrow(context_, exception); } CYObjectiveCatch } @@ -1235,7 +1316,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { JSValueRef arguments[2]; arguments[0] = CYCastJSValue(context_, index); arguments[1] = CYCastJSValue(context_, 1); - JSObjectRef Array(CYGetCachedObject(context_, Array_s)); + JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype"))); JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 2, arguments, &exception); CYThrow(context_, exception); } CYObjectiveCatch } @@ -1249,62 +1330,86 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { @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 { + JSValueUnprotect(context_, object_); + JSGlobalContextRelease(context_); + [super dealloc]; +} - return internal; - } +- (id) initInContext:(JSContextRef)context { + if ((self = [super init]) != nil) { + context_ = CYGetJSContext(context); + JSGlobalContextRetain(context_); + } return self; +} - 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)); @@ -1343,6 +1448,8 @@ static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void ( static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry { switch (type->primitive) { + // XXX: do something epic about blocks + case sig::block_P: case sig::object_P: case sig::typename_P: *reinterpret_cast(data) = CYCastNSObject(pool, context, value); @@ -1361,6 +1468,8 @@ static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Ty static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) { CYPoolTry { switch (type->primitive) { + // XXX: do something epic about blocks + case sig::block_P: case sig::object_P: if (NSObject *object = *reinterpret_cast(data)) { JSValueRef value(CYCastJSValue(context, object)); @@ -1384,7 +1493,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; @@ -1552,6 +1661,13 @@ static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, #endif } +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))) + return true; + return [_class cy$hasImplicitProperties]; +} + static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); id self(internal->GetValue()); @@ -1562,15 +1678,15 @@ static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStr CYPool pool; 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) @@ -1582,9 +1698,10 @@ static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStr return true; #endif - if (SEL sel = sel_getUid(string)) - if (CYImplements(self, _class, sel, true)) - return true; + if (CYHasImplicitProperties(_class)) + if (SEL sel = sel_getUid(string)) + if (CYImplements(self, _class, sel, true)) + return true; return false; } @@ -1599,8 +1716,8 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object, CYPool pool; 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 { @@ -1619,9 +1736,10 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object, } #endif - if (SEL sel = sel_getUid(string)) - if (CYImplements(self, _class, sel, true)) - return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception); + 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 NULL; } CYCatch } @@ -1672,13 +1790,14 @@ 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); + 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; } @@ -1695,6 +1814,18 @@ static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JS } CYPoolCatch(NULL) } CYCatch return /*XXX*/ NULL; } +static void Instance_getPropertyNames_message(JSPropertyNameAccumulatorRef names, objc_method *method) { + const char *name(sel_getName(method_getName(method))); + if (strchr(name, ':') != NULL) + return; + + const char *type(method_getTypeEncoding(method)); + if (type == NULL || *type == '\0' || *type == 'v') + return; + + JSPropertyNameAccumulatorAddName(names, CYJSString(name)); +} + static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); id self(internal->GetValue()); @@ -1712,9 +1843,24 @@ static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, } #endif + if (CYHasImplicitProperties(_class)) + for (Class current(_class); current != nil; current = class_getSuperclass(current)) { +#if OBJC_API_VERSION >= 2 + unsigned int size; + objc_method **data(class_copyMethodList(current, &size)); + for (size_t i(0); i != size; ++i) + Instance_getPropertyNames_message(names, data[i]); + free(data); +#else + for (objc_method_list *methods(current->methods); methods != NULL; methods = methods->method_next) + for (int i(0); i != methods->method_count; ++i) + Instance_getPropertyNames_message(names, &methods->method_list[i]); +#endif + } + 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() } @@ -1725,6 +1871,87 @@ static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef return value; } CYCatch } +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 + + struct BlockDescriptor1 { + unsigned long int reserved; + unsigned long int size; + }; + + struct BlockDescriptor2 { + void (*copy_helper)(void *dst, void *src); + void (*dispose_helper)(void *src); + }; + + struct BlockDescriptor3 { + const char *signature; + const char *layout; + }; + + struct BlockLiteral { + Class isa; + int flags; + int reserved; + void (*invoke)(void *, ...); + void *descriptor; + } *literal = reinterpret_cast(self); + + 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, + }; + + 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, exception, &signature, &cif, function); + } + } + + if (count != 0) + CYThrow("NSBlock without signature field passed arguments"); + + CYPoolTry { + [self invoke]; + } CYPoolCatch(NULL); + + return NULL; +} CYCatch } + static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) constructor))); Class _class(internal->GetValue()); @@ -1740,6 +1967,16 @@ static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, return false; } CYCatch } +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 } + static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { Internal *internal(reinterpret_cast(JSObjectGetPrivate(object))); CYPool pool; @@ -1933,6 +2170,18 @@ 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 } + +static void ObjectiveC_Constants_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { + JSPropertyNameAccumulatorAddName(names, CYJSString("nil")); +} + #ifdef __APPLE__ static bool stret(ffi_type *ffi_type) { return ffi_type->type == FFI_TYPE_STRUCT && ( @@ -1971,6 +2220,26 @@ 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); @@ -2028,42 +2297,6 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje 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); -} - -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 Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { JSValueRef setup[count + 2]; setup[0] = _this; @@ -2138,7 +2371,7 @@ static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjec return Instance::Make(context, (id) object_getClass(internal->GetValue())); } -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)) @@ -2159,7 +2392,7 @@ static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectR return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue()))); + return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue(), false))); } CYCatch } static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -2179,15 +2412,21 @@ static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectR } CYPoolCatch(NULL) } CYCatch 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_)) return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - return CYCastJSValue(context, reinterpret_cast(internal->GetValue())); + id value(internal->GetValue()); + + if (![value respondsToSelector:@selector(cy$valueOfInContext:)]) + return _this; + + if (JSValueRef result = [value cy$valueOfInContext:context]) + return result; + + return _this; } CYCatch return /*XXX*/ NULL; } -#endif 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_)) @@ -2203,14 +2442,14 @@ static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjec 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 return /*XXX*/ NULL; } @@ -2261,16 +2500,16 @@ 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} @@ -2290,14 +2529,23 @@ static JSStaticFunction Selector_staticFunctions[5] = { }; void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { + $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")); + apr_pool_t *pool(CYGetGlobalPool()); Object_type = new(pool) Type_privateData("@"); Selector_type = new(pool) Type_privateData(":"); #ifdef __APPLE__ - NSCFBoolean_ = objc_getClass("NSCFBoolean"); + // XXX: apparently, iOS now has both of these + NSCFBoolean_ = objc_getClass("__NSCFBoolean"); + if (NSCFBoolean_ == nil) + NSCFBoolean_ = objc_getClass("NSCFBoolean"); + NSCFType_ = objc_getClass("NSCFType"); + NSGenericDeallocHandler_ = objc_getClass("__NSGenericDeallocHandler"); NSMessageBuilder_ = objc_getClass("NSMessageBuilder"); NSZombie_ = objc_getClass("_NSZombie_"); #else @@ -2305,7 +2553,9 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { #endif NSArray_ = objc_getClass("NSArray"); + NSBlock_ = objc_getClass("NSBlock"); NSDictionary_ = objc_getClass("NSDictionary"); + NSString_ = objc_getClass("NSString"); Object_ = objc_getClass("Object"); JSClassDefinition definition; @@ -2320,10 +2570,23 @@ 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 = "ObjectInstance"; + ObjectInstance_ = JSClassCreate(&definition); + + definition.className = "StringInstance"; + StringInstance_ = JSClassCreate(&definition); + + definition.className = "FunctionInstance"; + FunctionInstance_ = JSClassCreate(&definition); + definition = kJSClassDefinitionEmpty; definition.className = "Internal"; definition.staticFunctions = Internal_staticFunctions; @@ -2373,6 +2636,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"; @@ -2393,10 +2662,6 @@ 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"); #endif @@ -2407,12 +2672,22 @@ 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)); @@ -2426,17 +2701,43 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry { 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); + CYSetProperty(context, cycript, CYJSString("Instance"), Instance); CYSetProperty(context, cycript, CYJSString("Selector"), Selector); CYSetProperty(context, cycript, CYJSString("Super"), Super); -#if defined(__APPLE__) && defined(__arm__) + JSObjectRef box(JSObjectMakeFunctionWithCallback(context, CYJSString("box"), &Instance_box_callAsFunction)); + CYSetProperty(context, Instance, CYJSString("box"), box); + +#if defined(__APPLE__) && defined(__arm__) && 0 CYSetProperty(context, all, CYJSString("objc_registerClassPair"), &objc_registerClassPair_, 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() } @@ -2444,7 +2745,6 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry { static CYHooks CYObjectiveCHooks = { &CYObjectiveC_ExecuteStart, &CYObjectiveC_ExecuteEnd, - &CYObjectiveC_RuntimeProperty, &CYObjectiveC_CallFunction, &CYObjectiveC_Initialize, &CYObjectiveC_SetupContext, @@ -2455,5 +2755,7 @@ static CYHooks CYObjectiveCHooks = { struct CYObjectiveC { CYObjectiveC() { hooks_ = &CYObjectiveCHooks; + // XXX: evil magic juju to make this actually take effect on a Mac when compiled with autoconf/libtool doom! + _assert(hooks_ != NULL); } } CYObjectiveC;