Find JVM with dlopen and register Android natives.

[cycript.git] / ObjectiveC / Library.mm

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 580660e87026b829f1cee635b49e726bf33a4cf1..e7c16b85de8353f0570ee2edf0cccd13e0e11553 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 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,45 @@ 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) :
+    CYValue(value),
+    flags_(flags)
+{
+    if ((flags & Instance::Permanent) == 0)
+        value_ = [value_ retain];

 }
 
 Instance::~Instance() {
     if ((flags_ & Permanent) == 0)
 }
 
 Instance::~Instance() {
     if ((flags_ & Permanent) == 0)

-        [GetValue() release];
+        [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 +391,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 +608,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 +643,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 +661,7 @@ NSBlock *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature
 NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSObjectRef object) {
     if (CYJSValueIsNSObject(context, object)) {
         Instance *internal(reinterpret_cast<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,28 +830,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);
 

-    sig::Block type;
-    sig::Copy(pool, type.signature, *signature);
-

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

-    CYTypeFunctionWith *function(typed->Function());
-    _assert(function != NULL);
-
-    _assert(function->parameters_ != NULL);
-    CYObjCBlock *block(new(pool) CYObjCBlock(typed, function->parameters_, NULL));
+    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;


@@ -1487,19 +1465,14 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) {
 
 @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);
 static JSValueRef CYCastJSValue(JSContextRef context, SEL sel) {
     if (sel == NULL)
         return CYJSNull(context);

-    return CYMakeSelector(context, sel);
+    return 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, 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 {


@@ -1527,10 +1500,10 @@ static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef val
     JSObjectRef object(CYCastJSObject(context, value));
 
     if (JSValueIsObjectOfClass(context, object, FunctionInstance_))
     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;
     }
 


@@ -1632,9 +1605,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) {


@@ -1644,12 +1617,12 @@ static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *enc
     sig::Parse(pool, &signature, encoding, &Structor_);
     Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &MessageAdapter_));
     // XXX: see notes in Library.cpp about needing to leak
     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));


@@ -1663,21 +1636,21 @@ static bool Messages_hasProperty(JSContextRef context, JSObjectRef object, JSStr
 
 static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Messages *internal(reinterpret_cast<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));


@@ -1686,10 +1659,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);


@@ -1715,7 +1688,7 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
 
 static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
 
 static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));

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

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


@@ -1733,7 +1706,7 @@ static bool CYHasImplicitProperties(Class _class) {
 
 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;


@@ -1769,10 +1742,10 @@ static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStr
 
 static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<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 Interior::Make(context, self, context, object);

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


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


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


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


@@ -1916,7 +1889,7 @@ static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object,
 
 static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<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) }
 


@@ -1932,19 +1905,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;


@@ -1956,11 +1936,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, &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)


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


@@ -1998,11 +1978,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)


@@ -2029,11 +2009,11 @@ static void CYBitField(unsigned &length, unsigned &shift, id self, Ivar ivar, co
     free(ivars);
 }
 
     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)) {


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

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

     CYPool pool;
 
     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)) {


@@ -2095,9 +2075,9 @@ 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_(Class _class, JSPropertyNameAccumulatorRef names) {

     if (Class super = class_getSuperclass(_class))
     if (Class super = class_getSuperclass(_class))

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

 
     unsigned int size;
     objc_ivar **data(class_copyIvarList(_class, &size));
 
     unsigned int size;
     objc_ivar **data(class_copyIvarList(_class, &size));


@@ -2106,19 +2086,19 @@ static void Internal_getPropertyNames_(Class _class, JSPropertyNameAccumulatorRe
     free(data);
 }
 
     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_(_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) {


@@ -2409,24 +2389,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);
-            element->type = new(pool) sig::Object();
-        }
-
-        signature.elements = elements;
-        signature.count = used;
-    }
-

     ffi_cif cif;
     ffi_cif cif;

-    sig::sig_ffi_cif(pool, &signature, &cif);
+    sig::sig_ffi_cif(pool, 0, signature, &cif);

 
     if (imp == NULL) {
 #ifndef CY_NO_STRET
 
     if (imp == NULL) {
 #ifndef CY_NO_STRET


@@ -2438,7 +2402,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[]) {


@@ -2453,14 +2417,14 @@ 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], 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();
         if (uninitialized)
         _class = nil;
         uninitialized = internal->IsUninitialized();
         if (uninitialized)


@@ -2502,7 +2466,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 {


@@ -2519,7 +2483,7 @@ 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 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 {


@@ -2528,48 +2492,35 @@ static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t
     return CYMakeInstance(context, CYCastPointer<id>(context, arguments[0]));
 } CYCatch(NULL) }
 
     return CYMakeInstance(context, CYCastPointer<id>(context, arguments[0]));
 } 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::Void XXX;
-
-    sig::Type *type;
-    ffi_type *ffi;
-
-    if (typical == NULL) {
-        type = &XXX;
-        ffi = NULL;
-    } else {
-        type = typical->type_;
-        ffi = typical->ffi_;
-    }
-
-    return CYMakePointer(context, &internal->value_, *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);


@@ -2577,7 +2528,7 @@ static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectR
 
 static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<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);
     return Messages::Make(context, (Class) self);
     if (!CYIsClass(self))
         return CYJSUndefined(context);
     return Messages::Make(context, (Class) self);


@@ -2590,7 +2541,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 {


@@ -2598,7 +2549,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;


@@ -2621,7 +2572,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:)])


@@ -2639,7 +2590,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 {


@@ -2647,7 +2598,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?


@@ -2660,7 +2611,7 @@ 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");


@@ -2671,7 +2622,7 @@ static JSValueRef Class_callAsFunction_pointerTo(JSContextRef context, JSObjectR
 
 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)));
 
 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) {


@@ -2680,7 +2631,7 @@ static JSValueRef Selector_callAsFunction_toJSON(JSContextRef context, JSObjectR
 
 static JSValueRef Selector_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     Selector_privateData *internal(reinterpret_cast<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]);


@@ -2694,43 +2645,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},


@@ -2744,8 +2693,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}
 };
 


@@ -2764,11 +2713,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());
-    Selector_type = new(pool) Type_privateData(sig::Selector());
-

     NSArray_ = objc_getClass("NSArray");
     NSBlock_ = objc_getClass("NSBlock");
     NSDictionary_ = objc_getClass("NSDictionary");
     NSArray_ = objc_getClass("NSArray");
     NSBlock_ = objc_getClass("NSBlock");
     NSDictionary_ = objc_getClass("NSDictionary");


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


@@ -2831,17 +2775,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);
+    Interior::Class_ = JSClassCreate(&definition);

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


@@ -2849,7 +2793,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";


@@ -2858,7 +2802,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);
+    Messages::Class_ = JSClassCreate(&definition);

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


@@ -2866,13 +2810,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);
+    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);
+    cy::Super::Class_ = JSClassCreate(&definition);

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


@@ -2945,12 +2888,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, Selector_privateData::Class_, &Selector_new));
+    JSObjectRef Super(JSObjectMakeConstructor(context, cy::Super::Class_, &Super_new));

 
 

+    JSObjectRef Instance(JSObjectMakeConstructor(context, Instance::Class_, &Instance_new));

     JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s)));
     CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);
 
     JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s)));
     CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);
 


@@ -2966,6 +2908,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);


@@ -2990,10 +2938,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);