X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/8aae0f85ad333a78139595a81e02ee359979a4f3..f2c357f9fb922258dac9f808df0143e548c4bfdc:/ObjectiveC/Library.mm diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm index 8e50804..e7c16b8 100644 --- a/ObjectiveC/Library.mm +++ b/ObjectiveC/Library.mm @@ -1,5 +1,5 @@ -/* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2015 Jay Freeman (saurik) +/* Cycript - The Truly Universal Scripting Language + * Copyright (C) 2009-2016 Jay Freeman (saurik) */ /* GNU Affero General Public License, Version 3 {{{ */ @@ -44,12 +44,14 @@ #include #include "Code.hpp" +#include "Decode.hpp" #include "Error.hpp" #include "JavaScript.hpp" #include "String.hpp" #include "Execute.hpp" #include "ObjectiveC/Internal.hpp" +#include "ObjectiveC/Syntax.hpp" #define CYObjectiveTry_ { \ try @@ -241,22 +243,14 @@ bool CYGetOffset(CYPool &pool, JSContextRef context, NSString *value, ssize_t &i return CYGetOffset(CYPoolCString(pool, context, value), index); } -static JSClassRef Instance_; - static JSClassRef ArrayInstance_; static JSClassRef BooleanInstance_; +static JSClassRef ClassInstance_; static JSClassRef FunctionInstance_; static JSClassRef NumberInstance_; static JSClassRef ObjectInstance_; static JSClassRef StringInstance_; -static JSClassRef Class_; -static JSClassRef Internal_; -static JSClassRef Message_; -static JSClassRef Messages_; -static JSClassRef Selector_; -static JSClassRef Super_; - static JSClassRef ObjectiveC_Classes_; static JSClassRef ObjectiveC_Constants_; static JSClassRef ObjectiveC_Protocols_; @@ -283,24 +277,13 @@ static Class NSString_; static Class NSZombie_; static Class Object_; -static Type_privateData *Object_type; -static Type_privateData *Selector_type; - -Type_privateData *Instance::GetType() const { - return Object_type; -} - -Type_privateData *Selector_privateData::GetType() const { - return Selector_type; -} - static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception); JSValueRef CYGetClassPrototype(JSContextRef context, Class self, bool meta) { if (self == nil) return CYGetCachedObject(context, CYJSString("Instance_prototype")); else if (meta && !class_isMetaClass(self)) - return CYGetCachedObject(context, CYJSString("Class_prototype")); + return CYGetCachedObject(context, CYJSString("ClassInstance_prototype")); JSObjectRef global(CYGetGlobalObject(context)); JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s))); @@ -313,7 +296,6 @@ JSValueRef CYGetClassPrototype(JSContextRef context, Class self, bool meta) { if (!JSValueIsUndefined(context, value)) return value; - JSClassRef _class(NULL); JSValueRef prototype; #ifdef __APPLE__ @@ -335,7 +317,7 @@ JSValueRef CYGetClassPrototype(JSContextRef context, Class self, bool meta) { else prototype = CYGetClassPrototype(context, class_getSuperclass(self), meta); - JSObjectRef object(JSObjectMake(context, _class, NULL)); + JSObjectRef object(JSObjectMake(context, NULL, NULL)); CYSetPrototype(context, object, prototype); CYSetProperty(context, cy, name, object); @@ -346,23 +328,12 @@ _finline JSValueRef CYGetClassPrototype(JSContextRef context, Class self) { return CYGetClassPrototype(context, self, class_isMetaClass(self)); } -JSObjectRef Messages::Make(JSContextRef context, Class _class) { - JSObjectRef value(JSObjectMake(context, Messages_, new Messages(_class))); - if (Class super = class_getSuperclass(_class)) - CYSetPrototype(context, value, Messages::Make(context, super)); - return value; -} - -JSObjectRef Internal::Make(JSContextRef context, id object, JSObjectRef owner) { - return JSObjectMake(context, Internal_, new Internal(object, context, owner)); +JSValueRef Messages::GetPrototype(JSContextRef context) const { + if (Class super = class_getSuperclass(value_)) + return Messages::Make(context, super); + return NULL; } -namespace cy { -JSObjectRef Super::Make(JSContextRef context, id object, Class _class) { - JSObjectRef value(JSObjectMake(context, Super_, new Super(object, _class))); - return value; -} } - bool CYIsKindOfClass(id object, Class _class) { for (Class isa(object_getClass(object)); isa != NULL; isa = class_getSuperclass(isa)) if (isa == _class) @@ -370,29 +341,45 @@ bool CYIsKindOfClass(id object, Class _class) { return false; } -JSObjectRef Instance::Make(JSContextRef context, id object, Flags flags) { - JSObjectRef value(JSObjectMake(context, CYIsKindOfClass(object, NSBlock_) ? FunctionInstance_ : Instance_, new Instance(object, flags))); - CYSetPrototype(context, value, CYGetClassPrototype(context, object_getClass(object))); - return value; +JSValueRef Instance::GetPrototype(JSContextRef context) const { + return CYGetClassPrototype(context, object_getClass(value_)); +} + +JSClassRef Instance::GetClass(id object, Flags flags) { + return CYIsKindOfClass(object, NSBlock_) ? FunctionInstance_ : Instance::Class_; +} + +Instance::Instance(id value, Flags flags) : + CYValue(value), + flags_(flags) +{ + if ((flags & Instance::Permanent) == 0) + value_ = [value_ retain]; } Instance::~Instance() { if ((flags_ & Permanent) == 0) - [GetValue() release]; + [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) { } + + static JSObjectRef Make(JSContextRef context, SEL sel, const char *type, IMP value); }; +JSClassRef Message_privateData::Class_; + JSObjectRef CYMakeInstance(JSContextRef context, id object, Instance::Flags flags = Instance::None) { _assert(object != nil); @@ -404,9 +391,6 @@ JSObjectRef CYMakeInstance(JSContextRef context, id object, Instance::Flags flag return instance; #endif - if ((flags & Instance::Permanent) == 0) - object = [object retain]; - JSObjectRef instance(Instance::Make(context, object, flags)); #ifdef __APPLE__ @@ -624,7 +608,7 @@ struct PropertyAttributes { /* }}} */ _finline bool CYJSValueIsNSObject(JSContextRef context, JSValueRef value) { - return JSValueIsObjectOfClass(context, value, Instance_) || JSValueIsObjectOfClass(context, value, FunctionInstance_); + return JSValueIsObjectOfClass(context, value, Instance::Class_) || JSValueIsObjectOfClass(context, value, FunctionInstance_); } _finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) { @@ -659,7 +643,7 @@ NSBlock *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature memset(&descriptor->d_, 0, sizeof(descriptor->d_)); descriptor->internal_ = CYMakeFunctor_(context, function, signature, &BlockAdapter_); - literal->invoke = reinterpret_cast(descriptor->internal_->GetValue()); + literal->invoke = reinterpret_cast(descriptor->internal_->value_); literal->isa = __NSMallocBlock__; literal->flags = BLOCK_HAS_SIGNATURE | BLOCK_HAS_COPY_DISPOSE | BLOCK_IS_GLOBAL; @@ -677,7 +661,7 @@ NSBlock *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature 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)); @@ -841,8 +825,39 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) { /* }}} */ /* Bridge: NSBlock {{{ */ #ifdef __APPLE__ -@interface NSBlock +@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); + + CYTypedIdentifier *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 /* }}} */ @@ -1227,12 +1242,11 @@ NSArray *CYCastNSArray(JSContextRef context, JSPropertyNameArrayRef names) { return array; } -JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { +JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { if (value == nil) return CYJSNull(context); - else - return CYMakeInstance(context, value); -} CYPoolCatch(NULL) return /*XXX*/ NULL; } + return CYMakeInstance(context, value); +} @implementation CYJSObject @@ -1451,13 +1465,14 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { @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 Selector_privateData::Make(context, sel); } static SEL CYCastSEL(JSContextRef context, JSValueRef value) { - if (JSValueIsObjectOfClass(context, value, Selector_)) { + if (JSValueIsObjectOfClass(context, value, Selector_privateData::Class_)) { Selector_privateData *internal(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) value))); return reinterpret_cast(internal->value_); } else { @@ -1478,17 +1493,17 @@ static void CYObjectiveC_CallFunction(CYPool &pool, JSContextRef context, ffi_ci CYCallFunction(pool, context, cif, function, value, values); } CYSadCatch() } +static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef value, const sig::Signature *signature) { #ifdef __APPLE__ -static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef value, sig::Signature *signature) { if (JSValueIsNull(context, value)) return nil; JSObjectRef object(CYCastJSObject(context, value)); if (JSValueIsObjectOfClass(context, object, FunctionInstance_)) - return reinterpret_cast(JSObjectGetPrivate(object))->GetValue(); + return reinterpret_cast(JSObjectGetPrivate(object))->value_; - if (JSValueIsObjectOfClass(context, object, Instance_)) { - _assert(reinterpret_cast(JSObjectGetPrivate(object))->GetValue() == nil); + if (JSValueIsObjectOfClass(context, object, Instance::Class_)) { + _assert(reinterpret_cast(JSObjectGetPrivate(object))->value_ == nil); return nil; } @@ -1505,82 +1520,71 @@ static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef val 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::Type(); + modified.elements[1].type = new(pool) sig::Object(); modified.elements[1].offset = _not(size_t); - memset(modified.elements[1].type, 0, sizeof(sig::Type)); - modified.elements[1].type->primitive = sig::object_P; - return CYMakeBlock(context, object, modified); -} +#else + _assert(false); #endif +} -static bool CYObjectiveC_PoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry { - // XXX: assigning to an indirect id * works for return values, but not for properties and fields +namespace sig { - switch (type->primitive) { -#ifdef __APPLE__ - case sig::block_P: - // XXX: this function might not handle the idea of a null pool - *reinterpret_cast(data) = CYCastNSBlock(*pool, context, value, &type->data.signature); - break; -#endif +void Block::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + // XXX: this function might not handle the idea of a null pool + *reinterpret_cast(data) = CYCastNSBlock(*pool, context, value, &signature); +} - case sig::object_P: - case sig::typename_P: - *reinterpret_cast(data) = CYCastNSObject(pool, context, value); - break; +// 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); +} - case sig::selector_P: - *reinterpret_cast(data) = CYCastSEL(context, value); - break; +void Meta::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + *reinterpret_cast(data) = CYCastNSObject(pool, context, value); +} - default: - return false; - } +void Selector::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + *reinterpret_cast(data) = CYCastSEL(context, value); +} - return true; -} CYSadCatch(false) } - -static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) { CYPoolTry { - switch (type->primitive) { - // XXX: do something epic about blocks - case sig::block_P: - case sig::object_P: - if (NSObject *value = *reinterpret_cast(data)) { - JSObjectRef object(CYMakeInstance(context, value)); - - if (initialize) { - Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - - if ((internal->flags_ & Instance::Uninitialized) != 0) { - internal->flags_ = static_cast(internal->flags_ & ~Instance::Uninitialized); - _assert(internal->value_ == nil); - internal->value_ = value; - } - - [value release]; - } - - return object; - } else goto null; - - case sig::typename_P: - if (Class value = *reinterpret_cast(data)) - return CYMakeInstance(context, value, Instance::Permanent); - else goto null; - - case sig::selector_P: - if (SEL value = *reinterpret_cast(data)) - return CYMakeSelector(context, value); - else goto null; - - null: - return CYJSNull(context); - default: - return NULL; +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->flags_ & Instance::Uninitialized) != 0) { + internal->flags_ = static_cast(internal->flags_ & ~Instance::Uninitialized); + _assert(internal->value_ == nil); + internal->value_ = value; + } + + [value release]; } -} CYPoolCatch(NULL) return /*XXX*/ NULL; } + + return object; +} + +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); +} + +JSValueRef Selector::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + return CYCastJSValue(context, *reinterpret_cast(data)); +} + +JSValueRef Block::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + return CYCastJSValue(context, *reinterpret_cast(data)); +} + +} static bool CYImplements(id object, Class _class, SEL selector, bool devoid = false) { if (objc_method *method = class_getInstanceMethod(_class, selector)) { @@ -1601,9 +1605,9 @@ static JSValueRef MessageAdapter_(JSContextRef context, size_t count, JSValueRef 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)); + return JSObjectMake(context, Message_privateData::Class_, internal); } static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *encoding) { @@ -1613,12 +1617,12 @@ static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *enc 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->GetValue()); + 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()); + Class _class(internal->value_); CYPool pool; const char *name(CYPoolCString(pool, context, property)); @@ -1632,21 +1636,21 @@ static bool Messages_hasProperty(JSContextRef context, JSObjectRef object, JSStr static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Messages *internal(reinterpret_cast(JSObjectGetPrivate(object))); - Class _class(internal->GetValue()); + Class _class(internal->value_); 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) { CYTry { Messages *internal(reinterpret_cast(JSObjectGetPrivate(object))); - Class _class(internal->GetValue()); + Class _class(internal->value_); CYPool pool; const char *name(CYPoolCString(pool, context, property)); @@ -1655,10 +1659,10 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr 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()); + imp = reinterpret_cast(message->value_); } else if (objc_method *method = class_getInstanceMethod(_class, sel)) { type = method_getTypeEncoding(method); imp = CYMakeMessage(context, value, type); @@ -1684,7 +1688,7 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { Messages *internal(reinterpret_cast(JSObjectGetPrivate(object))); - Class _class(internal->GetValue()); + Class _class(internal->value_); unsigned int size; objc_method **data(class_copyMethodList(_class, &size)); @@ -1702,7 +1706,7 @@ static bool CYHasImplicitProperties(Class _class) { 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; @@ -1738,10 +1742,10 @@ static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStr 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 Interior::Make(context, self, context, object); CYPool pool; NSString *name(CYCastNSString(&pool, context, property)); @@ -1774,7 +1778,7 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object, 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; @@ -1832,7 +1836,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr 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)); @@ -1854,7 +1858,7 @@ static void Instance_getPropertyNames_message(JSPropertyNameAccumulatorRef names 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)); @@ -1885,7 +1889,7 @@ static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, 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(CYMakeInstance(context, [internal->GetValue() alloc], Instance::Uninitialized)); + JSObjectRef value(CYMakeInstance(context, [internal->value_ alloc], Instance::Uninitialized)); return value; } CYCatch(NULL) } @@ -1901,9 +1905,26 @@ static const char *CYBlockEncoding(NSBlock *self) { return descriptor3->signature; } +static bool CYBlockSignature(CYPool &pool, NSBlock *self, sig::Signature &signature) { + const char *encoding(CYBlockEncoding(self)); + if (encoding == NULL) + return false; + + 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->GetValue()); + id self(internal->value_); if (const char *encoding = CYBlockEncoding(self)) { CYPool pool; @@ -1915,11 +1936,11 @@ static JSValueRef FunctionInstance_callAsFunction(JSContextRef context, JSObject sig::Parse(pool, &signature, encoding, &Structor_); ffi_cif cif; - sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &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, &signature, &cif, function); + return CYCallFunction(pool, context, 1, setup, count, arguments, false, false, signature, &cif, function); } if (count != 0) @@ -1934,14 +1955,14 @@ static JSValueRef FunctionInstance_callAsFunction(JSContextRef context, JSObject static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) constructor))); - Class _class(internal->GetValue()); + Class _class(internal->value_); if (!CYIsClass(_class)) return false; 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; @@ -1957,11 +1978,11 @@ static JSValueRef Instance_box_callAsFunction(JSContextRef context, JSObjectRef return CYCastJSValue(context, [value cy$box]); } CYCatch(NULL) } -static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { - Internal *internal(reinterpret_cast(JSObjectGetPrivate(object))); +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) @@ -1988,11 +2009,11 @@ static void CYBitField(unsigned &length, unsigned &shift, id self, Ivar ivar, co free(ivars); } -static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { - Internal *internal(reinterpret_cast(JSObjectGetPrivate(object))); +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)) { @@ -2017,18 +2038,18 @@ static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object, #endif auto type(new(pool) Type_privateData(encoding)); - return CYFromFFI(context, type->type_, type->GetFFI(), data); + return type->type_->FromFFI(context, type->GetFFI(), data); } } return NULL; } 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)) { @@ -2046,7 +2067,7 @@ static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStr field = field & ~(mask << shift) | (uintptr_t(CYCastDouble(context, value)) & mask) << shift; } else { auto type(new(pool) Type_privateData(ivar_getTypeEncoding(ivar))); - CYPoolFFI(&pool, context, type->type_, type->GetFFI(), reinterpret_cast(self) + ivar_getOffset(ivar), value); + type->type_->PoolFFI(&pool, context, type->GetFFI(), reinterpret_cast(self) + ivar_getOffset(ivar), value); return true; } } @@ -2054,9 +2075,9 @@ static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStr return false; } CYCatch(false) } -static void Internal_getPropertyNames_(Class _class, JSPropertyNameAccumulatorRef names) { +static void Interior_getPropertyNames_(Class _class, JSPropertyNameAccumulatorRef names) { if (Class super = class_getSuperclass(_class)) - Internal_getPropertyNames_(super, names); + Interior_getPropertyNames_(super, names); unsigned int size; objc_ivar **data(class_copyIvarList(_class, &size)); @@ -2065,19 +2086,19 @@ static void Internal_getPropertyNames_(Class _class, JSPropertyNameAccumulatorRe free(data); } -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_(_class, names); } -static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - Internal *internal(reinterpret_cast(JSObjectGetPrivate(object))); - return internal->GetOwner(); +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) { @@ -2368,28 +2389,8 @@ JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _cla sig::Signature signature; sig::Parse(pool, &signature, type, &Structor_); - size_t used(count + 3); - if (used > signature.count) { - sig::Element *elements(new (pool) sig::Element[used]); - memcpy(elements, signature.elements, used * sizeof(sig::Element)); - - for (size_t index(signature.count); index != used; ++index) { - sig::Element *element(&elements[index]); - element->name = NULL; - element->offset = _not(size_t); - - sig::Type *type(new (pool) sig::Type); - memset(type, 0, sizeof(*type)); - type->primitive = sig::object_P; - element->type = type; - } - - signature.elements = elements; - signature.count = used; - } - ffi_cif cif; - sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif); + sig::sig_ffi_cif(pool, 0, signature, &cif); if (imp == NULL) { #ifndef CY_NO_STRET @@ -2401,7 +2402,7 @@ JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _cla } void (*function)() = reinterpret_cast(imp); - return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, &signature, &cif, function); + 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[]) { @@ -2416,14 +2417,14 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje SEL _cmd; Class _class; - if (JSValueIsObjectOfClass(context, arguments[0], Super_)) { + if (JSValueIsObjectOfClass(context, arguments[0], cy::Super::Class_)) { cy::Super *internal(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) arguments[0]))); - self = internal->GetValue(); + self = internal->value_; _class = internal->class_;; uninitialized = false; } 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) @@ -2465,7 +2466,7 @@ static JSValueRef Message_callAsFunction(JSContextRef context, JSObjectRef objec setup[0] = &self; setup[1] = &internal->sel_; - return CYCallFunction(pool, context, 2, setup, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue()); + return CYCallFunction(pool, context, 2, setup, count, arguments, false, true, internal->signature_, &internal->cif_, internal->value_); } CYCatch(NULL) } static JSObjectRef Super_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -2482,59 +2483,44 @@ static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t 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)); + return Selector_privateData::Make(context, sel_registerName(name)); } CYCatch(NULL) } 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 CYMakeInstance(context, self); + return CYMakeInstance(context, CYCastPointer(context, arguments[0])); } CYCatch(NULL) } -static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { - CYValue *internal(reinterpret_cast(JSObjectGetPrivate(object))); - return CYCastJSValue(context, reinterpret_cast(internal->value_)); +static JSValueRef Selector_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + return CYMakeType(context, sig::Selector()); } CYCatch(NULL) } -static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - CYValue *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - Type_privateData *typical(internal->GetType()); - - sig::Type *type; - ffi_type *ffi; - - if (typical == NULL) { - type = NULL; - ffi = NULL; - } else { - type = typical->type_; - ffi = typical->ffi_; - } - - return CYMakePointer(context, &internal->value_, _not(size_t), type, ffi, object); +static JSValueRef Instance_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); + id self(internal->value_); + if (CYIsClass(self)) + return CYMakeType(context, sig::Meta()); + return CYMakeType(context, sig::Object(class_getName(object_getClass(self)))); } CYCatch(NULL) } -static JSValueRef FunctionInstance_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { +static JSValueRef FunctionInstance_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - const char *encoding(CYBlockEncoding(internal->GetValue())); - if (encoding == NULL) - return CYJSNull(context); - // XXX: this should be stored on a FunctionInstance private value subclass CYPool pool; - sig::Signature signature; - sig::Parse(pool, &signature, encoding, &Structor_); - return CYMakeType(context, &signature); + sig::Block type; + if (!CYBlockSignature(pool, internal->value_, type.signature)) + return CYJSNull(context); + return CYMakeType(context, type); } CYCatch(NULL) } static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - return CYMakeInstance(context, object_getClass(internal->GetValue()), Instance::Permanent); + return CYMakeInstance(context, object_getClass(internal->value_), Instance::Permanent); } CYCatch(NULL) } static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - id self(internal->GetValue()); + id self(internal->value_); if (!CYIsClass(self)) return CYJSUndefined(context); return CYGetClassPrototype(context, self); @@ -2542,7 +2528,7 @@ static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectR static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); - id self(internal->GetValue()); + id self(internal->value_); if (!CYIsClass(self)) return CYJSUndefined(context); return Messages::Make(context, (Class) self); @@ -2555,7 +2541,7 @@ static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectR return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue(), false, objects))); + return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->value_, false, objects))); } CYCatch(NULL) } static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -2563,7 +2549,7 @@ static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectR return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - id value(internal->GetValue()); + id value(internal->value_); CYPoolTry { NSString *key; @@ -2586,7 +2572,7 @@ static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObject return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - id value(internal->GetValue()); + id value(internal->value_); _assert(value != nil); if (![value respondsToSelector:@selector(cy$valueOfInContext:)]) @@ -2604,7 +2590,7 @@ static JSValueRef Instance_callAsFunction_toPointer(JSContextRef context, JSObje Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); // XXX: but... but... THIS ISN'T A POINTER! :( - return CYCastJSValue(context, reinterpret_cast(internal->GetValue())); + 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 { @@ -2612,7 +2598,7 @@ static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjec return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - id value(internal->GetValue()); + id value(internal->value_); CYPoolTry { // XXX: this seems like a stupid implementation; what if it crashes? why not use the CYONifier backend? @@ -2625,21 +2611,18 @@ static JSValueRef Class_callAsFunction_pointerTo(JSContextRef context, JSObjectR return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - id value(internal->GetValue()); + id value(internal->value_); if (!CYIsClass(value)) CYThrow("non-Class object cannot be used as Type"); - sig::Type type; - memset(&type, 0, sizeof(type)); - type.primitive = sig::object_P; - type.name = class_getName(value); - return CYMakeType(context, &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())); + 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) { @@ -2648,7 +2631,7 @@ 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]); @@ -2662,43 +2645,41 @@ 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_); Class _class(_require(CYCastClass(pool, context, arguments[0]))); objc_method *method(_require(class_getInstanceMethod(_class, sel))); const char *encoding(method_getTypeEncoding(method)); - sig::Signature signature; - sig::Parse(pool, &signature, encoding, &Structor_); - return CYMakeType(context, &signature); + 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} }; -// XXX: this is sadly duplicated in FunctionInstance_staticValues static JSStaticValue Instance_staticValues[5] = { + {"$cyt", &Instance_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + // XXX: this is sadly duplicated in FunctionInstance_staticValues {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"messages", &Instance_getProperty_messages, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"prototype", &Instance_getProperty_prototype, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, NULL, 0} }; -static JSStaticValue FunctionInstance_staticValues[6] = { - {"type", &FunctionInstance_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, +static JSStaticValue FunctionInstance_staticValues[5] = { + {"$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_prototype, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, - {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, NULL, 0} }; -static JSStaticFunction Instance_staticFunctions[7] = { - {"$cya", &CYValue_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, +static JSStaticFunction Instance_staticFunctions[6] = { {"toCYON", &Instance_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toJSON", &Instance_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, @@ -2712,8 +2693,8 @@ static JSStaticFunction Class_staticFunctions[2] = { {NULL, NULL, 0} }; -static JSStaticFunction Internal_staticFunctions[2] = { - {"$cya", &Internal_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, +static JSStaticFunction Interior_staticFunctions[2] = { + {"$cya", &Interior_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} }; @@ -2732,11 +2713,6 @@ JSValueRef NSCFType$cy$toJSON$inContext$(id self, SEL sel, JSValueRef key, JSCon #endif void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { - CYPool &pool(CYGetGlobalPool()); - - Object_type = new(pool) Type_privateData(sig::object_P); - Selector_type = new(pool) Type_privateData(sig::selector_P); - NSArray_ = objc_getClass("NSArray"); NSBlock_ = objc_getClass("NSBlock"); NSDictionary_ = objc_getClass("NSDictionary"); @@ -2774,7 +2750,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition.callAsConstructor = &Instance_callAsConstructor; definition.hasInstance = &Instance_hasInstance; definition.finalize = &CYFinalize; - Instance_ = JSClassCreate(&definition); + Instance::Class_ = JSClassCreate(&definition); definition.className = "ArrayInstance"; ArrayInstance_ = JSClassCreate(&definition); @@ -2799,17 +2775,17 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition = kJSClassDefinitionEmpty; definition.className = "Class"; definition.staticFunctions = Class_staticFunctions; - Class_ = JSClassCreate(&definition); + ClassInstance_ = 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); + Interior::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "Message"; @@ -2817,7 +2793,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition.staticValues = cy::Functor::StaticValues; definition.callAsFunction = &Message_callAsFunction; definition.finalize = &CYFinalize; - Message_ = JSClassCreate(&definition); + Message_privateData::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "Messages"; @@ -2826,7 +2802,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition.setProperty = &Messages_setProperty; definition.getPropertyNames = &Messages_getPropertyNames; definition.finalize = &CYFinalize; - Messages_ = JSClassCreate(&definition); + Messages::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "Selector"; @@ -2834,13 +2810,12 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition.staticFunctions = Selector_staticFunctions; definition.callAsFunction = &Selector_callAsFunction; definition.finalize = &CYFinalize; - Selector_ = JSClassCreate(&definition); + Selector_privateData::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "Super"; - definition.staticFunctions = Internal_staticFunctions; definition.finalize = &CYFinalize; - Super_ = JSClassCreate(&definition); + cy::Super::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "ObjectiveC::Classes"; @@ -2913,12 +2888,11 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry { CYSetProperty(context, ObjectiveC, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL)); #endif - JSObjectRef Class(JSObjectMakeConstructor(context, Class_, NULL)); - JSObjectRef Instance(JSObjectMakeConstructor(context, Instance_, &Instance_new)); - JSObjectRef Message(JSObjectMakeConstructor(context, Message_, NULL)); - JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new)); - JSObjectRef Super(JSObjectMakeConstructor(context, Super_, &Super_new)); + JSObjectRef Message(JSObjectMakeConstructor(context, Message_privateData::Class_, NULL)); + JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_privateData::Class_, &Selector_new)); + JSObjectRef Super(JSObjectMakeConstructor(context, cy::Super::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); @@ -2934,6 +2908,12 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry { JSObjectRef Boolean_prototype(CYGetCachedObject(context, CYJSString("Boolean_prototype"))); CYSetPrototype(context, BooleanInstance_prototype, Boolean_prototype); + JSObjectRef ClassInstance(JSObjectMakeConstructor(context, ClassInstance_, NULL)); + JSObjectRef ClassInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ClassInstance, prototype_s))); + CYSetProperty(context, cy, CYJSString("ClassInstance_prototype"), ClassInstance_prototype); + // XXX: this doesn't fit the pattern of the other ones; maybe it sort of should? + CYSetPrototype(context, ClassInstance_prototype, Instance_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); @@ -2958,10 +2938,6 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry { JSObjectRef String_prototype(CYGetCachedObject(context, CYJSString("String_prototype"))); CYSetPrototype(context, StringInstance_prototype, String_prototype); - JSObjectRef Class_prototype(CYCastJSObject(context, CYGetProperty(context, Class, prototype_s))); - CYSetProperty(context, cy, CYJSString("Class_prototype"), Class_prototype); - CYSetPrototype(context, Class_prototype, Instance_prototype); - CYSetProperty(context, cycript, CYJSString("Instance"), Instance); CYSetProperty(context, cycript, CYJSString("Selector"), Selector); CYSetProperty(context, cycript, CYJSString("objc_super"), Super); @@ -2981,9 +2957,9 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry { 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, "@"), kJSPropertyAttributeDontEnum); - CYSetProperty(context, cache, CYJSString("Class"), CYMakeType(context, "#"), kJSPropertyAttributeDontEnum); - CYSetProperty(context, cache, CYJSString("SEL"), CYMakeType(context, ":"), 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); } CYPoolCatch() } static void *CYObjectiveC_CastSymbol(const char *name) { @@ -3001,8 +2977,6 @@ static CYHook CYObjectiveCHook = { &CYObjectiveC_CallFunction, &CYObjectiveC_Initialize, &CYObjectiveC_SetupContext, - &CYObjectiveC_PoolFFI, - &CYObjectiveC_FromFFI, &CYObjectiveC_CastSymbol, };