With -p on all platforms, we can't use asprintf().

[cycript.git] / ObjectiveC / Library.mm

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 11a130540b20d3528c683de8111739d4443d7cbe..29d7be4bfa9bf7393381f739af815b860cafa80c 100644 (file)
--- 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 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -46,6 +46,7 @@
 #include "Code.hpp"
 #include "Decode.hpp"
 #include "Error.hpp"
 #include "Code.hpp"
 #include "Decode.hpp"
 #include "Error.hpp"

+#include "Functor.hpp"

 #include "JavaScript.hpp"
 #include "String.hpp"
 #include "Execute.hpp"
 #include "JavaScript.hpp"
 #include "String.hpp"
 #include "Execute.hpp"


@@ -129,6 +130,10 @@ enum {
     BLOCK_HAS_SIGNATURE = 1 << 30,
 };
 
     BLOCK_HAS_SIGNATURE = 1 << 30,
 };
 

+static bool CYIsClass(id self) {
+    return class_isMetaClass(object_getClass(self));
+}
+

 JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize);
 
 /* Objective-C Pool Release {{{ */
 JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize);
 
 /* Objective-C Pool Release {{{ */


@@ -243,14 +248,6 @@ bool CYGetOffset(CYPool &pool, JSContextRef context, NSString *value, ssize_t &i
     return CYGetOffset(CYPoolCString(pool, context, value), index);
 }
 
     return CYGetOffset(CYPoolCString(pool, context, value), index);
 }
 

-static JSClassRef ArrayInstance_;
-static JSClassRef BooleanInstance_;
-static JSClassRef ClassInstance_;
-static JSClassRef FunctionInstance_;
-static JSClassRef NumberInstance_;
-static JSClassRef ObjectInstance_;
-static JSClassRef StringInstance_;
-

 static JSClassRef ObjectiveC_Classes_;
 static JSClassRef ObjectiveC_Constants_;
 static JSClassRef ObjectiveC_Protocols_;
 static JSClassRef ObjectiveC_Classes_;
 static JSClassRef ObjectiveC_Constants_;
 static JSClassRef ObjectiveC_Protocols_;


@@ -273,65 +270,38 @@ static Class NSArray_;
 static Class NSBlock_;
 static Class NSDictionary_;
 static Class NSNumber_;
 static Class NSBlock_;
 static Class NSDictionary_;
 static Class NSNumber_;

+static Class NSObject_;

 static Class NSString_;
 static Class NSZombie_;
 static Class Object_;
 
 static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception);
 
 static Class NSString_;
 static Class NSZombie_;
 static Class Object_;
 
 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("ClassInstance_prototype"));
-
-    JSObjectRef global(CYGetGlobalObject(context));
-    JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));
-
-    char label[32];
-    sprintf(label, "i%p", self);
-    CYJSString name(label);
-
-    JSValueRef value(CYGetProperty(context, cy, name));
-    if (!JSValueIsUndefined(context, value))
-        return value;
-
-    JSValueRef prototype;
-
+JSValueRef Messages::GetPrototype(JSContextRef context) const {

 #ifdef __APPLE__
 #ifdef __APPLE__

-    if (self == NSCFBoolean_)
+    if (value_ == NSCFBoolean_)

 #else
 #else

-    if (self == NSBoolNumber_)
+    if (value_ == NSBoolNumber_)

 #endif
 #endif

-        prototype = CYGetCachedObject(context, CYJSString("BooleanInstance_prototype"));
-    else if (self == NSArray_)
-        prototype = CYGetCachedObject(context, CYJSString("ArrayInstance_prototype"));
-    else if (self == NSBlock_)
-        prototype = CYGetCachedObject(context, CYJSString("FunctionInstance_prototype"));
-    else if (self == NSNumber_)
-        prototype = CYGetCachedObject(context, CYJSString("NumberInstance_prototype"));
-    else if (self == NSDictionary_)
-        prototype = CYGetCachedObject(context, CYJSString("ObjectInstance_prototype"));
-    else if (self == NSString_)
-        prototype = CYGetCachedObject(context, CYJSString("StringInstance_prototype"));
-    else
-        prototype = CYGetClassPrototype(context, class_getSuperclass(self), meta);
-
-    JSObjectRef object(JSObjectMake(context, NULL, NULL));
-    CYSetPrototype(context, object, prototype);
-    CYSetProperty(context, cy, name, object);
-
-    return object;
-}
-
-_finline JSValueRef CYGetClassPrototype(JSContextRef context, Class self) {
-    return CYGetClassPrototype(context, self, class_isMetaClass(self));
-}
+        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"));

 
 

-JSValueRef Messages::GetPrototype(JSContextRef context) const {

     if (Class super = class_getSuperclass(value_))
     if (Class super = class_getSuperclass(value_))

-        return Messages::Make(context, super);
-    return NULL;
+        if (class_isMetaClass(value_) && !class_isMetaClass(super))
+            return CYGetCachedObject(context, CYJSString("TypeInstance_prototype"));
+        else
+            return CYPrivate<Messages>::Cache(context, super);
+    else
+        return CYGetCachedObject(context, CYJSString("Instance_prototype"));

 }
 
 bool CYIsKindOfClass(id object, Class _class) {
 }
 
 bool CYIsKindOfClass(id object, Class _class) {


@@ -342,23 +312,22 @@ bool CYIsKindOfClass(id object, Class _class) {
 }
 
 JSValueRef Instance::GetPrototype(JSContextRef context) const {
 }
 
 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_;
+    return CYPrivate<Messages>::Cache(context, object_getClass(value_));

 }
 
 Instance::Instance(id value, Flags flags) :
 }
 
 Instance::Instance(id value, Flags flags) :

-    CYValue(value),
+    value_(value),

     flags_(flags)
 {
     flags_(flags)
 {

-    if ((flags & Instance::Permanent) == 0)
+    if (IsPermanent());
+    /*else if ([value retainCount] == NSUInteger(-1))
+        flags_ |= Instance::Permanent;*/
+    else

         value_ = [value_ retain];
 }
 
 Instance::~Instance() {
         value_ = [value_ retain];
 }
 
 Instance::~Instance() {

-    if ((flags_ & Permanent) == 0)
+    if (!IsPermanent())

         [value_ release];
 }
 
         [value_ release];
 }
 


@@ -375,6 +344,8 @@ struct Message_privateData :
     {
     }
 
     {
     }
 

+    virtual CYPropertyName *GetName(CYPool &pool) const;
+

     static JSObjectRef Make(JSContextRef context, SEL sel, const char *type, IMP value);
 };
 
     static JSObjectRef Make(JSContextRef context, SEL sel, const char *type, IMP value);
 };
 


@@ -391,7 +362,14 @@ JSObjectRef CYMakeInstance(JSContextRef context, id object, Instance::Flags flag
             return instance;
 #endif
 
             return instance;
 #endif
 

-    JSObjectRef instance(Instance::Make(context, object, flags));
+    JSObjectRef instance;
+    if (false);
+    else if (CYIsKindOfClass(object, NSBlock_))
+        instance = CYPrivate<Block>::Make(context, object, flags);
+    else if (CYIsClass(object))
+        instance = CYPrivate<Constructor>::Make(context, object, flags);
+    else
+        instance = CYPrivate<Instance>::Make(context, object, flags);

 
 #ifdef __APPLE__
     if (weak != NULL && &JSWeakObjectMapSet != NULL)
 
 #ifdef __APPLE__
     if (weak != NULL && &JSWeakObjectMapSet != NULL)


@@ -608,7 +586,7 @@ struct PropertyAttributes {
 /* }}} */
 
 _finline bool CYJSValueIsNSObject(JSContextRef context, JSValueRef value) {
 /* }}} */
 
 _finline bool CYJSValueIsNSObject(JSContextRef context, JSValueRef value) {

-    return JSValueIsObjectOfClass(context, value, Instance::Class_) || JSValueIsObjectOfClass(context, value, FunctionInstance_);
+    return JSValueIsObjectOfClass(context, value, CYPrivate<Instance>::Class_);

 }
 
 _finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) {
 }
 
 _finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) {


@@ -664,6 +642,9 @@ NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSObjectRef object)
         return internal->value_;
     }
 
         return internal->value_;
     }
 

+    if (NSObject *pointer = CYCastPointerEx<NSObject *>(context, object))
+        return pointer;
+

     bool array(CYJSValueIsInstanceOfCachedConstructor(context, object, Array_s));
     id value(array ? [CYJSArray alloc] : [CYJSObject alloc]);
     return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]);
     bool array(CYJSValueIsInstanceOfCachedConstructor(context, object, Array_s));
     id value(array ? [CYJSArray alloc] : [CYJSObject alloc]);
     return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]);


@@ -842,7 +823,7 @@ static bool CYBlockSignature(CYPool &pool, NSBlock *self, sig::Signature &signat
         return [super cy$toCYON:objective inSet:objects];
     _oassert(objects.insert(self).second);
 
         return [super cy$toCYON:objective inSet:objects];
     _oassert(objects.insert(self).second);
 

-    CYTypedIdentifier *typed((new(pool) CYTypeExpression(CYDecodeType(pool, &type)))->typed_);
+    CYType *typed((new(pool) CYTypeExpression(CYDecodeType(pool, &type)))->typed_);

     CYTypeModifier *&modifier(CYGetLast(typed->modifier_));
     CYTypeBlockWith *with(dynamic_cast<CYTypeBlockWith *>(modifier));
     _assert(with != NULL);
     CYTypeModifier *&modifier(CYGetLast(typed->modifier_));
     CYTypeBlockWith *with(dynamic_cast<CYTypeBlockWith *>(modifier));
     _assert(with != NULL);


@@ -1164,7 +1145,7 @@ static bool CYBlockSignature(CYPool &pool, NSBlock *self, sig::Signature &signat
     if (!objective)
         str << '@';
     CYUTF8String string(CYCastUTF8String(self));
     if (!objective)
         str << '@';
     CYUTF8String string(CYCastUTF8String(self));

-    CYStringify(str, string.data, string.size, true);
+    CYStringify(str, string.data, string.size, CYStringifyModeNative);

     std::string value(str.str());
     return CYCastNSString(NULL, CYUTF8String(value.c_str(), value.size()));
 }
     std::string value(str.str());
     return CYCastNSString(NULL, CYUTF8String(value.c_str(), value.size()));
 }


@@ -1221,10 +1202,6 @@ static bool CYBlockSignature(CYPool &pool, NSBlock *self, sig::Signature &signat
 @end
 /* }}} */
 
 @end
 /* }}} */
 

-static bool CYIsClass(id self) {
-    return class_isMetaClass(object_getClass(self));
-}
-

 Class CYCastClass(CYPool &pool, JSContextRef context, JSValueRef value) {
     id self(CYCastNSObject(&pool, context, value));
     if (CYIsClass(self))
 Class CYCastClass(CYPool &pool, JSContextRef context, JSValueRef value) {
     id self(CYCastNSObject(&pool, context, value));
     if (CYIsClass(self))


@@ -1468,11 +1445,11 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) {
 static JSValueRef CYCastJSValue(JSContextRef context, SEL sel) {
     if (sel == NULL)
         return CYJSNull(context);
 static JSValueRef CYCastJSValue(JSContextRef context, SEL sel) {
     if (sel == NULL)
         return CYJSNull(context);

-    return Selector_privateData::Make(context, sel);
+    return CYPrivate<Selector_privateData>::Make(context, sel);

 }
 
 static SEL CYCastSEL(JSContextRef context, JSValueRef value) {
 }
 
 static SEL CYCastSEL(JSContextRef context, JSValueRef value) {

-    if (JSValueIsObjectOfClass(context, value, Selector_privateData::Class_)) {
+    if (JSValueIsObjectOfClass(context, value, CYPrivate<Selector_privateData>::Class_)) {

         Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate((JSObjectRef) value)));
         return reinterpret_cast<SEL>(internal->value_);
     } else {
         Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate((JSObjectRef) value)));
         return reinterpret_cast<SEL>(internal->value_);
     } else {


@@ -1499,10 +1476,10 @@ static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef val
         return nil;
     JSObjectRef object(CYCastJSObject(context, value));
 
         return nil;
     JSObjectRef object(CYCastJSObject(context, value));
 

-    if (JSValueIsObjectOfClass(context, object, FunctionInstance_))
+    if (JSValueIsObjectOfClass(context, object, CYPrivate<Block>::Class_))

         return reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->value_;
 
         return reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->value_;
 

-    if (JSValueIsObjectOfClass(context, object, Instance::Class_)) {
+    if (JSValueIsObjectOfClass(context, object, CYPrivate<Instance>::Class_)) {

         _assert(reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->value_ == nil);
         return nil;
     }
         _assert(reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->value_ == nil);
         return nil;
     }


@@ -1532,7 +1509,8 @@ static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef val
 namespace sig {
 
 void Block::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
 namespace sig {
 
 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
+    // XXX: this function actually needs to handle null pools as it is an autorelease
+    _assert(pool != NULL);

     *reinterpret_cast<id *>(data) = CYCastNSBlock(*pool, context, value, &signature);
 }
 
     *reinterpret_cast<id *>(data) = CYCastNSBlock(*pool, context, value, &signature);
 }
 


@@ -1558,10 +1536,12 @@ JSValueRef Object::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool
     if (initialize) {
         Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
 
     if (initialize) {
         Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
 

-        if ((internal->flags_ & Instance::Uninitialized) != 0) {
-            internal->flags_ = static_cast<Instance::Flags>(internal->flags_ & ~Instance::Uninitialized);
-            _assert(internal->value_ == nil);
-            internal->value_ = value;
+        if (internal->IsUninitialized()) {
+            internal->flags_ &= ~Instance::Uninitialized;
+            if (internal->value_ == nil)
+                internal->value_ = value;
+            else
+                _assert(internal->value_ == value);

         }
 
         [value release];
         }
 
         [value release];


@@ -1607,7 +1587,9 @@ static JSValueRef MessageAdapter_(JSContextRef context, size_t count, JSValueRef
 
 JSObjectRef Message_privateData::Make(JSContextRef context, SEL sel, const char *type, IMP value) {
     Message_privateData *internal(new Message_privateData(sel, type, value));
 
 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);
+    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 *encoding) {
 }
 
 static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *encoding) {


@@ -1621,7 +1603,7 @@ static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *enc
 }
 
 static bool Messages_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
 }
 
 static bool Messages_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {

-    Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
+    auto internal(CYPrivate<Messages>::Get(context, object));

     Class _class(internal->value_);
 
     CYPool pool;
     Class _class(internal->value_);
 
     CYPool pool;


@@ -1635,7 +1617,7 @@ static bool Messages_hasProperty(JSContextRef context, JSObjectRef object, JSStr
 }
 
 static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
 }
 
 static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {

-    Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
+    auto internal(CYPrivate<Messages>::Get(context, object));

     Class _class(internal->value_);
 
     CYPool pool;
     Class _class(internal->value_);
 
     CYPool pool;


@@ -1649,7 +1631,7 @@ static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object,
 } CYCatch(NULL) }
 
 static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
 } CYCatch(NULL) }
 
 static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {

-    Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
+    auto internal(CYPrivate<Messages>::Get(context, object));

     Class _class(internal->value_);
 
     CYPool pool;
     Class _class(internal->value_);
 
     CYPool pool;


@@ -1666,17 +1648,18 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
     } else if (objc_method *method = class_getInstanceMethod(_class, sel)) {
         type = method_getTypeEncoding(method);
         imp = CYMakeMessage(context, value, type);
     } else if (objc_method *method = class_getInstanceMethod(_class, sel)) {
         type = method_getTypeEncoding(method);
         imp = CYMakeMessage(context, value, type);

-    } else _assert(false);
+    } else return false;

 
     objc_method *method(NULL);
     unsigned int size;
     objc_method **methods(class_copyMethodList(_class, &size));
 
     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;
         }
     for (size_t i(0); i != size; ++i)
         if (sel_isEqual(method_getName(methods[i]), sel)) {
             method = methods[i];
             break;
         }

-    free(methods);

 
     if (method != NULL)
         method_setImplementation(method, imp);
 
     if (method != NULL)
         method_setImplementation(method, imp);


@@ -1686,24 +1669,65 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
     return true;
 } CYCatch(false) }
 
     return true;
 } CYCatch(false) }
 

-static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
-    Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
+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;
+    CYUTF8String prefix(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0])));
+
+    auto internal(CYPrivate<Messages>::Get(context, _this));

     Class _class(internal->value_);
 
     unsigned int size;
     objc_method **data(class_copyMethodList(_class, &size));
     Class _class(internal->value_);
 
     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);
-}
+    pool.atexit(free, data);

 
 

-static bool CYHasImplicitProperties(Class _class) {
+    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) }
+
+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];
 }
 
     // XXX: this is an evil hack to deal with NSProxy; fix elsewhere
     if (!CYImplements(_class, object_getClass(_class), @selector(cy$hasImplicitProperties)))
         return true;
     return [_class cy$hasImplicitProperties];
 }
 

+static 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;
+
+    /* // 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 bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->value_);
 static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->value_);


@@ -1729,10 +1753,10 @@ static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStr
 
     const char *string(CYPoolCString(pool, context, name));
 
 
     const char *string(CYPoolCString(pool, context, name));
 

-    if (class_getProperty(_class, string) != NULL)
+    if (CYFindProperty(pool, _class, string) != NULL)

         return true;
 
         return true;
 

-    if (CYHasImplicitProperties(_class))
+    if (CYHasImplicitProperties(context, _class))

         if (SEL sel = sel_getUid(string))
             if (CYImplements(self, _class, sel, true))
                 return true;
         if (SEL sel = sel_getUid(string))
             if (CYImplements(self, _class, sel, true))
                 return true;


@@ -1745,7 +1769,7 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object,
     id self(internal->value_);
 
     if (JSStringIsEqualToUTF8CString(property, "$cyi"))
     id self(internal->value_);
 
     if (JSStringIsEqualToUTF8CString(property, "$cyi"))

-        return Internal::Make(context, self, context, object);
+        return CYPrivate<Interior>::Make(context, self, context, object);

 
     CYPool pool;
     NSString *name(CYCastNSString(&pool, context, property));
 
     CYPool pool;
     NSString *name(CYCastNSString(&pool, context, property));


@@ -1762,13 +1786,13 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object,
     const char *string(CYPoolCString(pool, context, name));
     Class _class(object_getClass(self));
 
     const char *string(CYPoolCString(pool, context, name));
     Class _class(object_getClass(self));
 

-    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);
     }
 
         PropertyAttributes attributes(property);
         SEL sel(sel_registerName(attributes.Getter()));
         return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false);
     }
 

-    if (CYHasImplicitProperties(_class))
+    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);
         if (SEL sel = sel_getUid(string))
             if (CYImplements(self, _class, sel, true))
                 return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false);


@@ -1793,7 +1817,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
     const char *string(CYPoolCString(pool, context, name));
     Class _class(object_getClass(self));
 
     const char *string(CYPoolCString(pool, context, name));
     Class _class(object_getClass(self));
 

-    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));
         PropertyAttributes attributes(property);
         if (const char *setter = attributes.Setter()) {
             SEL sel(sel_registerName(setter));


@@ -1844,16 +1868,22 @@ static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JS
     } CYPoolCatch(false)
 } CYCatch(false) return /*XXX*/ false; }
 
     } CYPoolCatch(false)
 } CYCatch(false) return /*XXX*/ false; }
 

-static void Instance_getPropertyNames_message(JSPropertyNameAccumulatorRef names, objc_method *method) {
-    const char *name(sel_getName(method_getName(method)));
-    if (strchr(name, ':') != NULL)
-        return;
+static void CYForEachProperty(CYPool &pool, Class _class, const Functor<void (objc_method *, const char *)> &code) {
+    for (; _class != Nil; _class = class_getSuperclass(_class)) {
+        unsigned int size;
+        objc_method **data(class_copyMethodList(_class, &size));
+        pool.atexit(free, data);

 
 

-    const char *type(method_getTypeEncoding(method));
-    if (type == NULL || *type == '\0' || *type == 'v')
-        return;
+        for (size_t i(0); i != size; ++i) {
+            objc_method *method(data[i]);

 
 

-    JSPropertyNameAccumulatorAddName(names, CYJSString(name));
+            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) {
 }
 
 static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {


@@ -1863,22 +1893,19 @@ static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object,
     CYPool pool;
     Class _class(object_getClass(self));
 
     CYPool pool;
     Class _class(object_getClass(self));
 

-    {
+    for (Class current(_class); current != Nil; current = class_getSuperclass(current)) {

         unsigned int size;
         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])));
         for (size_t i(0); i != size; ++i)
             JSPropertyNameAccumulatorAddName(names, CYJSString(property_getName(data[i])));

-        free(data);

     }
 
     }
 

-    if (CYHasImplicitProperties(_class))
-        for (Class current(_class); current != nil; current = class_getSuperclass(current)) {
-            unsigned int size;
-            objc_method **data(class_copyMethodList(current, &size));
-            for (size_t i(0); i != size; ++i)
-                Instance_getPropertyNames_message(names, data[i]);
-            free(data);
-        }
+    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
 
     CYPoolTry {
         // XXX: this is an evil hack to deal with NSProxy; fix elsewhere


@@ -1887,11 +1914,40 @@ static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object,
     } CYPoolCatch()
 }
 
     } CYPoolCatch()
 }
 

-static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
+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<Instance *>(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<Constructor>::Get(context, object));

     JSObjectRef value(CYMakeInstance(context, [internal->value_ alloc], Instance::Uninitialized));
     return value;
     JSObjectRef value(CYMakeInstance(context, [internal->value_ alloc], Instance::Uninitialized));
     return value;

-} CYCatch(NULL) }
+} CYCatchObject() }

 
 static const char *CYBlockEncoding(NSBlock *self) {
     BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(self));
 
 static const char *CYBlockEncoding(NSBlock *self) {
     BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(self));


@@ -1922,7 +1978,7 @@ static bool CYBlockSignature(CYPool &pool, NSBlock *self, sig::Signature &signat
     return true;
 }
 
     return true;
 }
 

-static JSValueRef FunctionInstance_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+static JSValueRef Block_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {

     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->value_);
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->value_);
 


@@ -1953,11 +2009,9 @@ static JSValueRef FunctionInstance_callAsFunction(JSContextRef context, JSObject
     return NULL;
 } CYCatch(NULL) }
 
     return NULL;
 } CYCatch(NULL) }
 

-static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) { CYTry {
-    Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) constructor)));
+static bool Constructor_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) { CYTry {
+    auto internal(CYPrivate<Constructor>::Get(context, constructor));

     Class _class(internal->value_);
     Class _class(internal->value_);

-    if (!CYIsClass(_class))
-        return false;

 
     if (CYJSValueIsNSObject(context, instance)) {
         Instance *linternal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) instance)));
 
     if (CYJSValueIsNSObject(context, instance)) {
         Instance *linternal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) instance)));


@@ -1978,8 +2032,8 @@ static JSValueRef Instance_box_callAsFunction(JSContextRef context, JSObjectRef
     return CYCastJSValue(context, [value cy$box]);
 } CYCatch(NULL) }
 
     return CYCastJSValue(context, [value cy$box]);
 } CYCatch(NULL) }
 

-static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
-    Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
+static bool Interior_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
+    Interior *internal(reinterpret_cast<Interior *>(JSObjectGetPrivate(object)));

     CYPool pool;
 
     id self(internal->value_);
     CYPool pool;
 
     id self(internal->value_);


@@ -1991,12 +2045,14 @@ static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStr
     return false;
 }
 
     return false;
 }
 

-static void CYBitField(unsigned &length, unsigned &shift, id self, Ivar ivar, const char *encoding, unsigned offset) {
+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));
     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;
     for (size_t i(0); i != size; ++i)
         if (ivars[i] == ivar)
             break;


@@ -2006,11 +2062,10 @@ static void CYBitField(unsigned &length, unsigned &shift, id self, Ivar ivar, co
             _assert(encoding[0] == 'b');
             shift += CYCastDouble(encoding + 1);
         }
             _assert(encoding[0] == 'b');
             shift += CYCastDouble(encoding + 1);
         }

-    free(ivars);

 }
 
 }
 

-static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
+static JSValueRef Interior_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+    Interior *internal(reinterpret_cast<Interior *>(JSObjectGetPrivate(object)));

     CYPool pool;
 
     id self(internal->value_);
     CYPool pool;
 
     id self(internal->value_);


@@ -2025,7 +2080,7 @@ static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object,
         _assert(encoding[0] != '\0');
         if (encoding[0] == 'b') {
             unsigned length, shift;
         _assert(encoding[0] != '\0');
         if (encoding[0] == 'b') {
             unsigned length, shift;

-            CYBitField(length, shift, self, ivar, encoding, offset);
+            CYBitField(pool, length, shift, self, ivar, encoding, offset);

             _assert(shift + length <= sizeof(uintptr_t) * 8);
             uintptr_t &field(*reinterpret_cast<uintptr_t *>(data));
             uintptr_t mask((1 << length) - 1);
             _assert(shift + length <= sizeof(uintptr_t) * 8);
             uintptr_t &field(*reinterpret_cast<uintptr_t *>(data));
             uintptr_t mask((1 << length) - 1);


@@ -2045,8 +2100,8 @@ static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object,
     return NULL;
 } CYCatch(NULL) }
 
     return NULL;
 } CYCatch(NULL) }
 

-static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
-    Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
+static bool Interior_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
+    Interior *internal(reinterpret_cast<Interior *>(JSObjectGetPrivate(object)));

     CYPool pool;
 
     id self(internal->value_);
     CYPool pool;
 
     id self(internal->value_);


@@ -2060,7 +2115,7 @@ static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStr
         _assert(encoding != NULL);
         if (encoding[0] == 'b') {
             unsigned length, shift;
         _assert(encoding != NULL);
         if (encoding[0] == 'b') {
             unsigned length, shift;

-            CYBitField(length, shift, self, ivar, encoding, offset);
+            CYBitField(pool, length, shift, self, ivar, encoding, offset);

             _assert(shift + length <= sizeof(uintptr_t) * 8);
             uintptr_t &field(*reinterpret_cast<uintptr_t *>(data));
             uintptr_t mask((1 << length) - 1);
             _assert(shift + length <= sizeof(uintptr_t) * 8);
             uintptr_t &field(*reinterpret_cast<uintptr_t *>(data));
             uintptr_t mask((1 << length) - 1);


@@ -2075,29 +2130,30 @@ static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStr
     return false;
 } CYCatch(false) }
 
     return false;
 } 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))
     if (Class super = class_getSuperclass(_class))

-        Internal_getPropertyNames_(super, names);
+        Interior_getPropertyNames_(pool, super, names);

 
     unsigned int size;
     objc_ivar **data(class_copyIvarList(_class, &size));
 
     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])));
     for (size_t i(0); i != size; ++i)
         JSPropertyNameAccumulatorAddName(names, CYJSString(ivar_getName(data[i])));

-    free(data);

 }
 
 }
 

-static void Internal_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
-    Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
+static void Interior_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
+    Interior *internal(reinterpret_cast<Interior *>(JSObjectGetPrivate(object)));

     CYPool pool;
 
     id self(internal->value_);
     Class _class(object_getClass(self));
 
     CYPool pool;
 
     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) { CYTry {
-    Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
+static JSValueRef Interior_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    Interior *internal(reinterpret_cast<Interior *>(JSObjectGetPrivate(object)));

     return internal->owner_;
 } CYCatch(NULL) }
 
     return internal->owner_;
 } CYCatch(NULL) }
 


@@ -2137,11 +2193,13 @@ static Class *CYCopyClassList(size_t &size) {
 }
 
 static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
 }
 
 static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {

+    CYPool pool;
+

     size_t size;
     if (Class *data = CYCopyClassList(size)) {
     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])));
         for (size_t i(0); i != size; ++i)
             JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(data[i])));

-        free(data);

     }
 }
 
     }
 }
 


@@ -2151,30 +2209,33 @@ static JSValueRef ObjectiveC_Image_Classes_getProperty(JSContextRef context, JSO
 
     CYPool pool;
     const char *name(CYPoolCString(pool, context, property));
 
     CYPool pool;
     const char *name(CYPoolCString(pool, context, property));

+

     unsigned int size;
     const char **data(objc_copyClassNamesForImage(internal, &size));
     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) {
     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, Instance::Permanent);
-                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;
+
+    return NULL;

 } CYCatch(NULL) }
 
 static void ObjectiveC_Image_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     const char *internal(reinterpret_cast<const char *>(JSObjectGetPrivate(object)));
 } CYCatch(NULL) }
 
 static void ObjectiveC_Image_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     const char *internal(reinterpret_cast<const char *>(JSObjectGetPrivate(object)));

+    CYPool pool;
+

     unsigned int size;
     const char **data(objc_copyClassNamesForImage(internal, &size));
     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]));
     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 {
 }
 
 static JSValueRef ObjectiveC_Images_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {


@@ -2196,11 +2257,14 @@ static JSValueRef ObjectiveC_Images_getProperty(JSContextRef context, JSObjectRe
 } CYCatch(NULL) }
 
 static void ObjectiveC_Images_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
 } CYCatch(NULL) }
 
 static void ObjectiveC_Images_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {

+    CYPool pool;
+

     unsigned int size;
     const char **data(objc_copyImageNames(&size));
     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]));
     for (size_t i(0); i != size; ++i)
         JSPropertyNameAccumulatorAddName(names, CYJSString(data[i]));

-    free(data);

 }
 #endif
 
 }
 #endif
 


@@ -2213,11 +2277,14 @@ static JSValueRef ObjectiveC_Protocols_getProperty(JSContextRef context, JSObjec
 } CYCatch(NULL) }
 
 static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
 } CYCatch(NULL) }
 
 static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {

+    CYPool pool;
+

     unsigned int size;
     Protocol **data(objc_copyProtocolList(&size));
     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])));
     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 {
 }
 
 static JSValueRef ObjectiveC_Constants_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {


@@ -2308,6 +2375,7 @@ static JSValueRef choose(JSContextRef context, JSObjectRef object, JSObjectRef _
     size_t number;
     Class *classes(CYCopyClassList(number));
     _assert(classes != NULL);
     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))
 
     for (size_t i(0); i != number; ++i)
         for (Class current(classes[i]); current != Nil; current = class_getSuperclass(current))


@@ -2316,8 +2384,6 @@ static JSValueRef choose(JSContextRef context, JSObjectRef object, JSObjectRef _
                 break;
             }
 
                 break;
             }
 

-    free(classes);
-

     for (unsigned i(0); i != size; ++i) {
         const malloc_zone_t *zone(reinterpret_cast<const malloc_zone_t *>(zones[i]));
         if (zone == NULL || zone->introspect == NULL)
     for (unsigned i(0); i != size; ++i) {
         const malloc_zone_t *zone(reinterpret_cast<const malloc_zone_t *>(zones[i]));
         if (zone == NULL || zone->introspect == NULL)


@@ -2417,7 +2483,7 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
     SEL _cmd;
     Class _class;
 
     SEL _cmd;
     Class _class;
 

-    if (JSValueIsObjectOfClass(context, arguments[0], cy::Super::Class_)) {
+    if (JSValueIsObjectOfClass(context, arguments[0], CYPrivate<cy::Super>::Class_)) {

         cy::Super *internal(reinterpret_cast<cy::Super *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));
         self = internal->value_;
         _class = internal->class_;;
         cy::Super *internal(reinterpret_cast<cy::Super *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));
         self = internal->value_;
         _class = internal->class_;;


@@ -2427,7 +2493,7 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
         self = internal->value_;
         _class = nil;
         uninitialized = internal->IsUninitialized();
         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]);
             internal->value_ = nil;
     } else {
         self = CYCastNSObject(&pool, context, arguments[0]);


@@ -2469,28 +2535,32 @@ static JSValueRef Message_callAsFunction(JSContextRef context, JSObjectRef objec
     return CYCallFunction(pool, context, 2, setup, count, arguments, false, true, internal->signature_, &internal->cif_, internal->value_);
 } CYCatch(NULL) }
 
     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 objc_super constructor");
     CYPool pool;
     id self(CYCastNSObject(&pool, context, arguments[0]));
     Class _class(CYCastClass(pool, context, arguments[1]));
 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 objc_super constructor");
     CYPool pool;
     id self(CYCastNSObject(&pool, context, arguments[0]));
     Class _class(CYCastClass(pool, context, arguments[1]));

-    return cy::Super::Make(context, self, _class);
-} CYCatch(NULL) }
+    return CYPrivate<cy::Super>::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]));
 
 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 Selector_privateData::Make(context, sel_registerName(name));
-} CYCatch(NULL) }
+    return CYPrivate<Selector_privateData>::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)
         throw CYJSError(context, "incorrect number of arguments to Instance constructor");
     return CYMakeInstance(context, CYCastPointer<id>(context, arguments[0]));
 
 static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 1)
         throw CYJSError(context, "incorrect number of arguments to Instance constructor");
     return CYMakeInstance(context, CYCastPointer<id>(context, arguments[0]));

-} CYCatch(NULL) }
+} CYCatchObject() }

 
 static JSValueRef Selector_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     return CYMakeType(context, sig::Selector());
 
 static JSValueRef Selector_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     return CYMakeType(context, sig::Selector());


@@ -2499,8 +2569,6 @@ static JSValueRef Selector_getProperty_$cyt(JSContextRef context, JSObjectRef ob
 static JSValueRef Instance_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->value_);
 static JSValueRef Instance_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(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) }
 
     return CYMakeType(context, sig::Object(class_getName(object_getClass(self))));
 } CYCatch(NULL) }
 


@@ -2513,25 +2581,19 @@ static JSValueRef FunctionInstance_getProperty_$cyt(JSContextRef context, JSObje
     return CYMakeType(context, type);
 } CYCatch(NULL) }
 
     return CYMakeType(context, type);
 } CYCatch(NULL) }
 

-static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
-    return CYMakeInstance(context, object_getClass(internal->value_), Instance::Permanent);
+static JSValueRef Constructor_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+    return CYMakeType(context, sig::Meta());

 } CYCatch(NULL) }
 
 } CYCatch(NULL) }
 

-static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {

     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));

-    id self(internal->value_);
-    if (!CYIsClass(self))
-        return CYJSUndefined(context);
-    return CYGetClassPrototype(context, self);
+    return CYMakeInstance(context, object_getClass(internal->value_), Instance::Permanent);

 } CYCatch(NULL) }
 
 } CYCatch(NULL) }
 

-static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef Constructor_getProperty_prototype(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {

     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->value_);
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->value_);

-    if (!CYIsClass(self))
-        return CYJSUndefined(context);
-    return Messages::Make(context, (Class) self);
+    return CYPrivate<Messages>::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 {
 } CYCatch(NULL) }
 
 static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {


@@ -2587,10 +2649,8 @@ static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObject
 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;
 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<Instance *>(JSObjectGetPrivate(_this)));
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));

-    // XXX: but... but... THIS ISN'T A POINTER! :(
-    return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->value_));
+    return CYMakePointer(context, internal->value_, sig::Void(true), NULL, object);

 } 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 {
 } 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 {


@@ -2661,25 +2721,23 @@ static JSStaticValue Selector_staticValues[2] = {
     {NULL, NULL, NULL, 0}
 };
 
     {NULL, NULL, NULL, 0}
 };
 

-static JSStaticValue Instance_staticValues[5] = {
+static JSStaticValue Instance_staticValues[3] = {

     {"$cyt", &Instance_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"$cyt", &Instance_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

-    // XXX: this is sadly duplicated in FunctionInstance_staticValues

     {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

-    {"messages", &Instance_getProperty_messages, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
-    {"prototype", &Instance_getProperty_prototype, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

     {NULL, NULL, NULL, 0}
 };
 
     {NULL, NULL, NULL, 0}
 };
 

-static JSStaticValue FunctionInstance_staticValues[5] = {
+static JSStaticValue Block_staticValues[3] = {

     {"$cyt", &FunctionInstance_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"$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},

     {NULL, NULL, NULL, 0}
 };
 
     {NULL, NULL, NULL, 0}
 };
 

-static JSStaticFunction Instance_staticFunctions[6] = {
+static JSStaticFunction Instance_staticFunctions[7] = {
+    {"cy$complete", &Instance_complete_callAsFunction, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {NULL, NULL, 0}
+};
+
+static JSStaticFunction Prototype_staticFunctions[6] = {

     {"toCYON", &Instance_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toJSON", &Instance_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toCYON", &Instance_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toJSON", &Instance_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},


@@ -2688,13 +2746,24 @@ static JSStaticFunction Instance_staticFunctions[6] = {
     {NULL, NULL, 0}
 };
 
     {NULL, NULL, 0}
 };
 

-static JSStaticFunction Class_staticFunctions[2] = {
+static JSStaticFunction Messages_staticFunctions[2] = {
+    {"cy$complete", &Messages_complete_callAsFunction, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {NULL, NULL, 0}
+};
+
+static JSStaticValue Constructor_staticValues[3] = {
+    {"$cyt", &Constructor_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"prototype", &Constructor_getProperty_prototype, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {NULL, NULL, NULL, 0}
+};
+
+static JSStaticFunction Constructor_staticFunctions[2] = {

     {"pointerTo", &Class_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
 };
 
     {"pointerTo", &Class_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {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}
 };
 
     {NULL, NULL, 0}
 };
 


@@ -2717,6 +2786,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     NSBlock_ = objc_getClass("NSBlock");
     NSDictionary_ = objc_getClass("NSDictionary");
     NSNumber_ = objc_getClass("NSNumber");
     NSBlock_ = objc_getClass("NSBlock");
     NSDictionary_ = objc_getClass("NSDictionary");
     NSNumber_ = objc_getClass("NSNumber");

+    NSObject_ = objc_getClass("NSObject");

     NSString_ = objc_getClass("NSString");
     Object_ = objc_getClass("Object");
 
     NSString_ = objc_getClass("NSString");
     Object_ = objc_getClass("Object");
 


@@ -2739,6 +2809,16 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     JSClassDefinition definition;
 
     definition = kJSClassDefinitionEmpty;
     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<Messages>::Class_ = JSClassCreate(&definition);
+
+    definition = kJSClassDefinitionEmpty;
+    definition.attributes = kJSClassAttributeNoAutomaticPrototype;

     definition.className = "Instance";
     definition.staticValues = Instance_staticValues;
     definition.staticFunctions = Instance_staticFunctions;
     definition.className = "Instance";
     definition.staticValues = Instance_staticValues;
     definition.staticFunctions = Instance_staticFunctions;


@@ -2747,62 +2827,51 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     definition.setProperty = &Instance_setProperty;
     definition.deleteProperty = &Instance_deleteProperty;
     definition.getPropertyNames = &Instance_getPropertyNames;
     definition.setProperty = &Instance_setProperty;
     definition.deleteProperty = &Instance_deleteProperty;
     definition.getPropertyNames = &Instance_getPropertyNames;

-    definition.callAsConstructor = &Instance_callAsConstructor;
-    definition.hasInstance = &Instance_hasInstance;

     definition.finalize = &CYFinalize;
     definition.finalize = &CYFinalize;

-    Instance::Class_ = JSClassCreate(&definition);
-
-    definition.className = "ArrayInstance";
-    ArrayInstance_ = JSClassCreate(&definition);
-
-    definition.className = "BooleanInstance";
-    BooleanInstance_ = JSClassCreate(&definition);
+    CYPrivate<Instance>::Class_ = 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.attributes = kJSClassAttributeNoAutomaticPrototype;
+    definition.className = "Block";
+    definition.parentClass = CYPrivate<Instance>::Class_;
+    definition.staticValues = Block_staticValues;
+    definition.callAsFunction = &Block_callAsFunction;
+    CYPrivate<Block>::Class_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
 
     definition = kJSClassDefinitionEmpty;

-    definition.className = "Class";
-    definition.staticFunctions = Class_staticFunctions;
-    ClassInstance_ = JSClassCreate(&definition);
+    definition.attributes = kJSClassAttributeNoAutomaticPrototype;
+    definition.className = "Constructor";
+    definition.parentClass = CYPrivate<Instance>::Class_;
+    definition.staticValues = Constructor_staticValues;
+    definition.staticFunctions = Constructor_staticFunctions;
+    definition.hasInstance = &Constructor_hasInstance;
+    definition.callAsConstructor = &Constructor_callAsConstructor;
+    CYPrivate<Constructor>::Class_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
 
     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.attributes = kJSClassAttributeNoAutomaticPrototype;
+    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;
     definition.finalize = &CYFinalize;

-    Internal::Class_ = JSClassCreate(&definition);
+    CYPrivate<Interior>::Class_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Message";
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Message";

-    definition.staticFunctions = cy::Functor::StaticFunctions;
-    definition.staticValues = cy::Functor::StaticValues;
+    definition.parentClass = cy::Functor::Class_;

     definition.callAsFunction = &Message_callAsFunction;
     definition.finalize = &CYFinalize;
     Message_privateData::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     definition.callAsFunction = &Message_callAsFunction;
     definition.finalize = &CYFinalize;
     Message_privateData::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;

-    definition.className = "Messages";
-    definition.hasProperty = &Messages_hasProperty;
-    definition.getProperty = &Messages_getProperty;
-    definition.setProperty = &Messages_setProperty;
-    definition.getPropertyNames = &Messages_getPropertyNames;
+    definition.attributes = kJSClassAttributeNoAutomaticPrototype;
+    definition.className = "Prototype";
+    definition.staticFunctions = Prototype_staticFunctions;

     definition.finalize = &CYFinalize;
     definition.finalize = &CYFinalize;

-    Messages::Class_ = JSClassCreate(&definition);
+    CYPrivate<Prototype>::Class_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Selector";
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Selector";


@@ -2810,14 +2879,16 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     definition.staticFunctions = Selector_staticFunctions;
     definition.callAsFunction = &Selector_callAsFunction;
     definition.finalize = &CYFinalize;
     definition.staticFunctions = Selector_staticFunctions;
     definition.callAsFunction = &Selector_callAsFunction;
     definition.finalize = &CYFinalize;

-    Selector_privateData::Class_ = JSClassCreate(&definition);
+    CYPrivate<Selector_privateData>::Class_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
 
     definition = kJSClassDefinitionEmpty;

+    definition.attributes = kJSClassAttributeNoAutomaticPrototype;

     definition.className = "Super";
     definition.finalize = &CYFinalize;
     definition.className = "Super";
     definition.finalize = &CYFinalize;

-    cy::Super::Class_ = JSClassCreate(&definition);
+    CYPrivate<cy::Super>::Class_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
 
     definition = kJSClassDefinitionEmpty;

+    definition.attributes = kJSClassAttributeNoAutomaticPrototype;

     definition.className = "ObjectiveC::Classes";
     definition.hasProperty = &ObjectiveC_Classes_hasProperty;
     definition.getProperty = &ObjectiveC_Classes_getProperty;
     definition.className = "ObjectiveC::Classes";
     definition.hasProperty = &ObjectiveC_Classes_hasProperty;
     definition.getProperty = &ObjectiveC_Classes_getProperty;


@@ -2825,6 +2896,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     ObjectiveC_Classes_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     ObjectiveC_Classes_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;

+    definition.attributes = kJSClassAttributeNoAutomaticPrototype;

     definition.className = "ObjectiveC::Constants";
     definition.getProperty = &ObjectiveC_Constants_getProperty;
     definition.getPropertyNames = &ObjectiveC_Constants_getPropertyNames;
     definition.className = "ObjectiveC::Constants";
     definition.getProperty = &ObjectiveC_Constants_getProperty;
     definition.getPropertyNames = &ObjectiveC_Constants_getPropertyNames;


@@ -2832,12 +2904,14 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
 
 #ifdef __APPLE__
     definition = kJSClassDefinitionEmpty;
 
 #ifdef __APPLE__
     definition = kJSClassDefinitionEmpty;

+    definition.attributes = kJSClassAttributeNoAutomaticPrototype;

     definition.className = "ObjectiveC::Images";
     definition.getProperty = &ObjectiveC_Images_getProperty;
     definition.getPropertyNames = &ObjectiveC_Images_getPropertyNames;
     ObjectiveC_Images_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "ObjectiveC::Images";
     definition.getProperty = &ObjectiveC_Images_getProperty;
     definition.getPropertyNames = &ObjectiveC_Images_getPropertyNames;
     ObjectiveC_Images_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;

+    definition.attributes = kJSClassAttributeNoAutomaticPrototype;

     definition.className = "ObjectiveC::Image::Classes";
     definition.getProperty = &ObjectiveC_Image_Classes_getProperty;
     definition.getPropertyNames = &ObjectiveC_Image_Classes_getPropertyNames;
     definition.className = "ObjectiveC::Image::Classes";
     definition.getProperty = &ObjectiveC_Image_Classes_getProperty;
     definition.getPropertyNames = &ObjectiveC_Image_Classes_getPropertyNames;


@@ -2845,6 +2919,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
 #endif
 
     definition = kJSClassDefinitionEmpty;
 #endif
 
     definition = kJSClassDefinitionEmpty;

+    definition.attributes = kJSClassAttributeNoAutomaticPrototype;

     definition.className = "ObjectiveC::Protocols";
     definition.getProperty = &ObjectiveC_Protocols_getProperty;
     definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames;
     definition.className = "ObjectiveC::Protocols";
     definition.getProperty = &ObjectiveC_Protocols_getProperty;
     definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames;


@@ -2889,56 +2964,50 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
 #endif
 
     JSObjectRef Message(JSObjectMakeConstructor(context, Message_privateData::Class_, NULL));
 #endif
 
     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 Selector(JSObjectMakeConstructor(context, CYPrivate<Selector_privateData>::Class_, &Selector_new));
+    JSObjectRef Super(JSObjectMakeConstructor(context, CYPrivate<cy::Super>::Class_, &Super_new));

 
 

-    JSObjectRef Instance(JSObjectMakeConstructor(context, Instance::Class_, &Instance_new));
-    JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s)));
+    JSObjectRef Instance(JSObjectMakeConstructor(context, CYPrivate<::Instance>::Class_, &Instance_new));
+    JSObjectRef Instance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));

     CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);
     CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);

+    CYSetProperty(context, Instance, prototype_s, Instance_prototype);

 
 

-    JSObjectRef ArrayInstance(JSObjectMakeConstructor(context, ArrayInstance_, NULL));
-    JSObjectRef ArrayInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ArrayInstance, prototype_s)));
+    JSObjectRef ArrayInstance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));

     CYSetProperty(context, cy, CYJSString("ArrayInstance_prototype"), ArrayInstance_prototype);
     JSObjectRef Array_prototype(CYGetCachedObject(context, CYJSString("Array_prototype")));
     CYSetPrototype(context, ArrayInstance_prototype, Array_prototype);
 
     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)));
+    JSObjectRef BooleanInstance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));

     CYSetProperty(context, cy, CYJSString("BooleanInstance_prototype"), BooleanInstance_prototype);
     JSObjectRef Boolean_prototype(CYGetCachedObject(context, CYJSString("Boolean_prototype")));
     CYSetPrototype(context, BooleanInstance_prototype, Boolean_prototype);
 
     CYSetProperty(context, cy, CYJSString("BooleanInstance_prototype"), BooleanInstance_prototype);
     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)));
+    JSObjectRef FunctionInstance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));

     CYSetProperty(context, cy, CYJSString("FunctionInstance_prototype"), FunctionInstance_prototype);
     JSObjectRef Function_prototype(CYGetCachedObject(context, CYJSString("Function_prototype")));
     CYSetPrototype(context, FunctionInstance_prototype, Function_prototype);
 
     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)));
+    JSObjectRef NumberInstance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));

     CYSetProperty(context, cy, CYJSString("NumberInstance_prototype"), NumberInstance_prototype);
     JSObjectRef Number_prototype(CYGetCachedObject(context, CYJSString("Number_prototype")));
     CYSetPrototype(context, NumberInstance_prototype, Number_prototype);
 
     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)));
+    JSObjectRef ObjectInstance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));

     CYSetProperty(context, cy, CYJSString("ObjectInstance_prototype"), ObjectInstance_prototype);
     JSObjectRef Object_prototype(CYGetCachedObject(context, CYJSString("Object_prototype")));
     CYSetPrototype(context, ObjectInstance_prototype, Object_prototype);
 
     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)));
+    JSObjectRef StringInstance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));

     CYSetProperty(context, cy, CYJSString("StringInstance_prototype"), StringInstance_prototype);
     JSObjectRef String_prototype(CYGetCachedObject(context, CYJSString("String_prototype")));
     CYSetPrototype(context, StringInstance_prototype, String_prototype);
 
     CYSetProperty(context, cy, CYJSString("StringInstance_prototype"), StringInstance_prototype);
     JSObjectRef String_prototype(CYGetCachedObject(context, CYJSString("String_prototype")));
     CYSetPrototype(context, StringInstance_prototype, String_prototype);
 

+    JSObjectRef TypeInstance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));
+    CYSetProperty(context, cy, CYJSString("TypeInstance_prototype"), TypeInstance_prototype);
+    // XXX: maybe TypeInstance should have Type as its prototype? FWIW, that's why I named it like this ;P
+

     CYSetProperty(context, cycript, CYJSString("Instance"), Instance);
     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);
 
     CYSetProperty(context, cycript, CYJSString("Selector"), Selector);
     CYSetProperty(context, cycript, CYJSString("objc_super"), Super);
 


@@ -2960,6 +3029,8 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
     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);
     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);

+
+    CYSetProperty(context, cy, CYJSString("cydget"), CYCastJSValue(context, false));

 } CYPoolCatch() }
 
 static void *CYObjectiveC_CastSymbol(const char *name) {
 } CYPoolCatch() }
 
 static void *CYObjectiveC_CastSymbol(const char *name) {


@@ -2984,6 +3055,9 @@ CYRegisterHook CYObjectiveC(&CYObjectiveCHook);
 
 _extern void CydgetSetupContext(JSGlobalContextRef context) { CYObjectiveTry_ {
     CYSetupContext(context);
 
 _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 {
 } CYObjectiveCatch }
 
 _extern void CydgetMemoryParse(const uint16_t **data, size_t *size) { try {