Remove CYJavaValue and (almost) CYPrivate as base.

[cycript.git] / ObjectiveC / Library.mm

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 0fb792a07bc812e79b213e056e2c7c4da3871751..ca3662bc5cb8a7a17077153a3c57a36e4130f04c 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 {{{ */


@@ -243,22 +243,14 @@ 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 Instance_;
-

 static JSClassRef ArrayInstance_;
 static JSClassRef BooleanInstance_;
 static JSClassRef ArrayInstance_;
 static JSClassRef BooleanInstance_;

+static JSClassRef ClassInstance_;

 static JSClassRef FunctionInstance_;
 static JSClassRef NumberInstance_;
 static JSClassRef ObjectInstance_;
 static JSClassRef StringInstance_;
 
 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_;
 static JSClassRef ObjectiveC_Classes_;
 static JSClassRef ObjectiveC_Constants_;
 static JSClassRef ObjectiveC_Protocols_;


@@ -285,24 +277,13 @@ static Class NSString_;
 static Class NSZombie_;
 static Class Object_;
 
 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))
 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)));
 
     JSObjectRef global(CYGetGlobalObject(context));
     JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));


@@ -315,7 +296,6 @@ JSValueRef CYGetClassPrototype(JSContextRef context, Class self, bool meta) {
     if (!JSValueIsUndefined(context, value))
         return value;
 
     if (!JSValueIsUndefined(context, value))
         return value;
 

-    JSClassRef _class(NULL);

     JSValueRef prototype;
 
 #ifdef __APPLE__
     JSValueRef prototype;
 
 #ifdef __APPLE__


@@ -337,7 +317,7 @@ JSValueRef CYGetClassPrototype(JSContextRef context, Class self, bool meta) {
     else
         prototype = CYGetClassPrototype(context, class_getSuperclass(self), 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);
 
     CYSetPrototype(context, object, prototype);
     CYSetProperty(context, cy, name, object);
 


@@ -348,23 +328,12 @@ _finline JSValueRef CYGetClassPrototype(JSContextRef context, Class self) {
     return CYGetClassPrototype(context, self, class_isMetaClass(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 CYPrivate<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)
 bool CYIsKindOfClass(id object, Class _class) {
     for (Class isa(object_getClass(object)); isa != NULL; isa = class_getSuperclass(isa))
         if (isa == _class)


@@ -372,29 +341,48 @@ bool CYIsKindOfClass(id object, Class _class) {
     return false;
 }
 
     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) :
+    value_(value),
+    flags_(flags)
+{
+    if (IsPermanent());
+    /*else if ([value retainCount] == NSUInteger(-1))
+        flags_ |= Instance::Permanent;*/
+    else
+        value_ = [value_ retain];

 }
 
 Instance::~Instance() {
 }
 
 Instance::~Instance() {

-    if ((flags_ & Permanent) == 0)
-        [GetValue() release];
+    if (!IsPermanent())
+        [value_ release];

 }
 
 struct Message_privateData :
     cy::Functor
 {
 }
 
 struct Message_privateData :
     cy::Functor
 {

+    static JSClassRef Class_;
+

     SEL sel_;
 
     SEL sel_;
 

-    Message_privateData(SEL sel, const char *type, IMP value = NULL) :
-        cy::Functor(type, reinterpret_cast<void (*)()>(value)),
+    Message_privateData(SEL sel, const char *type, IMP value) :
+        cy::Functor(reinterpret_cast<void (*)()>(value), type),

         sel_(sel)
     {
     }
         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);
 
 JSObjectRef CYMakeInstance(JSContextRef context, id object, Instance::Flags flags = Instance::None) {
     _assert(object != nil);
 


@@ -406,9 +394,6 @@ JSObjectRef CYMakeInstance(JSContextRef context, id object, Instance::Flags flag
             return instance;
 #endif
 
             return instance;
 #endif
 

-    if ((flags & Instance::Permanent) == 0)
-        object = [object retain];
-

     JSObjectRef instance(Instance::Make(context, object, flags));
 
 #ifdef __APPLE__
     JSObjectRef instance(Instance::Make(context, object, flags));
 
 #ifdef __APPLE__


@@ -626,7 +611,7 @@ struct PropertyAttributes {
 /* }}} */
 
 _finline bool CYJSValueIsNSObject(JSContextRef context, JSValueRef value) {
 /* }}} */
 
 _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) {
 }
 
 _finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) {


@@ -661,7 +646,7 @@ NSBlock *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature
     memset(&descriptor->d_, 0, sizeof(descriptor->d_));
 
     descriptor->internal_ = CYMakeFunctor_(context, function, signature, &BlockAdapter_);
     memset(&descriptor->d_, 0, sizeof(descriptor->d_));
 
     descriptor->internal_ = CYMakeFunctor_(context, function, signature, &BlockAdapter_);

-    literal->invoke = reinterpret_cast<void (*)(void *, ...)>(descriptor->internal_->GetValue());
+    literal->invoke = reinterpret_cast<void (*)(void *, ...)>(descriptor->internal_->value_);

 
     literal->isa = __NSMallocBlock__;
     literal->flags = BLOCK_HAS_SIGNATURE | BLOCK_HAS_COPY_DISPOSE | BLOCK_IS_GLOBAL;
 
     literal->isa = __NSMallocBlock__;
     literal->flags = BLOCK_HAS_SIGNATURE | BLOCK_HAS_COPY_DISPOSE | BLOCK_IS_GLOBAL;


@@ -679,7 +664,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<Instance *>(JSObjectGetPrivate(object)));
 NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSObjectRef object) {
     if (CYJSValueIsNSObject(context, object)) {
         Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));

-        return internal->GetValue();
+        return internal->value_;

     }
 
     bool array(CYJSValueIsInstanceOfCachedConstructor(context, object, Array_s));
     }
 
     bool array(CYJSValueIsInstanceOfCachedConstructor(context, object, Array_s));


@@ -848,36 +833,24 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
 @end
 
 static const char *CYBlockEncoding(NSBlock *self);
 @end
 
 static const char *CYBlockEncoding(NSBlock *self);

-static sig::Signature *CYBlockSignature(CYPool &pool, NSBlock *self);
+static bool CYBlockSignature(CYPool &pool, NSBlock *self, sig::Signature &signature);

 
 @implementation NSBlock (Cycript)
 
 - (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
     CYLocalPool pool;
 
 
 @implementation NSBlock (Cycript)
 
 - (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
     CYLocalPool pool;
 

-    sig::Signature *signature(CYBlockSignature(pool, self));
-    // XXX: I am checking signature->count due to Decode doing it for block_P
-    if (signature == NULL || signature->count == 0)
+    sig::Block type;
+    if (!CYBlockSignature(pool, self, type.signature))

         return [super cy$toCYON:objective inSet:objects];
     _oassert(objects.insert(self).second);
 
         return [super cy$toCYON:objective inSet:objects];
     _oassert(objects.insert(self).second);
 

-    // XXX: maybe move this id check into Decode's implementation for block_P
-    _assert(signature->count >= 2);
-    _assert(signature->elements[1].type->primitive == sig::object_P);
-
-    sig::Type type;
-    type.name = NULL;
-    type.flags = 0;
-
-    type.primitive = sig::function_P; // XXX: sig::block_P
-    sig::Copy(pool, type.data.signature, *signature);
-
-    CYTypedIdentifier *typed((new(pool) CYTypeExpression(Decode(pool, &type)))->typed_);
-    CYTypeFunctionWith *function(typed->Function());
-    _assert(function != NULL);
-
-    _assert(function->parameters_ != NULL);
-    CYObjCBlock *block(new(pool) CYObjCBlock(typed, function->parameters_->next_, NULL));
+    CYType *typed((new(pool) CYTypeExpression(CYDecodeType(pool, &type)))->typed_);
+    CYTypeModifier *&modifier(CYGetLast(typed->modifier_));
+    CYTypeBlockWith *with(dynamic_cast<CYTypeBlockWith *>(modifier));
+    _assert(with != NULL);
+    CYObjCBlock *block(new(pool) CYObjCBlock(typed, with->parameters_, NULL));
+    modifier = NULL;

 
     std::ostringstream str;
     CYOptions options;
 
     std::ostringstream str;
     CYOptions options;


@@ -1272,12 +1245,11 @@ NSArray *CYCastNSArray(JSContextRef context, JSPropertyNameArrayRef names) {
     return array;
 }
 
     return array;
 }
 

-JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
+JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) {

     if (value == nil)
         return CYJSNull(context);
     if (value == nil)
         return CYJSNull(context);

-    else
-        return CYMakeInstance(context, value);
-} CYPoolCatch(NULL) return /*XXX*/ NULL; }
+    return CYMakeInstance(context, value);
+}

 
 @implementation CYJSObject
 
 
 @implementation CYJSObject
 


@@ -1496,13 +1468,14 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 
 @end
 
 
 @end
 

-static JSObjectRef CYMakeSelector(JSContextRef context, SEL sel) {
-    Selector_privateData *internal(new Selector_privateData(sel));
-    return JSObjectMake(context, Selector_, internal);
+static JSValueRef CYCastJSValue(JSContextRef context, SEL sel) {
+    if (sel == NULL)
+        return CYJSNull(context);
+    return CYPrivate<Selector_privateData>::Make(context, sel);

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

-    if (JSValueIsObjectOfClass(context, value, Selector_)) {
+    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 {


@@ -1523,17 +1496,17 @@ static void CYObjectiveC_CallFunction(CYPool &pool, JSContextRef context, ffi_ci
     CYCallFunction(pool, context, cif, function, value, values);
 } CYSadCatch() }
 
     CYCallFunction(pool, context, cif, function, value, values);
 } CYSadCatch() }
 

+static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef value, const sig::Signature *signature) {

 #ifdef __APPLE__
 #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_))
     if (JSValueIsNull(context, value))
         return nil;
     JSObjectRef object(CYCastJSObject(context, value));
 
     if (JSValueIsObjectOfClass(context, object, FunctionInstance_))

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

 
 

-    if (JSValueIsObjectOfClass(context, object, Instance_)) {
-        _assert(reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->GetValue() == nil);
+    if (JSValueIsObjectOfClass(context, object, Instance::Class_)) {
+        _assert(reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->value_ == nil);

         return nil;
     }
 
         return nil;
     }
 


@@ -1550,82 +1523,73 @@ 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;
     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);
 
     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);
     return CYMakeBlock(context, object, modified);

-}
+#else
+    _assert(false);

 #endif
 #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<id *>(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<id *>(data) = CYCastNSBlock(*pool, context, value, &signature);
+}

 
 

-        case sig::object_P:
-        case sig::typename_P:
-            *reinterpret_cast<id *>(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<id *>(data) = CYCastNSObject(pool, context, value);
+}

 
 

-        case sig::selector_P:
-            *reinterpret_cast<SEL *>(data) = CYCastSEL(context, value);
-        break;
+void Meta::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    *reinterpret_cast<id *>(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<SEL *>(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<NSObject **>(data)) {
-                JSObjectRef object(CYMakeInstance(context, value));
-
-                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;
-                    }
-
-                    [value release];
-                }
-
-                return object;
-            } else goto null;
-
-        case sig::typename_P:
-            if (Class value = *reinterpret_cast<Class *>(data))
-                return CYMakeInstance(context, value, Instance::Permanent);
-            else goto null;
-
-        case sig::selector_P:
-            if (SEL value = *reinterpret_cast<SEL *>(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<NSObject **>(data));
+    if (value == NULL)
+        return CYJSNull(context);
+    JSObjectRef object(CYMakeInstance(context, value));
+
+    if (initialize) {
+        Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
+
+        if (internal->IsUninitialized()) {
+            internal->flags_ &= ~Instance::Uninitialized;
+            if (internal->value_ == nil)
+                internal->value_ = value;
+            else
+                _assert(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<Class *>(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<SEL *>(data));
+}
+
+JSValueRef Block::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    return CYCastJSValue(context, *reinterpret_cast<NSObject **>(data));
+}
+
+}

 
 static bool CYImplements(id object, Class _class, SEL selector, bool devoid = false) {
     if (objc_method *method = class_getInstanceMethod(_class, selector)) {
 
 static bool CYImplements(id object, Class _class, SEL selector, bool devoid = false) {
     if (objc_method *method = class_getInstanceMethod(_class, selector)) {


@@ -1646,9 +1610,9 @@ static JSValueRef MessageAdapter_(JSContextRef context, size_t count, JSValueRef
     return CYCallAsFunction(context, function, _this, count - 2, values + 2);
 }
 
     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) {
 }
 
 static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *encoding) {


@@ -1658,12 +1622,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
     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<IMP>(internal->GetValue());
+    return reinterpret_cast<IMP>(internal->value_);

 }
 
 static bool Messages_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
 }
 
 static bool Messages_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));

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

 
     CYPool pool;
     const char *name(CYPoolCString(pool, context, property));
 
     CYPool pool;
     const char *name(CYPoolCString(pool, context, property));


@@ -1677,21 +1641,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<Messages *>(JSObjectGetPrivate(object)));
 
 static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Messages *internal(reinterpret_cast<Messages *>(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))
 
     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<Messages *>(JSObjectGetPrivate(object)));
 
     return NULL;
 } CYCatch(NULL) }
 
 static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));

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

 
     CYPool pool;
     const char *name(CYPoolCString(pool, context, property));
 
     CYPool pool;
     const char *name(CYPoolCString(pool, context, property));


@@ -1700,10 +1664,10 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
     const char *type;
     IMP imp;
 
     const char *type;
     IMP imp;
 

-    if (JSValueIsObjectOfClass(context, value, Message_)) {
+    if (JSValueIsObjectOfClass(context, value, Message_privateData::Class_)) {

         Message_privateData *message(reinterpret_cast<Message_privateData *>(JSObjectGetPrivate((JSObjectRef) value)));
         type = sig::Unparse(pool, &message->signature_);
         Message_privateData *message(reinterpret_cast<Message_privateData *>(JSObjectGetPrivate((JSObjectRef) value)));
         type = sig::Unparse(pool, &message->signature_);

-        imp = reinterpret_cast<IMP>(message->GetValue());
+        imp = reinterpret_cast<IMP>(message->value_);

     } 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);


@@ -1712,12 +1676,13 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
     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);


@@ -1729,25 +1694,50 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
 
 static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
 
 static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));

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

 
     unsigned int size;
     objc_method **data(class_copyMethodList(_class, &size));
 
     unsigned int size;
     objc_method **data(class_copyMethodList(_class, &size));

+    pool.atexit(free, data);
+

     for (size_t i(0); i != size; ++i)
         JSPropertyNameAccumulatorAddName(names, CYJSString(sel_getName(method_getName(data[i]))));
     free(data);
 }
 
     for (size_t i(0); i != size; ++i)
         JSPropertyNameAccumulatorAddName(names, CYJSString(sel_getName(method_getName(data[i]))));
     free(data);
 }
 

-static bool CYHasImplicitProperties(Class _class) {
+static bool CYHasImplicitProperties(JSContextRef context, Class _class) {
+    if (!CYCastBool(context, CYGetCachedValue(context, CYJSString("cydget"))))
+        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)));
 static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));

-    id self(internal->GetValue());
+    id self(internal->value_);

 
     if (JSStringIsEqualToUTF8CString(property, "$cyi"))
         return true;
 
     if (JSStringIsEqualToUTF8CString(property, "$cyi"))
         return true;


@@ -1770,10 +1760,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;


@@ -1783,10 +1773,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<Instance *>(JSObjectGetPrivate(object)));
 
 static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));

-    id self(internal->GetValue());
+    id self(internal->value_);

 
     if (JSStringIsEqualToUTF8CString(property, "$cyi"))
 
     if (JSStringIsEqualToUTF8CString(property, "$cyi"))

-        return Internal::Make(context, self, 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));


@@ -1803,13 +1793,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);


@@ -1819,7 +1809,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<Instance *>(JSObjectGetPrivate(object)));
 
 static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));

-    id self(internal->GetValue());
+    id self(internal->value_);

 
     CYPool pool;
 
 
     CYPool pool;
 


@@ -1834,7 +1824,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));


@@ -1877,7 +1867,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<Instance *>(JSObjectGetPrivate(object)));
 
 static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));

-    id self(internal->GetValue());
+    id self(internal->value_);

 
     CYPoolTry {
         NSString *name(CYCastNSString(NULL, context, property));
 
     CYPoolTry {
         NSString *name(CYCastNSString(NULL, context, property));


@@ -1899,7 +1889,7 @@ static void Instance_getPropertyNames_message(JSPropertyNameAccumulatorRef names
 
 static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
 
 static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));

-    id self(internal->GetValue());
+    id self(internal->value_);

 
     CYPool pool;
     Class _class(object_getClass(self));
 
     CYPool pool;
     Class _class(object_getClass(self));


@@ -1907,18 +1897,20 @@ static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object,
     {
         unsigned int size;
         objc_property_t *data(class_copyPropertyList(_class, &size));
     {
         unsigned int size;
         objc_property_t *data(class_copyPropertyList(_class, &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))
+    if (CYHasImplicitProperties(context, _class))

         for (Class current(_class); current != nil; current = class_getSuperclass(current)) {
             unsigned int size;
             objc_method **data(class_copyMethodList(current, &size));
         for (Class current(_class); current != nil; current = class_getSuperclass(current)) {
             unsigned int size;
             objc_method **data(class_copyMethodList(current, &size));

+            pool.atexit(free, data);
+

             for (size_t i(0); i != size; ++i)
                 Instance_getPropertyNames_message(names, data[i]);
             for (size_t i(0); i != size; ++i)
                 Instance_getPropertyNames_message(names, data[i]);

-            free(data);

         }
 
     CYPoolTry {
         }
 
     CYPoolTry {


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

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

     return value;
 } CYCatch(NULL) }
 
     return value;
 } CYCatch(NULL) }
 


@@ -1946,19 +1938,26 @@ static const char *CYBlockEncoding(NSBlock *self) {
     return descriptor3->signature;
 }
 
     return descriptor3->signature;
 }
 

-static sig::Signature *CYBlockSignature(CYPool &pool, NSBlock *self) {
+static bool CYBlockSignature(CYPool &pool, NSBlock *self, sig::Signature &signature) {

     const char *encoding(CYBlockEncoding(self));
     if (encoding == NULL)
     const char *encoding(CYBlockEncoding(self));
     if (encoding == NULL)

-        return NULL;
-    // XXX: this should be stored on a FunctionInstance private value subclass
-    sig::Signature *signature(new(pool) sig::Signature());
-    sig::Parse(pool, signature, encoding, &Structor_);
-    return signature;
+        return false;
+
+    sig::Parse(pool, &signature, encoding, &Structor_);
+    _assert(signature.count >= 2);
+
+    _assert(dynamic_cast<sig::Object *>(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<Instance *>(JSObjectGetPrivate(object)));
 }
 
 static JSValueRef FunctionInstance_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->GetValue());
+    id self(internal->value_);

 
     if (const char *encoding = CYBlockEncoding(self)) {
         CYPool pool;
 
     if (const char *encoding = CYBlockEncoding(self)) {
         CYPool pool;


@@ -1970,11 +1969,11 @@ static JSValueRef FunctionInstance_callAsFunction(JSContextRef context, JSObject
         sig::Parse(pool, &signature, encoding, &Structor_);
 
         ffi_cif cif;
         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<BlockLiteral *>(self));
         void (*function)() = reinterpret_cast<void (*)()>(literal->invoke);
 
         BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(self));
         void (*function)() = reinterpret_cast<void (*)()>(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)
     }
 
     if (count != 0)


@@ -1989,14 +1988,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<Instance *>(JSObjectGetPrivate((JSObjectRef) constructor)));
 
 static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) constructor)));

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

     if (!CYIsClass(_class))
         return false;
 
     if (CYJSValueIsNSObject(context, instance)) {
         Instance *linternal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) instance)));
         // XXX: this isn't always safe
     if (!CYIsClass(_class))
         return false;
 
     if (CYJSValueIsNSObject(context, instance)) {
         Instance *linternal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) instance)));
         // XXX: this isn't always safe

-        return [linternal->GetValue() isKindOfClass:_class];
+        return [linternal->value_ isKindOfClass:_class];

     }
 
     return false;
     }
 
     return false;


@@ -2012,11 +2011,11 @@ 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;
 
     CYPool pool;
 

-    id self(internal->GetValue());
+    id self(internal->value_);

     const char *name(CYPoolCString(pool, context, property));
 
     if (object_getInstanceVariable(self, name, NULL) != NULL)
     const char *name(CYPoolCString(pool, context, property));
 
     if (object_getInstanceVariable(self, name, NULL) != NULL)


@@ -2025,12 +2024,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;


@@ -2040,14 +2041,13 @@ 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;
 
     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)) {
     const char *name(CYPoolCString(pool, context, property));
 
     if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {


@@ -2059,7 +2059,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);


@@ -2072,18 +2072,18 @@ static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object,
 #endif
 
             auto type(new(pool) Type_privateData(encoding));
 #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) }
 
         }
     }
 
     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;
 
     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)) {
     const char *name(CYPoolCString(pool, context, property));
 
     if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {


@@ -2094,14 +2094,14 @@ 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);
             field = field & ~(mask << shift) | (uintptr_t(CYCastDouble(context, value)) & mask) << shift;
         } else {
             auto type(new(pool) Type_privateData(ivar_getTypeEncoding(ivar)));
             _assert(shift + length <= sizeof(uintptr_t) * 8);
             uintptr_t &field(*reinterpret_cast<uintptr_t *>(data));
             uintptr_t mask((1 << length) - 1);
             field = field & ~(mask << shift) | (uintptr_t(CYCastDouble(context, value)) & mask) << shift;
         } else {
             auto type(new(pool) Type_privateData(ivar_getTypeEncoding(ivar)));

-            CYPoolFFI(&pool, context, type->type_, type->GetFFI(), reinterpret_cast<uint8_t *>(self) + ivar_getOffset(ivar), value);
+            type->type_->PoolFFI(&pool, context, type->GetFFI(), reinterpret_cast<uint8_t *>(self) + ivar_getOffset(ivar), value);

             return true;
         }
     }
             return true;
         }
     }


@@ -2109,30 +2109,31 @@ 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;
 
     CYPool pool;
 

-    id self(internal->GetValue());
+    id self(internal->value_);

     Class _class(object_getClass(self));
 
     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)));
-    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<Interior *>(JSObjectGetPrivate(object)));
+    return internal->owner_;

 } CYCatch(NULL) }
 
 static bool ObjectiveC_Classes_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
 } CYCatch(NULL) }
 
 static bool ObjectiveC_Classes_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {


@@ -2171,11 +2172,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);

     }
 }
 
     }
 }
 


@@ -2185,30 +2188,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 {


@@ -2230,11 +2236,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
 


@@ -2247,11 +2256,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 {


@@ -2342,6 +2354,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))


@@ -2350,8 +2363,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)


@@ -2423,28 +2434,8 @@ JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _cla
     sig::Signature signature;
     sig::Parse(pool, &signature, type, &Structor_);
 
     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;
     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
 
     if (imp == NULL) {
 #ifndef CY_NO_STRET


@@ -2456,7 +2447,7 @@ JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _cla
     }
 
     void (*function)() = reinterpret_cast<void (*)()>(imp);
     }
 
     void (*function)() = reinterpret_cast<void (*)()>(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[]) {
 }
 
 static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[]) {


@@ -2471,17 +2462,17 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
     SEL _cmd;
     Class _class;
 
     SEL _cmd;
     Class _class;
 

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

         cy::Super *internal(reinterpret_cast<cy::Super *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));
         cy::Super *internal(reinterpret_cast<cy::Super *>(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<Instance *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));
         _class = internal->class_;;
         uninitialized = false;
     } else if (CYJSValueIsNSObject(context, arguments[0])) {
         Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));

-        self = internal->GetValue();
+        self = internal->value_;

         _class = nil;
         uninitialized = internal->IsUninitialized();
         _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]);


@@ -2520,7 +2511,7 @@ static JSValueRef Message_callAsFunction(JSContextRef context, JSObjectRef objec
     setup[0] = &self;
     setup[1] = &internal->sel_;
 
     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 {
 } CYCatch(NULL) }
 
 static JSObjectRef Super_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {


@@ -2529,7 +2520,7 @@ static JSObjectRef Super_new(JSContextRef context, JSObjectRef object, size_t co
     CYPool pool;
     id self(CYCastNSObject(&pool, context, arguments[0]));
     Class _class(CYCastClass(pool, context, arguments[1]));
     CYPool pool;
     id self(CYCastNSObject(&pool, context, arguments[0]));
     Class _class(CYCastClass(pool, context, arguments[1]));

-    return cy::Super::Make(context, self, _class);
+    return CYPrivate<cy::Super>::Make(context, self, _class);

 } CYCatch(NULL) }
 
 static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 } CYCatch(NULL) }
 
 static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {


@@ -2537,56 +2528,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]));
         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 CYPrivate<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 {
 } 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");
         throw CYJSError(context, "incorrect number of arguments to Instance constructor");

-    id self(count == 0 ? nil : CYCastPointer<id>(context, arguments[0]));
-    return CYMakeInstance(context, self);
+    return CYMakeInstance(context, CYCastPointer<id>(context, arguments[0]));

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

-static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(object)));
-    return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->value_));
+static JSValueRef Selector_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+    return CYMakeType(context, sig::Selector());

 } CYCatch(NULL) }
 
 } 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<CYValue *>(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<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) }
 
 } 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<Instance *>(JSObjectGetPrivate(object)));
     CYPool pool;
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     CYPool pool;

-    sig::Signature *signature(CYBlockSignature(pool, internal->GetValue()));
-    if (signature == NULL)
+    sig::Block type;
+    if (!CYBlockSignature(pool, internal->value_, type.signature))

         return CYJSNull(context);
         return CYJSNull(context);

-    return CYMakeType(context, signature);
+    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)));
 } 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->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<Instance *>(JSObjectGetPrivate(object)));
 } CYCatch(NULL) }
 
 static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));

-    id self(internal->GetValue());
+    id self(internal->value_);

     if (!CYIsClass(self))
         return CYJSUndefined(context);
     return CYGetClassPrototype(context, self);
     if (!CYIsClass(self))
         return CYJSUndefined(context);
     return CYGetClassPrototype(context, self);


@@ -2594,10 +2573,10 @@ 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<Instance *>(JSObjectGetPrivate(object)));
 
 static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));

-    id self(internal->GetValue());
+    id self(internal->value_);

     if (!CYIsClass(self))
         return CYJSUndefined(context);
     if (!CYIsClass(self))
         return CYJSUndefined(context);

-    return Messages::Make(context, (Class) self);
+    return CYPrivate<Messages>::Make(context, (Class) 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 {


@@ -2607,7 +2586,7 @@ static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectR
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(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 {
 } CYCatch(NULL) }
 
 static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {


@@ -2615,7 +2594,7 @@ static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectR
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));

-    id value(internal->GetValue());
+    id value(internal->value_);

 
     CYPoolTry {
         NSString *key;
 
     CYPoolTry {
         NSString *key;


@@ -2638,7 +2617,7 @@ static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObject
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));

-    id value(internal->GetValue());
+    id value(internal->value_);

     _assert(value != nil);
 
     if (![value respondsToSelector:@selector(cy$valueOfInContext:)])
     _assert(value != nil);
 
     if (![value respondsToSelector:@selector(cy$valueOfInContext:)])


@@ -2656,7 +2635,7 @@ static JSValueRef Instance_callAsFunction_toPointer(JSContextRef context, JSObje
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
     // XXX: but... but... THIS ISN'T A POINTER! :(
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
     // XXX: but... but... THIS ISN'T A POINTER! :(

-    return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->GetValue()));
+    return CYCastJSValue(context, reinterpret_cast<uintptr_t>(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 {
 } 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 {


@@ -2664,7 +2643,7 @@ static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjec
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(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?
 
     CYPoolTry {
         // XXX: this seems like a stupid implementation; what if it crashes? why not use the CYONifier backend?


@@ -2677,21 +2656,18 @@ static JSValueRef Class_callAsFunction_pointerTo(JSContextRef context, JSObjectR
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));

-    id value(internal->GetValue());
+    id value(internal->value_);

 
     if (!CYIsClass(value))
         CYThrow("non-Class object cannot be used as Type");
 
 
     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<Selector_privateData *>(JSObjectGetPrivate(_this)));
 } 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<Selector_privateData *>(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) {
 } CYCatch(NULL) }
 
 static JSValueRef Selector_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {


@@ -2700,7 +2676,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<Selector_privateData *>(JSObjectGetPrivate(_this)));
 
 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<Selector_privateData *>(JSObjectGetPrivate(_this)));

-    const char *name(sel_getName(internal->GetValue()));
+    const char *name(sel_getName(internal->value_));

 
     CYPoolTry {
         NSString *string([NSString stringWithFormat:@"@selector(%s)", name]);
 
     CYPoolTry {
         NSString *string([NSString stringWithFormat:@"@selector(%s)", name]);


@@ -2714,43 +2690,41 @@ static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef
 
     CYPool pool;
     Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate(_this)));
 
     CYPool pool;
     Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(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));
 
 
     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] = {
 } 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}
 };
 
     {NULL, NULL, NULL, 0}
 };
 

-// XXX: this is sadly duplicated in FunctionInstance_staticValues

 static JSStaticValue Instance_staticValues[5] = {
 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},
     {"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}
 };
 
     {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},
     // 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}
 };
 
     {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},
     {"toCYON", &Instance_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toJSON", &Instance_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},


@@ -2764,8 +2738,8 @@ static JSStaticFunction Class_staticFunctions[2] = {
     {NULL, NULL, 0}
 };
 
     {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}
 };
 


@@ -2784,11 +2758,6 @@ JSValueRef NSCFType$cy$toJSON$inContext$(id self, SEL sel, JSValueRef key, JSCon
 #endif
 
 void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
 #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");
     NSArray_ = objc_getClass("NSArray");
     NSBlock_ = objc_getClass("NSBlock");
     NSDictionary_ = objc_getClass("NSDictionary");


@@ -2826,7 +2795,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     definition.callAsConstructor = &Instance_callAsConstructor;
     definition.hasInstance = &Instance_hasInstance;
     definition.finalize = &CYFinalize;
     definition.callAsConstructor = &Instance_callAsConstructor;
     definition.hasInstance = &Instance_hasInstance;
     definition.finalize = &CYFinalize;

-    Instance_ = JSClassCreate(&definition);
+    Instance::Class_ = JSClassCreate(&definition);

 
     definition.className = "ArrayInstance";
     ArrayInstance_ = JSClassCreate(&definition);
 
     definition.className = "ArrayInstance";
     ArrayInstance_ = JSClassCreate(&definition);


@@ -2851,17 +2820,17 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     definition = kJSClassDefinitionEmpty;
     definition.className = "Class";
     definition.staticFunctions = Class_staticFunctions;
     definition = kJSClassDefinitionEmpty;
     definition.className = "Class";
     definition.staticFunctions = Class_staticFunctions;

-    Class_ = JSClassCreate(&definition);
+    ClassInstance_ = 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.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_ = JSClassCreate(&definition);
+    CYPrivate<Interior>::Class_ = JSClassCreate(&definition);

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


@@ -2869,7 +2838,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     definition.staticValues = cy::Functor::StaticValues;
     definition.callAsFunction = &Message_callAsFunction;
     definition.finalize = &CYFinalize;
     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";
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Messages";


@@ -2878,7 +2847,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     definition.setProperty = &Messages_setProperty;
     definition.getPropertyNames = &Messages_getPropertyNames;
     definition.finalize = &CYFinalize;
     definition.setProperty = &Messages_setProperty;
     definition.getPropertyNames = &Messages_getPropertyNames;
     definition.finalize = &CYFinalize;

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

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


@@ -2886,13 +2855,12 @@ 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_ = JSClassCreate(&definition);
+    CYPrivate<Selector_privateData>::Class_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Super";
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "Super";

-    definition.staticFunctions = Internal_staticFunctions;

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

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

 
     definition = kJSClassDefinitionEmpty;
     definition.className = "ObjectiveC::Classes";
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "ObjectiveC::Classes";


@@ -2965,12 +2933,11 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
     CYSetProperty(context, ObjectiveC, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL));
 #endif
 
     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, 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)));
     CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);
 
     JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s)));
     CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);
 


@@ -2986,6 +2953,12 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
     JSObjectRef Boolean_prototype(CYGetCachedObject(context, CYJSString("Boolean_prototype")));
     CYSetPrototype(context, BooleanInstance_prototype, Boolean_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)));
     CYSetProperty(context, cy, CYJSString("FunctionInstance_prototype"), FunctionInstance_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);


@@ -3010,10 +2983,6 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
     JSObjectRef String_prototype(CYGetCachedObject(context, CYJSString("String_prototype")));
     CYSetPrototype(context, StringInstance_prototype, String_prototype);
 
     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);
     CYSetProperty(context, cycript, CYJSString("Instance"), Instance);
     CYSetProperty(context, cycript, CYJSString("Selector"), Selector);
     CYSetProperty(context, cycript, CYJSString("objc_super"), Super);


@@ -3033,9 +3002,11 @@ 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);
     JSObjectRef cache(CYGetCachedObject(context, CYJSString("cache")));
     CYSetProperty(context, cache, CYJSString("YES"), JSValueMakeBoolean(context, true), kJSPropertyAttributeDontEnum);
     CYSetProperty(context, cache, CYJSString("NO"), JSValueMakeBoolean(context, false), kJSPropertyAttributeDontEnum);

-    CYSetProperty(context, cache, CYJSString("id"), CYMakeType(context, sig::object_P), kJSPropertyAttributeDontEnum);
-    CYSetProperty(context, cache, CYJSString("Class"), CYMakeType(context, sig::typename_P), kJSPropertyAttributeDontEnum);
-    CYSetProperty(context, cache, CYJSString("SEL"), CYMakeType(context, sig::selector_P), 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) {


@@ -3053,8 +3024,6 @@ static CYHook CYObjectiveCHook = {
     &CYObjectiveC_CallFunction,
     &CYObjectiveC_Initialize,
     &CYObjectiveC_SetupContext,
     &CYObjectiveC_CallFunction,
     &CYObjectiveC_Initialize,
     &CYObjectiveC_SetupContext,

-    &CYObjectiveC_PoolFFI,
-    &CYObjectiveC_FromFFI,

     &CYObjectiveC_CastSymbol,
 };
 
     &CYObjectiveC_CastSymbol,
 };
 


@@ -3062,6 +3031,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 {