X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/3c9f7e221fac3b21092776dad59052fd79ec1897..6419a40fb7c8e1c92e2bb7a6691f071fbfa76e77:/ObjectiveC/Library.mm?ds=sidebyside diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm index 8182375..7392a2e 100644 --- a/ObjectiveC/Library.mm +++ b/ObjectiveC/Library.mm @@ -1,44 +1,67 @@ -#if defined(__APPLE__) && defined(__arm__) -#include -#else -#include -#endif +/* Cycript - The Truly Universal Scripting Language + * Copyright (C) 2009-2016 Jay Freeman (saurik) +*/ + +/* GNU Affero General Public License, Version 3 {{{ */ +/* + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + + * This program 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 Affero General Public License for more details. + + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . +**/ +/* }}} */ -#include "ObjectiveC/Internal.hpp" +#include "cycript.hpp" -#ifdef __APPLE__ -#include "Struct.hpp" -#endif +#include -#include +#include +#include -#include +#include -#include "cycript.hpp" +#ifdef __APPLE__ +#include +#include +#endif -#include "ObjectiveC/Internal.hpp" +#include +#include #ifdef __APPLE__ #include #include -#include #endif +#include + +#include "Code.hpp" +#include "Decode.hpp" #include "Error.hpp" +#include "Functor.hpp" #include "JavaScript.hpp" #include "String.hpp" +#include "Execute.hpp" -#include -#include +#include "ObjectiveC/Internal.hpp" +#include "ObjectiveC/Syntax.hpp" -#define CYObjectiveTry_(context) { \ - JSContextRef context_(context); \ +#define CYObjectiveTry_ { \ try #define CYObjectiveTry { \ + JSContextRef context(context_); \ try #define CYObjectiveCatch \ catch (const CYException &error) { \ - @throw CYCastNSObject(NULL, context_, error.CastJSValue(context_)); \ + @throw CYCastNSObject(NULL, context, error.CastJSValue(context, "Error")); \ } \ } @@ -58,99 +81,115 @@ } \ } -#ifndef __APPLE__ -#define class_getSuperclass GSObjCSuper -#define class_getInstanceVariable GSCGetInstanceVariableDefinition -#define class_getName GSNameFromClass - -#define class_removeMethods(cls, list) GSRemoveMethodList(cls, list, YES) - -#define ivar_getName(ivar) ((ivar)->ivar_name) -#define ivar_getOffset(ivar) ((ivar)->ivar_offset) -#define ivar_getTypeEncoding(ivar) ((ivar)->ivar_type) +#define CYSadTry { \ + @try +#define CYSadCatch(value) \ + @catch (NSException *error ) { \ + throw CYJSError(context, CYCastJSValue(context, error)); \ + } return value; \ +} -#define method_getName(method) ((method)->method_name) -#define method_getImplementation(method) ((method)->method_imp) -#define method_getTypeEncoding(method) ((method)->method_types) -#define method_setImplementation(method, imp) ((void) ((method)->method_imp = (imp))) +#define _oassert(test) \ + if (!(test)) \ + @throw [NSException exceptionWithName:NSInternalInconsistencyException reason:@"_assert(" #test ")" userInfo:nil]; -#undef objc_getClass -#define objc_getClass GSClassFromName +@class NSBlock; -#define objc_getProtocol GSProtocolFromName +struct BlockLiteral { + Class isa; + int flags; + int reserved; + void (*invoke)(void *, ...); + void *descriptor; +}; -#define object_getClass GSObjCClass +struct BlockDescriptor1 { + unsigned long int reserved; + unsigned long int size; +}; -#define object_getInstanceVariable(object, name, value) ({ \ - objc_ivar *ivar(class_getInstanceVariable(object_getClass(object), name)); \ - if (ivar != NULL) \ - GSObjCGetVariable(object, ivar_getOffset(ivar), sizeof(void *), value); \ - ivar; \ -}) +struct BlockDescriptor2 { + void (*copy_helper)(BlockLiteral *dst, BlockLiteral *src); + void (*dispose_helper)(BlockLiteral *src); +}; -#define object_setIvar(object, ivar, value) ({ \ - void *data = (value); \ - GSObjCSetVariable(object, ivar_getOffset(ivar), sizeof(void *), &data); \ -}) +struct BlockDescriptor3 { + const char *signature; + const char *layout; +}; -#define protocol_getName(protocol) [(protocol) name] -#endif +enum { + BLOCK_DEALLOCATING = 0x0001, + BLOCK_REFCOUNT_MASK = 0xfffe, + BLOCK_NEEDS_FREE = 1 << 24, + BLOCK_HAS_COPY_DISPOSE = 1 << 25, + BLOCK_HAS_CTOR = 1 << 26, + BLOCK_IS_GC = 1 << 27, + BLOCK_IS_GLOBAL = 1 << 28, + BLOCK_HAS_STRET = 1 << 29, + BLOCK_HAS_SIGNATURE = 1 << 30, +}; -JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception); +static bool CYIsClass(id self) { + return class_isMetaClass(object_getClass(self)); +} -extern sqlite3 *Bridge_; +JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize); /* Objective-C Pool Release {{{ */ -apr_status_t CYPoolRelease_(void *data) { +void CYPoolRelease_(void *data) { id object(reinterpret_cast(data)); [object release]; - return APR_SUCCESS; } -id CYPoolRelease_(apr_pool_t *pool, id object) { +id CYPoolRelease_(CYPool *pool, id object) { if (object == nil) return nil; else if (pool == NULL) return [object autorelease]; else { - apr_pool_cleanup_register(pool, object, &CYPoolRelease_, &apr_pool_cleanup_null); + pool->atexit(CYPoolRelease_); return object; } } template -Type_ CYPoolRelease(apr_pool_t *pool, Type_ object) { +Type_ CYPoolRelease(CYPool *pool, Type_ object) { return (Type_) CYPoolRelease_(pool, (id) object); } /* }}} */ /* Objective-C Strings {{{ */ -const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, NSString *value) { - if (pool == NULL) - return [value UTF8String]; - else { - size_t size([value maximumLengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1); - char *string(new(pool) char[size]); - if (![value getCString:string maxLength:size encoding:NSUTF8StringEncoding]) - throw CYJSError(context, "[NSString getCString:maxLength:encoding:] == NO"); - return string; - } +CYUTF8String CYPoolUTF8String(CYPool &pool, JSContextRef context, NSString *value) { + size_t size([value maximumLengthOfBytesUsingEncoding:NSUTF8StringEncoding]); + char *string(new(pool) char[size + 1]); + if (![value getCString:string maxLength:size encoding:NSUTF8StringEncoding]) + throw CYJSError(context, "[NSString getCString:maxLength:encoding:] == NO"); + return CYUTF8String(string, [value lengthOfBytesUsingEncoding:NSUTF8StringEncoding]); +} + +const char *CYPoolCString(CYPool &pool, JSContextRef context, NSString *value) { + CYUTF8String utf8(CYPoolUTF8String(pool, context, value)); + _assert(memchr(utf8.data, '\0', utf8.size) == NULL); + return utf8.data; } +#ifdef __clang__ JSStringRef CYCopyJSString(JSContextRef context, NSString *value) { -#ifdef __APPLE__ return JSStringCreateWithCFString(reinterpret_cast(value)); -#else - CYPool pool; - return CYCopyJSString(CYPoolCString(pool, context, value)); -#endif } +#endif JSStringRef CYCopyJSString(JSContextRef context, NSObject *value) { if (value == nil) return NULL; // XXX: this definition scares me; is anyone using this?! NSString *string([value description]); +#ifdef __clang__ return CYCopyJSString(context, string); +#else + CYPool pool; + return CYCopyJSString(CYPoolUTF8String(pool, context, string)); +#endif } NSString *CYCopyNSString(const CYUTF8String &value) { @@ -174,16 +213,16 @@ NSString *CYCopyNSString(JSContextRef context, JSValueRef value) { return CYCopyNSString(context, CYJSString(context, value)); } -NSString *CYCastNSString(apr_pool_t *pool, const CYUTF8String &value) { +NSString *CYCastNSString(CYPool *pool, const CYUTF8String &value) { return CYPoolRelease(pool, CYCopyNSString(value)); } -NSString *CYCastNSString(apr_pool_t *pool, SEL sel) { +NSString *CYCastNSString(CYPool *pool, SEL sel) { const char *name(sel_getName(sel)); return CYPoolRelease(pool, CYCopyNSString(CYUTF8String(name, strlen(name)))); } -NSString *CYCastNSString(apr_pool_t *pool, JSContextRef context, JSStringRef value) { +NSString *CYCastNSString(CYPool *pool, JSContextRef context, JSStringRef value) { return CYPoolRelease(pool, CYCopyNSString(context, value)); } @@ -205,18 +244,19 @@ size_t CYGetIndex(NSString *value) { return CYGetIndex(CYCastUTF8String(value)); } -bool CYGetOffset(apr_pool_t *pool, JSContextRef context, NSString *value, ssize_t &index) { +bool CYGetOffset(CYPool &pool, JSContextRef context, NSString *value, ssize_t &index) { return CYGetOffset(CYPoolCString(pool, context, value), index); } -static JSClassRef Instance_; -static JSClassRef Internal_; -static JSClassRef Message_; -static JSClassRef Messages_; -static JSClassRef Selector_; -static JSClassRef Super_; +static JSClassRef ArrayInstance_; +static JSClassRef BooleanInstance_; +static JSClassRef FunctionInstance_; +static JSClassRef NumberInstance_; +static JSClassRef ObjectInstance_; +static JSClassRef StringInstance_; static JSClassRef ObjectiveC_Classes_; +static JSClassRef ObjectiveC_Constants_; static JSClassRef ObjectiveC_Protocols_; #ifdef __APPLE__ @@ -224,120 +264,129 @@ static JSClassRef ObjectiveC_Image_Classes_; static JSClassRef ObjectiveC_Images_; #endif -static JSObjectRef Instance_prototype_; - #ifdef __APPLE__ +static Class __NSMallocBlock__; static Class NSCFBoolean_; static Class NSCFType_; -static Class NSMessageBuilder_; -static Class NSZombie_; +static Class NSGenericDeallocHandler_; #else static Class NSBoolNumber_; #endif static Class NSArray_; +static Class NSBlock_; static Class NSDictionary_; +static Class NSNumber_; +static Class NSObject_; +static Class NSString_; +static Class NSZombie_; static Class Object_; -static Type_privateData *Object_type; -static Type_privateData *Selector_type; +static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception); -Type_privateData *Instance::GetType() const { - return Object_type; -} - -Type_privateData *Selector_privateData::GetType() const { - return Selector_type; -} - -// XXX: trick this out with associated objects! -JSValueRef CYGetClassPrototype(JSContextRef context, id self) { - if (self == nil) - return Instance_prototype_; - - // XXX: I need to think through multi-context - typedef std::map CacheMap; - static CacheMap cache_; - - JSValueRef &value(cache_[self]); - if (value != NULL) - return value; - - JSClassRef _class(NULL); - JSValueRef prototype; - - if (self == NSArray_) - prototype = Array_prototype_; - else if (self == NSDictionary_) - prototype = Object_prototype_; - else - prototype = CYGetClassPrototype(context, class_getSuperclass(self)); - - JSObjectRef object(JSObjectMake(context, _class, NULL)); - JSObjectSetPrototype(context, object, prototype); - - JSValueProtect(context, object); - value = object; - return object; +JSValueRef Prototype::GetPrototype(JSContextRef context) const { +#ifdef __APPLE__ + if (value_ == NSCFBoolean_) +#else + if (value_ == NSBoolNumber_) +#endif + return CYGetCachedObject(context, CYJSString("BooleanInstance_prototype")); + if (value_ == NSArray_) + return CYGetCachedObject(context, CYJSString("ArrayInstance_prototype")); + if (value_ == NSBlock_) + return CYGetCachedObject(context, CYJSString("FunctionInstance_prototype")); + if (value_ == NSNumber_) + return CYGetCachedObject(context, CYJSString("NumberInstance_prototype")); + if (value_ == NSDictionary_) + return CYGetCachedObject(context, CYJSString("ObjectInstance_prototype")); + if (value_ == NSString_) + return CYGetCachedObject(context, CYJSString("StringInstance_prototype")); + + if (Class super = class_getSuperclass(value_)) + return CYPrivate::Cache(context, super); + return CYGetCachedObject(context, CYJSString("Instance_prototype")); +} + +JSValueRef Constructor::GetPrototype(JSContextRef context) const { + if (Class super = class_getSuperclass(value_)) + return CYPrivate::Cache(context, super); + return CYGetCachedObject(context, CYJSString("Constructor_prototype")); +} + +bool CYIsKindOfClass(id object, Class _class) { + for (Class isa(object_getClass(object)); isa != NULL; isa = class_getSuperclass(isa)) + if (isa == _class) + return true; + return false; } -JSObjectRef Messages::Make(JSContextRef context, Class _class, bool array) { - JSObjectRef value(JSObjectMake(context, Messages_, new Messages(_class))); - if (_class == NSArray_) - array = true; - if (Class super = class_getSuperclass(_class)) - JSObjectSetPrototype(context, value, Messages::Make(context, super, array)); - /*else if (array) - JSObjectSetPrototype(context, value, Array_prototype_);*/ - return value; +JSValueRef Instance::GetPrototype(JSContextRef context) const { + return CYPrivate::Cache(context, object_getClass(value_)); } -JSObjectRef Internal::Make(JSContextRef context, id object, JSObjectRef owner) { - return JSObjectMake(context, Internal_, new Internal(object, context, owner)); +JSClassRef Instance::GetClass(id object, Flags flags) { + return CYIsKindOfClass(object, NSBlock_) ? FunctionInstance_ : Instance::Class_; } -namespace cy { -JSObjectRef Super::Make(JSContextRef context, id object, Class _class) { - JSObjectRef value(JSObjectMake(context, Super_, new Super(object, _class))); - return value; -} } - -JSObjectRef Instance::Make(JSContextRef context, id object, Flags flags) { - JSObjectRef value(JSObjectMake(context, Instance_, new Instance(object, flags))); - JSObjectSetPrototype(context, value, CYGetClassPrototype(context, object_getClass(object))); - return value; +Instance::Instance(id value, Flags flags) : + value_(value), + flags_(flags) +{ + if (IsPermanent()); + /*else if ([value retainCount] == NSUInteger(-1)) + flags_ |= Instance::Permanent;*/ + else + value_ = [value_ retain]; } Instance::~Instance() { - if ((flags_ & Transient) == 0) - // XXX: does this handle background threads correctly? - // XXX: this simply does not work on the console because I'm stupid - [GetValue() performSelector:@selector(release) withObject:nil afterDelay:0]; + if (!IsPermanent()) + [value_ release]; } struct Message_privateData : cy::Functor { + static JSClassRef Class_; + SEL sel_; - Message_privateData(SEL sel, const char *type, IMP value = NULL) : - cy::Functor(type, reinterpret_cast(value)), + Message_privateData(SEL sel, const char *type, IMP value) : + cy::Functor(reinterpret_cast(value), type), sel_(sel) { } + + virtual CYPropertyName *GetName(CYPool &pool) const; + + static JSObjectRef Make(JSContextRef context, SEL sel, const char *type, IMP value); }; -JSObjectRef CYMakeInstance(JSContextRef context, id object, bool transient) { - Instance::Flags flags; +JSClassRef Message_privateData::Class_; - if (transient) - flags = Instance::Transient; - else { - flags = Instance::None; - object = [object retain]; - } +JSObjectRef CYMakeInstance(JSContextRef context, id object, Instance::Flags flags = Instance::None) { + _assert(object != nil); + +#ifdef __APPLE__ + JSWeakObjectMapRef weak(CYCastPointer(context, CYGetCachedValue(context, weak_s))); + + if (weak != NULL && &JSWeakObjectMapGet != NULL) + if (JSObjectRef instance = JSWeakObjectMapGet(context, weak, object)) + return instance; +#endif + + JSObjectRef instance; + if (CYIsClass(object) && !class_isMetaClass(object)) + instance = CYPrivate::Cache(context, object); + else + instance = Instance::Make(context, object, flags); + +#ifdef __APPLE__ + if (weak != NULL && &JSWeakObjectMapSet != NULL) + JSWeakObjectMapSet(context, weak, object, instance); +#endif - return Instance::Make(context, object, flags); + return instance; } @interface NSMethodSignature (Cycript) @@ -346,64 +395,64 @@ JSObjectRef CYMakeInstance(JSContextRef context, id object, bool transient) { @interface NSObject (Cycript) -- (JSValueRef) cy$JSValueInContext:(JSContextRef)context; +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context; - (JSType) cy$JSType; -- (NSObject *) cy$toJSON:(NSString *)key; -- (NSString *) cy$toCYON; -- (NSString *) cy$toKey; +- (JSValueRef) cy$toJSON:(NSString *)key inContext:(JSContextRef)context; +- (NSString *) cy$toCYON:(bool)objective inSet:(std::set &)objects; - (bool) cy$hasProperty:(NSString *)name; - (NSObject *) cy$getProperty:(NSString *)name; +- (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context; - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value; - (bool) cy$deleteProperty:(NSString *)name; - (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context; ++ (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 *string; +NSString *CYCastNSCYON(id value, bool objective, std::set &objects) { + _assert(value != nil); - if (value == nil) - string = @"nil"; - else { - Class _class(object_getClass(value)); - SEL sel(@selector(cy$toCYON)); - - if (objc_method *toCYON = class_getInstanceMethod(_class, sel)) - string = reinterpret_cast(method_getImplementation(toCYON))(value, sel); - 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]; - else goto fail; - } else fail: { - if (false); -#ifdef __APPLE__ - else if (value == NSZombie_) - string = @"_NSZombie_"; - else if (_class == NSZombie_) - string = [NSString stringWithFormat:@"<_NSZombie_: %p>", value]; - // XXX: frowny /in/ the pants - else if (value == NSMessageBuilder_ || value == Object_) - string = nil; -#endif - else - string = [NSString stringWithFormat:@"%@", value]; - } + Class _class(object_getClass(value)); - // XXX: frowny pants - if (string == nil) - string = @"undefined"; + if (class_isMetaClass(_class)) { + const char *name(class_getName(value)); + if (class_isMetaClass(value)) + return [NSString stringWithFormat:@"object_getClass(%s)", name]; + else + return [NSString stringWithUTF8String:name]; } - return string; + if (_class == NSZombie_) + return [NSString stringWithFormat:@"<_NSZombie_: %p>", value]; + + SEL sel(@selector(cy$toCYON:inSet:)); + + if (objc_method *toCYON = class_getInstanceMethod(_class, sel)) + return reinterpret_cast &)>(method_getImplementation(toCYON))(value, sel, objective, objects); + else if (objc_method *methodSignatureForSelector = class_getInstanceMethod(_class, @selector(methodSignatureForSelector:))) + if (reinterpret_cast(method_getImplementation(methodSignatureForSelector))(value, @selector(methodSignatureForSelector:), sel) != nil) + return [value cy$toCYON:objective inSet:objects]; + + return [NSString stringWithFormat:@"%@", value]; +} + +NSString *CYCastNSCYON(id value, bool objective, std::set *objects) { + if (objects != NULL) + return CYCastNSCYON(value, objective, *objects); + else { + std::set objects; + return CYCastNSCYON(value, objective, objects); + } } -#ifdef __APPLE__ struct PropertyAttributes { CYPool pool_; @@ -437,7 +486,9 @@ struct PropertyAttributes { name = property_getName(property); const char *attributes(property_getAttributes(property)); - for (char *state, *token(apr_strtok(apr_pstrdup(pool_, attributes), ",", &state)); token != NULL; token = apr_strtok(NULL, ",", &state)) { + for (char *token(pool_.strdup(attributes)), *next; token != NULL; token = next) { + if ((next = strchr(token, ',')) != NULL) + *next++ = '\0'; switch (*token) { case 'R': readonly = true; break; case 'C': copy = true; break; @@ -462,7 +513,7 @@ struct PropertyAttributes { const char *Getter() { if (getter_ == NULL) - getter_ = apr_pstrdup(pool_, name); + getter_ = pool_.strdup(name); return getter_; } @@ -489,15 +540,7 @@ struct PropertyAttributes { } }; -#endif - -#ifdef __APPLE__ -NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) { - return [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease]; -} -#endif -#ifndef __APPLE__ @interface CYWebUndefined : NSObject { } @@ -515,18 +558,15 @@ NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) { @end #define WebUndefined CYWebUndefined -#endif /* Bridge: CYJSObject {{{ */ @interface CYJSObject : NSMutableDictionary { JSObjectRef object_; - JSContextRef context_; + JSGlobalContextRef context_; } - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context; -- (NSObject *) cy$toJSON:(NSString *)key; - - (NSUInteger) count; - (id) objectForKey:(id)key; - (NSEnumerator *) keyEnumerator; @@ -538,7 +578,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; @@ -555,21 +595,66 @@ NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) { @end /* }}} */ -NSObject *CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) { - JSValueRef exception(NULL); - bool array(JSValueIsInstanceOfConstructor(context, object, Array_, &exception)); - CYThrow(context, exception); - id value(array ? [CYJSArray alloc] : [CYJSObject alloc]); - return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]); +_finline bool CYJSValueIsNSObject(JSContextRef context, JSValueRef value) { + return JSValueIsObjectOfClass(context, value, Instance::Class_) || JSValueIsObjectOfClass(context, value, FunctionInstance_) || JSValueIsObjectOfClass(context, value, CYPrivate::Class_); } -NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSObjectRef object) { - if (!JSValueIsObjectOfClass(context, object, Instance_)) - return CYCastNSObject_(pool, context, object); - else { +_finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) { + return _jsccall(JSValueIsInstanceOfConstructor, context, value, CYGetCachedObject(context, cache)); +} + +#ifdef __APPLE__ +struct CYBlockDescriptor { + struct { + BlockDescriptor1 one_; + BlockDescriptor2 two_; + BlockDescriptor3 three_; + } d_; + + Closure_privateData *internal_; +}; + +void CYDisposeBlock(BlockLiteral *literal) { + delete reinterpret_cast(literal->descriptor)->internal_; +} + +static JSValueRef BlockAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) { + JSObjectRef _this(CYCastJSObject(context, values[0])); + return CYCallAsFunction(context, function, _this, count - 1, values + 1); +} + +NSBlock *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature &signature) { + _assert(__NSMallocBlock__ != Nil); + BlockLiteral *literal(reinterpret_cast(malloc(sizeof(BlockLiteral)))); + + CYBlockDescriptor *descriptor(new CYBlockDescriptor); + memset(&descriptor->d_, 0, sizeof(descriptor->d_)); + + descriptor->internal_ = CYMakeFunctor_(context, function, signature, &BlockAdapter_); + literal->invoke = reinterpret_cast(descriptor->internal_->value_); + + literal->isa = __NSMallocBlock__; + literal->flags = BLOCK_HAS_SIGNATURE | BLOCK_HAS_COPY_DISPOSE | BLOCK_IS_GLOBAL; + literal->reserved = 0; + literal->descriptor = descriptor; + + descriptor->d_.one_.size = sizeof(descriptor->d_); + descriptor->d_.two_.dispose_helper = &CYDisposeBlock; + descriptor->d_.three_.signature = sig::Unparse(*descriptor->internal_->pool_, &signature); + + return reinterpret_cast(literal); +} +#endif + +NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSObjectRef object) { + if (CYJSValueIsNSObject(context, object)) { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - return internal->GetValue(); + return internal->value_; } + + 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) { @@ -582,7 +667,7 @@ NSNumber *CYCopyNSNumber(JSContextRef context, JSValueRef value) { @end #endif -id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cast) { +id CYNSObject(CYPool *pool, JSContextRef context, JSValueRef value, bool cast) { id object; bool copy; @@ -635,23 +720,29 @@ id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cas return [object retain]; } -NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) { +NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSValueRef value) { return CYNSObject(pool, context, value, true); } -NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) { - return CYNSObject(pool, context, value, false); +NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) { + return CYNSObject(&pool, context, value, false); } /* Bridge: NSArray {{{ */ @implementation NSArray (Cycript) -- (NSString *) cy$toCYON { +- (id) cy$box { + return [[self mutableCopy] autorelease]; +} + +- (NSString *) cy$toCYON:(bool)objective inSet:(std::set &)objects { + _oassert(objects.insert(self).second); + NSMutableString *json([[[NSMutableString alloc] init] autorelease]); - [json appendString:@"["]; + [json appendString:@"@["]; bool comma(false); -#ifdef __APPLE__ +#ifdef __clang__ for (id object in self) { #else for (size_t index(0), count([self count]); index != count; ++index) { @@ -661,8 +752,8 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu [json appendString:@","]; else comma = true; - if (object == nil || [object cy$JSType] != kJSTypeUndefined) - [json appendString:CYCastNSCYON(object)]; + if (object != nil && [object cy$JSType] != kJSTypeUndefined) + [json appendString:CYCastNSCYON(object, true, objects)]; else { [json appendString:@","]; comma = false; @@ -685,15 +776,6 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu } - (NSObject *) cy$getProperty:(NSString *)name { - if ([name isEqualToString:@"length"]) { - NSUInteger count([self count]); -#ifdef __APPLE__ - return [NSNumber numberWithUnsignedInteger:count]; -#else - return [NSNumber numberWithUnsignedInt:count]; -#endif - } - size_t index(CYGetIndex(name)); if (index == _not(size_t) || index >= [self count]) return [super cy$getProperty:name]; @@ -701,6 +783,15 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return [self objectAtIndex:index]; } +- (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context { + CYObjectiveTry_ { + if ([name isEqualToString:@"length"]) + return CYCastJSValue(context, [self count]); + } CYObjectiveCatch + + return [super cy$getProperty:name inContext:context]; +} + - (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context { [super cy$getPropertyNames:names inContext:context]; @@ -714,7 +805,49 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu } } ++ (bool) cy$hasImplicitProperties { + return false; +} + +@end +/* }}} */ +/* Bridge: NSBlock {{{ */ +#ifdef __APPLE__ +@interface NSBlock : NSObject +- (void) invoke; +@end + +static const char *CYBlockEncoding(NSBlock *self); +static bool CYBlockSignature(CYPool &pool, NSBlock *self, sig::Signature &signature); + +@implementation NSBlock (Cycript) + +- (NSString *) cy$toCYON:(bool)objective inSet:(std::set &)objects { + CYLocalPool pool; + + sig::Block type; + if (!CYBlockSignature(pool, self, type.signature)) + return [super cy$toCYON:objective inSet:objects]; + _oassert(objects.insert(self).second); + + CYType *typed((new(pool) CYTypeExpression(CYDecodeType(pool, &type)))->typed_); + CYTypeModifier *&modifier(CYGetLast(typed->modifier_)); + CYTypeBlockWith *with(dynamic_cast(modifier)); + _assert(with != NULL); + CYObjCBlock *block(new(pool) CYObjCBlock(typed, with->parameters_, NULL)); + modifier = NULL; + + std::ostringstream str; + CYOptions options; + CYOutput out(*str.rdbuf(), options); + block->Output(out, CYNoFlags); + + std::string value(str.str()); + return CYCastNSString(NULL, CYUTF8String(value.c_str(), value.size())); +} + @end +#endif /* }}} */ /* Bridge: NSBoolNumber {{{ */ #ifndef __APPLE__ @@ -724,15 +857,12 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return kJSTypeBoolean; } -- (NSObject *) cy$toJSON:(NSString *)key { - return self; -} - -- (NSString *) cy$toCYON { - return [self boolValue] ? @"true" : @"false"; +- (NSString *) cy$toCYON:(bool)objective inSet:(std::set &)objects { + NSString *value([self boolValue] ? @"true" : @"false"); + return objective ? value : [NSString stringWithFormat:@"@%@", value]; } -- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) { +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ { return CYCastJSValue(context, (bool) [self boolValue]); } CYObjectiveCatch } @@ -742,12 +872,18 @@ 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 inSet:(std::set &)objects { + _oassert(objects.insert(self).second); + NSMutableString *json([[[NSMutableString alloc] init] autorelease]); - [json appendString:@"{"]; + [json appendString:@"@{"]; bool comma(false); -#ifdef __APPLE__ +#ifdef __clang__ for (NSObject *key in self) { #else NSEnumerator *keys([self keyEnumerator]); @@ -757,10 +893,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, objects)]; [json appendString:@":"]; NSObject *object([self objectForKey:key]); - [json appendString:CYCastNSCYON(object)]; + [json appendString:CYCastNSCYON(object, true, objects)]; } [json appendString:@"}"]; @@ -778,7 +914,7 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu - (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context { [super cy$getPropertyNames:names inContext:context]; -#ifdef __APPLE__ +#ifdef __clang__ for (NSObject *key in self) { #else NSEnumerator *keys([self keyEnumerator]); @@ -788,6 +924,10 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu } } ++ (bool) cy$hasImplicitProperties { + return false; +} + @end /* }}} */ /* Bridge: NSMutableArray {{{ */ @@ -797,11 +937,7 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu if ([name isEqualToString:@"length"]) { // XXX: is this not intelligent? NSNumber *number(reinterpret_cast(value)); -#ifdef __APPLE__ NSUInteger size([number unsignedIntegerValue]); -#else - NSUInteger size([number unsignedIntValue]); -#endif NSUInteger count([self count]); if (size < count) [self removeObjectsInRange:NSMakeRange(size, count - size)]; @@ -876,16 +1012,13 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return kJSTypeNumber; } -- (NSObject *) cy$toJSON:(NSString *)key { - return self; -} - -- (NSString *) cy$toCYON { - return [self cy$JSType] != kJSTypeBoolean ? [self stringValue] : [self boolValue] ? @"true" : @"false"; +- (NSString *) cy$toCYON:(bool)objective inSet:(std::set &)objects { + NSString *value([self cy$JSType] != kJSTypeBoolean ? [self stringValue] : [self boolValue] ? @"true" : @"false"); + return objective ? value : [NSString stringWithFormat:@"@%@", value]; } -- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) { - return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, [self boolValue]); +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ { + return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, static_cast([self boolValue])); } CYObjectiveCatch } @end @@ -897,37 +1030,38 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return kJSTypeNull; } -- (NSObject *) cy$toJSON:(NSString *)key { - return self; +- (NSString *) cy$toCYON:(bool)objective inSet:(std::set &)objects { + NSString *value(@"null"); + return objective ? value : [NSString stringWithFormat:@"@%@", value]; } -- (NSString *) cy$toCYON { - return @"null"; -} +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ { + return CYJSNull(context); +} CYObjectiveCatch } @end /* }}} */ /* Bridge: NSObject {{{ */ @implementation NSObject (Cycript) -- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) { - return CYMakeInstance(context, self, false); -} CYObjectiveCatch } - -- (JSType) cy$JSType { - return kJSTypeObject; +- (id) cy$box { + return self; } -- (NSObject *) cy$toJSON:(NSString *)key { - return [self description]; +- (JSValueRef) cy$toJSON:(NSString *)key inContext:(JSContextRef)context { + return [self cy$valueOfInContext:context]; } -- (NSString *) cy$toCYON { - return [[self cy$toJSON:@""] cy$toCYON]; +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ { + return NULL; +} CYObjectiveCatch } + +- (JSType) cy$JSType { + return kJSTypeObject; } -- (NSString *) cy$toKey { - return [self cy$toCYON]; +- (NSString *) cy$toCYON:(bool)objective inSet:(std::set &)objects { + return [@"#" stringByAppendingString:[[self description] cy$toCYON:true inSet:objects]]; } - (bool) cy$hasProperty:(NSString *)name { @@ -938,6 +1072,12 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return nil; } +- (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context { CYObjectiveTry_ { + if (NSObject *value = [self cy$getProperty:name]) + return CYCastJSValue(context, value); + return NULL; +} CYObjectiveCatch } + - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value { return false; } @@ -949,17 +1089,49 @@ 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: NSOrderedSet {{{ */ +#ifdef __APPLE__ +@implementation NSOrderedSet (Cycript) + +- (NSString *) cy$toCYON:(bool)objective inSet:(std::set &)objects { + _oassert(objects.insert(self).second); + + NSMutableString *json([[[NSMutableString alloc] init] autorelease]); + [json appendString:@"[NSOrderedSet orderedSetWithArray:"]; + [json appendString:CYCastNSCYON([self array], true, objects)]; + [json appendString:@"]]"]; + return json; +} + @end +#endif /* }}} */ /* Bridge: NSProxy {{{ */ @implementation NSProxy (Cycript) -- (NSObject *) cy$toJSON:(NSString *)key { - return [self description]; +- (NSString *) cy$toCYON:(bool)objective inSet:(std::set &)objects { + return [[self description] cy$toCYON:objective inSet:objects]; } -- (NSString *) cy$toCYON { - return [[self cy$toJSON:@""] cy$toCYON]; +@end +/* }}} */ +/* Bridge: NSSet {{{ */ +@implementation NSSet (Cycript) + +- (NSString *) cy$toCYON:(bool)objective inSet:(std::set &)objects { + _oassert(objects.insert(self).second); + + NSMutableString *json([[[NSMutableString alloc] init] autorelease]); + [json appendString:@"[NSSet setWithArray:"]; + [json appendString:CYCastNSCYON([self allObjects], true, objects)]; + [json appendString:@"]]"]; + return json; } @end @@ -967,28 +1139,54 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu /* Bridge: NSString {{{ */ @implementation NSString (Cycript) -- (JSType) cy$JSType { - return kJSTypeString; +- (id) cy$box { + return [[self copy] autorelease]; } -- (NSObject *) cy$toJSON:(NSString *)key { - return self; +- (JSType) cy$JSType { + return kJSTypeString; } -- (NSString *) cy$toCYON { +- (NSString *) cy$toCYON:(bool)objective inSet:(std::set &)objects { std::ostringstream str; + if (!objective) + str << '@'; CYUTF8String string(CYCastUTF8String(self)); - CYStringify(str, string.data, string.size); + CYStringify(str, string.data, string.size, CYStringifyModeNative); 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 { + 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 { + 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)); + } } +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ { + return CYCastJSValue(context, CYJSString(context, self)); +} CYObjectiveCatch } + @end /* }}} */ /* Bridge: WebUndefined {{{ */ @@ -998,32 +1196,21 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu return kJSTypeUndefined; } -- (NSObject *) cy$toJSON:(NSString *)key { - return self; -} - -- (NSString *) cy$toCYON { - return @"undefined"; +- (NSString *) cy$toCYON:(bool)objective inSet:(std::set &)objects { + NSString *value(@"undefined"); + return value; // XXX: maybe use the below code, adding @undefined? + //return objective ? value : [NSString stringWithFormat:@"@%@", value]; } -- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) { +- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ { return CYJSUndefined(context); } CYObjectiveCatch } @end /* }}} */ -static bool CYIsClass(id self) { -#ifdef __APPLE__ - // XXX: this is a lame object_isClass - return class_getInstanceMethod(object_getClass(self), @selector(alloc)) != NULL; -#else - return GSObjCIsClass(self); -#endif -} - -Class CYCastClass(apr_pool_t *pool, JSContextRef context, JSValueRef value) { - id self(CYCastNSObject(pool, context, value)); +Class CYCastClass(CYPool &pool, JSContextRef context, JSValueRef value) { + id self(CYCastNSObject(&pool, context, value)); if (CYIsClass(self)) return (Class) self; throw CYJSError(context, "got something that is not a Class"); @@ -1035,395 +1222,396 @@ NSArray *CYCastNSArray(JSContextRef context, JSPropertyNameArrayRef names) { size_t size(JSPropertyNameArrayGetCount(names)); NSMutableArray *array([NSMutableArray arrayWithCapacity:size]); for (size_t index(0); index != size; ++index) - [array addObject:CYCastNSString(pool, context, JSPropertyNameArrayGetNameAtIndex(names, index))]; + [array addObject:CYCastNSString(&pool, context, JSPropertyNameArrayGetNameAtIndex(names, index))]; return array; } -JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { +JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { 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; } + return CYMakeInstance(context, value); +} @implementation CYJSObject -- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry { +- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry_ { if ((self = [super init]) != nil) { object_ = object; context_ = CYGetJSContext(context); - //XXX:JSGlobalContextRetain(context_); + JSGlobalContextRetain(context_); JSValueProtect(context_, object_); } return self; } CYObjectiveCatch } - (void) dealloc { CYObjectiveTry { JSValueUnprotect(context_, object_); - //XXX:JSGlobalContextRelease(context_); + JSGlobalContextRelease(context_); [super dealloc]; } CYObjectiveCatch } -- (NSObject *) cy$toJSON:(NSString *)key { CYObjectiveTry { - JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_)); - if (!CYIsCallable(context_, toJSON)) - return [super cy$toJSON:key]; - else { - JSValueRef arguments[1] = {CYCastJSValue(context_, key)}; - JSValueRef value(CYCallAsFunction(context_, (JSObjectRef) toJSON, object_, 1, arguments)); - // XXX: do I really want an NSNull here?! - return CYCastNSObject(NULL, context_, value) ?: [NSNull null]; - } -} CYObjectiveCatch } - -- (NSString *) cy$toCYON { CYObjectiveTry { +- (NSString *) cy$toCYON:(bool)objective inSet:(std::set &)objects { CYObjectiveTry { CYPool pool; - JSValueRef exception(NULL); - const char *cyon(CYPoolCCYON(pool, context_, object_)); - CYThrow(context_, exception); + const char *cyon(CYPoolCCYON(pool, context, object_, objects)); if (cyon == NULL) - return [super cy$toCYON]; + return [super cy$toCYON:objective inSet:objects]; else return [NSString stringWithUTF8String:cyon]; } CYObjectiveCatch } - (NSUInteger) count { CYObjectiveTry { - JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context_, object_)); + JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context, object_)); size_t size(JSPropertyNameArrayGetCount(names)); JSPropertyNameArrayRelease(names); return size; } CYObjectiveCatch } - (id) objectForKey:(id)key { CYObjectiveTry { - JSValueRef value(CYGetProperty(context_, object_, CYJSString(context_, (NSObject *) key))); - if (JSValueIsUndefined(context_, value)) + JSValueRef value(CYGetProperty(context, object_, CYJSString(context, (NSObject *) key))); + if (JSValueIsUndefined(context, value)) return nil; - return CYCastNSObject(NULL, context_, value) ?: [NSNull null]; + return CYCastNSObject(NULL, context, value) ?: [NSNull null]; } CYObjectiveCatch } - (NSEnumerator *) keyEnumerator { CYObjectiveTry { - JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context_, object_)); - NSEnumerator *enumerator([CYCastNSArray(context_, names) objectEnumerator]); + JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context, object_)); + NSEnumerator *enumerator([CYCastNSArray(context, names) objectEnumerator]); JSPropertyNameArrayRelease(names); return enumerator; } CYObjectiveCatch } - (void) setObject:(id)object forKey:(id)key { CYObjectiveTry { - CYSetProperty(context_, object_, CYJSString(context_, (NSObject *) key), CYCastJSValue(context_, (NSString *) object)); + CYSetProperty(context, object_, CYJSString(context, (NSObject *) key), CYCastJSValue(context, (NSString *) object)); } CYObjectiveCatch } - (void) removeObjectForKey:(id)key { CYObjectiveTry { - JSValueRef exception(NULL); - (void) JSObjectDeleteProperty(context_, object_, CYJSString(context_, (NSObject *) key), &exception); - CYThrow(context_, exception); + (void) _jsccall(JSObjectDeleteProperty, context, object_, CYJSString(context, (NSObject *) key)); } CYObjectiveCatch } @end @implementation CYJSArray -- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry { +- (NSString *) cy$toCYON:(bool)objective inSet:(std::set &)objects { CYObjectiveTry { + CYPool pool; + return [NSString stringWithUTF8String:CYPoolCCYON(pool, context, object_, objects)]; +} CYObjectiveCatch } + +- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry_ { if ((self = [super init]) != nil) { object_ = object; context_ = CYGetJSContext(context); - //XXX:JSGlobalContextRetain(context_); + JSGlobalContextRetain(context_); JSValueProtect(context_, object_); } return self; } CYObjectiveCatch } - (void) dealloc { CYObjectiveTry { JSValueUnprotect(context_, object_); - //XXX:JSGlobalContextRelease(context_); + JSGlobalContextRelease(context_); [super dealloc]; } CYObjectiveCatch } - (NSUInteger) count { CYObjectiveTry { - return CYCastDouble(context_, CYGetProperty(context_, object_, length_)); + return CYArrayLength(context, object_); } CYObjectiveCatch } - (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry { size_t bounds([self count]); if (index >= bounds) - @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray objectAtIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil]; - JSValueRef exception(NULL); - JSValueRef value(JSObjectGetPropertyAtIndex(context_, object_, index, &exception)); - CYThrow(context_, exception); - return CYCastNSObject(NULL, context_, value) ?: [NSNull null]; + @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray objectAtIndex:]: index (%zu) beyond bounds (%zu)", static_cast(index), bounds] userInfo:nil]; + JSValueRef value(_jsccall(JSObjectGetPropertyAtIndex, context, object_, index)); + return CYCastNSObject(NULL, context, value) ?: [NSNull null]; } CYObjectiveCatch } - (void) addObject:(id)object { CYObjectiveTry { - JSValueRef exception(NULL); - JSValueRef arguments[1]; - arguments[0] = CYCastJSValue(context_, (NSObject *) object); - JSObjectCallAsFunction(context_, Array_push_, object_, 1, arguments, &exception); - CYThrow(context_, exception); + CYArrayPush(context, object_, CYCastJSValue(context, (NSObject *) object)); } CYObjectiveCatch } - (void) insertObject:(id)object atIndex:(NSUInteger)index { CYObjectiveTry { size_t bounds([self count] + 1); if (index >= bounds) - @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray insertObject:atIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil]; - JSValueRef exception(NULL); + @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray insertObject:atIndex:]: index (%zu) beyond bounds (%zu)", static_cast(index), bounds] userInfo:nil]; JSValueRef arguments[3]; - arguments[0] = CYCastJSValue(context_, index); - arguments[1] = CYCastJSValue(context_, 0); - arguments[2] = CYCastJSValue(context_, (NSObject *) object); - JSObjectCallAsFunction(context_, Array_splice_, object_, 3, arguments, &exception); - CYThrow(context_, exception); + arguments[0] = CYCastJSValue(context, index); + arguments[1] = CYCastJSValue(context, 0); + arguments[2] = CYCastJSValue(context, (NSObject *) object); + JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype"))); + _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, splice_s)), object_, 3, arguments); } CYObjectiveCatch } - (void) removeLastObject { CYObjectiveTry { - JSValueRef exception(NULL); - JSObjectCallAsFunction(context_, Array_pop_, object_, 0, NULL, &exception); - CYThrow(context_, exception); + JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype"))); + _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, pop_s)), object_, 0, NULL); } CYObjectiveCatch } - (void) removeObjectAtIndex:(NSUInteger)index { CYObjectiveTry { size_t bounds([self count]); if (index >= bounds) - @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray removeObjectAtIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil]; - JSValueRef exception(NULL); + @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray removeObjectAtIndex:]: index (%zu) beyond bounds (%zu)", static_cast(index), bounds] userInfo:nil]; JSValueRef arguments[2]; - arguments[0] = CYCastJSValue(context_, index); - arguments[1] = CYCastJSValue(context_, 1); - JSObjectCallAsFunction(context_, Array_splice_, object_, 2, arguments, &exception); - CYThrow(context_, exception); + arguments[0] = CYCastJSValue(context, index); + arguments[1] = CYCastJSValue(context, 1); + JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype"))); + _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, splice_s)), object_, 2, arguments); } CYObjectiveCatch } - (void) replaceObjectAtIndex:(NSUInteger)index withObject:(id)object { CYObjectiveTry { size_t bounds([self count]); if (index >= bounds) - @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray replaceObjectAtIndex:withObject:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil]; - CYSetProperty(context_, object_, index, CYCastJSValue(context_, (NSObject *) object)); + @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray replaceObjectAtIndex:withObject:]: index (%zu) beyond bounds (%zu)", static_cast(index), bounds] userInfo:nil]; + CYSetProperty(context, object_, index, CYCastJSValue(context, (NSObject *) object)); } CYObjectiveCatch } @end -// XXX: use objc_getAssociatedObject and objc_setAssociatedObject on 10.6 -struct CYInternal : - CYData -{ +// XXX: inherit from or replace with CYJSObject +@interface CYInternal : NSObject { + JSGlobalContextRef context_; JSObjectRef object_; +} - CYInternal() : - object_(NULL) - { - } +@end - ~CYInternal() { - // XXX: delete object_? ;( - } +@implementation CYInternal - static CYInternal *Get(id self) { - CYInternal *internal(NULL); - if (object_getInstanceVariable(self, "cy$internal_", reinterpret_cast(&internal)) == NULL) { - // XXX: do something epic? ;P - } +- (void) dealloc { CYObjectiveTry { + JSValueUnprotect(context_, object_); + JSGlobalContextRelease(context_); + [super dealloc]; +} CYObjectiveCatch } - return internal; - } +- (id) initInContext:(JSContextRef)context { CYObjectiveTry_ { + if ((self = [super init]) != nil) { + context_ = CYGetJSContext(context); + JSGlobalContextRetain(context_); + } return self; +} CYObjectiveCatch } - static CYInternal *Set(id self) { - CYInternal *internal(NULL); - if (objc_ivar *ivar = object_getInstanceVariable(self, "cy$internal_", reinterpret_cast(&internal))) { - if (internal == NULL) { - internal = new CYInternal(); - object_setIvar(self, ivar, reinterpret_cast(internal)); - } - } else { - // XXX: do something epic? ;P - } +- (bool) hasProperty:(JSStringRef)name inContext:(JSContextRef)context { + if (object_ == NULL) + return false; - return internal; - } + return JSObjectHasProperty(context, object_, name); +} - bool HasProperty(JSContextRef context, JSStringRef name) { - if (object_ == NULL) - return false; - return JSObjectHasProperty(context, object_, name); +- (JSValueRef) getProperty:(JSStringRef)name inContext:(JSContextRef)context { + if (object_ == NULL) + return NULL; + + return CYGetProperty(context, object_, name); +} + +- (void) setProperty:(JSStringRef)name toValue:(JSValueRef)value inContext:(JSContextRef)context { + @synchronized (self) { + if (object_ == NULL) { + object_ = JSObjectMake(context, NULL, NULL); + JSValueProtect(context, object_); + } } - JSValueRef GetProperty(JSContextRef context, JSStringRef name) { - if (object_ == NULL) - return NULL; - return CYGetProperty(context, object_, name); + CYSetProperty(context, object_, name, value); +} + ++ (CYInternal *) get:(id)object { +#ifdef __APPLE__ + if (&objc_getAssociatedObject == NULL) + return nil; + + @synchronized (object) { + if (CYInternal *internal = objc_getAssociatedObject(object, @selector(cy$internal))) + return internal; } +#endif - 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 { +#ifdef __APPLE__ + 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; } -}; +#endif + + return nil; +} + +@end -static JSObjectRef CYMakeSelector(JSContextRef context, SEL sel) { - Selector_privateData *internal(new Selector_privateData(sel)); - return JSObjectMake(context, Selector_, internal); +static JSValueRef CYCastJSValue(JSContextRef context, SEL sel) { + if (sel == NULL) + return CYJSNull(context); + return CYPrivate::Make(context, sel); } static SEL CYCastSEL(JSContextRef context, JSValueRef value) { - if (JSValueIsObjectOfClass(context, value, Selector_)) { + if (JSValueIsObjectOfClass(context, value, CYPrivate::Class_)) { Selector_privateData *internal(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) value))); return reinterpret_cast(internal->value_); - } else - return CYCastPointer(context, value); + } else { + CYPool pool; + return sel_registerName(CYPoolCString(pool, 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) { CYPoolTry { - if (name == "nil") - return Instance::Make(context, nil); - if (Class _class = objc_getClass(name.data)) - return CYMakeInstance(context, _class, true); - return NULL; -} CYPoolCatch(NULL) return /*XXX*/ NULL; } +static void CYObjectiveC_CallFunction(CYPool &pool, JSContextRef context, ffi_cif *cif, void (*function)(), void *value, void **values) { CYSadTry { + CYCallFunction(pool, context, cif, function, value, values); +} CYSadCatch() } -static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { @try { - ffi_call(cif, function, value, values); -} @catch (NSException *error ) { - throw CYJSError(context, CYCastJSValue(context, error)); -} } +static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef value, const sig::Signature *signature) { +#ifdef __APPLE__ + if (JSValueIsNull(context, value)) + return nil; + JSObjectRef object(CYCastJSObject(context, value)); -static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYPoolTry { - switch (type->primitive) { - case sig::object_P: - case sig::typename_P: - *reinterpret_cast(data) = CYCastNSObject(pool, context, value); - break; + if (JSValueIsObjectOfClass(context, object, FunctionInstance_)) + return reinterpret_cast(JSObjectGetPrivate(object))->value_; - case sig::selector_P: - *reinterpret_cast(data) = CYCastSEL(context, value); - break; - - default: - return false; + if (JSValueIsObjectOfClass(context, object, Instance::Class_)) { + _assert(reinterpret_cast(JSObjectGetPrivate(object))->value_ == nil); + return nil; } - return true; -} CYPoolCatch(false) return /*XXX*/ NULL; } - -static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) { CYPoolTry { - switch (type->primitive) { - case sig::object_P: - if (NSObject *object = *reinterpret_cast(data)) { - JSValueRef value(CYCastJSValue(context, object)); - if (initialize) - [object release]; - return value; - } else goto null; - - case sig::typename_P: - return CYMakeInstance(context, *reinterpret_cast(data), true); - - case sig::selector_P: - if (SEL sel = *reinterpret_cast(data)) - return CYMakeSelector(context, sel); - else goto null; - - null: - return CYJSNull(context); - default: - return NULL; - } -} CYPoolCatch(NULL) return /*XXX*/ NULL; } + _assert(JSObjectIsFunction(context, object)); -static bool CYImplements(id object, Class _class, SEL selector, bool devoid) { - if (objc_method *method = class_getInstanceMethod(_class, selector)) { - if (!devoid) - return true; -#if OBJC_API_VERSION >= 2 - char type[16]; - method_getReturnType(method, type, sizeof(type)); + _assert(signature != NULL); + _assert(signature->count != 0); + + sig::Signature modified; + modified.count = signature->count + 1; + modified.elements = new(pool) sig::Element[modified.count]; + + modified.elements[0] = signature->elements[0]; + memcpy(modified.elements + 2, signature->elements + 1, sizeof(sig::Element) * (signature->count - 1)); + + modified.elements[1].name = NULL; + modified.elements[1].type = new(pool) sig::Object(); + modified.elements[1].offset = _not(size_t); + + return CYMakeBlock(context, object, modified); #else - const char *type(method_getTypeEncoding(method)); + _assert(false); #endif - if (type[0] != 'v') - return true; - } +} - // XXX: possibly use a more "awesome" check? - return false; +namespace sig { + +void Block::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + // XXX: this function actually needs to handle null pools as it is an autorelease + _assert(pool != NULL); + *reinterpret_cast(data) = CYCastNSBlock(*pool, context, value, &signature); } -static const char *CYPoolTypeEncoding(apr_pool_t *pool, JSContextRef context, SEL sel, objc_method *method) { - if (method != NULL) - return method_getTypeEncoding(method); +// XXX: assigning to an indirect id * works for return values, but not for properties and fields +void Object::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + *reinterpret_cast(data) = CYCastNSObject(pool, context, value); +} - const char *name(sel_getName(sel)); +void Meta::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + *reinterpret_cast(data) = CYCastNSObject(pool, context, value); +} - 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); +void Selector::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + *reinterpret_cast(data) = CYCastSEL(context, value); +} + +JSValueRef Object::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + NSObject *value(*reinterpret_cast(data)); + if (value == NULL) + return CYJSNull(context); + JSObjectRef object(CYMakeInstance(context, value)); + + if (initialize) { + Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); + + if (internal->IsUninitialized()) { + internal->flags_ &= ~Instance::Uninitialized; + if (internal->value_ == nil) + internal->value_ = value; + else + _assert(internal->value_ == value); } - _sqlcall(sqlite3_finalize(statement)); + [value release]; + } - if (value != NULL) - return value; -_trace(); - return NULL; + return object; } -static void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) { - Closure_privateData *internal(reinterpret_cast(arg)); +JSValueRef Meta::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + if (Class value = *reinterpret_cast(data)) + return CYMakeInstance(context, value, Instance::Permanent); + return CYJSNull(context); +} - JSContextRef context(internal->context_); +JSValueRef Selector::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + return CYCastJSValue(context, *reinterpret_cast(data)); +} - size_t count(internal->cif_.nargs); - JSValueRef values[count]; +JSValueRef Block::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + return CYCastJSValue(context, *reinterpret_cast(data)); +} - for (size_t index(0); index != count; ++index) - values[index] = CYFromFFI(context, internal->signature_.elements[1 + index].type, internal->cif_.arg_types[index], arguments[index]); +} - JSObjectRef _this(CYCastJSObject(context, values[0])); +static bool CYImplements(id object, Class _class, SEL selector, bool devoid = false) { + if (objc_method *method = class_getInstanceMethod(_class, selector)) { + if (!devoid) + return true; + char type[16]; + method_getReturnType(method, type, sizeof(type)); + if (type[0] != 'v') + return true; + } + + // XXX: possibly use a more "awesome" check? + return false; +} - JSValueRef value(CYCallAsFunction(context, internal->function_, _this, count - 2, values + 2)); - CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value); +static JSValueRef MessageAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) { + JSObjectRef _this(CYCastJSObject(context, values[0])); + return CYCallAsFunction(context, function, _this, count - 2, values + 2); } -static JSObjectRef CYMakeMessage(JSContextRef context, SEL sel, IMP imp, const char *type) { - Message_privateData *internal(new Message_privateData(sel, type, imp)); - return JSObjectMake(context, Message_, internal); +JSObjectRef Message_privateData::Make(JSContextRef context, SEL sel, const char *type, IMP value) { + Message_privateData *internal(new Message_privateData(sel, type, value)); + JSObjectRef object(JSObjectMake(context, Message_privateData::Class_, internal)); + CYSetPrototype(context, object, CYGetCachedValue(context, CYJSString("Functor_prototype"))); + return object; } -static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *type) { +static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *encoding) { JSObjectRef function(CYCastJSObject(context, value)); - Closure_privateData *internal(CYMakeFunctor_(context, function, type, &MessageClosure_)); - return reinterpret_cast(internal->GetValue()); + CYPool pool; + sig::Signature signature; + sig::Parse(pool, &signature, encoding, &Structor_); + Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &MessageAdapter_)); + // XXX: see notes in Library.cpp about needing to leak + return reinterpret_cast(internal->value_); } static bool Messages_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { - Messages *internal(reinterpret_cast(JSObjectGetPrivate(object))); - Class _class(internal->GetValue()); + auto internal(CYPrivate::Get(context, object)); + Class _class(internal->GetClass()); CYPool pool; const char *name(CYPoolCString(pool, context, property)); @@ -1435,197 +1623,245 @@ static bool Messages_hasProperty(JSContextRef context, JSObjectRef object, JSStr return false; } -static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { - Messages *internal(reinterpret_cast(JSObjectGetPrivate(object))); - Class _class(internal->GetValue()); +static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, object)); + Class _class(internal->GetClass()); CYPool pool; const char *name(CYPoolCString(pool, context, property)); if (SEL sel = sel_getUid(name)) if (objc_method *method = class_getInstanceMethod(_class, sel)) - return CYMakeMessage(context, sel, method_getImplementation(method), method_getTypeEncoding(method)); + return Message_privateData::Make(context, sel, method_getTypeEncoding(method), method_getImplementation(method)); return NULL; -} +} CYCatch(NULL) } -static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { - Messages *internal(reinterpret_cast(JSObjectGetPrivate(object))); - Class _class(internal->GetValue()); +static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, object)); + Class _class(internal->GetClass()); CYPool pool; const char *name(CYPoolCString(pool, context, property)); - SEL sel(sel_registerName(name)); - objc_method *method(class_getInstanceMethod(_class, sel)); - const char *type; IMP imp; - if (JSValueIsObjectOfClass(context, value, Message_)) { + if (JSValueIsObjectOfClass(context, value, Message_privateData::Class_)) { Message_privateData *message(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) value))); type = sig::Unparse(pool, &message->signature_); - imp = reinterpret_cast(message->GetValue()); - } else { - type = CYPoolTypeEncoding(pool, context, sel, method); + imp = reinterpret_cast(message->value_); + } else if (objc_method *method = class_getInstanceMethod(_class, sel)) { + type = method_getTypeEncoding(method); imp = CYMakeMessage(context, value, type); - } + } else return false; + + objc_method *method(NULL); + unsigned int size; + objc_method **methods(class_copyMethodList(_class, &size)); + pool.atexit(free, methods); + + for (size_t i(0); i != size; ++i) + if (sel_isEqual(method_getName(methods[i]), sel)) { + method = methods[i]; + break; + } if (method != NULL) method_setImplementation(method, imp); - else { -#ifdef GNU_RUNTIME - GSMethodList list(GSAllocMethodList(1)); - GSAppendMethodToList(list, sel, type, imp, YES); - GSAddMethodList(_class, list, YES); - GSFlushMethodCacheForClass(_class); -#else + else class_addMethod(_class, sel, imp, type); -#endif - } return true; -} +} CYCatch(false) } -#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()); +static JSValueRef Messages_complete_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count == 2) { + if (!CYCastBool(context, arguments[1])) + return CYObjectMakeArray(context, 0, NULL); + count = 1; + } + _assert(count == 1); CYPool pool; - const char *name(CYPoolCString(pool, context, property)); + CYUTF8String prefix(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0]))); - if (SEL sel = sel_getUid(name)) - if (objc_method *method = class_getInstanceMethod(_class, sel)) { - objc_method_list list = {NULL, 1, {method}}; - class_removeMethods(_class, &list); - return true; + auto internal(CYPrivate::Get(context, _this)); + Class _class(internal->GetClass()); + + unsigned int size; + objc_method **data(class_copyMethodList(_class, &size)); + pool.atexit(free, data); + + JSObjectRef array(NULL); { + CYArrayBuilder<1024> values(context, array); + + for (size_t i(0); i != size; ++i) { + CYUTF8String name(sel_getName(method_getName(data[i]))); + if (CYStartsWith(name, prefix)) + values(CYCastJSValue(context, CYJSString(name))); } + } return array; +} CYCatch(NULL) } - return false; +static bool CYHasImplicitProperties(JSContextRef context, Class _class) { + if (!CYCastBool(context, CYGetCachedValue(context, CYJSString("cydget")))) + if (class_getProperty(NSObject_, "description") != NULL) + return false; + // 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]; } -#endif -static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { - Messages *internal(reinterpret_cast(JSObjectGetPrivate(object))); - Class _class(internal->GetValue()); +static objc_property_t CYFindProperty(CYPool &pool, Class _class, const char *name) { + if (_class == Nil) + return NULL; + if (objc_property_t property = class_getProperty(_class, name)) + return property; + return NULL; -#if OBJC_API_VERSION >= 2 - unsigned int size; - objc_method **data(class_copyMethodList(_class, &size)); - for (size_t i(0); i != size; ++i) - JSPropertyNameAccumulatorAddName(names, CYJSString(sel_getName(method_getName(data[i])))); - free(data); -#else - for (objc_method_list *methods(_class->methods); methods != NULL; methods = methods->method_next) - for (int i(0); i != methods->method_count; ++i) - JSPropertyNameAccumulatorAddName(names, CYJSString(sel_getName(method_getName(&methods->method_list[i])))); -#endif + /* // XXX: I don't think any of this is required + unsigned int count; + Protocol **protocols(class_copyProtocolList(_class, &count)); + // XXX: just implement a scope guard already :/ + pool.atexit(free, protocols); + + for (unsigned int i(0); i != count; ++i) + if (objc_property_t property = protocol_getProperty(protocols[i], name, true, true)) + return property; + + return CYFindProperty(pool, class_getSuperclass(_class), name); */ } +static JSValueRef Constructor_getProperty_$cyi(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, object)); + return CYPrivate::Make(context, internal->value_, context, object); +} CYCatch(NULL) } + +static bool Constructor_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { + auto internal(CYPrivate::Get(context, object)); + Class _class(object_getClass(internal->value_)); + if (!CYHasImplicitProperties(context, _class)) + return false; + CYPool pool; + if (SEL sel = sel_getUid(CYPoolCString(pool, context, property))) + if (CYImplements(internal->value_, _class, sel, true)) + return true; + return false; +} + +static JSValueRef Constructor_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, object)); + Class _class(object_getClass(internal->value_)); + if (!CYHasImplicitProperties(context, _class)) + return NULL; + CYPool pool; + if (SEL sel = sel_getUid(CYPoolCString(pool, context, property))) + if (CYImplements(internal->value_, _class, sel, true)) + return CYSendMessage(pool, context, internal->value_, NULL, sel, 0, NULL, false); + return NULL; +} CYCatch(NULL) } + static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - id self(internal->GetValue()); + id self(internal->value_); if (JSStringIsEqualToUTF8CString(property, "$cyi")) return true; CYPool pool; - NSString *name(CYCastNSString(pool, context, property)); + NSString *name(CYCastNSString(&pool, context, property)); - if (CYInternal *internal = CYInternal::Get(self)) - if (internal->HasProperty(context, property)) + if (CYInternal *internal = [CYInternal get:self]) + if ([internal hasProperty:property inContext:context]) return true; Class _class(object_getClass(self)); CYPoolTry { // XXX: this is an evil hack to deal with NSProxy; fix elsewhere - if (CYImplements(self, _class, @selector(cy$hasProperty:), false)) + if (CYImplements(self, _class, @selector(cy$hasProperty:))) if ([self cy$hasProperty:name]) return true; } CYPoolCatch(false) const char *string(CYPoolCString(pool, context, name)); -#ifdef __APPLE__ - if (class_getProperty(_class, string) != NULL) + if (CYFindProperty(pool, _class, string) != NULL) return true; -#endif - if (SEL sel = sel_getUid(string)) - if (CYImplements(self, _class, sel, true)) - return true; + if (CYHasImplicitProperties(context, _class)) + if (SEL sel = sel_getUid(string)) + if (CYImplements(self, _class, sel, true)) + return true; return false; } static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - id self(internal->GetValue()); + id self(internal->value_); if (JSStringIsEqualToUTF8CString(property, "$cyi")) - return Internal::Make(context, self, object); + return CYPrivate::Make(context, self, context, object); CYPool pool; - NSString *name(CYCastNSString(pool, context, property)); + NSString *name(CYCastNSString(&pool, context, property)); - if (CYInternal *internal = CYInternal::Get(self)) - if (JSValueRef value = internal->GetProperty(context, property)) + if (CYInternal *internal = [CYInternal get:self]) + if (JSValueRef value = [internal getProperty:property inContext:context]) return value; CYPoolTry { - if (NSObject *data = [self cy$getProperty:name]) - return CYCastJSValue(context, data); + if (JSValueRef value = [self cy$getProperty:name inContext:context]) + return value; } CYPoolCatch(NULL) const char *string(CYPoolCString(pool, context, name)); Class _class(object_getClass(self)); -#ifdef __APPLE__ - if (objc_property_t property = class_getProperty(_class, string)) { + if (objc_property_t property = CYFindProperty(pool, _class, string)) { PropertyAttributes attributes(property); SEL sel(sel_registerName(attributes.Getter())); - return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception); + return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false); } -#endif - if (SEL sel = sel_getUid(string)) - if (CYImplements(self, _class, sel, true)) - return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception); + if (CYHasImplicitProperties(context, _class)) + if (SEL sel = sel_getUid(string)) + if (CYImplements(self, _class, sel, true)) + return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false); return NULL; -} CYCatch } +} CYCatch(NULL) } static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - id self(internal->GetValue()); + id self(internal->value_); CYPool pool; - NSString *name(CYCastNSString(pool, context, property)); - NSObject *data(CYCastNSObject(pool, context, value)); + NSString *name(CYCastNSString(&pool, context, property)); + NSObject *data(CYCastNSObject(&pool, context, value)); CYPoolTry { if ([self cy$setProperty:name to:data]) return true; - } CYPoolCatch(NULL) + } CYPoolCatch(false) const char *string(CYPoolCString(pool, context, name)); Class _class(object_getClass(self)); -#ifdef __APPLE__ - if (objc_property_t property = class_getProperty(_class, string)) { + if (objc_property_t property = CYFindProperty(pool, _class, string)) { PropertyAttributes attributes(property); if (const char *setter = attributes.Setter()) { SEL sel(sel_registerName(setter)); JSValueRef arguments[1] = {value}; - CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception); + CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false); return true; } } -#endif size_t length(strlen(string)); @@ -1644,79 +1880,199 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr set[length + 4] = '\0'; if (SEL sel = sel_getUid(set)) - if (CYImplements(self, _class, sel, false)) { + if (CYImplements(self, _class, sel)) { JSValueRef arguments[1] = {value}; - CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception); + CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false); + return true; } - if (CYInternal *internal = CYInternal::Set(self)) { - internal->SetProperty(context, property, value); + if (CYInternal *internal = [CYInternal set:self inContext:context]) { + [internal setProperty:property toValue:value inContext:context]; return true; } return false; -} CYCatch } +} CYCatch(false) } static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - id self(internal->GetValue()); + id self(internal->value_); CYPoolTry { NSString *name(CYCastNSString(NULL, context, property)); return [self cy$deleteProperty:name]; - } CYPoolCatch(NULL) -} CYCatch return /*XXX*/ NULL; } + } CYPoolCatch(false) +} CYCatch(false) return /*XXX*/ false; } + +static void CYForEachProperty(CYPool &pool, Class _class, const Functor &code) { + for (; _class != Nil; _class = class_getSuperclass(_class)) { + unsigned int size; + objc_method **data(class_copyMethodList(_class, &size)); + pool.atexit(free, data); + + for (size_t i(0); i != size; ++i) { + objc_method *method(data[i]); + + const char *name(sel_getName(method_getName(method))); + if (strchr(name, ':') != NULL) + continue; + + code(method, name); + } + } +} static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - id self(internal->GetValue()); + id self(internal->value_); CYPool pool; Class _class(object_getClass(self)); -#ifdef __APPLE__ - { + for (Class current(_class); current != Nil; current = class_getSuperclass(current)) { unsigned int size; - objc_property_t *data(class_copyPropertyList(_class, &size)); + objc_property_t *data(class_copyPropertyList(current, &size)); + pool.atexit(free, data); + for (size_t i(0); i != size; ++i) JSPropertyNameAccumulatorAddName(names, CYJSString(property_getName(data[i]))); - free(data); } -#endif + + if (CYHasImplicitProperties(context, _class)) + CYForEachProperty(pool, _class, fun([&](objc_method *method, const char *name) { + JSPropertyNameAccumulatorAddName(names, CYJSString(name)); + })); 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() } -static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - JSObjectRef value(Instance::Make(context, [internal->GetValue() alloc], Instance::Uninitialized)); +static JSValueRef Instance_complete_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (!CYJSValueIsNSObject(context, _this)) + return CYObjectMakeArray(context, 0, NULL); + + Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + id self(internal->value_); + + _assert(count == 1 || count == 2); + CYPool pool; + Class _class(object_getClass(self)); + + CYUTF8String prefix(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0]))); + + JSObjectRef array(NULL); { + CYArrayBuilder<1024> values(context, array); + + CYForEachProperty(pool, _class, fun([&](objc_method *method, const char *name) { + if (!CYStartsWith(name, prefix)) + return; + const char *type(method_getTypeEncoding(method)); + if (type == NULL || *type == '\0' || *type == 'v') + return; + if (class_getProperty(_class, name) != NULL) + return; + values(CYCastJSValue(context, CYJSString(pool.strcat(name, "()", NULL)))); + })); + } return array; +} CYCatchObject() } + +static JSObjectRef Constructor_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, object)); + JSObjectRef value(CYMakeInstance(context, [internal->value_ alloc], Instance::Uninitialized)); return value; -} CYCatch } +} CYCatchObject() } -static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) { CYTry { - Instance *internal(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) constructor))); - Class _class(internal->GetValue()); - if (!CYIsClass(_class)) +static const char *CYBlockEncoding(NSBlock *self) { + BlockLiteral *literal(reinterpret_cast(self)); + if ((literal->flags & BLOCK_HAS_SIGNATURE) == 0) + return NULL; + uint8_t *descriptor(reinterpret_cast(literal->descriptor)); + descriptor += sizeof(BlockDescriptor1); + if ((literal->flags & BLOCK_HAS_COPY_DISPOSE) != 0) + descriptor += sizeof(BlockDescriptor2); + BlockDescriptor3 *descriptor3(reinterpret_cast(descriptor)); + return descriptor3->signature; +} + +static bool CYBlockSignature(CYPool &pool, NSBlock *self, sig::Signature &signature) { + const char *encoding(CYBlockEncoding(self)); + if (encoding == NULL) return false; - if (JSValueIsObjectOfClass(context, instance, Instance_)) { + sig::Parse(pool, &signature, encoding, &Structor_); + _assert(signature.count >= 2); + + _assert(dynamic_cast(signature.elements[1].type) != NULL); + signature.elements[1] = signature.elements[0]; + + ++signature.elements; + --signature.count; + + return true; +} + +static JSValueRef FunctionInstance_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); + id self(internal->value_); + + if (const char *encoding = CYBlockEncoding(self)) { + CYPool pool; + + void *setup[1]; + setup[0] = &self; + + sig::Signature signature; + sig::Parse(pool, &signature, encoding, &Structor_); + + ffi_cif cif; + sig::sig_ffi_cif(pool, 0, signature, &cif); + + BlockLiteral *literal(reinterpret_cast(self)); + void (*function)() = reinterpret_cast(literal->invoke); + return CYCallFunction(pool, context, 1, setup, count, arguments, false, false, signature, &cif, function); + } + + if (count != 0) + CYThrow("NSBlock without signature field passed arguments"); + + CYPoolTry { + [self invoke]; + } CYPoolCatch(NULL); + + return NULL; +} CYCatch(NULL) } + +static bool Constructor_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, constructor)); + Class _class(internal->value_); + + if (CYJSValueIsNSObject(context, instance)) { Instance *linternal(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) instance))); // XXX: this isn't always safe - return [linternal->GetValue() isKindOfClass:_class]; + return [linternal->value_ isKindOfClass:_class]; } return false; -} CYCatch } +} CYCatch(false) } -static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { - Internal *internal(reinterpret_cast(JSObjectGetPrivate(object))); +static JSValueRef Instance_box_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count == 0) + throw CYJSError(context, "incorrect number of arguments to Instance"); + CYPool pool; + id value(CYCastNSObject(&pool, context, arguments[0])); + if (value == nil) + value = [NSNull null]; + return CYCastJSValue(context, [value cy$box]); +} CYCatch(NULL) } + +static bool Interior_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { + Interior *internal(reinterpret_cast(JSObjectGetPrivate(object))); CYPool pool; - id self(internal->GetValue()); + id self(internal->value_); const char *name(CYPoolCString(pool, context, property)); if (object_getInstanceVariable(self, name, NULL) != NULL) @@ -1725,163 +2081,226 @@ static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStr return false; } -static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { - Internal *internal(reinterpret_cast(JSObjectGetPrivate(object))); +static void CYBitField(CYPool &pool, unsigned &length, unsigned &shift, id self, Ivar ivar, const char *encoding, unsigned offset) { + length = CYCastDouble(encoding + 1); + shift = 0; + + unsigned int size; + objc_ivar **ivars(class_copyIvarList(object_getClass(self), &size)); + pool.atexit(free, ivars); + + for (size_t i(0); i != size; ++i) + if (ivars[i] == ivar) + break; + else if (ivar_getOffset(ivars[i]) == offset) { + const char *encoding(ivar_getTypeEncoding(ivars[i])); + _assert(encoding != NULL); + _assert(encoding[0] == 'b'); + shift += CYCastDouble(encoding + 1); + } +} + +static JSValueRef Interior_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + Interior *internal(reinterpret_cast(JSObjectGetPrivate(object))); CYPool pool; - id self(internal->GetValue()); + id self(internal->value_); const char *name(CYPoolCString(pool, context, property)); if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) { - Type_privateData type(pool, ivar_getTypeEncoding(ivar)); - // XXX: if this fails and throws an exception the person we are throwing it to gets the wrong exception - return CYFromFFI(context, type.type_, type.GetFFI(), reinterpret_cast(self) + ivar_getOffset(ivar)); + ptrdiff_t offset(ivar_getOffset(ivar)); + void *data(reinterpret_cast(self) + offset); + + const char *encoding(ivar_getTypeEncoding(ivar)); + _assert(encoding != NULL); + _assert(encoding[0] != '\0'); + if (encoding[0] == 'b') { + unsigned length, shift; + CYBitField(pool, length, shift, self, ivar, encoding, offset); + _assert(shift + length <= sizeof(uintptr_t) * 8); + uintptr_t &field(*reinterpret_cast(data)); + uintptr_t mask((1 << length) - 1); + return CYCastJSValue(context, (field >> shift) & mask); + } else { +#if defined(__APPLE__) && defined(__LP64__) + // XXX: maybe do even more verifications here + if (strcmp(name, "isa") == 0) + return CYCastJSValue(context, object_getClass(self)); +#endif + + auto type(new(pool) Type_privateData(encoding)); + return type->type_->FromFFI(context, type->GetFFI(), data); + } } return NULL; -} CYCatch } +} CYCatch(NULL) } -static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { - Internal *internal(reinterpret_cast(JSObjectGetPrivate(object))); +static bool Interior_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { + Interior *internal(reinterpret_cast(JSObjectGetPrivate(object))); CYPool pool; - id self(internal->GetValue()); + id self(internal->value_); const char *name(CYPoolCString(pool, context, property)); if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) { - Type_privateData type(pool, ivar_getTypeEncoding(ivar)); - CYPoolFFI(pool, context, type.type_, type.GetFFI(), reinterpret_cast(self) + ivar_getOffset(ivar), value); - return true; + ptrdiff_t offset(ivar_getOffset(ivar)); + void *data(reinterpret_cast(self) + offset); + + const char *encoding(ivar_getTypeEncoding(ivar)); + _assert(encoding != NULL); + if (encoding[0] == 'b') { + unsigned length, shift; + CYBitField(pool, length, shift, self, ivar, encoding, offset); + _assert(shift + length <= sizeof(uintptr_t) * 8); + uintptr_t &field(*reinterpret_cast(data)); + uintptr_t mask((1 << length) - 1); + field = field & ~(mask << shift) | (uintptr_t(CYCastDouble(context, value)) & mask) << shift; + } else { + auto type(new(pool) Type_privateData(ivar_getTypeEncoding(ivar))); + type->type_->PoolFFI(&pool, context, type->GetFFI(), reinterpret_cast(self) + ivar_getOffset(ivar), value); + return true; + } } return false; -} CYCatch } +} CYCatch(false) } -static void Internal_getPropertyNames_(Class _class, JSPropertyNameAccumulatorRef names) { +static void Interior_getPropertyNames_(CYPool &pool, Class _class, JSPropertyNameAccumulatorRef names) { if (Class super = class_getSuperclass(_class)) - Internal_getPropertyNames_(super, names); + Interior_getPropertyNames_(pool, super, names); -#if OBJC_API_VERSION >= 2 unsigned int size; objc_ivar **data(class_copyIvarList(_class, &size)); + pool.atexit(free, data); + for (size_t i(0); i != size; ++i) JSPropertyNameAccumulatorAddName(names, CYJSString(ivar_getName(data[i]))); - free(data); -#else - if (objc_ivar_list *ivars = _class->ivars) - for (int i(0); i != ivars->ivar_count; ++i) - JSPropertyNameAccumulatorAddName(names, CYJSString(ivar_getName(&ivars->ivar_list[i]))); -#endif } -static void Internal_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { - Internal *internal(reinterpret_cast(JSObjectGetPrivate(object))); +static void Interior_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { + Interior *internal(reinterpret_cast(JSObjectGetPrivate(object))); CYPool pool; - id self(internal->GetValue()); + id self(internal->value_); Class _class(object_getClass(self)); - Internal_getPropertyNames_(_class, names); + Interior_getPropertyNames_(pool, _class, names); } -static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { - Internal *internal(reinterpret_cast(JSObjectGetPrivate(object))); - return internal->GetOwner(); +static JSValueRef Interior_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + Interior *internal(reinterpret_cast(JSObjectGetPrivate(object))); + return internal->owner_; +} CYCatch(NULL) } + +static bool ObjectiveC_Classes_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { + CYPool pool; + return objc_getClass(CYPoolCString(pool, context, property)) != Nil; } static JSValueRef ObjectiveC_Classes_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { CYPool pool; - NSString *name(CYCastNSString(pool, context, property)); + NSString *name(CYCastNSString(&pool, context, property)); if (Class _class = NSClassFromString(name)) - return CYMakeInstance(context, _class, true); + return CYMakeInstance(context, _class, Instance::Permanent); return NULL; -} CYCatch } +} CYCatch(NULL) } -static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { -#ifdef __APPLE__ - size_t size(objc_getClassList(NULL, 0)); +static Class *CYCopyClassList(size_t &size) { + size = objc_getClassList(NULL, 0); Class *data(reinterpret_cast(malloc(sizeof(Class) * size))); - get: - size_t writ(objc_getClassList(data, size)); - if (size < writ) { + for (;;) { + size_t writ(objc_getClassList(data, size)); + if (writ <= size) { + size = writ; + return data; + } + + Class *copy(reinterpret_cast(realloc(data, sizeof(Class) * writ))); + if (copy == NULL) { + free(data); + return NULL; + } + + data = copy; size = writ; - if (Class *copy = reinterpret_cast(realloc(data, sizeof(Class) * writ))) { - data = copy; - goto get; - } else goto done; } +} - for (size_t i(0); i != writ; ++i) - JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(data[i]))); +static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { + CYPool pool; - done: - free(data); -#else - void *state(NULL); - while (Class _class = objc_next_class(&state)) - JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(_class))); -#endif + size_t size; + if (Class *data = CYCopyClassList(size)) { + pool.atexit(free, data); + for (size_t i(0); i != size; ++i) + JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(data[i]))); + } } -#if OBJC_API_VERSION >= 2 +#ifdef __APPLE__ static JSValueRef ObjectiveC_Image_Classes_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { const char *internal(reinterpret_cast(JSObjectGetPrivate(object))); CYPool pool; const char *name(CYPoolCString(pool, context, property)); + unsigned int size; const char **data(objc_copyClassNamesForImage(internal, &size)); + pool.atexit(free, data); + JSValueRef value; for (size_t i(0); i != size; ++i) if (strcmp(name, data[i]) == 0) { - if (Class _class = objc_getClass(name)) { - value = CYMakeInstance(context, _class, true); - goto free; - } else - break; + if (Class _class = objc_getClass(name)) + return CYMakeInstance(context, _class, Instance::Permanent); + else + return NULL; } - value = NULL; - free: - free(data); - return value; -} CYCatch } + + return NULL; +} CYCatch(NULL) } static void ObjectiveC_Image_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { const char *internal(reinterpret_cast(JSObjectGetPrivate(object))); + CYPool pool; + unsigned int size; const char **data(objc_copyClassNamesForImage(internal, &size)); + pool.atexit(free, data); + for (size_t i(0); i != size; ++i) JSPropertyNameAccumulatorAddName(names, CYJSString(data[i])); - free(data); } static JSValueRef ObjectiveC_Images_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { CYPool pool; - const char *name(CYPoolCString(pool, context, property)); + CYUTF8String name(CYPoolUTF8String(pool, context, property)); + unsigned int size; const char **data(objc_copyImageNames(&size)); + pool.atexit(free, data); + for (size_t i(0); i != size; ++i) - if (strcmp(name, data[i]) == 0) { - name = data[i]; - goto free; + if (name == data[i]) { + JSObjectRef value(JSObjectMake(context, NULL, NULL)); + CYSetProperty(context, value, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Image_Classes_, const_cast(data[i]))); + return value; } - name = NULL; - free: - free(data); - if (name == NULL) - return NULL; - JSObjectRef value(JSObjectMake(context, NULL, NULL)); - CYSetProperty(context, value, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Image_Classes_, const_cast(name))); - return value; -} CYCatch } + + return NULL; +} CYCatch(NULL) } static void ObjectiveC_Images_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { + CYPool pool; + unsigned int size; const char **data(objc_copyImageNames(&size)); + pool.atexit(free, data); + for (size_t i(0); i != size; ++i) JSPropertyNameAccumulatorAddName(names, CYJSString(data[i])); - free(data); } #endif @@ -1889,23 +2308,146 @@ static JSValueRef ObjectiveC_Protocols_getProperty(JSContextRef context, JSObjec CYPool pool; const char *name(CYPoolCString(pool, context, property)); if (Protocol *protocol = objc_getProtocol(name)) - return CYMakeInstance(context, protocol, true); + return CYMakeInstance(context, protocol, Instance::Permanent); return NULL; -} CYCatch } +} CYCatch(NULL) } static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { -#if OBJC_API_VERSION >= 2 + CYPool pool; + unsigned int size; Protocol **data(objc_copyProtocolList(&size)); + pool.atexit(free, data); + for (size_t i(0); i != size; ++i) JSPropertyNameAccumulatorAddName(names, CYJSString(protocol_getName(data[i]))); - free(data); +} + +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 CYJSNull(context); + return NULL; +} CYCatch(NULL) } + +static void ObjectiveC_Constants_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { + JSPropertyNameAccumulatorAddName(names, CYJSString("nil")); +} + +#ifdef __APPLE__ +static kern_return_t CYReadMemory(task_t task, vm_address_t address, vm_size_t size, void **data) { + *data = reinterpret_cast(address); + return KERN_SUCCESS; +} + +struct CYChoice { + std::set query_; + JSContextRef context_; + JSObjectRef results_; +}; + +struct CYObjectStruct { + Class isa_; +}; + +static void choose_(task_t task, void *baton, unsigned type, vm_range_t *ranges, unsigned count) { + CYChoice *choice(reinterpret_cast(baton)); + JSContextRef context(choice->context_); + + for (unsigned i(0); i != count; ++i) { + vm_range_t &range(ranges[i]); + void *data(reinterpret_cast(range.address)); + size_t size(range.size); + + if (size < sizeof(CYObjectStruct)) + continue; + + uintptr_t *pointers(reinterpret_cast(data)); +#if defined(__APPLE__) && defined(__LP64__) + Class isa(reinterpret_cast(pointers[0] & 0x1fffffff8)); #else - // XXX: fix this! + Class isa(reinterpret_cast(pointers[0])); #endif + + std::set::const_iterator result(choice->query_.find(isa)); + if (result == choice->query_.end()) + continue; + + size_t needed(class_getInstanceSize(*result)); + // XXX: if (size < needed) + + size_t boundary(496); +#ifdef __LP64__ + boundary *= 2; +#endif + if (needed <= boundary && (needed + 15) / 16 * 16 != size || needed > boundary && (needed + 511) / 512 * 512 != size) + continue; + CYArrayPush(context, choice->results_, CYCastJSValue(context, reinterpret_cast(data))); + } } +static JSValueRef choose(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 1) + throw CYJSError(context, "choose() takes a class argument"); + + CYGarbageCollect(context); + + CYPool pool; + id _class(CYCastNSObject(&pool, context, arguments[0])); + + vm_address_t *zones(NULL); + unsigned size(0); + kern_return_t error(malloc_get_all_zones(0, &CYReadMemory, &zones, &size)); + _assert(error == KERN_SUCCESS); + + JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array"))); + JSObjectRef results(_jsccall(JSObjectCallAsConstructor, context, Array, 0, NULL)); + + CYChoice choice; + choice.context_ = context; + choice.results_ = results; + + size_t number; + Class *classes(CYCopyClassList(number)); + _assert(classes != NULL); + pool.atexit(free, classes); + + for (size_t i(0); i != number; ++i) + for (Class current(classes[i]); current != Nil; current = class_getSuperclass(current)) + if (current == _class) { + choice.query_.insert(classes[i]); + break; + } + + for (unsigned i(0); i != size; ++i) { + const malloc_zone_t *zone(reinterpret_cast(zones[i])); + if (zone == NULL || zone->introspect == NULL) + continue; + + zone->introspect->enumerator(mach_task_self(), &choice, MALLOC_PTR_IN_USE_RANGE_TYPE, zones[i], &CYReadMemory, &choose_); + } + + return results; +} CYCatch(NULL) } +#endif + #ifdef __APPLE__ +#if defined(__i386__) || defined(__x86_64__) +#define OBJC_MAX_STRUCT_BY_VALUE 8 +static int struct_forward_array[] = { + 0, 0, 0, 1, 0, 1, 1, 1, 0 }; +#elif defined(__arm__) +#define OBJC_MAX_STRUCT_BY_VALUE 1 +static int struct_forward_array[] = { + 0, 0 }; +#elif defined(__arm64__) +#define CY_NO_STRET +#else +#error missing objc-runtime-info +#endif + +#ifndef CY_NO_STRET static bool stret(ffi_type *ffi_type) { return ffi_type->type == FFI_TYPE_STRUCT && ( ffi_type->size > OBJC_MAX_STRUCT_BY_VALUE || @@ -1913,8 +2455,11 @@ static bool stret(ffi_type *ffi_type) { ); } #endif +#else +#define CY_NO_STRET +#endif -JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class _class, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception) { CYTry { +JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _class, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize) { const char *type; if (_class == NULL) @@ -1929,11 +2474,14 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class imp = NULL; CYPoolTry { - NSMethodSignature *method([self methodSignatureForSelector:_cmd]); - if (method == nil) - throw CYJSError(context, "unrecognized selector %s sent to object %p", sel_getName(_cmd), self); - type = CYPoolCString(pool, context, [method _typeString]); + if (NSMethodSignature *method = [self methodSignatureForSelector:_cmd]) + type = CYPoolCString(pool, context, [method _typeString]); + else + type = NULL; } CYPoolCatch(NULL) + + if (type == NULL) + throw CYJSError(context, "unrecognized selector %s sent to object %p", sel_getName(_cmd), self); } void *setup[2]; @@ -1944,25 +2492,22 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class sig::Parse(pool, &signature, type, &Structor_); ffi_cif cif; - sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif); + sig::sig_ffi_cif(pool, 0, signature, &cif); if (imp == NULL) { -#ifdef __APPLE__ +#ifndef CY_NO_STRET if (stret(cif.rtype)) imp = class_getMethodImplementation_stret(_class, _cmd); else - imp = class_getMethodImplementation(_class, _cmd); -#else - objc_super super = {self, _class}; - imp = objc_msg_lookup_super(&super, _cmd); #endif + imp = class_getMethodImplementation(_class, _cmd); } void (*function)() = reinterpret_cast(imp); - return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, exception, &signature, &cif, function); -} CYCatch } + return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, true, signature, &cif, function); +} -static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { +static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[]) { if (count < 2) throw CYJSError(context, "too few arguments to objc_msgSend"); @@ -1974,20 +2519,20 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje SEL _cmd; Class _class; - if (JSValueIsObjectOfClass(context, arguments[0], Super_)) { + if (JSValueIsObjectOfClass(context, arguments[0], CYPrivate::Class_)) { cy::Super *internal(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) arguments[0]))); - self = internal->GetValue(); + self = internal->value_; _class = internal->class_;; uninitialized = false; - } else if (JSValueIsObjectOfClass(context, arguments[0], Instance_)) { + } else if (CYJSValueIsNSObject(context, arguments[0])) { Instance *internal(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) arguments[0]))); - self = internal->GetValue(); + self = internal->value_; _class = nil; uninitialized = internal->IsUninitialized(); - if (uninitialized) + if (uninitialized && [internal->value_ retainCount] != NSUInteger(-1)) internal->value_ = nil; } else { - self = CYCastNSObject(pool, context, arguments[0]); + self = CYCastNSObject(&pool, context, arguments[0]); _class = nil; uninitialized = false; } @@ -1997,148 +2542,122 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje _cmd = CYCastSEL(context, arguments[1]); - return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized, exception); -} CYCatch } - -/* Hook: objc_registerClassPair {{{ */ -#if defined(__APPLE__) && defined(__arm__) -// XXX: replace this with associated objects - -MSHook(void, CYDealloc, id self, SEL sel) { - CYInternal *internal; - object_getInstanceVariable(self, "cy$internal_", reinterpret_cast(&internal)); - if (internal != NULL) - delete internal; - _CYDealloc(self, sel); -} - -MSHook(void, objc_registerClassPair, Class _class) { - Class super(class_getSuperclass(_class)); - if (super == NULL || class_getInstanceVariable(super, "cy$internal_") == NULL) { - class_addIvar(_class, "cy$internal_", sizeof(CYInternal *), log2(sizeof(CYInternal *)), "^{CYInternal}"); - MSHookMessage(_class, @selector(dealloc), MSHake(CYDealloc)); - } - - _objc_registerClassPair(_class); + return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized); } -static JSValueRef objc_registerClassPair_(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (count != 1) - throw CYJSError(context, "incorrect number of arguments to objc_registerClassPair"); - CYPool pool; - NSObject *value(CYCastNSObject(pool, context, arguments[0])); - if (value == NULL || !CYIsClass(value)) - throw CYJSError(context, "incorrect number of arguments to objc_registerClassPair"); - Class _class((Class) value); - $objc_registerClassPair(_class); - return CYJSUndefined(context); -} CYCatch } -#endif -/* }}} */ +static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + return $objc_msgSend(context, object, _this, count, arguments); +} CYCatch(NULL) } -static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { +static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { JSValueRef setup[count + 2]; setup[0] = _this; setup[1] = object; memcpy(setup + 2, arguments, sizeof(JSValueRef) * count); - return $objc_msgSend(context, NULL, NULL, count + 2, setup, exception); -} + return $objc_msgSend(context, NULL, NULL, count + 2, setup); +} CYCatch(NULL) } -static JSValueRef Message_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { +static JSValueRef Message_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { CYPool pool; Message_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); // XXX: handle Instance::Uninitialized? - id self(CYCastNSObject(pool, context, _this)); + id self(CYCastNSObject(&pool, context, _this)); void *setup[2]; setup[0] = &self; setup[1] = &internal->sel_; - return CYCallFunction(pool, context, 2, setup, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue()); + return CYCallFunction(pool, context, 2, setup, count, arguments, false, true, internal->signature_, &internal->cif_, internal->value_); +} CYCatch(NULL) } + +CYPropertyName *Message_privateData::GetName(CYPool &pool) const { + return new(pool) CYString(pool.strcat(":", sel_getName(sel_), NULL)); } static JSObjectRef Super_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 2) - throw CYJSError(context, "incorrect number of arguments to Super constructor"); + throw CYJSError(context, "incorrect number of arguments to objc_super constructor"); CYPool pool; - id self(CYCastNSObject(pool, context, arguments[0])); + id self(CYCastNSObject(&pool, context, arguments[0])); Class _class(CYCastClass(pool, context, arguments[1])); - return cy::Super::Make(context, self, _class); -} CYCatch } + return CYPrivate::Make(context, self, _class); +} CYCatchObject() } static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 1) throw CYJSError(context, "incorrect number of arguments to Selector constructor"); CYPool pool; const char *name(CYPoolCString(pool, context, arguments[0])); - return CYMakeSelector(context, sel_registerName(name)); -} CYCatch } + return CYPrivate::Make(context, sel_registerName(name)); +} CYCatchObject() } static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (count > 1) + 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); -} CYCatch } - -static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { - CYValue *internal(reinterpret_cast(JSObjectGetPrivate(object))); - return CYCastJSValue(context, reinterpret_cast(internal->value_)); -} + return CYMakeInstance(context, CYCastPointer(context, arguments[0])); +} CYCatchObject() } -static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { - CYValue *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - Type_privateData *typical(internal->GetType()); +static JSValueRef Selector_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + return CYMakeType(context, sig::Selector()); +} CYCatch(NULL) } - sig::Type *type; - ffi_type *ffi; +static JSValueRef Instance_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); + id self(internal->value_); + return CYMakeType(context, sig::Object(class_getName(object_getClass(self)))); +} CYCatch(NULL) } - if (typical == NULL) { - type = NULL; - ffi = NULL; - } else { - type = typical->type_; - ffi = typical->ffi_; - } +static JSValueRef FunctionInstance_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); + CYPool pool; + sig::Block type; + if (!CYBlockSignature(pool, internal->value_, type.signature)) + return CYJSNull(context); + return CYMakeType(context, type); +} CYCatch(NULL) } - return CYMakePointer(context, &internal->value_, _not(size_t), type, ffi, object); -} +static JSValueRef Constructor_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + return CYMakeType(context, sig::Meta()); +} CYCatch(NULL) } -static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { +static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - return Instance::Make(context, (id) object_getClass(internal->GetValue())); -} + return CYMakeInstance(context, object_getClass(internal->value_), Instance::Permanent); +} CYCatch(NULL) } -static JSValueRef Instance_getProperty_protocol(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { - Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - id self(internal->GetValue()); - if (!CYIsClass(self)) - return CYJSUndefined(context); - return CYGetClassPrototype(context, self); -} CYCatch } +static JSValueRef Constructor_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, object)); + return CYMakeInstance(context, object_getClass(internal->value_), Instance::Permanent); +} CYCatch(NULL) } -static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { +static JSValueRef Constructor_getProperty_prototype(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - id self(internal->GetValue()); - if (!CYIsClass(self)) - return CYJSUndefined(context); - return Messages::Make(context, (Class) self); -} + id self(internal->value_); + return CYPrivate::Cache(context, self); +} CYCatch(NULL) } static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (!JSValueIsObjectOfClass(context, _this, Instance_)) + std::set *objects(CYCastObjects(context, _this, count, arguments)); + + if (!CYJSValueIsNSObject(context, _this)) return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue()))); -} CYCatch } + return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->value_, false, objects))); +} CYCatch(NULL) } + +static JSValueRef Constructor_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, _this)); + return CYCastJSValue(context, CYJSString(class_getName(internal->value_))); +} CYCatch(NULL) } static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (!JSValueIsObjectOfClass(context, _this, Instance_)) + if (!CYJSValueIsNSObject(context, _this)) return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + id value(internal->value_); CYPoolTry { NSString *key; @@ -2146,27 +2665,78 @@ static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectR key = nil; else key = CYCastNSString(NULL, context, CYJSString(context, arguments[0])); - // XXX: check for support of cy$toJSON? - return CYCastJSValue(context, CYJSString(context, [internal->GetValue() cy$toJSON:key])); + + if (!CYImplements(value, object_getClass(value), @selector(cy$toJSON:inContext:))) + return CYJSUndefined(context); + else if (JSValueRef json = [value cy$toJSON:key inContext:context]) + return json; + else + return CYCastJSValue(context, CYJSString(context, [value description])); } CYPoolCatch(NULL) -} CYCatch return /*XXX*/ NULL; } +} CYCatch(NULL) return /*XXX*/ NULL; } + +static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (!CYJSValueIsNSObject(context, _this)) + return NULL; + + Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + id value(internal->value_); + _assert(value != nil); + + if (![value respondsToSelector:@selector(cy$valueOfInContext:)]) + return _this; + + if (JSValueRef result = [value cy$valueOfInContext:context]) + return result; + + return _this; +} CYCatch(NULL) return /*XXX*/ NULL; } + +static JSValueRef Instance_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (!CYJSValueIsNSObject(context, _this)) + return NULL; + Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + // XXX: return CYMakePointer(context, internal->value_, sig::Object(class_getName(object_getClass(internal->value_))), NULL, object); + return CYCastJSValue(context, reinterpret_cast(internal->value_)); +} CYCatch(NULL) return /*XXX*/ NULL; } + +static JSValueRef Constructor_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + auto internal(CYPrivate::Get(context, object)); + // XXX: return CYMakePointer(context, internal->value_, sig::Meta(), NULL, object); + return CYCastJSValue(context, reinterpret_cast(internal->value_)); +} CYCatch(NULL) return /*XXX*/ NULL; } static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (!JSValueIsObjectOfClass(context, _this, Instance_)) + if (!CYJSValueIsNSObject(context, _this)) return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + id value(internal->value_); 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; } +} CYCatch(NULL) return /*XXX*/ NULL; } + +static JSValueRef Class_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (!CYJSValueIsNSObject(context, _this)) + return NULL; + + Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + id value(internal->value_); + + if (!CYIsClass(value)) + CYThrow("non-Class object cannot be used as Type"); + + sig::Object type(class_getName(value)); + return CYMakeType(context, type); +} CYCatch(NULL) return /*XXX*/ NULL; } static JSValueRef Selector_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { Selector_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - return CYCastJSValue(context, sel_getName(internal->GetValue())); -} CYCatch } + return CYCastJSValue(context, sel_getName(internal->value_)); +} CYCatch(NULL) } static JSValueRef Selector_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { return Selector_callAsFunction_toString(context, object, _this, count, arguments, exception); @@ -2174,13 +2744,13 @@ static JSValueRef Selector_callAsFunction_toJSON(JSContextRef context, JSObjectR static JSValueRef Selector_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { Selector_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - const char *name(sel_getName(internal->GetValue())); + const char *name(sel_getName(internal->value_)); CYPoolTry { NSString *string([NSString stringWithFormat:@"@selector(%s)", name]); return CYCastJSValue(context, CYJSString(context, string)); } CYPoolCatch(NULL) -} CYCatch return /*XXX*/ NULL; } +} CYCatch(NULL) return /*XXX*/ NULL; } static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 1) @@ -2188,43 +2758,68 @@ static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef CYPool pool; Selector_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - SEL sel(internal->GetValue()); + SEL sel(internal->value_); - objc_method *method; - if (Class _class = CYCastClass(pool, context, arguments[0])) - method = class_getInstanceMethod(_class, sel); - else - method = NULL; + Class _class(_require(CYCastClass(pool, context, arguments[0]))); + objc_method *method(_require(class_getInstanceMethod(_class, sel))); + const char *encoding(method_getTypeEncoding(method)); - if (const char *type = CYPoolTypeEncoding(pool, context, sel, method)) - return CYCastJSValue(context, CYJSString(type)); - - return CYJSNull(context); -} CYCatch } + sig::Function type(false); + sig::Parse(pool, &type.signature, encoding, &Structor_); + return CYMakeType(context, type); +} CYCatch(NULL) } static JSStaticValue Selector_staticValues[2] = { - {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete}, + {"$cyt", &Selector_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, NULL, 0} +}; + +static JSStaticValue Instance_staticValues[3] = { + {"$cyt", &Instance_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + // XXX: this is sadly duplicated in FunctionInstance_staticValues + {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, NULL, 0} }; -static JSStaticValue Instance_staticValues[5] = { +static JSStaticValue FunctionInstance_staticValues[3] = { + {"$cyt", &FunctionInstance_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + // XXX: this is sadly a duplicate of Instance_staticValues {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"messages", &Instance_getProperty_messages, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"prototype", &Instance_getProperty_protocol, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, NULL, 0} }; -static JSStaticFunction Instance_staticFunctions[5] = { - {"$cya", &CYValue_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, +static JSStaticFunction Instance_staticFunctions[7] = { + {"cy$complete", &Instance_complete_callAsFunction, 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} }; -static JSStaticFunction Internal_staticFunctions[2] = { - {"$cya", &Internal_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, +static JSStaticFunction Messages_staticFunctions[2] = { + {"cy$complete", &Messages_complete_callAsFunction, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, 0} +}; + +static JSStaticValue Constructor_staticValues[5] = { + {"$cyi", &Constructor_getProperty_$cyi, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"$cyt", &Constructor_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"constructor", &Constructor_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"prototype", &Constructor_getProperty_prototype, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, NULL, 0} +}; + +static JSStaticFunction Constructor_staticFunctions[5] = { + {"pointerTo", &Class_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"toCYON", &Constructor_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"toPointer", &Constructor_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, 0} +}; + +static JSStaticFunction Interior_staticFunctions[2] = { + {"$cya", &Interior_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} }; @@ -2236,27 +2831,60 @@ static JSStaticFunction Selector_staticFunctions[5] = { {NULL, NULL, 0} }; -void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { - apr_pool_t *pool(CYGetGlobalPool()); +#ifdef __APPLE__ +JSValueRef NSCFType$cy$toJSON$inContext$(id self, SEL sel, JSValueRef key, JSContextRef context) { CYObjectiveTry_ { + return CYCastJSValue(context, [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease]); +} CYObjectiveCatch } +#endif - Object_type = new(pool) Type_privateData("@"); - Selector_type = new(pool) Type_privateData(":"); +void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { + NSArray_ = objc_getClass("NSArray"); + NSBlock_ = objc_getClass("NSBlock"); + NSDictionary_ = objc_getClass("NSDictionary"); + NSNumber_ = objc_getClass("NSNumber"); + NSObject_ = objc_getClass("NSObject"); + NSString_ = objc_getClass("NSString"); + Object_ = objc_getClass("Object"); #ifdef __APPLE__ - NSCFBoolean_ = objc_getClass("NSCFBoolean"); + __NSMallocBlock__ = objc_getClass("__NSMallocBlock__"); + + // XXX: apparently, iOS now has both of these + NSCFBoolean_ = objc_getClass("__NSCFBoolean"); + if (NSCFBoolean_ == nil) + NSCFBoolean_ = objc_getClass("NSCFBoolean"); + NSCFType_ = objc_getClass("NSCFType"); - NSMessageBuilder_ = objc_getClass("NSMessageBuilder"); + NSZombie_ = objc_getClass("_NSZombie_"); #else NSBoolNumber_ = objc_getClass("NSBoolNumber"); + NSZombie_ = objc_getClass("NSZombie"); #endif - NSArray_ = objc_getClass("NSArray"); - NSDictionary_ = objc_getClass("NSDictionary"); - Object_ = objc_getClass("Object"); - JSClassDefinition definition; + definition = kJSClassDefinitionEmpty; + definition.attributes = kJSClassAttributeNoAutomaticPrototype; + definition.className = "Messages"; + definition.staticFunctions = Messages_staticFunctions; + definition.hasProperty = &Messages_hasProperty; + definition.getProperty = &Messages_getProperty; + definition.setProperty = &Messages_setProperty; + CYPrivate::Class_ = JSClassCreate(&definition); + + definition = kJSClassDefinitionEmpty; + definition.className = "Constructor"; + definition.parentClass = CYPrivate::Class_; + definition.staticValues = Constructor_staticValues; + definition.staticFunctions = Constructor_staticFunctions; + definition.hasInstance = &Constructor_hasInstance; + definition.hasProperty = &Constructor_hasProperty; + definition.getProperty = &Constructor_getProperty; + definition.callAsConstructor = &Constructor_callAsConstructor; + definition.finalize = &CYFinalize; + CYPrivate::Class_ = JSClassCreate(&definition); + definition = kJSClassDefinitionEmpty; definition.className = "Instance"; definition.staticValues = Instance_staticValues; @@ -2266,39 +2894,52 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition.setProperty = &Instance_setProperty; definition.deleteProperty = &Instance_deleteProperty; definition.getPropertyNames = &Instance_getPropertyNames; - definition.callAsConstructor = &Instance_callAsConstructor; - definition.hasInstance = &Instance_hasInstance; definition.finalize = &CYFinalize; - Instance_ = JSClassCreate(&definition); + Instance::Class_ = JSClassCreate(&definition); + + definition.className = "ArrayInstance"; + ArrayInstance_ = JSClassCreate(&definition); + + definition.className = "BooleanInstance"; + BooleanInstance_ = JSClassCreate(&definition); + + definition.className = "NumberInstance"; + NumberInstance_ = JSClassCreate(&definition); + + definition.className = "ObjectInstance"; + ObjectInstance_ = JSClassCreate(&definition); + + definition.className = "StringInstance"; + StringInstance_ = JSClassCreate(&definition); + + definition.className = "FunctionInstance"; + definition.staticValues = FunctionInstance_staticValues; + definition.callAsFunction = &FunctionInstance_callAsFunction; + FunctionInstance_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; - definition.className = "Internal"; - definition.staticFunctions = Internal_staticFunctions; - definition.hasProperty = &Internal_hasProperty; - definition.getProperty = &Internal_getProperty; - definition.setProperty = &Internal_setProperty; - definition.getPropertyNames = &Internal_getPropertyNames; + definition.className = "Interior"; + definition.staticFunctions = Interior_staticFunctions; + definition.hasProperty = &Interior_hasProperty; + definition.getProperty = &Interior_getProperty; + definition.setProperty = &Interior_setProperty; + definition.getPropertyNames = &Interior_getPropertyNames; definition.finalize = &CYFinalize; - Internal_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "Message"; - definition.staticFunctions = cy::Functor::StaticFunctions; + definition.parentClass = cy::Functor::Class_; definition.callAsFunction = &Message_callAsFunction; definition.finalize = &CYFinalize; - Message_ = JSClassCreate(&definition); + Message_privateData::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; - definition.className = "Messages"; - definition.hasProperty = &Messages_hasProperty; - definition.getProperty = &Messages_getProperty; - definition.setProperty = &Messages_setProperty; -#if 0 && OBJC_API_VERSION < 2 - definition.deleteProperty = &Messages_deleteProperty; -#endif - definition.getPropertyNames = &Messages_getPropertyNames; + definition.attributes = kJSClassAttributeNoAutomaticPrototype; + definition.className = "Prototype"; + definition.parentClass = CYPrivate::Class_; definition.finalize = &CYFinalize; - Messages_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "Selector"; @@ -2306,21 +2947,27 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition.staticFunctions = Selector_staticFunctions; definition.callAsFunction = &Selector_callAsFunction; definition.finalize = &CYFinalize; - Selector_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "Super"; - definition.staticFunctions = Internal_staticFunctions; definition.finalize = &CYFinalize; - Super_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "ObjectiveC::Classes"; + definition.hasProperty = &ObjectiveC_Classes_hasProperty; definition.getProperty = &ObjectiveC_Classes_getProperty; definition.getPropertyNames = &ObjectiveC_Classes_getPropertyNames; ObjectiveC_Classes_ = JSClassCreate(&definition); -#if OBJC_API_VERSION >= 2 + definition = kJSClassDefinitionEmpty; + definition.className = "ObjectiveC::Constants"; + definition.getProperty = &ObjectiveC_Constants_getProperty; + definition.getPropertyNames = &ObjectiveC_Constants_getPropertyNames; + ObjectiveC_Constants_ = JSClassCreate(&definition); + +#ifdef __APPLE__ definition = kJSClassDefinitionEmpty; definition.className = "ObjectiveC::Images"; definition.getProperty = &ObjectiveC_Images_getProperty; @@ -2340,63 +2987,160 @@ 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"); + class_addMethod(NSCFType_, @selector(cy$toJSON:inContext:), reinterpret_cast(&NSCFType$cy$toJSON$inContext$), + // XXX: this is horrible; there has to be a better way to do this + #ifdef __LP64__ + "^{OpaqueJSValue=}32@0:8@16^{OpaqueJSContext=}24" + #else + "^{OpaqueJSValue=}16@0:4@8^{OpaqueJSContext=}12" + #endif + ); #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 alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls")))); JSObjectRef ObjectiveC(JSObjectMake(context, NULL, NULL)); - CYSetProperty(context, global, CYJSString("ObjectiveC"), ObjectiveC); + CYSetProperty(context, cycript, CYJSString("ObjectiveC"), ObjectiveC); + + JSObjectRef protocols(JSObjectMake(context, ObjectiveC_Protocols_, NULL)); + CYSetProperty(context, ObjectiveC, CYJSString("protocols"), protocols); + CYArrayPush(context, alls, protocols); - CYSetProperty(context, ObjectiveC, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Classes_, NULL)); - CYSetProperty(context, ObjectiveC, CYJSString("protocols"), JSObjectMake(context, ObjectiveC_Protocols_, NULL)); + JSObjectRef classes(JSObjectMake(context, ObjectiveC_Classes_, NULL)); + CYSetProperty(context, ObjectiveC, CYJSString("classes"), classes); + CYArrayPush(context, alls, classes); -#if OBJC_API_VERSION >= 2 + JSObjectRef constants(JSObjectMake(context, ObjectiveC_Constants_, NULL)); + CYSetProperty(context, ObjectiveC, CYJSString("constants"), constants); + CYArrayPush(context, alls, constants); + +#ifdef __APPLE__ 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 Super(JSObjectMakeConstructor(context, Super_, &Super_new)); + JSObjectRef Message(JSObjectMakeConstructor(context, Message_privateData::Class_, NULL)); + JSObjectRef Selector(JSObjectMakeConstructor(context, CYPrivate::Class_, &Selector_new)); + JSObjectRef Super(JSObjectMakeConstructor(context, CYPrivate::Class_, &Super_new)); + + JSObjectRef Instance(JSObjectMakeConstructor(context, Instance::Class_, &Instance_new)); + JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s))); + CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype); + + JSObjectRef Constructor(JSObjectMakeConstructor(context, CYPrivate<::Constructor>::Class_, NULL)); + JSObjectRef Constructor_prototype(CYCastJSObject(context, CYGetProperty(context, Constructor, prototype_s))); + CYSetProperty(context, cy, CYJSString("Constructor_prototype"), Constructor_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"))); + CYSetPrototype(context, ArrayInstance_prototype, Array_prototype); + + JSObjectRef BooleanInstance(JSObjectMakeConstructor(context, BooleanInstance_, NULL)); + JSObjectRef BooleanInstance_prototype(CYCastJSObject(context, CYGetProperty(context, BooleanInstance, prototype_s))); + CYSetProperty(context, cy, CYJSString("BooleanInstance_prototype"), BooleanInstance_prototype); + JSObjectRef Boolean_prototype(CYGetCachedObject(context, CYJSString("Boolean_prototype"))); + CYSetPrototype(context, BooleanInstance_prototype, Boolean_prototype); + + JSObjectRef FunctionInstance(JSObjectMakeConstructor(context, FunctionInstance_, NULL)); + JSObjectRef FunctionInstance_prototype(CYCastJSObject(context, CYGetProperty(context, FunctionInstance, prototype_s))); + CYSetProperty(context, cy, CYJSString("FunctionInstance_prototype"), FunctionInstance_prototype); + JSObjectRef Function_prototype(CYGetCachedObject(context, CYJSString("Function_prototype"))); + CYSetPrototype(context, FunctionInstance_prototype, Function_prototype); + + JSObjectRef NumberInstance(JSObjectMakeConstructor(context, NumberInstance_, NULL)); + JSObjectRef NumberInstance_prototype(CYCastJSObject(context, CYGetProperty(context, NumberInstance, prototype_s))); + CYSetProperty(context, cy, CYJSString("NumberInstance_prototype"), NumberInstance_prototype); + JSObjectRef Number_prototype(CYGetCachedObject(context, CYJSString("Number_prototype"))); + CYSetPrototype(context, NumberInstance_prototype, Number_prototype); + + JSObjectRef ObjectInstance(JSObjectMakeConstructor(context, ObjectInstance_, NULL)); + JSObjectRef ObjectInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ObjectInstance, prototype_s))); + CYSetProperty(context, cy, CYJSString("ObjectInstance_prototype"), ObjectInstance_prototype); + JSObjectRef Object_prototype(CYGetCachedObject(context, CYJSString("Object_prototype"))); + CYSetPrototype(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"))); + CYSetPrototype(context, StringInstance_prototype, String_prototype); + + CYSetProperty(context, cycript, CYJSString("Instance"), Instance); + CYSetProperty(context, cycript, CYJSString("Message"), Message); + CYSetProperty(context, cycript, CYJSString("Selector"), Selector); + CYSetProperty(context, cycript, CYJSString("objc_super"), Super); + + JSObjectRef box(JSObjectMakeFunctionWithCallback(context, CYJSString("box"), &Instance_box_callAsFunction)); + CYSetProperty(context, Instance, CYJSString("box"), box, kJSPropertyAttributeDontEnum); - Instance_prototype_ = (JSObjectRef) CYGetProperty(context, Instance, prototype_); - JSValueProtect(context, Instance_prototype_); +#ifdef __APPLE__ + CYSetProperty(context, all, CYJSString("choose"), &choose, kJSPropertyAttributeDontEnum); +#endif - CYSetProperty(context, global, CYJSString("Instance"), Instance); - CYSetProperty(context, global, CYJSString("Selector"), Selector); - CYSetProperty(context, global, CYJSString("Super"), Super); + CYSetProperty(context, all, CYJSString("objc_msgSend"), &$objc_msgSend, kJSPropertyAttributeDontEnum); -#if defined(__APPLE__) && defined(__arm__) - CYSetProperty(context, global, CYJSString("objc_registerClassPair"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_registerClassPair"), &objc_registerClassPair_)); -#endif + CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Message, prototype_s)), Function_prototype); + CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Selector, prototype_s)), Function_prototype); - CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend)); + JSObjectRef cache(CYGetCachedObject(context, CYJSString("cache"))); + CYSetProperty(context, cache, CYJSString("YES"), JSValueMakeBoolean(context, true), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("NO"), JSValueMakeBoolean(context, false), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("id"), CYMakeType(context, sig::Object()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("Class"), CYMakeType(context, sig::Meta()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("SEL"), CYMakeType(context, sig::Selector()), kJSPropertyAttributeDontEnum); - JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Message, prototype_), Function_prototype_); - JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Selector, prototype_), Function_prototype_); + CYSetProperty(context, cy, CYJSString("cydget"), CYCastJSValue(context, false)); } CYPoolCatch() } -static CYHooks CYObjectiveCHooks = { +static void *CYObjectiveC_CastSymbol(const char *name) { + if (false); +#ifdef __GNU_LIBOBJC__ + else if (strcmp(name, "object_getClass") == 0) + return reinterpret_cast(&object_getClass); +#endif + return NULL; +} + +static CYHook CYObjectiveCHook = { &CYObjectiveC_ExecuteStart, &CYObjectiveC_ExecuteEnd, - &CYObjectiveC_RuntimeProperty, &CYObjectiveC_CallFunction, &CYObjectiveC_Initialize, &CYObjectiveC_SetupContext, - &CYObjectiveC_PoolFFI, - &CYObjectiveC_FromFFI, + &CYObjectiveC_CastSymbol, }; -struct CYObjectiveC { - CYObjectiveC() { - hooks_ = &CYObjectiveCHooks; - } -} CYObjectiveC; +CYRegisterHook CYObjectiveC(&CYObjectiveCHook); + +_extern void CydgetSetupContext(JSGlobalContextRef context) { CYObjectiveTry_ { + CYSetupContext(context); + JSObjectRef global(CYGetGlobalObject(context)); + JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s))); + CYSetProperty(context, cy, CYJSString("cydget"), CYCastJSValue(context, true)); +} CYObjectiveCatch } + +_extern void CydgetMemoryParse(const uint16_t **data, size_t *size) { try { + CYPool pool; + + CYUTF8String utf8(CYPoolUTF8String(pool, CYUTF16String(*data, *size))); + utf8 = CYPoolCode(pool, utf8); + + CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(utf8.data, utf8.size))); + size_t bytes(utf16.size * sizeof(uint16_t)); + uint16_t *copy(reinterpret_cast(malloc(bytes))); + memcpy(copy, utf16.data, bytes); + + *data = copy; + *size = utf16.size; +} catch (const CYException &exception) { + CYPool pool; + @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"%s", exception.PoolCString(pool)] userInfo:nil]; +} }