X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/8665da0c32ae1736e981caa4fbed7091423b048b..9772d9bfeff32f00eb6a2c38f11b01530e47482b:/ObjectiveC/Library.mm diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm index 128d1f2..957c80c 100644 --- a/ObjectiveC/Library.mm +++ b/ObjectiveC/Library.mm @@ -1,8 +1,23 @@ -#ifdef __APPLE__ -#include -#endif - -#include "ObjectiveC/Internal.hpp" +/* Cycript - Optimizing JavaScript Compiler/Runtime + * Copyright (C) 2009-2010 Jay Freeman (saurik) +*/ + +/* GNU Lesser 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 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. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Cycript. If not, see . +**/ +/* }}} */ #ifdef __APPLE__ #include "Struct.hpp" @@ -10,7 +25,9 @@ #include -#include +#include "ObjectiveC/Internal.hpp" + +#include #include "cycript.hpp" @@ -18,14 +35,15 @@ #ifdef __APPLE__ #include -#include #include #include +#include #endif #include "Error.hpp" #include "JavaScript.hpp" #include "String.hpp" +#include "Execute.hpp" #include #include @@ -57,6 +75,14 @@ } \ } +#define CYSadTry { \ + @try +#define CYSadCatch(value) \ + @catch (NSException *error ) { \ + throw CYJSError(context, CYCastJSValue(context, error)); \ + } return value; \ +} + #ifndef __APPLE__ #define class_getSuperclass GSObjCSuper #define class_getInstanceVariable GSCGetInstanceVariableDefinition @@ -73,13 +99,18 @@ #define method_getTypeEncoding(method) ((method)->method_types) #define method_setImplementation(method, imp) ((void) ((method)->method_imp = (imp))) +#undef objc_getClass +#define objc_getClass GSClassFromName + #define objc_getProtocol GSProtocolFromName #define object_getClass GSObjCClass #define object_getInstanceVariable(object, name, value) ({ \ objc_ivar *ivar(class_getInstanceVariable(object_getClass(object), name)); \ - GSObjCGetVariable(object, ivar_getOffset(ivar), sizeof(void *), value); \ + _assert(value != NULL); \ + if (ivar != NULL) \ + GSObjCGetVariable(object, ivar_getOffset(ivar), sizeof(void *), value); \ ivar; \ }) @@ -93,8 +124,6 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception); -extern sqlite3 *Bridge_; - /* Objective-C Pool Release {{{ */ apr_status_t CYPoolRelease_(void *data) { id object(reinterpret_cast(data)); @@ -188,6 +217,8 @@ CYUTF8String CYCastUTF8String(NSString *value) { } /* }}} */ +JSValueRef CYCastJSValue(JSContextRef context, NSObject *value); + void CYThrow(JSContextRef context, NSException *error, JSValueRef *exception) { if (exception == NULL) throw error; @@ -207,6 +238,7 @@ static JSClassRef Internal_; static JSClassRef Message_; static JSClassRef Messages_; static JSClassRef Selector_; +static JSClassRef StringInstance_; static JSClassRef Super_; static JSClassRef ObjectiveC_Classes_; @@ -217,17 +249,19 @@ static JSClassRef ObjectiveC_Image_Classes_; static JSClassRef ObjectiveC_Images_; #endif -static JSObjectRef Instance_prototype_; - #ifdef __APPLE__ static Class NSCFBoolean_; static Class NSCFType_; +static Class NSGenericDeallocHandler_; static Class NSMessageBuilder_; static Class NSZombie_; +#else +static Class NSBoolNumber_; #endif static Class NSArray_; static Class NSDictionary_; +static Class NSString_; static Class Object_; static Type_privateData *Object_type; @@ -241,34 +275,39 @@ Type_privateData *Selector_privateData::GetType() const { return Selector_type; } -// XXX: trick this out with associated objects! +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 Instance_prototype_; + return CYGetCachedObject(context, CYJSString("Instance_prototype")); - // XXX: I need to think through multi-context - typedef std::map CacheMap; - static CacheMap cache_; + JSObjectRef global(CYGetGlobalObject(context)); + JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s))); + + char label[32]; + sprintf(label, "i%p", self); + CYJSString name(label); - JSValueRef &value(cache_[self]); - if (value != NULL) + JSValueRef value(CYGetProperty(context, cy, name)); + if (!JSValueIsUndefined(context, value)) return value; JSClassRef _class(NULL); JSValueRef prototype; if (self == NSArray_) - prototype = Array_prototype_; + prototype = CYGetCachedObject(context, CYJSString("Array_prototype")); else if (self == NSDictionary_) - prototype = Object_prototype_; + prototype = CYGetCachedObject(context, CYJSString("Object_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); - JSValueProtect(context, object); - value = object; return object; } @@ -350,6 +389,8 @@ 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 @@ -379,7 +420,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 @@ -547,8 +588,9 @@ NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) { /* }}} */ 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)); + 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]); @@ -567,6 +609,12 @@ NSNumber *CYCopyNSNumber(JSContextRef context, JSValueRef value) { return [[NSNumber alloc] initWithDouble:CYCastDouble(context, value)]; } +#ifndef __APPLE__ +@interface NSBoolNumber : NSNumber { +} +@end +#endif + id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cast) { id object; bool copy; @@ -586,7 +634,7 @@ id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cas object = (id) (CYCastBool(context, value) ? kCFBooleanTrue : kCFBooleanFalse); copy = false; #else - object = [[NSNumber alloc] initWithBool:CYCastBool(context, value)]; + object = [[NSBoolNumber alloc] initWithBool:CYCastBool(context, value)]; copy = true; #endif break; @@ -699,8 +747,35 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu } } ++ (bool) cy$hasImplicitProperties { + return false; +} + @end /* }}} */ +/* Bridge: NSBoolNumber {{{ */ +#ifndef __APPLE__ +@implementation NSBoolNumber (Cycript) + +- (JSType) cy$JSType { + return kJSTypeBoolean; +} + +- (NSObject *) cy$toJSON:(NSString *)key { + return self; +} + +- (NSString *) cy$toCYON { + return [self boolValue] ? @"true" : @"false"; +} + +- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) { + return CYCastJSValue(context, (bool) [self boolValue]); +} CYObjectiveCatch } + +@end +#endif +/* }}} */ /* Bridge: NSDictionary {{{ */ @implementation NSDictionary (Cycript) @@ -710,10 +785,10 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu bool comma(false); #ifdef __APPLE__ - for (id key in self) { + for (NSObject *key in self) { #else NSEnumerator *keys([self keyEnumerator]); - while (id key = [keys nextObject]) { + while (NSObject *key = [keys nextObject]) { #endif if (comma) [json appendString:@","]; @@ -741,15 +816,19 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu [super cy$getPropertyNames:names inContext:context]; #ifdef __APPLE__ - for (NSString *key in self) { + for (NSObject *key in self) { #else NSEnumerator *keys([self keyEnumerator]); - while (NSString *key = [keys nextObject]) { + while (NSObject *key = [keys nextObject]) { #endif JSPropertyNameAccumulatorAddName(names, CYJSString(context, key)); } } ++ (bool) cy$hasImplicitProperties { + return false; +} + @end /* }}} */ /* Bridge: NSMutableArray {{{ */ @@ -911,6 +990,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 {{{ */ @@ -951,6 +1034,49 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu 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; +} + @end /* }}} */ /* Bridge: WebUndefined {{{ */ @@ -1001,32 +1127,34 @@ NSArray *CYCastNSArray(JSContextRef context, JSPropertyNameArrayRef names) { return array; } -JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry { +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) } +} CYPoolCatch(NULL) return /*XXX*/ NULL; } @implementation CYJSObject - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry { if ((self = [super init]) != nil) { object_ = object; - context_ = context; + context_ = CYGetJSContext(context); + //XXX:JSGlobalContextRetain(context_); JSValueProtect(context_, object_); } return self; } CYObjectiveCatch } - (void) dealloc { CYObjectiveTry { JSValueUnprotect(context_, object_); + //XXX:JSGlobalContextRelease(context_); [super dealloc]; } CYObjectiveCatch } - (NSObject *) cy$toJSON:(NSString *)key { CYObjectiveTry { - JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_)); + JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_s)); if (!CYIsCallable(context_, toJSON)) return [super cy$toJSON:key]; else { @@ -1056,8 +1184,7 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry { } CYObjectiveCatch } - (id) objectForKey:(id)key { CYObjectiveTry { - // XXX: are NSDictionary keys always NSString *? - JSValueRef value(CYGetProperty(context_, object_, CYJSString(context_, (NSString *) key))); + JSValueRef value(CYGetProperty(context_, object_, CYJSString(context_, (NSObject *) key))); if (JSValueIsUndefined(context_, value)) return nil; return CYCastNSObject(NULL, context_, value) ?: [NSNull null]; @@ -1071,14 +1198,12 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry { } CYObjectiveCatch } - (void) setObject:(id)object forKey:(id)key { CYObjectiveTry { - // XXX: are NSDictionary keys always NSString *? - CYSetProperty(context_, object_, CYJSString(context_, (NSString *) key), CYCastJSValue(context_, object)); + CYSetProperty(context_, object_, CYJSString(context_, (NSObject *) key), CYCastJSValue(context_, (NSString *) object)); } CYObjectiveCatch } - (void) removeObjectForKey:(id)key { CYObjectiveTry { JSValueRef exception(NULL); - // XXX: are NSDictionary keys always NSString *? - (void) JSObjectDeleteProperty(context_, object_, CYJSString(context_, (NSString *) key), &exception); + (void) JSObjectDeleteProperty(context_, object_, CYJSString(context_, (NSObject *) key), &exception); CYThrow(context_, exception); } CYObjectiveCatch } @@ -1089,18 +1214,20 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry { - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry { if ((self = [super init]) != nil) { object_ = object; - context_ = context; + context_ = CYGetJSContext(context); + //XXX:JSGlobalContextRetain(context_); JSValueProtect(context_, object_); } return self; } CYObjectiveCatch } - (void) dealloc { CYObjectiveTry { JSValueUnprotect(context_, object_); + //XXX:JSGlobalContextRelease(context_); [super dealloc]; } CYObjectiveCatch } - (NSUInteger) count { CYObjectiveTry { - return CYCastDouble(context_, CYGetProperty(context_, object_, length_)); + return CYCastDouble(context_, CYGetProperty(context_, object_, length_s)); } CYObjectiveCatch } - (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry { @@ -1116,8 +1243,9 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry { - (void) addObject:(id)object { CYObjectiveTry { JSValueRef exception(NULL); JSValueRef arguments[1]; - arguments[0] = CYCastJSValue(context_, object); - JSObjectCallAsFunction(context_, Array_push_, object_, 1, arguments, &exception); + arguments[0] = CYCastJSValue(context_, (NSObject *) object); + JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype"))); + JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, push_s)), object_, 1, arguments, &exception); CYThrow(context_, exception); } CYObjectiveCatch } @@ -1129,14 +1257,16 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry { JSValueRef arguments[3]; arguments[0] = CYCastJSValue(context_, index); arguments[1] = CYCastJSValue(context_, 0); - arguments[2] = CYCastJSValue(context_, object); - JSObjectCallAsFunction(context_, Array_splice_, object_, 3, arguments, &exception); + arguments[2] = CYCastJSValue(context_, (NSObject *) object); + 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); - JSObjectCallAsFunction(context_, Array_pop_, object_, 0, NULL, &exception); + JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype"))); + JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, pop_s)), object_, 0, NULL, &exception); CYThrow(context_, exception); } CYObjectiveCatch } @@ -1148,7 +1278,8 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry { JSValueRef arguments[2]; arguments[0] = CYCastJSValue(context_, index); arguments[1] = CYCastJSValue(context_, 1); - JSObjectCallAsFunction(context_, Array_splice_, object_, 2, arguments, &exception); + JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype"))); + JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 2, arguments, &exception); CYThrow(context_, exception); } CYObjectiveCatch } @@ -1156,7 +1287,7 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry { 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_, object)); + CYSetProperty(context_, object_, index, CYCastJSValue(context_, (NSObject *) object)); } CYObjectiveCatch } @end @@ -1231,30 +1362,32 @@ static SEL CYCastSEL(JSContextRef context, JSValueRef value) { return CYCastPointer(context, value); } -void *CYObjectiveC_ExecuteStart(JSContextRef context) { - // XXX: deal with exceptions! +void *CYObjectiveC_ExecuteStart(JSContextRef context) { CYSadTry { return (void *) [[NSAutoreleasePool alloc] init]; -} +} CYSadCatch(NULL) } -void CYObjectiveC_ExecuteEnd(JSContextRef context, void *handle) { - // XXX: deal with exceptions! +void CYObjectiveC_ExecuteEnd(JSContextRef context, void *handle) { CYSadTry { return [(NSAutoreleasePool *) handle release]; -} +} CYSadCatch() } -JSValueRef CYObjectiveC_RuntimeProperty(JSContextRef context, CYUTF8String name) { CYObjectiveTry_(context) { +JSValueRef CYObjectiveC_RuntimeProperty(JSContextRef context, CYUTF8String name) { CYPoolTry { if (name == "nil") return Instance::Make(context, nil); if (Class _class = objc_getClass(name.data)) return CYMakeInstance(context, _class, true); + if (Protocol *protocol = objc_getProtocol(name.data)) + return CYMakeInstance(context, protocol, true); return NULL; -} CYObjectiveCatch } +} CYPoolCatch(NULL) return /*XXX*/ NULL; } -static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { CYObjectiveTry_(context) { +static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { CYSadTry { ffi_call(cif, function, value, values); -} CYObjectiveCatch } +} CYSadCatch() } -static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYObjectiveTry_(context) { +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); @@ -1269,12 +1402,14 @@ static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Ty } return true; -} CYObjectiveCatch } +} CYSadCatch(false) } -static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) { CYObjectiveTry_(context) { +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 (id object = *reinterpret_cast(data)) { + if (NSObject *object = *reinterpret_cast(data)) { JSValueRef value(CYCastJSValue(context, object)); if (initialize) [object release]; @@ -1294,13 +1429,13 @@ static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ff default: return NULL; } -} CYObjectiveCatch } +} CYPoolCatch(NULL) return /*XXX*/ NULL; } static bool CYImplements(id object, Class _class, SEL selector, bool devoid) { if (objc_method *method = class_getInstanceMethod(_class, selector)) { if (!devoid) return true; -#ifdef __OBJC2__ +#if OBJC_API_VERSION >= 2 char type[16]; method_getReturnType(method, type, sizeof(type)); #else @@ -1319,36 +1454,16 @@ static const char *CYPoolTypeEncoding(apr_pool_t *pool, JSContextRef context, SE return method_getTypeEncoding(method); const char *name(sel_getName(sel)); + size_t length(strlen(name)); - sqlite3_stmt *statement; - - _sqlcall(sqlite3_prepare(Bridge_, - "select " - "\"bridge\".\"value\" " - "from \"bridge\" " - "where" - " \"bridge\".\"mode\" = -1 and" - " \"bridge\".\"name\" = ?" - " limit 1" - , -1, &statement, NULL)); - - _trace(); - _sqlcall(sqlite3_bind_text(statement, 1, name, -1, SQLITE_STATIC)); - - const char *value; - if (_sqlcall(sqlite3_step(statement)) == SQLITE_DONE) { - _trace(); - value = NULL;} - else { - _trace(); - value = sqlite3_column_pooled(pool, statement, 0); - } + char keyed[length + 2]; + keyed[0] = '6'; + keyed[length + 1] = '\0'; + memcpy(keyed + 1, name, length); - _sqlcall(sqlite3_finalize(statement)); + if (CYBridgeEntry *entry = CYBridgeHash(keyed, length + 1)) + return entry->value_; - if (value != NULL) - return value; -_trace(); return NULL; } @@ -1377,6 +1492,7 @@ static JSObjectRef CYMakeMessage(JSContextRef context, SEL sel, IMP imp, const c static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *type) { JSObjectRef function(CYCastJSObject(context, value)); Closure_privateData *internal(CYMakeFunctor_(context, function, type, &MessageClosure_)); + // XXX: see notes in Library.cpp about needing to leak return reinterpret_cast(internal->GetValue()); } @@ -1447,7 +1563,7 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr return true; } -#if 0 && !__OBJC2__ +#if 0 && OBJC_API_VERSION < 2 static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { Messages *internal(reinterpret_cast(JSObjectGetPrivate(object))); Class _class(internal->GetValue()); @@ -1470,7 +1586,7 @@ static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, Messages *internal(reinterpret_cast(JSObjectGetPrivate(object))); Class _class(internal->GetValue()); -#ifdef __OBJC2__ +#if OBJC_API_VERSION >= 2 unsigned int size; objc_method **data(class_copyMethodList(_class, &size)); for (size_t i(0); i != size; ++i) @@ -1483,6 +1599,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), false)) + 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()); @@ -1513,9 +1636,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; } @@ -1550,9 +1674,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 } @@ -1624,7 +1749,19 @@ static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JS NSString *name(CYCastNSString(NULL, context, property)); return [self cy$deleteProperty:name]; } CYPoolCatch(NULL) -} CYCatch } +} 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))); @@ -1643,6 +1780,21 @@ 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)) @@ -1693,6 +1845,7 @@ static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object, 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)); } @@ -1719,7 +1872,7 @@ static void Internal_getPropertyNames_(Class _class, JSPropertyNameAccumulatorRe if (Class super = class_getSuperclass(_class)) Internal_getPropertyNames_(super, names); -#ifdef __OBJC2__ +#if OBJC_API_VERSION >= 2 unsigned int size; objc_ivar **data(class_copyIvarList(_class, &size)); for (size_t i(0); i != size; ++i) @@ -1782,7 +1935,7 @@ static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRe #endif } -#ifdef __OBJC2__ +#if OBJC_API_VERSION >= 2 static JSValueRef ObjectiveC_Image_Classes_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { const char *internal(reinterpret_cast(JSObjectGetPrivate(object))); @@ -1852,7 +2005,7 @@ static JSValueRef ObjectiveC_Protocols_getProperty(JSContextRef context, JSObjec } CYCatch } static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { -#ifdef __OBJC2__ +#if OBJC_API_VERSION >= 2 unsigned int size; Protocol **data(objc_copyProtocolList(&size)); for (size_t i(0); i != size; ++i) @@ -1959,7 +2112,7 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje } CYCatch } /* Hook: objc_registerClassPair {{{ */ -#ifdef __OBJC2__ +#if defined(__APPLE__) && defined(__arm__) && 0 // XXX: replace this with associated objects MSHook(void, CYDealloc, id self, SEL sel) { @@ -2037,7 +2190,7 @@ static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t if (count > 1) throw CYJSError(context, "incorrect number of arguments to Instance constructor"); id self(count == 0 ? nil : CYCastPointer(context, arguments[0])); - return Instance::Make(context, self); + return CYMakeInstance(context, self, false); } CYCatch } static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { @@ -2060,7 +2213,7 @@ static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef ffi = typical->ffi_; } - return CYMakePointer(context, &internal->value_, type, ffi, object); + return CYMakePointer(context, &internal->value_, _not(size_t), type, ffi, object); } static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { @@ -2068,7 +2221,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)) @@ -2107,7 +2260,26 @@ static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectR // XXX: check for support of cy$toJSON? return CYCastJSValue(context, CYJSString(context, [internal->GetValue() cy$toJSON:key])); } CYPoolCatch(NULL) -} CYCatch } +} 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())); +} 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_)) + 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; } 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_)) @@ -2115,11 +2287,15 @@ static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjec 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])); } CYPoolCatch(NULL) -} CYCatch } +} CYCatch 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))); @@ -2135,9 +2311,10 @@ static JSValueRef Selector_callAsFunction_toCYON(JSContextRef context, JSObjectR const char *name(sel_getName(internal->GetValue())); CYPoolTry { - return CYCastJSValue(context, CYJSString(context, [NSString stringWithFormat:@"@selector(%s)", name])); + NSString *string([NSString stringWithFormat:@"@selector(%s)", name]); + return CYCastJSValue(context, CYJSString(context, string)); } CYPoolCatch(NULL) -} CYCatch } +} CYCatch 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) @@ -2167,15 +2344,17 @@ 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[5] = { +static JSStaticFunction Instance_staticFunctions[6] = { {"$cya", &CYValue_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toCYON", &Instance_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toJSON", &Instance_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + //{"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"toPointer", &Instance_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toString", &Instance_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} }; @@ -2193,22 +2372,31 @@ static JSStaticFunction Selector_staticFunctions[5] = { {NULL, NULL, 0} }; -void CYObjectiveC_SetupContext(JSContextRef context) { - JSObjectRef global(CYGetGlobalObject(context)); +static JSStaticFunction StringInstance_staticFunctions[2] = { + //{"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"toString", &Instance_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, 0} +}; + +void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { apr_pool_t *pool(CYGetGlobalPool()); - Object_type = new(pool) Type_privateData(pool, "@"); - Selector_type = new(pool) Type_privateData(pool, ":"); + Object_type = new(pool) Type_privateData("@"); + Selector_type = new(pool) Type_privateData(":"); #ifdef __APPLE__ NSCFBoolean_ = objc_getClass("NSCFBoolean"); NSCFType_ = objc_getClass("NSCFType"); + NSGenericDeallocHandler_ = objc_getClass("__NSGenericDeallocHandler"); NSMessageBuilder_ = objc_getClass("NSMessageBuilder"); NSZombie_ = objc_getClass("_NSZombie_"); +#else + NSBoolNumber_ = objc_getClass("NSBoolNumber"); #endif NSArray_ = objc_getClass("NSArray"); NSDictionary_ = objc_getClass("NSDictionary"); + NSString_ = objc_getClass("NSString"); Object_ = objc_getClass("Object"); JSClassDefinition definition; @@ -2249,7 +2437,7 @@ void CYObjectiveC_SetupContext(JSContextRef context) { definition.hasProperty = &Messages_hasProperty; definition.getProperty = &Messages_getProperty; definition.setProperty = &Messages_setProperty; -#if 0 && !__OBJC2__ +#if 0 && OBJC_API_VERSION < 2 definition.deleteProperty = &Messages_deleteProperty; #endif definition.getPropertyNames = &Messages_getPropertyNames; @@ -2264,6 +2452,11 @@ void CYObjectiveC_SetupContext(JSContextRef context) { 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; @@ -2276,19 +2469,7 @@ void CYObjectiveC_SetupContext(JSContextRef context) { definition.getPropertyNames = &ObjectiveC_Classes_getPropertyNames; ObjectiveC_Classes_ = JSClassCreate(&definition); - definition = kJSClassDefinitionEmpty; - definition.className = "ObjectiveC::Protocols"; - definition.getProperty = &ObjectiveC_Protocols_getProperty; - definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames; - ObjectiveC_Protocols_ = JSClassCreate(&definition); - - JSObjectRef ObjectiveC(JSObjectMake(context, NULL, NULL)); - CYSetProperty(context, global, CYJSString("ObjectiveC"), ObjectiveC); - - CYSetProperty(context, ObjectiveC, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Classes_, NULL)); - CYSetProperty(context, ObjectiveC, CYJSString("protocols"), JSObjectMake(context, ObjectiveC_Protocols_, NULL)); - -#ifdef __OBJC2__ +#if OBJC_API_VERSION >= 2 definition = kJSClassDefinitionEmpty; definition.className = "ObjectiveC::Images"; definition.getProperty = &ObjectiveC_Images_getProperty; @@ -2300,42 +2481,75 @@ void CYObjectiveC_SetupContext(JSContextRef context) { definition.getProperty = &ObjectiveC_Image_Classes_getProperty; definition.getPropertyNames = &ObjectiveC_Image_Classes_getPropertyNames; ObjectiveC_Image_Classes_ = JSClassCreate(&definition); +#endif + definition = kJSClassDefinitionEmpty; + definition.className = "ObjectiveC::Protocols"; + definition.getProperty = &ObjectiveC_Protocols_getProperty; + definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames; + ObjectiveC_Protocols_ = JSClassCreate(&definition); + +#if defined(__APPLE__) && defined(__arm__) && 0 + 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 +} CYPoolCatch() } + +void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry { + JSObjectRef global(CYGetGlobalObject(context)); + 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 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)); + +#if OBJC_API_VERSION >= 2 CYSetProperty(context, ObjectiveC, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL)); #endif 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)); - Instance_prototype_ = (JSObjectRef) CYGetProperty(context, Instance, prototype_); - JSValueProtect(context, Instance_prototype_); - - CYSetProperty(context, global, CYJSString("Instance"), Instance); - CYSetProperty(context, global, CYJSString("Selector"), Selector); - CYSetProperty(context, global, CYJSString("Super"), Super); + JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s))); + CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype); -#ifdef __OBJC2__ - CYSetProperty(context, global, CYJSString("objc_registerClassPair"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_registerClassPair"), &objc_registerClassPair_)); - MSHookFunction(&objc_registerClassPair, MSHake(objc_registerClassPair)); -#endif + JSObjectRef StringInstance_prototype(CYCastJSObject(context, CYGetProperty(context, StringInstance, prototype_s))); + CYSetProperty(context, cy, CYJSString("StringInstance_prototype"), StringInstance_prototype); - CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend)); + JSObjectRef String_prototype(CYGetCachedObject(context, CYJSString("String_prototype"))); + JSObjectSetPrototype(context, StringInstance_prototype, String_prototype); - JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Message, prototype_), Function_prototype_); - JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Selector, prototype_), Function_prototype_); + CYSetProperty(context, cycript, CYJSString("Instance"), Instance); + CYSetProperty(context, cycript, CYJSString("Selector"), Selector); + CYSetProperty(context, cycript, CYJSString("Super"), Super); -#ifdef __APPLE__ - class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast(&NSCFType$cy$toJSON), "@12@0:4@8"); +#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() } static CYHooks CYObjectiveCHooks = { &CYObjectiveC_ExecuteStart, &CYObjectiveC_ExecuteEnd, &CYObjectiveC_RuntimeProperty, &CYObjectiveC_CallFunction, + &CYObjectiveC_Initialize, &CYObjectiveC_SetupContext, &CYObjectiveC_PoolFFI, &CYObjectiveC_FromFFI, @@ -2344,5 +2558,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;