Added a CYOutput object between std::ostream and the actual mechanism.

[cycript.git] / Library.mm

diff --git a/Library.mm b/Library.mm
index c8a2a6733d75922c0ba2de239c76f60b0fc25663..1b4a19820ed6fcda6ed2ba39a157242a3d0d6d16 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -96,6 +96,115 @@
     } \
 }
 
     } \
 }
 

+void CYThrow(JSContextRef context, JSValueRef value);
+
+/* JavaScript Properties {{{ */
+JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, size_t index) {
+    JSValueRef exception(NULL);
+    JSValueRef value(JSObjectGetPropertyAtIndex(context, object, index, &exception));
+    CYThrow(context, exception);
+    return value;
+}
+
+JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, JSStringRef name) {
+    JSValueRef exception(NULL);
+    JSValueRef value(JSObjectGetProperty(context, object, name, &exception));
+    CYThrow(context, exception);
+    return value;
+}
+
+void CYSetProperty(JSContextRef context, JSObjectRef object, size_t index, JSValueRef value) {
+    JSValueRef exception(NULL);
+    JSObjectSetPropertyAtIndex(context, object, index, value, &exception);
+    CYThrow(context, exception);
+}
+
+void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef value) {
+    JSValueRef exception(NULL);
+    JSObjectSetProperty(context, object, name, value, kJSPropertyAttributeNone, &exception);
+    CYThrow(context, exception);
+}
+/* }}} */
+/* JavaScript Strings {{{ */
+JSStringRef CYCopyJSString(id value) {
+    // XXX: this definition scares me; is anyone using this?!
+    return value == NULL ? NULL : JSStringCreateWithCFString(reinterpret_cast<CFStringRef>([value description]));
+}
+
+JSStringRef CYCopyJSString(const char *value) {
+    return value == NULL ? NULL : JSStringCreateWithUTF8CString(value);
+}
+
+JSStringRef CYCopyJSString(JSStringRef value) {
+    return value == NULL ? NULL : JSStringRetain(value);
+}
+
+JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value) {
+    if (JSValueIsNull(context, value))
+        return NULL;
+    JSValueRef exception(NULL);
+    JSStringRef string(JSValueToStringCopy(context, value, &exception));
+    CYThrow(context, exception);
+    return string;
+}
+
+class CYJSString {
+  private:
+    JSStringRef string_;
+
+    void Clear_() {
+        if (string_ != NULL)
+            JSStringRelease(string_);
+    }
+
+  public:
+    CYJSString(const CYJSString &rhs) :
+        string_(CYCopyJSString(rhs.string_))
+    {
+    }
+
+    template <typename Arg0_>
+    CYJSString(Arg0_ arg0) :
+        string_(CYCopyJSString(arg0))
+    {
+    }
+
+    template <typename Arg0_, typename Arg1_>
+    CYJSString(Arg0_ arg0, Arg1_ arg1) :
+        string_(CYCopyJSString(arg0, arg1))
+    {
+    }
+
+    CYJSString &operator =(const CYJSString &rhs) {
+        Clear_();
+        string_ = CYCopyJSString(rhs.string_);
+        return *this;
+    }
+
+    ~CYJSString() {
+        Clear_();
+    }
+
+    void Clear() {
+        Clear_();
+        string_ = NULL;
+    }
+
+    operator JSStringRef() const {
+        return string_;
+    }
+};
+
+CFStringRef CYCopyCFString(JSStringRef value) {
+    return JSStringCopyCFString(kCFAllocatorDefault, value);
+}
+
+CFStringRef CYCopyCFString(JSContextRef context, JSValueRef value) {
+    return CYCopyCFString(CYJSString(context, value));
+}
+
+/* }}} */
+

 static JSGlobalContextRef Context_;
 static JSObjectRef System_;
 static JSObjectRef ObjectiveC_;
 static JSGlobalContextRef Context_;
 static JSObjectRef System_;
 static JSObjectRef ObjectiveC_;


@@ -104,8 +213,9 @@ static JSClassRef Functor_;
 static JSClassRef Instance_;
 static JSClassRef Internal_;
 static JSClassRef Message_;
 static JSClassRef Instance_;
 static JSClassRef Internal_;
 static JSClassRef Message_;

+static JSClassRef Messages_;
+static JSClassRef NSArrayPrototype_;

 static JSClassRef Pointer_;
 static JSClassRef Pointer_;

-static JSClassRef Prototype_;

 static JSClassRef Runtime_;
 static JSClassRef Selector_;
 static JSClassRef Struct_;
 static JSClassRef Runtime_;
 static JSClassRef Selector_;
 static JSClassRef Struct_;


@@ -118,6 +228,7 @@ static JSClassRef ObjectiveC_Protocols_;
 
 static JSObjectRef Array_;
 static JSObjectRef Function_;
 
 static JSObjectRef Array_;
 static JSObjectRef Function_;

+static JSObjectRef String_;

 
 static JSStringRef Result_;
 
 
 static JSStringRef Result_;
 


@@ -128,6 +239,9 @@ static JSStringRef prototype_;
 static JSStringRef toCYON_;
 static JSStringRef toJSON_;
 
 static JSStringRef toCYON_;
 static JSStringRef toJSON_;
 

+static JSObjectRef Instance_prototype_;
+static JSObjectRef Object_prototype_;
+

 static JSObjectRef Array_prototype_;
 static JSObjectRef Array_pop_;
 static JSObjectRef Array_push_;
 static JSObjectRef Array_prototype_;
 static JSObjectRef Array_pop_;
 static JSObjectRef Array_push_;


@@ -136,6 +250,7 @@ static JSObjectRef Array_splice_;
 static Class NSArray_;
 static Class NSCFBoolean_;
 static Class NSCFType_;
 static Class NSArray_;
 static Class NSCFBoolean_;
 static Class NSCFType_;

+static Class NSDictionary_;

 static Class NSMessageBuilder_;
 static Class NSZombie_;
 static Class Object_;
 static Class NSMessageBuilder_;
 static Class NSZombie_;
 static Class Object_;


@@ -186,6 +301,37 @@ struct Selector_privateData :
     virtual Type_privateData *GetType() const;
 };
 
     virtual Type_privateData *GetType() const;
 };
 

+// XXX: trick this out with associated objects!
+JSValueRef CYGetClassPrototype(JSContextRef context, id self) {
+    if (self == nil)
+        return Instance_prototype_;
+
+    // XXX: I need to think through multi-context
+    typedef std::map<Class, JSValueRef> CacheMap;
+    static CacheMap cache_;
+
+    JSValueRef &value(cache_[self]);
+    if (value != NULL)
+        return value;
+
+    JSClassRef _class(NULL);
+    JSValueRef prototype;
+
+    if (self == NSArray_)
+        prototype = Array_prototype_;
+    else if (self == NSDictionary_)
+        prototype = Object_prototype_;
+    else
+        prototype = CYGetClassPrototype(context, class_getSuperclass(self));
+
+    JSObjectRef object(JSObjectMake(context, _class, NULL));
+    JSObjectSetPrototype(context, object, prototype);
+
+    JSValueProtect(context, object);
+    value = object;
+    return object;
+}
+

 struct Instance :
     CYValue
 {
 struct Instance :
     CYValue
 {


@@ -211,12 +357,7 @@ struct Instance :
 
     static JSObjectRef Make(JSContextRef context, id object, Flags flags = None) {
         JSObjectRef value(JSObjectMake(context, Instance_, new Instance(object, flags)));
 
     static JSObjectRef Make(JSContextRef context, id object, Flags flags = None) {
         JSObjectRef value(JSObjectMake(context, Instance_, new Instance(object, flags)));

-        if (object != nil)
-            for (Class _class(object_getClass(object)); _class != nil; _class = class_getSuperclass(_class))
-                if (_class == NSArray_) {
-                    JSObjectSetPrototype(context, value, Array_prototype_);
-                    break;
-                }
+        JSObjectSetPrototype(context, value, CYGetClassPrototype(context, object == nil ? nil : object_getClass(object)));

         return value;
     }
 
         return value;
     }
 


@@ -231,20 +372,20 @@ struct Instance :
     virtual Type_privateData *GetType() const;
 };
 
     virtual Type_privateData *GetType() const;
 };
 

-struct Prototype :
+struct Messages :

     CYValue
 {
     CYValue
 {

-    Prototype(Class value) :
+    Messages(Class value) :

         CYValue(value)
     {
     }
 
     static JSObjectRef Make(JSContextRef context, Class _class, bool array = false) {
         CYValue(value)
     {
     }
 
     static JSObjectRef Make(JSContextRef context, Class _class, bool array = false) {

-        JSObjectRef value(JSObjectMake(context, Prototype_, new Prototype(_class)));
+        JSObjectRef value(JSObjectMake(context, Messages_, new Messages(_class)));

         if (_class == NSArray_)
             array = true;
         if (Class super = class_getSuperclass(_class))
         if (_class == NSArray_)
             array = true;
         if (Class super = class_getSuperclass(_class))

-            JSObjectSetPrototype(context, value, Prototype::Make(context, super, array));
+            JSObjectSetPrototype(context, value, Messages::Make(context, super, array));

         /*else if (array)
             JSObjectSetPrototype(context, value, Array_prototype_);*/
         return value;
         /*else if (array)
             JSObjectSetPrototype(context, value, Array_prototype_);*/
         return value;


@@ -255,19 +396,41 @@ struct Prototype :
     }
 };
 
     }
 };
 

-struct Internal :
+struct CYOwned :

     CYValue
 {
     CYValue
 {

+  private:
+    JSContextRef context_;

     JSObjectRef owner_;
 
     JSObjectRef owner_;
 

-    Internal(id value, JSObjectRef owner) :
+  public:
+    CYOwned(void *value, JSContextRef context, JSObjectRef owner) :

         CYValue(value),
         CYValue(value),

+        context_(context),

         owner_(owner)
         owner_(owner)

+    {
+        JSValueProtect(context_, owner_);
+    }
+
+    virtual ~CYOwned() {
+        JSValueUnprotect(context_, owner_);
+    }
+
+    JSObjectRef GetOwner() const {
+        return owner_;
+    }
+};
+
+struct Internal :
+    CYOwned
+{
+    Internal(id value, JSContextRef context, JSObjectRef owner) :
+        CYOwned(value, context, owner)

     {
     }
 
     static JSObjectRef Make(JSContextRef context, id object, JSObjectRef owner) {
     {
     }
 
     static JSObjectRef Make(JSContextRef context, id object, JSObjectRef owner) {

-        return JSObjectMake(context, Internal_, new Internal(object, owner));
+        return JSObjectMake(context, Internal_, new Internal(object, context, owner));

     }
 
     id GetValue() const {
     }
 
     id GetValue() const {


@@ -440,27 +603,24 @@ Type_privateData *Selector_privateData::GetType() const {
 }
 
 struct Pointer :
 }
 
 struct Pointer :

-    CYValue
+    CYOwned

 {
 {

-    JSObjectRef owner_;

     Type_privateData *type_;
 
     Type_privateData *type_;
 

-    Pointer(void *value, sig::Type *type, JSObjectRef owner) :
-        CYValue(value),
-        owner_(owner),
+    Pointer(void *value, JSContextRef context, JSObjectRef owner, sig::Type *type) :
+        CYOwned(value, context, owner),

         type_(new(pool_) Type_privateData(type))
     {
     }
 };
 
 struct Struct_privateData :
         type_(new(pool_) Type_privateData(type))
     {
     }
 };
 
 struct Struct_privateData :

-    CYValue
+    CYOwned

 {
 {

-    JSObjectRef owner_;

     Type_privateData *type_;
 
     Type_privateData *type_;
 

-    Struct_privateData(JSObjectRef owner) :
-        owner_(owner)
+    Struct_privateData(JSContextRef context, JSObjectRef owner) :
+        CYOwned(NULL, context, owner)

     {
     }
 };
     {
     }
 };


@@ -469,7 +629,7 @@ typedef std::map<const char *, Type_privateData *, CStringMapLess> TypeMap;
 static TypeMap Types_;
 
 JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
 static TypeMap Types_;
 
 JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {

-    Struct_privateData *internal(new Struct_privateData(owner));
+    Struct_privateData *internal(new Struct_privateData(context, owner));

     apr_pool_t *pool(internal->pool_);
     Type_privateData *typical(new(pool) Type_privateData(type, ffi));
     internal->type_ = typical;
     apr_pool_t *pool(internal->pool_);
     Type_privateData *typical(new(pool) Type_privateData(type, ffi));
     internal->type_ = typical;


@@ -511,9 +671,16 @@ struct Closure_privateData :
     JSContextRef context_;
     JSObjectRef function_;
 
     JSContextRef context_;
     JSObjectRef function_;
 

-    Closure_privateData(const char *type) :
-        Functor_privateData(type, NULL)
+    Closure_privateData(JSContextRef context, JSObjectRef function, const char *type) :
+        Functor_privateData(type, NULL),
+        context_(context),
+        function_(function)

     {
     {

+        JSValueProtect(context_, function_);
+    }
+
+    virtual ~Closure_privateData() {
+        JSValueUnprotect(context_, function_);

     }
 };
 
     }
 };
 


@@ -589,10 +756,17 @@ size_t CYGetIndex(const char *value) {
     return _not(size_t);
 }
 
     return _not(size_t);
 }
 

+// XXX: fix this
+static const char *CYPoolCString(apr_pool_t *pool, JSStringRef value);
+

 size_t CYGetIndex(apr_pool_t *pool, NSString *value) {
     return CYGetIndex(CYPoolCString(pool, value));
 }
 
 size_t CYGetIndex(apr_pool_t *pool, NSString *value) {
     return CYGetIndex(CYPoolCString(pool, value));
 }
 

+size_t CYGetIndex(apr_pool_t *pool, JSStringRef value) {
+    return CYGetIndex(CYPoolCString(pool, value));
+}
+

 bool CYGetOffset(const char *value, ssize_t &index) {
     if (value[0] != '0') {
         char *end;
 bool CYGetOffset(const char *value, ssize_t &index) {
     if (value[0] != '0') {
         char *end;


@@ -727,98 +901,11 @@ struct PropertyAttributes {
 
 };
 
 
 };
 

-@implementation NSProxy (Cycript)
-
-- (NSObject *) cy$toJSON:(NSString *)key {
-    return [self description];
-}
-
-- (NSString *) cy$toCYON {
-    return [[self cy$toJSON:@""] cy$toCYON];
-}
-
-@end
-
-@implementation NSObject (Cycript)
-
-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context {
-    return CYMakeInstance(context, self, false);
-}
-
-- (JSType) cy$JSType {
-    return kJSTypeObject;
-}
-
-- (NSObject *) cy$toJSON:(NSString *)key {
-    return [self description];
-}
-
-- (NSString *) cy$toCYON {
-    return [[self cy$toJSON:@""] cy$toCYON];
-}
-
-- (NSString *) cy$toKey {
-    return [self cy$toCYON];
-}
-
-- (bool) cy$hasProperty:(NSString *)name {
-    return false;
-}
-
-- (NSObject *) cy$getProperty:(NSString *)name {
-    return nil;
-}
-
-- (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {
-    return false;
-}
-
-- (bool) cy$deleteProperty:(NSString *)name {
-    return false;
-}
-
-@end
-

 NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
     return [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease];
 }
 
 NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
     return [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease];
 }
 

-@implementation WebUndefined (Cycript)
-
-- (JSType) cy$JSType {
-    return kJSTypeUndefined;
-}
-
-- (NSObject *) cy$toJSON:(NSString *)key {
-    return self;
-}
-
-- (NSString *) cy$toCYON {
-    return @"undefined";
-}
-
-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context {
-    return CYJSUndefined(context);
-}
-
-@end
-
-@implementation NSNull (Cycript)
-
-- (JSType) cy$JSType {
-    return kJSTypeNull;
-}
-
-- (NSObject *) cy$toJSON:(NSString *)key {
-    return self;
-}
-
-- (NSString *) cy$toCYON {
-    return @"null";
-}
-
-@end
-
+/* Bridge: NSArray {{{ */

 @implementation NSArray (Cycript)
 
 - (NSString *) cy$toCYON {
 @implementation NSArray (Cycript)
 
 - (NSString *) cy$toCYON {


@@ -866,7 +953,41 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 }
 
 @end
 }
 
 @end

+/* }}} */
+/* Bridge: NSDictionary {{{ */
+@implementation NSDictionary (Cycript)
+
+- (NSString *) cy$toCYON {
+    NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
+    [json appendString:@"{"];
+
+    bool comma(false);
+    for (id key in self) {
+        if (comma)
+            [json appendString:@","];
+        else
+            comma = true;
+        [json appendString:[key cy$toKey]];
+        [json appendString:@":"];
+        NSObject *object([self objectForKey:key]);
+        [json appendString:CYPoolNSCYON(NULL, object)];
+    }

 
 

+    [json appendString:@"}"];
+    return json;
+}
+
+- (bool) cy$hasProperty:(NSString *)name {
+    return [self objectForKey:name] != nil;
+}
+
+- (NSObject *) cy$getProperty:(NSString *)name {
+    return [self objectForKey:name];
+}
+
+@end
+/* }}} */
+/* Bridge: NSMutableArray {{{ */

 @implementation NSMutableArray (Cycript)
 
 - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {
 @implementation NSMutableArray (Cycript)
 
 - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {


@@ -915,78 +1036,120 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 }
 
 @end
 }
 
 @end

+/* }}} */
+/* Bridge: NSMutableDictionary {{{ */
+@implementation NSMutableDictionary (Cycript)

 
 

-@implementation NSDictionary (Cycript)
+- (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {
+    [self setObject:(value ?: [NSNull null]) forKey:name];
+    return true;
+}
+
+- (bool) cy$deleteProperty:(NSString *)name {
+    if ([self objectForKey:name] == nil)
+        return false;
+    else {
+        [self removeObjectForKey:name];
+        return true;
+    }
+}
+
+@end
+/* }}} */
+/* Bridge: NSNumber {{{ */
+@implementation NSNumber (Cycript)
+
+- (JSType) cy$JSType {
+    // XXX: this just seems stupid
+    return [self class] == NSCFBoolean_ ? kJSTypeBoolean : kJSTypeNumber;
+}
+
+- (NSObject *) cy$toJSON:(NSString *)key {
+    return self;
+}

 
 - (NSString *) cy$toCYON {
 
 - (NSString *) cy$toCYON {

-    NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
-    [json appendString:@"{"];
+    return [self cy$JSType] != kJSTypeBoolean ? [self stringValue] : [self boolValue] ? @"true" : @"false";
+}

 
 

-    bool comma(false);
-    for (id key in self) {
-        if (comma)
-            [json appendString:@","];
-        else
-            comma = true;
-        [json appendString:[key cy$toKey]];
-        [json appendString:@":"];
-        NSObject *object([self objectForKey:key]);
-        [json appendString:CYPoolNSCYON(NULL, object)];
-    }
+- (JSValueRef) cy$JSValueInContext:(JSContextRef)context {
+    return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, [self boolValue]);
+}

 
 

-    [json appendString:@"}"];
-    return json;
+@end
+/* }}} */
+/* Bridge: NSNull {{{ */
+@implementation NSNull (Cycript)
+
+- (JSType) cy$JSType {
+    return kJSTypeNull;

 }
 
 }
 

-- (bool) cy$hasProperty:(NSString *)name {
-    return [self objectForKey:name] != nil;
+- (NSObject *) cy$toJSON:(NSString *)key {
+    return self;

 }
 
 }
 

-- (NSObject *) cy$getProperty:(NSString *)name {
-    return [self objectForKey:name];
+- (NSString *) cy$toCYON {
+    return @"null";

 }
 
 @end
 }
 
 @end

+/* }}} */
+/* Bridge: NSObject {{{ */
+@implementation NSObject (Cycript)

 
 

-@implementation NSMutableDictionary (Cycript)
+- (JSValueRef) cy$JSValueInContext:(JSContextRef)context {
+    return CYMakeInstance(context, self, false);
+}

 
 

-- (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {
-    [self setObject:(value ?: [NSNull null]) forKey:name];
-    return true;
+- (JSType) cy$JSType {
+    return kJSTypeObject;

 }
 
 }
 

-- (bool) cy$deleteProperty:(NSString *)name {
-    if ([self objectForKey:name] == nil)
-        return false;
-    else {
-        [self removeObjectForKey:name];
-        return true;
-    }
+- (NSObject *) cy$toJSON:(NSString *)key {
+    return [self description];
+}
+
+- (NSString *) cy$toCYON {
+    return [[self cy$toJSON:@""] cy$toCYON];
+}
+
+- (NSString *) cy$toKey {
+    return [self cy$toCYON];
+}
+
+- (bool) cy$hasProperty:(NSString *)name {
+    return false;
+}
+
+- (NSObject *) cy$getProperty:(NSString *)name {
+    return nil;

 }
 
 }
 

-@end
-
-@implementation NSNumber (Cycript)
+- (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {
+    return false;
+}

 
 

-- (JSType) cy$JSType {
-    // XXX: this just seems stupid
-    return [self class] == NSCFBoolean_ ? kJSTypeBoolean : kJSTypeNumber;
+- (bool) cy$deleteProperty:(NSString *)name {
+    return false;

 }
 
 }
 

+@end
+/* }}} */
+/* Bridge: NSProxy {{{ */
+@implementation NSProxy (Cycript)
+

 - (NSObject *) cy$toJSON:(NSString *)key {
 - (NSObject *) cy$toJSON:(NSString *)key {

-    return self;
+    return [self description];

 }
 
 - (NSString *) cy$toCYON {
 }
 
 - (NSString *) cy$toCYON {

-    return [self cy$JSType] != kJSTypeBoolean ? [self stringValue] : [self boolValue] ? @"true" : @"false";
-}
-
-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context {
-    return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, [self boolValue]);
+    return [[self cy$toJSON:@""] cy$toCYON];

 }
 
 @end
 }
 
 @end

-
+/* }}} */
+/* Bridge: NSString {{{ */

 @implementation NSString (Cycript)
 
 - (JSType) cy$JSType {
 @implementation NSString (Cycript)
 
 - (JSType) cy$JSType {


@@ -1044,6 +1207,28 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 }
 
 @end
 }
 
 @end

+/* }}} */
+/* Bridge: WebUndefined {{{ */
+@implementation WebUndefined (Cycript)
+
+- (JSType) cy$JSType {
+    return kJSTypeUndefined;
+}
+
+- (NSObject *) cy$toJSON:(NSString *)key {
+    return self;
+}
+
+- (NSString *) cy$toCYON {
+    return @"undefined";
+}
+
+- (JSValueRef) cy$JSValueInContext:(JSContextRef)context {
+    return CYJSUndefined(context);
+}
+
+@end
+/* }}} */

 
 @interface CYJSObject : NSMutableDictionary {
     JSObjectRef object_;
 
 @interface CYJSObject : NSMutableDictionary {
     JSObjectRef object_;


@@ -1092,8 +1277,6 @@ CYRange WordEndRange_  (0x3ff001000000000LLU, 0x7fffffe87fffffeLLU); // A-Za-z_$
         return NULL; \
     }
 
         return NULL; \
     }
 

-void CYThrow(JSContextRef context, JSValueRef value);
-

 apr_status_t CYPoolRelease_(void *data) {
     id object(reinterpret_cast<id>(data));
     [object release];
 apr_status_t CYPoolRelease_(void *data) {
     id object(reinterpret_cast<id>(data));
     [object release];


@@ -1132,82 +1315,6 @@ id CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
     }
 }
 
     }
 }
 

-JSStringRef CYCopyJSString(id value) {
-    return value == NULL ? NULL : JSStringCreateWithCFString(reinterpret_cast<CFStringRef>([value description]));
-}
-
-JSStringRef CYCopyJSString(const char *value) {
-    return value == NULL ? NULL : JSStringCreateWithUTF8CString(value);
-}
-
-JSStringRef CYCopyJSString(JSStringRef value) {
-    return value == NULL ? NULL : JSStringRetain(value);
-}
-
-JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value) {
-    if (JSValueIsNull(context, value))
-        return NULL;
-    JSValueRef exception(NULL);
-    JSStringRef string(JSValueToStringCopy(context, value, &exception));
-    CYThrow(context, exception);
-    return string;
-}
-
-class CYJSString {
-  private:
-    JSStringRef string_;
-
-    void Clear_() {
-        if (string_ != NULL)
-            JSStringRelease(string_);
-    }
-
-  public:
-    CYJSString(const CYJSString &rhs) :
-        string_(CYCopyJSString(rhs.string_))
-    {
-    }
-
-    template <typename Arg0_>
-    CYJSString(Arg0_ arg0) :
-        string_(CYCopyJSString(arg0))
-    {
-    }
-
-    template <typename Arg0_, typename Arg1_>
-    CYJSString(Arg0_ arg0, Arg1_ arg1) :
-        string_(CYCopyJSString(arg0, arg1))
-    {
-    }
-
-    CYJSString &operator =(const CYJSString &rhs) {
-        Clear_();
-        string_ = CYCopyJSString(rhs.string_);
-        return *this;
-    }
-
-    ~CYJSString() {
-        Clear_();
-    }
-
-    void Clear() {
-        Clear_();
-        string_ = NULL;
-    }
-
-    operator JSStringRef() const {
-        return string_;
-    }
-};
-
-CFStringRef CYCopyCFString(JSStringRef value) {
-    return JSStringCopyCFString(kCFAllocatorDefault, value);
-}
-
-CFStringRef CYCopyCFString(JSContextRef context, JSValueRef value) {
-    return CYCopyCFString(CYJSString(context, value));
-}
-

 double CYCastDouble(const char *value, size_t size) {
     char *end;
     double number(strtod(value, &end));
 double CYCastDouble(const char *value, size_t size) {
     char *end;
     double number(strtod(value, &end));


@@ -1351,32 +1458,6 @@ JSObjectRef CYCastJSObject(JSContextRef context, JSValueRef value) {
     return object;
 }
 
     return object;
 }
 

-JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, size_t index) {
-    JSValueRef exception(NULL);
-    JSValueRef value(JSObjectGetPropertyAtIndex(context, object, index, &exception));
-    CYThrow(context, exception);
-    return value;
-}
-
-JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, JSStringRef name) {
-    JSValueRef exception(NULL);
-    JSValueRef value(JSObjectGetProperty(context, object, name, &exception));
-    CYThrow(context, exception);
-    return value;
-}
-
-void CYSetProperty(JSContextRef context, JSObjectRef object, size_t index, JSValueRef value) {
-    JSValueRef exception(NULL);
-    JSObjectSetPropertyAtIndex(context, object, index, value, &exception);
-    CYThrow(context, exception);
-}
-
-void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef value) {
-    JSValueRef exception(NULL);
-    JSObjectSetProperty(context, object, name, value, kJSPropertyAttributeNone, &exception);
-    CYThrow(context, exception);
-}
-

 void CYThrow(JSContextRef context, id error, JSValueRef *exception) {
     if (exception == NULL)
         throw error;
 void CYThrow(JSContextRef context, id error, JSValueRef *exception) {
     if (exception == NULL)
         throw error;


@@ -1401,9 +1482,15 @@ bool CYIsCallable(JSContextRef context, JSValueRef value) {
     if ((self = [super init]) != nil) {
         object_ = object;
         context_ = context;
     if ((self = [super init]) != nil) {
         object_ = object;
         context_ = context;

+        JSValueProtect(context_, object_);

     } return self;
 }
 
     } return self;
 }
 

+- (void) dealloc {
+    JSValueUnprotect(context_, object_);
+    [super dealloc];
+}
+

 - (NSObject *) cy$toJSON:(NSString *)key {
     JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_));
     if (!CYIsCallable(context_, toJSON))
 - (NSObject *) cy$toJSON:(NSString *)key {
     JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_));
     if (!CYIsCallable(context_, toJSON))


@@ -1418,12 +1505,11 @@ bool CYIsCallable(JSContextRef context, JSValueRef value) {
 
 - (NSString *) cy$toCYON {
     JSValueRef toCYON(CYGetProperty(context_, object_, toCYON_));
 
 - (NSString *) cy$toCYON {
     JSValueRef toCYON(CYGetProperty(context_, object_, toCYON_));

-    if (!CYIsCallable(context_, toCYON))
+    if (!CYIsCallable(context_, toCYON)) super:

         return [super cy$toCYON];
         return [super cy$toCYON];

-    else {
-        JSValueRef value(CYCallAsFunction(context_, (JSObjectRef) toCYON, object_, 0, NULL));
+    else if (JSValueRef value = CYCallAsFunction(context_, (JSObjectRef) toCYON, object_, 0, NULL))

         return CYCastNSString(NULL, CYJSString(context_, value));
         return CYCastNSString(NULL, CYJSString(context_, value));

-    }
+    else goto super;

 }
 
 - (NSUInteger) count {
 }
 
 - (NSUInteger) count {


@@ -1434,7 +1520,10 @@ bool CYIsCallable(JSContextRef context, JSValueRef value) {
 }
 
 - (id) objectForKey:(id)key {
 }
 
 - (id) objectForKey:(id)key {

-    return CYCastNSObject(NULL, context_, CYGetProperty(context_, object_, CYJSString(key))) ?: [NSNull null];
+    JSValueRef value(CYGetProperty(context_, object_, CYJSString(key)));
+    if (JSValueIsUndefined(context_, value))
+        return nil;
+    return CYCastNSObject(NULL, context_, value) ?: [NSNull null];

 }
 
 - (NSEnumerator *) keyEnumerator {
 }
 
 - (NSEnumerator *) keyEnumerator {


@@ -1462,16 +1551,23 @@ bool CYIsCallable(JSContextRef context, JSValueRef value) {
     if ((self = [super init]) != nil) {
         object_ = object;
         context_ = context;
     if ((self = [super init]) != nil) {
         object_ = object;
         context_ = context;

+        JSValueProtect(context_, object_);

     } return self;
 }
 
     } return self;
 }
 

+- (void) dealloc {
+    JSValueUnprotect(context_, object_);
+    [super dealloc];
+}
+

 - (NSUInteger) count {
     return CYCastDouble(context_, CYGetProperty(context_, object_, length_));
 }
 
 - (id) objectAtIndex:(NSUInteger)index {
 - (NSUInteger) count {
     return CYCastDouble(context_, CYGetProperty(context_, object_, length_));
 }
 
 - (id) objectAtIndex:(NSUInteger)index {

-    if (index >= CYCastDouble(context_, CYGetProperty(context_, object_, length_)))
-        return nil;
+    size_t bounds([self count]);
+    if (index >= bounds)
+        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray objectAtIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];

     JSValueRef exception(NULL);
     JSValueRef value(JSObjectGetPropertyAtIndex(context_, object_, index, &exception));
     CYThrow(context_, exception);
     JSValueRef exception(NULL);
     JSValueRef value(JSObjectGetPropertyAtIndex(context_, object_, index, &exception));
     CYThrow(context_, exception);


@@ -1487,6 +1583,9 @@ bool CYIsCallable(JSContextRef context, JSValueRef value) {
 }
 
 - (void) insertObject:(id)object atIndex:(NSUInteger)index {
 }
 
 - (void) insertObject:(id)object atIndex:(NSUInteger)index {

+    size_t bounds([self count] + 1);
+    if (index >= bounds)
+        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray insertObject:atIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];

     JSValueRef exception(NULL);
     JSValueRef arguments[3];
     arguments[0] = CYCastJSValue(context_, index);
     JSValueRef exception(NULL);
     JSValueRef arguments[3];
     arguments[0] = CYCastJSValue(context_, index);


@@ -1503,6 +1602,9 @@ bool CYIsCallable(JSContextRef context, JSValueRef value) {
 }
 
 - (void) removeObjectAtIndex:(NSUInteger)index {
 }
 
 - (void) removeObjectAtIndex:(NSUInteger)index {

+    size_t bounds([self count]);
+    if (index >= bounds)
+        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray removeObjectAtIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];

     JSValueRef exception(NULL);
     JSValueRef arguments[2];
     arguments[0] = CYCastJSValue(context_, index);
     JSValueRef exception(NULL);
     JSValueRef arguments[2];
     arguments[0] = CYCastJSValue(context_, index);


@@ -1512,6 +1614,9 @@ bool CYIsCallable(JSContextRef context, JSValueRef value) {
 }
 
 - (void) replaceObjectAtIndex:(NSUInteger)index withObject:(id)object {
 }
 
 - (void) replaceObjectAtIndex:(NSUInteger)index withObject:(id)object {

+    size_t bounds([self count]);
+    if (index >= bounds)
+        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray replaceObjectAtIndex:withObject:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];

     CYSetProperty(context_, object_, index, CYCastJSValue(context_, object));
 }
 
     CYSetProperty(context_, object_, index, CYCastJSValue(context_, object));
 }
 


@@ -1632,23 +1737,24 @@ struct CYInternal :
     }
 };
 
     }
 };
 

-JSObjectRef CYMakeSelector(JSContextRef context, SEL sel) {
+static JSObjectRef CYMakeSelector(JSContextRef context, SEL sel) {

     Selector_privateData *internal(new Selector_privateData(sel));
     return JSObjectMake(context, Selector_, internal);
 }
 
     Selector_privateData *internal(new Selector_privateData(sel));
     return JSObjectMake(context, Selector_, internal);
 }
 

-JSObjectRef CYMakePointer(JSContextRef context, void *pointer, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
-    Pointer *internal(new Pointer(pointer, type, owner));
+static JSObjectRef CYMakePointer(JSContextRef context, void *pointer, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
+    Pointer *internal(new Pointer(pointer, context, owner, type));

     return JSObjectMake(context, Pointer_, internal);
 }
 
     return JSObjectMake(context, Pointer_, internal);
 }
 

-JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const char *type) {
+static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const char *type) {

     Functor_privateData *internal(new Functor_privateData(type, function));
     return JSObjectMake(context, Functor_, internal);
 }
 
     Functor_privateData *internal(new Functor_privateData(type, function));
     return JSObjectMake(context, Functor_, internal);
 }
 

-const char *CYPoolCString(apr_pool_t *pool, JSStringRef value) {
+static const char *CYPoolCString(apr_pool_t *pool, JSStringRef value) {

     if (pool == NULL) {
     if (pool == NULL) {

+        // XXX: this could be much more efficient

         const char *string([CYCastNSString(NULL, value) UTF8String]);
         return string;
     } else {
         const char *string([CYCastNSString(NULL, value) UTF8String]);
         return string;
     } else {


@@ -1659,11 +1765,11 @@ const char *CYPoolCString(apr_pool_t *pool, JSStringRef value) {
     }
 }
 
     }
 }
 

-const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
+static const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSValueRef value) {

     return JSValueIsNull(context, value) ? NULL : CYPoolCString(pool, CYJSString(context, value));
 }
 
     return JSValueIsNull(context, value) ? NULL : CYPoolCString(pool, CYJSString(context, value));
 }
 

-bool CYGetOffset(apr_pool_t *pool, JSStringRef value, ssize_t &index) {
+static bool CYGetOffset(apr_pool_t *pool, JSStringRef value, ssize_t &index) {

     return CYGetOffset(CYPoolCString(pool, value), index);
 }
 
     return CYGetOffset(CYPoolCString(pool, value), index);
 }
 


@@ -1682,7 +1788,7 @@ bool CYGetOffset(apr_pool_t *pool, JSStringRef value, ssize_t &index) {
     utf8; \
 })
 
     utf8; \
 })
 

-void *CYCastPointer_(JSContextRef context, JSValueRef value) {
+static void *CYCastPointer_(JSContextRef context, JSValueRef value) {

     switch (JSValueGetType(context, value)) {
         case kJSTypeNull:
             return NULL;
     switch (JSValueGetType(context, value)) {
         case kJSTypeNull:
             return NULL;


@@ -1702,11 +1808,11 @@ void *CYCastPointer_(JSContextRef context, JSValueRef value) {
 }
 
 template <typename Type_>
 }
 
 template <typename Type_>

-_finline Type_ CYCastPointer(JSContextRef context, JSValueRef value) {
+static _finline Type_ CYCastPointer(JSContextRef context, JSValueRef value) {

     return reinterpret_cast<Type_>(CYCastPointer_(context, value));
 }
 
     return reinterpret_cast<Type_>(CYCastPointer_(context, value));
 }
 

-SEL CYCastSEL(JSContextRef context, JSValueRef value) {
+static SEL CYCastSEL(JSContextRef context, JSValueRef value) {

     if (JSValueIsObjectOfClass(context, value, Selector_)) {
         Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate((JSObjectRef) value)));
         return reinterpret_cast<SEL>(internal->value_);
     if (JSValueIsObjectOfClass(context, value, Selector_)) {
         Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate((JSObjectRef) value)));
         return reinterpret_cast<SEL>(internal->value_);


@@ -1714,7 +1820,7 @@ SEL CYCastSEL(JSContextRef context, JSValueRef value) {
         return CYCastPointer<SEL>(context, value);
 }
 
         return CYCastPointer<SEL>(context, value);
 }
 

-void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) {
+static void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) {

     switch (type->primitive) {
         case sig::boolean_P:
             *reinterpret_cast<bool *>(data) = JSValueToBoolean(context, value);
     switch (type->primitive) {
         case sig::boolean_P:
             *reinterpret_cast<bool *>(data) = JSValueToBoolean(context, value);


@@ -1792,7 +1898,7 @@ void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type
     }
 }
 
     }
 }
 

-JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize = false, JSObjectRef owner = NULL) {
+static JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize = false, JSObjectRef owner = NULL) {

     JSValueRef value;
 
     switch (type->primitive) {
     JSValueRef value;
 
     switch (type->primitive) {


@@ -1882,7 +1988,7 @@ static bool CYImplements(id object, Class _class, SEL selector, bool devoid) {
     return false;
 }
 
     return false;
 }
 

-const char *CYPoolTypeEncoding(apr_pool_t *pool, Class _class, SEL sel, Method method) {
+static const char *CYPoolTypeEncoding(apr_pool_t *pool, Class _class, SEL sel, Method method) {

     if (method != NULL)
         return method_getTypeEncoding(method);
     else if (NSString *type = [[Bridge_ objectAtIndex:1] objectForKey:CYCastNSString(pool, sel_getName(sel))])
     if (method != NULL)
         return method_getTypeEncoding(method);
     else if (NSString *type = [[Bridge_ objectAtIndex:1] objectForKey:CYCastNSString(pool, sel_getName(sel))])


@@ -1891,7 +1997,7 @@ const char *CYPoolTypeEncoding(apr_pool_t *pool, Class _class, SEL sel, Method m
         return NULL;
 }
 
         return NULL;
 }
 

-void FunctionClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
+static void FunctionClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {

     Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg));
 
     JSContextRef context(internal->context_);
     Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg));
 
     JSContextRef context(internal->context_);


@@ -1906,7 +2012,7 @@ void FunctionClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
     CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value);
 }
 
     CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value);
 }
 

-void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
+static void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {

     Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg));
 
     JSContextRef context(internal->context_);
     Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg));
 
     JSContextRef context(internal->context_);


@@ -1923,10 +2029,10 @@ void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
     CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value);
 }
 
     CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value);
 }
 

-Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const char *type, void (*callback)(ffi_cif *, void *, void **, void *)) {
+static Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const char *type, void (*callback)(ffi_cif *, void *, void **, void *)) {

     // XXX: in case of exceptions this will leak
     // XXX: in point of fact, this may /need/ to leak :(
     // XXX: in case of exceptions this will leak
     // XXX: in point of fact, this may /need/ to leak :(

-    Closure_privateData *internal(new Closure_privateData(type));
+    Closure_privateData *internal(new Closure_privateData(CYGetJSContext(), function, type));

 
     ffi_closure *closure((ffi_closure *) _syscall(mmap(
         NULL, sizeof(ffi_closure),
 
     ffi_closure *closure((ffi_closure *) _syscall(mmap(
         NULL, sizeof(ffi_closure),


@@ -1941,13 +2047,10 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function,
 
     internal->value_ = closure;
 
 
     internal->value_ = closure;
 

-    internal->context_ = CYGetJSContext();
-    internal->function_ = function;
-

     return internal;
 }
 
     return internal;
 }
 

-JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const char *type) {
+static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const char *type) {

     Closure_privateData *internal(CYMakeFunctor_(context, function, type, &FunctionClosure_));
     return JSObjectMake(context, Functor_, internal);
 }
     Closure_privateData *internal(CYMakeFunctor_(context, function, type, &FunctionClosure_));
     return JSObjectMake(context, Functor_, internal);
 }


@@ -1977,8 +2080,8 @@ static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *typ
     return reinterpret_cast<IMP>(internal->GetValue());
 }
 
     return reinterpret_cast<IMP>(internal->GetValue());
 }
 

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

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


@@ -1991,8 +2094,8 @@ static bool Prototype_hasProperty(JSContextRef context, JSObjectRef object, JSSt
     return false;
 }
 
     return false;
 }
 

-static JSValueRef Prototype_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
-    Prototype *internal(reinterpret_cast<Prototype *>(JSObjectGetPrivate(object)));
+static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+    Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));

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


@@ -2005,8 +2108,8 @@ static JSValueRef Prototype_getProperty(JSContextRef context, JSObjectRef object
     return NULL;
 }
 
     return NULL;
 }
 

-static bool Prototype_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) {
-    Prototype *internal(reinterpret_cast<Prototype *>(JSObjectGetPrivate(object)));
+static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) {
+    Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));

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


@@ -2037,8 +2140,8 @@ static bool Prototype_setProperty(JSContextRef context, JSObjectRef object, JSSt
 }
 
 #if !__OBJC2__
 }
 
 #if !__OBJC2__

-static bool Prototype_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
-    Prototype *internal(reinterpret_cast<Prototype *>(JSObjectGetPrivate(object)));
+static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+    Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));

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


@@ -2055,8 +2158,8 @@ static bool Prototype_deleteProperty(JSContextRef context, JSObjectRef object, J
 }
 #endif
 
 }
 #endif
 

-static void Prototype_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
-    Prototype *internal(reinterpret_cast<Prototype *>(JSObjectGetPrivate(object)));
+static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
+    Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));

     Class _class(internal->GetValue());
 
     unsigned int size;
     Class _class(internal->GetValue());
 
     unsigned int size;


@@ -2080,13 +2183,16 @@ static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStr
         if (internal->HasProperty(context, property))
             return true;
 
         if (internal->HasProperty(context, property))
             return true;
 

+    Class _class(object_getClass(self));
+

     CYPoolTry {
     CYPoolTry {

-        if ([self cy$hasProperty:name])
-            return true;
+        // XXX: this is an evil hack to deal with NSProxy; fix elsewhere
+        if (CYImplements(self, _class, @selector(cy$hasProperty:), false))
+            if ([self cy$hasProperty:name])
+                return true;

     } CYPoolCatch(false)
 
     const char *string(CYPoolCString(pool, name));
     } CYPoolCatch(false)
 
     const char *string(CYPoolCString(pool, name));

-    Class _class(object_getClass(self));

 
     if (class_getProperty(_class, string) != NULL)
         return true;
 
     if (class_getProperty(_class, string) != NULL)
         return true;


@@ -2230,6 +2336,28 @@ static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef
     } CYCatch
 }
 
     } CYCatch
 }
 

+static bool CYIsClass(id self) {
+    // XXX: this is a lame object_isClass
+    return class_getInstanceMethod(object_getClass(self), @selector(alloc)) != NULL;
+}
+
+static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) {
+    Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) constructor)));
+    Class _class(internal->GetValue());
+    if (!CYIsClass(_class))
+        return false;
+
+    if (JSValueIsObjectOfClass(context, instance, Instance_)) {
+        Instance *linternal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) instance)));
+        // XXX: this isn't always safe
+        CYTry {
+            return [linternal->GetValue() isKindOfClass:_class];
+        } CYCatch
+    }
+
+    return false;
+}
+

 static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
     CYPool pool;
 static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
     CYPool pool;


@@ -2301,10 +2429,10 @@ static void Internal_getPropertyNames(JSContextRef context, JSObjectRef object,
 
 static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
 
 static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));

-    return internal->owner_;
+    return internal->GetOwner();

 }
 
 }
 

-bool Index_(apr_pool_t *pool, Struct_privateData *internal, JSStringRef property, ssize_t &index, uint8_t *&base) {
+static bool Index_(apr_pool_t *pool, Struct_privateData *internal, JSStringRef property, ssize_t &index, uint8_t *&base) {

     Type_privateData *typical(internal->type_);
     sig::Type *type(typical->type_);
     if (type == NULL)
     Type_privateData *typical(internal->type_);
     sig::Type *type(typical->type_);
     if (type == NULL)


@@ -2356,7 +2484,7 @@ static JSValueRef Pointer_getIndex(JSContextRef context, JSObjectRef object, siz
     uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
     base += ffi->size * index;
 
     uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
     base += ffi->size * index;
 

-    JSObjectRef owner(internal->owner_ ?: object);
+    JSObjectRef owner(internal->GetOwner() ?: object);

 
     CYTry {
         return CYFromFFI(context, typical->type_, ffi, base, false, owner);
 
     CYTry {
         return CYFromFFI(context, typical->type_, ffi, base, false, owner);


@@ -2433,7 +2561,7 @@ static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, J
     if (!Index_(pool, internal, property, index, base))
         return NULL;
 
     if (!Index_(pool, internal, property, index, base))
         return NULL;
 

-    JSObjectRef owner(internal->owner_ ?: object);
+    JSObjectRef owner(internal->GetOwner() ?: object);

 
     CYTry {
         return CYFromFFI(context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, false, owner);
 
     CYTry {
         return CYFromFFI(context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, false, owner);


@@ -2619,6 +2747,16 @@ static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObject
     free(data);
 }
 
     free(data);
 }
 

+static JSObjectRef CYMakeType(JSContextRef context, const char *type) {
+    Type_privateData *internal(new Type_privateData(NULL, type));
+    return JSObjectMake(context, Type_, internal);
+}
+
+static JSObjectRef CYMakeType(JSContextRef context, sig::Type *type) {
+    Type_privateData *internal(new Type_privateData(type));
+    return JSObjectMake(context, Type_, internal);
+}
+

 static JSValueRef Runtime_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
     if (JSStringIsEqualToUTF8CString(property, "nil"))
         return Instance::Make(context, nil);
 static JSValueRef Runtime_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
     if (JSStringIsEqualToUTF8CString(property, "nil"))
         return Instance::Make(context, nil);


@@ -2642,11 +2780,17 @@ static JSValueRef Runtime_getProperty(JSContextRef context, JSObjectRef object,
                     sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
                     return CYFromFFI(context, signature.elements[0].type, cif.rtype, [name cy$symbol]);
             }
                     sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
                     return CYFromFFI(context, signature.elements[0].type, cif.rtype, [name cy$symbol]);
             }

+        if (NSMutableArray *entry = [[Bridge_ objectAtIndex:2] objectForKey:name])
+            switch ([[entry objectAtIndex:0] intValue]) {
+                // XXX: implement case 0
+                case 1:
+                    return CYMakeType(context, CYPoolCString(pool, [entry objectAtIndex:1]));
+            }

         return NULL;
     } CYCatch
 }
 
         return NULL;
     } CYCatch
 }
 

-bool stret(ffi_type *ffi_type) {
+static bool stret(ffi_type *ffi_type) {

     return ffi_type->type == FFI_TYPE_STRUCT && (
         ffi_type->size > OBJC_MAX_STRUCT_BY_VALUE ||
         struct_forward_array[ffi_type->size] != 0
     return ffi_type->type == FFI_TYPE_STRUCT && (
         ffi_type->size > OBJC_MAX_STRUCT_BY_VALUE ||
         struct_forward_array[ffi_type->size] != 0


@@ -2697,6 +2841,14 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, SEL _c
     return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, exception, &signature, &cif, function);
 }
 
     return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, exception, &signature, &cif, function);
 }
 

+static size_t Nonce_(0);
+
+static JSValueRef $cyq(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+    char name[16];
+    sprintf(name, "%s%zu", CYCastCString(context, arguments[0]), Nonce_++);
+    return CYCastJSValue(context, name);
+}
+

 static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYPool pool;
 
 static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYPool pool;
 


@@ -2729,6 +2881,9 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
     return CYSendMessage(pool, context, self, _cmd, count - 2, arguments + 2, uninitialized, exception);
 }
 
     return CYSendMessage(pool, context, self, _cmd, count - 2, arguments + 2, uninitialized, exception);
 }
 

+/* Hook: objc_registerClassPair {{{ */
+// XXX: replace this with associated objects
+

 MSHook(void, CYDealloc, id self, SEL sel) {
     CYInternal *internal;
     object_getInstanceVariable(self, "cy$internal_", reinterpret_cast<void **>(&internal));
 MSHook(void, CYDealloc, id self, SEL sel) {
     CYInternal *internal;
     object_getInstanceVariable(self, "cy$internal_", reinterpret_cast<void **>(&internal));


@@ -2757,6 +2912,7 @@ static JSValueRef objc_registerClassPair_(JSContextRef context, JSObjectRef obje
         return CYJSUndefined(context);
     } CYCatch
 }
         return CYJSUndefined(context);
     } CYCatch
 }

+/* }}} */

 
 static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     JSValueRef setup[count + 2];
 
 static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     JSValueRef setup[count + 2];


@@ -2786,7 +2942,7 @@ static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef objec
     return CYCallFunction(pool, context, 0, NULL, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue());
 }
 
     return CYCallFunction(pool, context, 0, NULL, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue());
 }
 

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

     CYTry {
         if (count != 1)
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Selector constructor" userInfo:nil];
     CYTry {
         if (count != 1)
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Selector constructor" userInfo:nil];


@@ -2795,7 +2951,7 @@ JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t count,
     } CYCatch
 }
 
     } CYCatch
 }
 

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

     CYTry {
         if (count != 2)
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Functor constructor" userInfo:nil];
     CYTry {
         if (count != 2)
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Functor constructor" userInfo:nil];


@@ -2812,25 +2968,47 @@ JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t count,
     } CYCatch
 }
 
     } CYCatch
 }
 

-JSObjectRef CYMakeType(JSContextRef context, JSObjectRef object, const char *type) {
-    Type_privateData *internal(new Type_privateData(NULL, type));
-    return JSObjectMake(context, Type_, internal);
-}
-
-JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {

     CYTry {
         if (count != 1)
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Type constructor" userInfo:nil];
         const char *type(CYCastCString(context, arguments[0]));
     CYTry {
         if (count != 1)
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Type constructor" userInfo:nil];
         const char *type(CYCastCString(context, arguments[0]));

-        return CYMakeType(context, object, type);
+        return CYMakeType(context, type);
+    } CYCatch
+}
+
+static JSValueRef Type_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
+
+    CYTry {
+        sig::Type type;
+
+        if (JSStringIsEqualToUTF8CString(property, "$cyi")) {
+            type.primitive = sig::pointer_P;
+            type.data.data.size = 0;
+        } else {
+            size_t index(CYGetIndex(NULL, property));
+            if (index == _not(size_t))
+                return NULL;
+            type.primitive = sig::array_P;
+            type.data.data.size = index;
+        }
+
+        type.name = NULL;
+        type.flags = 0;
+
+        type.data.data.type = internal->type_;
+
+        return CYMakeType(context, &type);

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

+    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
+

     CYTry {
         if (count != 1)
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to type cast function" userInfo:nil];
     CYTry {
         if (count != 1)
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to type cast function" userInfo:nil];

-        Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));

         sig::Type *type(internal->type_);
         ffi_type *ffi(internal->GetFFI());
         // XXX: alignment?
         sig::Type *type(internal->type_);
         ffi_type *ffi(internal->GetFFI());
         // XXX: alignment?


@@ -2843,17 +3021,26 @@ static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object,
 
 static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
 
 static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {

-        if (count > 1)
+        if (count != 0)

             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to type cast function" userInfo:nil];
         Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to type cast function" userInfo:nil];
         Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));

-        size_t size(count == 0 ? 0 : CYCastDouble(context, arguments[0]));
-        // XXX: alignment?
-        void *value(malloc(internal->GetFFI()->size * size));
-        return CYMakePointer(context, value, internal->type_, internal->ffi_, NULL);
+
+        sig::Type *type(internal->type_);
+        size_t size;
+
+        if (type->primitive != sig::array_P)
+            size = 0;
+        else {
+            size = type->data.data.size;
+            type = type->data.data.type;
+        }
+
+        void *value(malloc(internal->GetFFI()->size));
+        return CYMakePointer(context, value, type, NULL, NULL);

     } CYCatch
 }
 
     } CYCatch
 }
 

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

     CYTry {
         if (count > 1)
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Instance constructor" userInfo:nil];
     CYTry {
         if (count > 1)
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Instance constructor" userInfo:nil];


@@ -2862,7 +3049,7 @@ JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t count,
     } CYCatch
 }
 
     } CYCatch
 }
 

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

     CYTry {
         if (count != 2)
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Functor constructor" userInfo:nil];
     CYTry {
         if (count != 2)
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Functor constructor" userInfo:nil];


@@ -2871,7 +3058,7 @@ JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t count,
     } CYCatch
 }
 
     } CYCatch
 }
 

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

     CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(object)));
     return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->value_));
 }
     CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(object)));
     return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->value_));
 }


@@ -2921,16 +3108,28 @@ static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjec
     return Instance::Make(context, object_getClass(internal->GetValue()));
 }
 
     return Instance::Make(context, object_getClass(internal->GetValue()));
 }
 

-static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+static JSValueRef Instance_getProperty_protocol(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+    Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
+    id self(internal->GetValue());
+    if (!CYIsClass(self))
+        return CYJSUndefined(context);
+    CYTry {
+        return CYGetClassPrototype(context, self);
+    } CYCatch
+}
+
+static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {

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

-    // XXX: this is a lame object_isClass

     if (class_getInstanceMethod(object_getClass(self), @selector(alloc)) == NULL)
         return CYJSUndefined(context);
     if (class_getInstanceMethod(object_getClass(self), @selector(alloc)) == NULL)
         return CYJSUndefined(context);

-    return Prototype::Make(context, self);
+    return Messages::Make(context, self);

 }
 
 static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
 }
 
 static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {

+    if (!JSValueIsObjectOfClass(context, _this, Instance_))
+        return NULL;
+

     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
 
     CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
 
     CYTry {


@@ -2941,17 +3140,24 @@ static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectR
 }
 
 static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
 }
 
 static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {

+    if (!JSValueIsObjectOfClass(context, _this, Instance_))
+        return NULL;
+

     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
 
     CYTry {
         CYPoolTry {
             NSString *key(count == 0 ? nil : CYCastNSString(NULL, CYJSString(context, arguments[0])));
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
 
     CYTry {
         CYPoolTry {
             NSString *key(count == 0 ? nil : CYCastNSString(NULL, CYJSString(context, arguments[0])));

+            // XXX: check for support of cy$toJSON?

             return CYCastJSValue(context, CYJSString([internal->GetValue() cy$toJSON:key]));
         } CYPoolCatch(NULL)
     } CYCatch
 }
 
 static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
             return CYCastJSValue(context, CYJSString([internal->GetValue() cy$toJSON:key]));
         } CYPoolCatch(NULL)
     } CYCatch
 }
 
 static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {

+    if (!JSValueIsObjectOfClass(context, _this, Instance_))
+        return NULL;
+

     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
 
     CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
 
     CYTry {


@@ -3053,9 +3259,10 @@ static JSStaticFunction Functor_staticFunctions[4] = {
     {NULL, NULL, 0}
 };
 
     {NULL, NULL, 0}
 };
 

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

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

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

     {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, NULL, 0}
 };
     {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, NULL, 0}
 };


@@ -3143,7 +3350,14 @@ const char *CYExecute(apr_pool_t *pool, const char *code) { _pooled
     if (JSValueIsUndefined(context, result))
         return NULL;
 
     if (JSValueIsUndefined(context, result))
         return NULL;
 

-    const char *json(CYPoolCCYON(pool, context, result, &exception));
+    const char *json;
+
+    try {
+        json = CYPoolCCYON(pool, context, result, &exception);
+    } catch (const char *error) {
+        return error;
+    }
+

     if (exception != NULL)
         goto error;
 
     if (exception != NULL)
         goto error;
 


@@ -3169,7 +3383,7 @@ bool CYSendAll_(int socket, const uint8_t *data, size_t size) {
     return true;
 }
 
     return true;
 }
 

-apr_pool_t *Pool_;
+static apr_pool_t *Pool_;

 
 struct CYExecute_ {
     apr_pool_t *pool_;
 
 struct CYExecute_ {
     apr_pool_t *pool_;


@@ -3236,7 +3450,8 @@ struct CYClient :
                 size = _not(size_t);
             } else {
                 std::ostringstream str;
                 size = _not(size_t);
             } else {
                 std::ostringstream str;

-                driver.source_->Show(str);
+                CYOutput out(str);
+                driver.source_->Show(out);

                 std::string code(str.str());
                 CYExecute_ execute = {pool, code.c_str()};
                 [client performSelectorOnMainThread:@selector(execute:) withObject:[NSValue valueWithPointer:&execute] waitUntilDone:YES];
                 std::string code(str.str());
                 CYExecute_ execute = {pool, code.c_str()};
                 [client performSelectorOnMainThread:@selector(execute:) withObject:[NSValue valueWithPointer:&execute] waitUntilDone:YES];


@@ -3279,6 +3494,7 @@ MSInitialize { _pooled
     NSArray_ = objc_getClass("NSArray");
     NSCFBoolean_ = objc_getClass("NSCFBoolean");
     NSCFType_ = objc_getClass("NSCFType");
     NSArray_ = objc_getClass("NSArray");
     NSCFBoolean_ = objc_getClass("NSCFBoolean");
     NSCFType_ = objc_getClass("NSCFType");

+    NSDictionary_ = objc_getClass("NSDictonary");

     NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
     NSZombie_ = objc_getClass("_NSZombie_");
     Object_ = objc_getClass("Object");
     NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
     NSZombie_ = objc_getClass("_NSZombie_");
     Object_ = objc_getClass("Object");


@@ -3305,6 +3521,7 @@ JSGlobalContextRef CYGetJSContext() {
         definition.deleteProperty = &Instance_deleteProperty;
         definition.getPropertyNames = &Instance_getPropertyNames;
         definition.callAsConstructor = &Instance_callAsConstructor;
         definition.deleteProperty = &Instance_deleteProperty;
         definition.getPropertyNames = &Instance_getPropertyNames;
         definition.callAsConstructor = &Instance_callAsConstructor;

+        definition.hasInstance = &Instance_hasInstance;

         definition.finalize = &Finalize;
         Instance_ = JSClassCreate(&definition);
 
         definition.finalize = &Finalize;
         Instance_ = JSClassCreate(&definition);
 


@@ -3325,6 +3542,27 @@ JSGlobalContextRef CYGetJSContext() {
         definition.finalize = &Finalize;
         Message_ = JSClassCreate(&definition);
 
         definition.finalize = &Finalize;
         Message_ = JSClassCreate(&definition);
 

+        definition = kJSClassDefinitionEmpty;
+        definition.className = "Messages";
+        definition.hasProperty = &Messages_hasProperty;
+        definition.getProperty = &Messages_getProperty;
+        definition.setProperty = &Messages_setProperty;
+#if !__OBJC2__
+        definition.deleteProperty = &Messages_deleteProperty;
+#endif
+        definition.getPropertyNames = &Messages_getPropertyNames;
+        definition.finalize = &Finalize;
+        Messages_ = JSClassCreate(&definition);
+
+        definition = kJSClassDefinitionEmpty;
+        definition.className = "NSArrayPrototype";
+        //definition.hasProperty = &NSArrayPrototype_hasProperty;
+        //definition.getProperty = &NSArrayPrototype_getProperty;
+        //definition.setProperty = &NSArrayPrototype_setProperty;
+        //definition.deleteProperty = &NSArrayPrototype_deleteProperty;
+        //definition.getPropertyNames = &NSArrayPrototype_getPropertyNames;
+        NSArrayPrototype_ = JSClassCreate(&definition);
+

         definition = kJSClassDefinitionEmpty;
         definition.className = "Pointer";
         definition.staticValues = Pointer_staticValues;
         definition = kJSClassDefinitionEmpty;
         definition.className = "Pointer";
         definition.staticValues = Pointer_staticValues;


@@ -3334,18 +3572,6 @@ JSGlobalContextRef CYGetJSContext() {
         definition.finalize = &Finalize;
         Pointer_ = JSClassCreate(&definition);
 
         definition.finalize = &Finalize;
         Pointer_ = JSClassCreate(&definition);
 

-        definition = kJSClassDefinitionEmpty;
-        definition.className = "Prototype";
-        definition.hasProperty = &Prototype_hasProperty;
-        definition.getProperty = &Prototype_getProperty;
-        definition.setProperty = &Prototype_setProperty;
-#if !__OBJC2__
-        definition.deleteProperty = &Prototype_deleteProperty;
-#endif
-        definition.getPropertyNames = &Prototype_getPropertyNames;
-        definition.finalize = &Finalize;
-        Prototype_ = JSClassCreate(&definition);
-

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


@@ -3366,7 +3592,7 @@ JSGlobalContextRef CYGetJSContext() {
         definition = kJSClassDefinitionEmpty;
         definition.className = "Type";
         definition.staticFunctions = Type_staticFunctions;
         definition = kJSClassDefinitionEmpty;
         definition.className = "Type";
         definition.staticFunctions = Type_staticFunctions;

-        //definition.getProperty = &Type_getProperty;
+        definition.getProperty = &Type_getProperty;

         definition.callAsFunction = &Type_callAsFunction;
         definition.callAsConstructor = &Type_callAsConstructor;
         definition.finalize = &Finalize;
         definition.callAsFunction = &Type_callAsFunction;
         definition.callAsConstructor = &Type_callAsConstructor;
         definition.finalize = &Finalize;


@@ -3393,7 +3619,6 @@ JSGlobalContextRef CYGetJSContext() {
         definition.className = "ObjectiveC::Image::Classes";
         definition.getProperty = &ObjectiveC_Image_Classes_getProperty;
         definition.getPropertyNames = &ObjectiveC_Image_Classes_getPropertyNames;
         definition.className = "ObjectiveC::Image::Classes";
         definition.getProperty = &ObjectiveC_Image_Classes_getProperty;
         definition.getPropertyNames = &ObjectiveC_Image_Classes_getPropertyNames;

-        definition.finalize = &Finalize;

         ObjectiveC_Image_Classes_ = JSClassCreate(&definition);
 
         definition = kJSClassDefinitionEmpty;
         ObjectiveC_Image_Classes_ = JSClassCreate(&definition);
 
         definition = kJSClassDefinitionEmpty;


@@ -3421,6 +3646,7 @@ JSGlobalContextRef CYGetJSContext() {
 
         Array_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Array")));
         Function_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Function")));
 
         Array_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Array")));
         Function_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Function")));

+        String_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("String")));

 
         length_ = JSStringCreateWithUTF8CString("length");
         message_ = JSStringCreateWithUTF8CString("message");
 
         length_ = JSStringCreateWithUTF8CString("length");
         message_ = JSStringCreateWithUTF8CString("message");


@@ -3429,22 +3655,28 @@ JSGlobalContextRef CYGetJSContext() {
         toCYON_ = JSStringCreateWithUTF8CString("toCYON");
         toJSON_ = JSStringCreateWithUTF8CString("toJSON");
 
         toCYON_ = JSStringCreateWithUTF8CString("toCYON");
         toJSON_ = JSStringCreateWithUTF8CString("toJSON");
 

+        JSObjectRef Object(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Object"))));
+        Object_prototype_ = CYCastJSObject(context, CYGetProperty(context, Object, prototype_));
+

         Array_prototype_ = CYCastJSObject(context, CYGetProperty(context, Array_, prototype_));
         Array_pop_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("pop")));
         Array_push_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("push")));
         Array_splice_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("splice")));
 
         JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));
         Array_prototype_ = CYCastJSObject(context, CYGetProperty(context, Array_, prototype_));
         Array_pop_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("pop")));
         Array_push_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("push")));
         Array_splice_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("splice")));
 
         JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));

+        JSObjectRef Instance(JSObjectMakeConstructor(context, Instance_, &Instance_new));

         JSObjectRef Message(JSObjectMakeConstructor(context, Message_, NULL));
         JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new));
 
         JSObjectRef Message(JSObjectMakeConstructor(context, Message_, NULL));
         JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new));
 

+        Instance_prototype_ = (JSObjectRef) CYGetProperty(context, Instance, prototype_);
+

         JSValueRef function(CYGetProperty(context, Function_, prototype_));
         JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Message, prototype_), function);
         JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Functor, prototype_), function);
         JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Selector, prototype_), function);
 
         CYSetProperty(context, global, CYJSString("Functor"), Functor);
         JSValueRef function(CYGetProperty(context, Function_, prototype_));
         JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Message, prototype_), function);
         JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Functor, prototype_), function);
         JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Selector, prototype_), function);
 
         CYSetProperty(context, global, CYJSString("Functor"), Functor);

-        CYSetProperty(context, global, CYJSString("Instance"), JSObjectMakeConstructor(context, Instance_, &Instance_new));
+        CYSetProperty(context, global, CYJSString("Instance"), Instance);

         CYSetProperty(context, global, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer_, &Pointer_new));
         CYSetProperty(context, global, CYJSString("Selector"), Selector);
         CYSetProperty(context, global, CYJSString("Type"), JSObjectMakeConstructor(context, Type_, &Type_new));
         CYSetProperty(context, global, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer_, &Pointer_new));
         CYSetProperty(context, global, CYJSString("Selector"), Selector);
         CYSetProperty(context, global, CYJSString("Type"), JSObjectMakeConstructor(context, Type_, &Type_new));


@@ -3455,6 +3687,7 @@ JSGlobalContextRef CYGetJSContext() {
 
         CYSetProperty(context, global, CYJSString("objc_registerClassPair"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_registerClassPair"), &objc_registerClassPair_));
         CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend));
 
         CYSetProperty(context, global, CYJSString("objc_registerClassPair"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_registerClassPair"), &objc_registerClassPair_));
         CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend));

+        CYSetProperty(context, global, CYJSString("$cyq"), JSObjectMakeFunctionWithCallback(context, CYJSString("$cyq"), &$cyq));

 
         System_ = JSObjectMake(context, NULL, NULL);
         CYSetProperty(context, global, CYJSString("system"), System_);
 
         System_ = JSObjectMake(context, NULL, NULL);
         CYSetProperty(context, global, CYJSString("system"), System_);


@@ -3464,6 +3697,18 @@ JSGlobalContextRef CYGetJSContext() {
         CYSetProperty(context, System_, CYJSString("print"), JSObjectMakeFunctionWithCallback(context, CYJSString("print"), &System_print));
 
         Result_ = JSStringCreateWithUTF8CString("_");
         CYSetProperty(context, System_, CYJSString("print"), JSObjectMakeFunctionWithCallback(context, CYJSString("print"), &System_print));
 
         Result_ = JSStringCreateWithUTF8CString("_");

+
+        JSValueProtect(context, Array_);
+        JSValueProtect(context, Function_);
+        JSValueProtect(context, String_);
+
+        JSValueProtect(context, Instance_prototype_);
+        JSValueProtect(context, Object_prototype_);
+
+        JSValueProtect(context, Array_prototype_);
+        JSValueProtect(context, Array_pop_);
+        JSValueProtect(context, Array_push_);
+        JSValueProtect(context, Array_splice_);

     }
 
     return Context_;
     }
 
     return Context_;