Move Cydget* to ObjectiveC and @throw exceptions.

[cycript.git] / ObjectiveC / Library.mm

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index bec1730e63d85d36fabd85937cfde23b2d7014d0..b6410c7471507cddbd3e158379ab6861bcac5ca2 100644 (file)
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -1,9 +1,29 @@
-#include <substrate.h>
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)
+*/
+
+/* GNU General Public License, Version 3 {{{ */
+/*
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * Cycript is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/
+/* }}} */
+
+#include <Foundation/Foundation.h>

 
 #include "ObjectiveC/Internal.hpp"
 
 #include "ObjectiveC/Internal.hpp"

-#include "Struct.hpp"

 
 

-#include <Foundation/Foundation.h>
+#include <objc/objc-api.h>

 
 #include "cycript.hpp"
 
 
 #include "cycript.hpp"
 


@@ -11,25 +31,34 @@
 
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
 
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>

-#include <CoreFoundation/CFLogUtilities.h>

 #include <JavaScriptCore/JSStringRefCF.h>
 #include <JavaScriptCore/JSStringRefCF.h>

-#include <WebKit/WebScriptObject.h>
+#include <objc/runtime.h>
+#endif
+
+#ifdef __APPLE__
+#include <malloc/malloc.h>
+#include <mach/mach.h>

 #endif
 
 #include "Error.hpp"
 #include "JavaScript.hpp"
 #include "String.hpp"
 #endif
 
 #include "Error.hpp"
 #include "JavaScript.hpp"
 #include "String.hpp"

+#include "Execute.hpp"

 
 

+#include <cmath>

 #include <map>
 #include <map>

+#include <set>
+
+#include <dlfcn.h>

 
 

-#define CYObjectiveTry_(context) { \
-    JSContextRef context_(context); \
+#define CYObjectiveTry_ { \

     try
 #define CYObjectiveTry { \
     try
 #define CYObjectiveTry { \

+    JSContextRef context(context_); \

     try
 #define CYObjectiveCatch \
     catch (const CYException &error) { \
     try
 #define CYObjectiveCatch \
     catch (const CYException &error) { \

-        @throw CYCastNSObject(NULL, context_, error.CastJSValue(context_)); \
+        @throw CYCastNSObject(NULL, context, error.CastJSValue(context)); \

     } \
 }
 
     } \
 }
 


@@ -49,66 +78,140 @@
     } \
 }
 
     } \
 }
 

+#define CYSadTry { \
+    @try
+#define CYSadCatch(value) \
+    @catch (NSException *error ) { \
+        throw CYJSError(context, CYCastJSValue(context, error)); \
+    } return value; \
+}
+

 #ifndef __APPLE__
 #define class_getSuperclass GSObjCSuper
 #ifndef __APPLE__
 #define class_getSuperclass GSObjCSuper

+#define class_getInstanceVariable GSCGetInstanceVariableDefinition
+#define class_getName GSNameFromClass
+
+#define class_removeMethods(cls, list) GSRemoveMethodList(cls, list, YES)
+
+#define ivar_getName(ivar) ((ivar)->ivar_name)
+#define ivar_getOffset(ivar) ((ivar)->ivar_offset)
+#define ivar_getTypeEncoding(ivar) ((ivar)->ivar_type)
+
+#define method_getName(method) ((method)->method_name)
+#define method_getImplementation(method) ((method)->method_imp)
+#define method_getTypeEncoding(method) ((method)->method_types)
+#define method_setImplementation(method, imp) ((void) ((method)->method_imp = (imp)))
+
+#undef objc_getClass
+#define objc_getClass GSClassFromName
+
+#define objc_getProtocol GSProtocolFromName
+

 #define object_getClass GSObjCClass
 #define object_getClass GSObjCClass

+
+#define object_getInstanceVariable(object, name, value) ({ \
+    objc_ivar *ivar(class_getInstanceVariable(object_getClass(object), name)); \
+    _assert(value != NULL); \
+    if (ivar != NULL) \
+        GSObjCGetVariable(object, ivar_getOffset(ivar), sizeof(void *), value); \
+    ivar; \
+})
+
+#define object_setIvar(object, ivar, value) ({ \
+    void *data = (value); \
+    GSObjCSetVariable(object, ivar_getOffset(ivar), sizeof(void *), &data); \
+})
+
+#define protocol_getName(protocol) [(protocol) name]

 #endif
 
 #endif
 

-JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception);
+static void (*$objc_setAssociatedObject)(id object, void *key, id value, objc_AssociationPolicy policy);
+static id (*$objc_getAssociatedObject)(id object, void *key);
+static void (*$objc_removeAssociatedObjects)(id object);
+
+struct BlockLiteral {
+    Class isa;
+    int flags;
+    int reserved;
+    void (*invoke)(void *, ...);
+    void *descriptor;
+};
+
+struct BlockDescriptor1 {
+    unsigned long int reserved;
+    unsigned long int size;
+};
+
+struct BlockDescriptor2 {
+    void (*copy_helper)(BlockLiteral *dst, BlockLiteral *src);
+    void (*dispose_helper)(BlockLiteral *src);
+};
+
+struct BlockDescriptor3 {
+    const char *signature;
+    const char *layout;
+};
+
+enum {
+    BLOCK_DEALLOCATING = 0x0001,
+    BLOCK_REFCOUNT_MASK = 0xfffe,
+    BLOCK_NEEDS_FREE = 1 << 24,
+    BLOCK_HAS_COPY_DISPOSE = 1 << 25,
+    BLOCK_HAS_CTOR = 1 << 26,
+    BLOCK_IS_GC = 1 << 27,
+    BLOCK_IS_GLOBAL = 1 << 28,
+    BLOCK_HAS_STRET = 1 << 29,
+    BLOCK_HAS_SIGNATURE = 1 << 30,
+};

 
 

-extern sqlite3 *Bridge_;
+JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize);

 
 /* Objective-C Pool Release {{{ */
 
 /* Objective-C Pool Release {{{ */

-apr_status_t CYPoolRelease_(void *data) {
+void CYPoolRelease_(void *data) {

     id object(reinterpret_cast<id>(data));
     [object release];
     id object(reinterpret_cast<id>(data));
     [object release];

-    return APR_SUCCESS;

 }
 
 }
 

-id CYPoolRelease_(apr_pool_t *pool, id object) {
+id CYPoolRelease_(CYPool *pool, id object) {

     if (object == nil)
         return nil;
     else if (pool == NULL)
         return [object autorelease];
     else {
     if (object == nil)
         return nil;
     else if (pool == NULL)
         return [object autorelease];
     else {

-        apr_pool_cleanup_register(pool, object, &CYPoolRelease_, &apr_pool_cleanup_null);
+        pool->atexit(CYPoolRelease_);

         return object;
     }
 }
 
 template <typename Type_>
         return object;
     }
 }
 
 template <typename Type_>

-Type_ CYPoolRelease(apr_pool_t *pool, Type_ object) {
+Type_ CYPoolRelease(CYPool *pool, Type_ object) {

     return (Type_) CYPoolRelease_(pool, (id) object);
 }
 /* }}} */
 /* Objective-C Strings {{{ */
     return (Type_) CYPoolRelease_(pool, (id) object);
 }
 /* }}} */
 /* Objective-C Strings {{{ */

-const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, NSString *value) {
-    if (pool == NULL)
-        return [value UTF8String];
-    else {
-        size_t size([value maximumLengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1);
-        char *string(new(pool) char[size]);
-        if (![value getCString:string maxLength:size encoding:NSUTF8StringEncoding])
-            throw CYJSError(context, "[NSString getCString:maxLength:encoding:] == NO");
-        return string;
-    }
+const char *CYPoolCString(CYPool &pool, JSContextRef context, NSString *value) {
+    size_t size([value maximumLengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1);
+    char *string(new(pool) char[size]);
+    if (![value getCString:string maxLength:size encoding:NSUTF8StringEncoding])
+        throw CYJSError(context, "[NSString getCString:maxLength:encoding:] == NO");
+    return string;

 }
 
 }
 

-JSStringRef CYCopyJSString_(NSString *value) {
+JSStringRef CYCopyJSString(JSContextRef context, NSString *value) {

 #ifdef __APPLE__
     return JSStringCreateWithCFString(reinterpret_cast<CFStringRef>(value));
 #else
     CYPool pool;
 #ifdef __APPLE__
     return JSStringCreateWithCFString(reinterpret_cast<CFStringRef>(value));
 #else
     CYPool pool;

-    return CYCopyJSString(CYPoolCString(pool, value));
+    return CYCopyJSString(CYPoolCString(pool, context, value));

 #endif
 }
 
 #endif
 }
 

-JSStringRef CYCopyJSString(id value) {
+JSStringRef CYCopyJSString(JSContextRef context, NSObject *value) {

     if (value == nil)
         return NULL;
     // XXX: this definition scares me; is anyone using this?!
     NSString *string([value description]);
     if (value == nil)
         return NULL;
     // XXX: this definition scares me; is anyone using this?!
     NSString *string([value description]);

-    return CYCopyJSString_(string);
+    return CYCopyJSString(context, string);

 }
 
 NSString *CYCopyNSString(const CYUTF8String &value) {
 }
 
 NSString *CYCopyNSString(const CYUTF8String &value) {


@@ -119,29 +222,30 @@ NSString *CYCopyNSString(const CYUTF8String &value) {
 #endif
 }
 
 #endif
 }
 

-NSString *CYCopyNSString(JSStringRef value) {
+NSString *CYCopyNSString(JSContextRef context, JSStringRef value) {

 #ifdef __APPLE__
     return (NSString *) JSStringCopyCFString(kCFAllocatorDefault, value);
 #else
 #ifdef __APPLE__
     return (NSString *) JSStringCopyCFString(kCFAllocatorDefault, value);
 #else

-    return CYCopyNSString(CYCastCString_(value));
+    CYPool pool;
+    return CYCopyNSString(CYPoolUTF8String(pool, context, value));

 #endif
 }
 
 NSString *CYCopyNSString(JSContextRef context, JSValueRef value) {
 #endif
 }
 
 NSString *CYCopyNSString(JSContextRef context, JSValueRef value) {

-    return CYCopyNSString(CYJSString(context, value));
+    return CYCopyNSString(context, CYJSString(context, value));

 }
 
 }
 

-NSString *CYCastNSString(apr_pool_t *pool, const CYUTF8String &value) {
+NSString *CYCastNSString(CYPool *pool, const CYUTF8String &value) {

     return CYPoolRelease(pool, CYCopyNSString(value));
 }
 
     return CYPoolRelease(pool, CYCopyNSString(value));
 }
 

-NSString *CYCastNSString(apr_pool_t *pool, SEL sel) {
+NSString *CYCastNSString(CYPool *pool, SEL sel) {

     const char *name(sel_getName(sel));
     return CYPoolRelease(pool, CYCopyNSString(CYUTF8String(name, strlen(name))));
 }
 
     const char *name(sel_getName(sel));
     return CYPoolRelease(pool, CYCopyNSString(CYUTF8String(name, strlen(name))));
 }
 

-NSString *CYCastNSString(apr_pool_t *pool, JSStringRef value) {
-    return CYPoolRelease(pool, CYCopyNSString(value));
+NSString *CYCastNSString(CYPool *pool, JSContextRef context, JSStringRef value) {
+    return CYPoolRelease(pool, CYCopyNSString(context, value));

 }
 
 CYUTF8String CYCastUTF8String(NSString *value) {
 }
 
 CYUTF8String CYCastUTF8String(NSString *value) {


@@ -150,6 +254,8 @@ CYUTF8String CYCastUTF8String(NSString *value) {
 }
 /* }}} */
 
 }
 /* }}} */
 

+JSValueRef CYCastJSValue(JSContextRef context, NSObject *value);
+

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


@@ -160,11 +266,18 @@ size_t CYGetIndex(NSString *value) {
     return CYGetIndex(CYCastUTF8String(value));
 }
 
     return CYGetIndex(CYCastUTF8String(value));
 }
 

-bool CYGetOffset(apr_pool_t *pool, JSContextRef context, NSString *value, ssize_t &index) {
+bool CYGetOffset(CYPool &pool, JSContextRef context, NSString *value, ssize_t &index) {

     return CYGetOffset(CYPoolCString(pool, context, value), index);
 }
 
 static JSClassRef Instance_;
     return CYGetOffset(CYPoolCString(pool, context, value), index);
 }
 
 static JSClassRef Instance_;

+
+static JSClassRef ArrayInstance_;
+static JSClassRef FunctionInstance_;
+static JSClassRef ObjectInstance_;
+static JSClassRef StringInstance_;
+
+static JSClassRef Class_;

 static JSClassRef Internal_;
 static JSClassRef Message_;
 static JSClassRef Messages_;
 static JSClassRef Internal_;
 static JSClassRef Message_;
 static JSClassRef Messages_;


@@ -172,21 +285,29 @@ static JSClassRef Selector_;
 static JSClassRef Super_;
 
 static JSClassRef ObjectiveC_Classes_;
 static JSClassRef Super_;
 
 static JSClassRef ObjectiveC_Classes_;

-static JSClassRef ObjectiveC_Image_Classes_;
-static JSClassRef ObjectiveC_Images_;
+static JSClassRef ObjectiveC_Constants_;

 static JSClassRef ObjectiveC_Protocols_;
 
 static JSClassRef ObjectiveC_Protocols_;
 

-static JSObjectRef Instance_prototype_;
+#ifdef __APPLE__
+static JSClassRef ObjectiveC_Image_Classes_;
+static JSClassRef ObjectiveC_Images_;
+#endif

 
 #ifdef __APPLE__
 static Class NSCFBoolean_;
 static Class NSCFType_;
 
 #ifdef __APPLE__
 static Class NSCFBoolean_;
 static Class NSCFType_;

+static Class NSGenericDeallocHandler_;
+static Class NSZombie_;
+
+static std::set<Class> banned_;
+#else
+static Class NSBoolNumber_;

 #endif
 
 static Class NSArray_;
 #endif
 
 static Class NSArray_;

+static Class NSBlock_;

 static Class NSDictionary_;
 static Class NSDictionary_;

-static Class NSMessageBuilder_;
-static Class NSZombie_;
+static Class NSString_;

 static Class Object_;
 
 static Type_privateData *Object_type;
 static Class Object_;
 
 static Type_privateData *Object_type;


@@ -200,45 +321,54 @@ Type_privateData *Selector_privateData::GetType() const {
     return Selector_type;
 }
 
     return Selector_type;
 }
 

-// XXX: trick this out with associated objects!
-JSValueRef CYGetClassPrototype(JSContextRef context, id 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)
     if (self == nil)

-        return Instance_prototype_;
+        return CYGetCachedObject(context, CYJSString("Instance_prototype"));
+    else if (meta && !class_isMetaClass(self))
+        return CYGetCachedObject(context, CYJSString("Class_prototype"));

 
 

-    // XXX: I need to think through multi-context
-    typedef std::map<id, JSValueRef> CacheMap;
-    static CacheMap cache_;
+    JSObjectRef global(CYGetGlobalObject(context));
+    JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));

 
 

-    JSValueRef &value(cache_[self]);
-    if (value != NULL)
+    char label[32];
+    sprintf(label, "i%p", self);
+    CYJSString name(label);
+
+    JSValueRef value(CYGetProperty(context, cy, name));
+    if (!JSValueIsUndefined(context, value))

         return value;
 
     JSClassRef _class(NULL);
     JSValueRef prototype;
 
     if (self == NSArray_)
         return value;
 
     JSClassRef _class(NULL);
     JSValueRef prototype;
 
     if (self == NSArray_)

-        prototype = Array_prototype_;
+        prototype = CYGetCachedObject(context, CYJSString("ArrayInstance_prototype"));
+    else if (self == NSBlock_)
+        prototype = CYGetCachedObject(context, CYJSString("FunctionInstance_prototype"));

     else if (self == NSDictionary_)
     else if (self == NSDictionary_)

-        prototype = Object_prototype_;
+        prototype = CYGetCachedObject(context, CYJSString("ObjectInstance_prototype"));
+    else if (self == NSString_)
+        prototype = CYGetCachedObject(context, CYJSString("StringInstance_prototype"));

     else
     else

-        prototype = CYGetClassPrototype(context, class_getSuperclass(self));
+        prototype = CYGetClassPrototype(context, class_getSuperclass(self), meta);

 
     JSObjectRef object(JSObjectMake(context, _class, NULL));
     JSObjectSetPrototype(context, object, prototype);
 
     JSObjectRef object(JSObjectMake(context, _class, NULL));
     JSObjectSetPrototype(context, object, prototype);

+    CYSetProperty(context, cy, name, object);

 
 

-    JSValueProtect(context, object);
-    value = object;

     return object;
 }
 
     return object;
 }
 

-JSObjectRef Messages::Make(JSContextRef context, Class _class, bool array) {
+_finline JSValueRef CYGetClassPrototype(JSContextRef context, Class self) {
+    return CYGetClassPrototype(context, self, class_isMetaClass(self));
+}
+
+JSObjectRef Messages::Make(JSContextRef context, Class _class) {

     JSObjectRef value(JSObjectMake(context, Messages_, new Messages(_class)));
     JSObjectRef value(JSObjectMake(context, Messages_, new Messages(_class)));

-    if (_class == NSArray_)
-        array = true;

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

-        JSObjectSetPrototype(context, value, Messages::Make(context, super, array));
-    /*else if (array)
-        JSObjectSetPrototype(context, value, Array_prototype_);*/
+        JSObjectSetPrototype(context, value, Messages::Make(context, super));

     return value;
 }
 
     return value;
 }
 


@@ -296,48 +426,54 @@ JSObjectRef CYMakeInstance(JSContextRef context, id object, bool transient) {
 
 @interface NSObject (Cycript)
 
 
 @interface NSObject (Cycript)
 

-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context;
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context;

 - (JSType) cy$JSType;
 
 - (JSType) cy$JSType;
 

-- (NSObject *) cy$toJSON:(NSString *)key;
-- (NSString *) cy$toCYON;
-- (NSString *) cy$toKey;
+- (JSValueRef) cy$toJSON:(NSString *)key inContext:(JSContextRef)context;
+- (NSString *) cy$toCYON:(bool)objective;

 
 - (bool) cy$hasProperty:(NSString *)name;
 - (NSObject *) cy$getProperty:(NSString *)name;
 
 - (bool) cy$hasProperty:(NSString *)name;
 - (NSObject *) cy$getProperty:(NSString *)name;

+- (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context;

 - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value;
 - (bool) cy$deleteProperty:(NSString *)name;
 - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value;
 - (bool) cy$deleteProperty:(NSString *)name;

-- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names;
+- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context;
+
++ (bool) cy$hasImplicitProperties;

 
 @end
 
 @protocol Cycript
 
 @end
 
 @protocol Cycript

-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context;
+- (id) cy$box;
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context;

 @end
 
 @end
 

-NSString *CYCastNSCYON(id value) {
+NSString *CYCastNSCYON(id value, bool objective) {

     NSString *string;
 
     if (value == nil)
         string = @"nil";
     else {
         Class _class(object_getClass(value));
     NSString *string;
 
     if (value == nil)
         string = @"nil";
     else {
         Class _class(object_getClass(value));

-        SEL sel(@selector(cy$toCYON));
+        SEL sel(@selector(cy$toCYON:));

 
         if (objc_method *toCYON = class_getInstanceMethod(_class, sel))
 
         if (objc_method *toCYON = class_getInstanceMethod(_class, sel))

-            string = reinterpret_cast<NSString *(*)(id, SEL)>(method_getImplementation(toCYON))(value, sel);
+            string = reinterpret_cast<NSString *(*)(id, SEL, bool)>(method_getImplementation(toCYON))(value, sel, objective);

         else if (objc_method *methodSignatureForSelector = class_getInstanceMethod(_class, @selector(methodSignatureForSelector:))) {
             if (reinterpret_cast<NSMethodSignature *(*)(id, SEL, SEL)>(method_getImplementation(methodSignatureForSelector))(value, @selector(methodSignatureForSelector:), sel) != nil)
         else if (objc_method *methodSignatureForSelector = class_getInstanceMethod(_class, @selector(methodSignatureForSelector:))) {
             if (reinterpret_cast<NSMethodSignature *(*)(id, SEL, SEL)>(method_getImplementation(methodSignatureForSelector))(value, @selector(methodSignatureForSelector:), sel) != nil)

-                string = [value cy$toCYON];
+                string = [value cy$toCYON:objective];

             else goto fail;
         } else fail: {
             else goto fail;
         } else fail: {

-            if (value == NSZombie_)
+            if (false);
+#ifdef __APPLE__
+            else if (value == NSZombie_)

                 string = @"_NSZombie_";
             else if (_class == NSZombie_)
                 string = [NSString stringWithFormat:@"<_NSZombie_: %p>", value];
             // XXX: frowny /in/ the pants
                 string = @"_NSZombie_";
             else if (_class == NSZombie_)
                 string = [NSString stringWithFormat:@"<_NSZombie_: %p>", value];
             // XXX: frowny /in/ the pants

-            else if (value == NSMessageBuilder_ || value == Object_)
+            else if (banned_.find(value) != banned_.end())

                 string = nil;
                 string = nil;

+#endif

             else
                 string = [NSString stringWithFormat:@"%@", value];
         }
             else
                 string = [NSString stringWithFormat:@"%@", value];
         }


@@ -384,7 +520,9 @@ struct PropertyAttributes {
         name = property_getName(property);
         const char *attributes(property_getAttributes(property));
 
         name = property_getName(property);
         const char *attributes(property_getAttributes(property));
 

-        for (char *state, *token(apr_strtok(apr_pstrdup(pool_, attributes), ",", &state)); token != NULL; token = apr_strtok(NULL, ",", &state)) {
+        for (char *token(pool_.strdup(attributes)), *next; token != NULL; token = next) {
+            if ((next = strchr(token, ',')) != NULL)
+                *next++ = '\0';

             switch (*token) {
                 case 'R': readonly = true; break;
                 case 'C': copy = true; break;
             switch (*token) {
                 case 'R': readonly = true; break;
                 case 'C': copy = true; break;


@@ -409,7 +547,7 @@ struct PropertyAttributes {
 
     const char *Getter() {
         if (getter_ == NULL)
 
     const char *Getter() {
         if (getter_ == NULL)

-            getter_ = apr_pstrdup(pool_, name);
+            getter_ = pool_.strdup(name);

         return getter_;
     }
 
         return getter_;
     }
 


@@ -438,13 +576,6 @@ struct PropertyAttributes {
 };
 #endif
 
 };
 #endif
 

-#ifdef __APPLE__
-NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
-    return [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease];
-}
-#endif
-
-#ifndef __APPLE__

 @interface CYWebUndefined : NSObject {
 }
 
 @interface CYWebUndefined : NSObject {
 }
 


@@ -462,18 +593,15 @@ NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 @end
 
 #define WebUndefined CYWebUndefined
 @end
 
 #define WebUndefined CYWebUndefined

-#endif

 
 /* Bridge: CYJSObject {{{ */
 @interface CYJSObject : NSMutableDictionary {
     JSObjectRef object_;
 
 /* Bridge: CYJSObject {{{ */
 @interface CYJSObject : NSMutableDictionary {
     JSObjectRef object_;

-    JSContextRef context_;
+    JSGlobalContextRef context_;

 }
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context;
 
 }
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context;
 

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

 - (NSUInteger) count;
 - (id) objectForKey:(id)key;
 - (NSEnumerator *) keyEnumerator;
 - (NSUInteger) count;
 - (id) objectForKey:(id)key;
 - (NSEnumerator *) keyEnumerator;


@@ -485,7 +613,7 @@ NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 /* Bridge: CYJSArray {{{ */
 @interface CYJSArray : NSMutableArray {
     JSObjectRef object_;
 /* Bridge: CYJSArray {{{ */
 @interface CYJSArray : NSMutableArray {
     JSObjectRef object_;

-    JSContextRef context_;
+    JSGlobalContextRef context_;

 }
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context;
 }
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context;


@@ -502,28 +630,80 @@ NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 @end
 /* }}} */
 
 @end
 /* }}} */
 

-NSObject *CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
-    JSValueRef exception(NULL);
-    bool array(JSValueIsInstanceOfConstructor(context, object, Array_, &exception));
-    CYThrow(context, exception);
-    id value(array ? [CYJSArray alloc] : [CYJSObject alloc]);
-    return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]);
+_finline bool CYJSValueIsNSObject(JSContextRef context, JSValueRef value) {
+    return JSValueIsObjectOfClass(context, value, Instance_);

 }
 
 }
 

-NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
-    if (!JSValueIsObjectOfClass(context, object, Instance_))
-        return CYCastNSObject_(pool, context, object);
-    else {
+_finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) {
+    return _jsccall(JSValueIsInstanceOfConstructor, context, value, CYGetCachedObject(context, cache));
+}
+
+struct CYBlockDescriptor {
+    struct {
+        BlockDescriptor1 one_;
+        BlockDescriptor2 two_;
+        BlockDescriptor3 three_;
+    } d_;
+
+    Closure_privateData *internal_;
+};
+
+void CYDisposeBlock(BlockLiteral *literal) {
+    delete reinterpret_cast<CYBlockDescriptor *>(literal->descriptor)->internal_;
+}
+
+static JSValueRef BlockAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) {
+    JSObjectRef _this(CYCastJSObject(context, values[0]));
+    return CYCallAsFunction(context, function, _this, count - 1, values + 1);
+}
+
+static void BlockClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
+    CYExecuteClosure(cif, result, arguments, arg, &BlockAdapter_);
+}
+
+NSObject *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature &signature) {
+    BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(malloc(sizeof(BlockLiteral))));
+
+    CYBlockDescriptor *descriptor(new CYBlockDescriptor);
+    memset(&descriptor->d_, 0, sizeof(descriptor->d_));
+
+    descriptor->internal_ = CYMakeFunctor_(context, function, signature, &BlockClosure_);
+    literal->invoke = reinterpret_cast<void (*)(void *, ...)>(descriptor->internal_->GetValue());
+
+    literal->isa = objc_getClass("__NSMallocBlock__");
+    literal->flags = BLOCK_HAS_SIGNATURE | BLOCK_HAS_COPY_DISPOSE | BLOCK_IS_GLOBAL;
+    literal->reserved = 0;
+    literal->descriptor = descriptor;
+
+    descriptor->d_.one_.size = sizeof(descriptor->d_);
+    descriptor->d_.two_.dispose_helper = &CYDisposeBlock;
+    descriptor->d_.three_.signature = sig::Unparse(*descriptor->internal_->pool_, &signature);
+
+    return reinterpret_cast<NSObject *>(literal);
+}
+
+NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSObjectRef object) {
+    if (CYJSValueIsNSObject(context, object)) {

         Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
         return internal->GetValue();
     }
         Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
         return internal->GetValue();
     }

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

 }
 
 NSNumber *CYCopyNSNumber(JSContextRef context, JSValueRef value) {
     return [[NSNumber alloc] initWithDouble:CYCastDouble(context, value)];
 }
 
 }
 
 NSNumber *CYCopyNSNumber(JSContextRef context, JSValueRef value) {
     return [[NSNumber alloc] initWithDouble:CYCastDouble(context, value)];
 }
 

-id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cast) {
+#ifndef __APPLE__
+@interface NSBoolNumber : NSNumber {
+}
+@end
+#endif
+
+id CYNSObject(CYPool *pool, JSContextRef context, JSValueRef value, bool cast) {

     id object;
     bool copy;
 
     id object;
     bool copy;
 


@@ -542,7 +722,7 @@ id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cas
             object = (id) (CYCastBool(context, value) ? kCFBooleanTrue : kCFBooleanFalse);
             copy = false;
 #else
             object = (id) (CYCastBool(context, value) ? kCFBooleanTrue : kCFBooleanFalse);
             copy = false;
 #else

-            object = [[NSNumber alloc] initWithBool:CYCastBool(context, value)];
+            object = [[NSBoolNumber alloc] initWithBool:CYCastBool(context, value)];

             copy = true;
 #endif
         break;
             copy = true;
 #endif
         break;


@@ -576,20 +756,24 @@ id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cas
         return [object retain];
 }
 
         return [object retain];
 }
 

-NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
+NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSValueRef value) {

     return CYNSObject(pool, context, value, true);
 }
 
     return CYNSObject(pool, context, value, true);
 }
 

-NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
-    return CYNSObject(pool, context, value, false);
+NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
+    return CYNSObject(&pool, context, value, false);

 }
 
 /* Bridge: NSArray {{{ */
 @implementation NSArray (Cycript)
 
 }
 
 /* Bridge: NSArray {{{ */
 @implementation NSArray (Cycript)
 

-- (NSString *) cy$toCYON {
+- (id) cy$box {
+    return [[self mutableCopy] autorelease];
+}
+
+- (NSString *) cy$toCYON:(bool)objective {

     NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
     NSMutableString *json([[[NSMutableString alloc] init] autorelease]);

-    [json appendString:@"["];
+    [json appendString:@"@["];

 
     bool comma(false);
 #ifdef __APPLE__
 
     bool comma(false);
 #ifdef __APPLE__


@@ -603,7 +787,7 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
         else
             comma = true;
         if (object == nil || [object cy$JSType] != kJSTypeUndefined)
         else
             comma = true;
         if (object == nil || [object cy$JSType] != kJSTypeUndefined)

-            [json appendString:CYCastNSCYON(object)];
+            [json appendString:CYCastNSCYON(object, true)];

         else {
             [json appendString:@","];
             comma = false;
         else {
             [json appendString:@","];
             comma = false;


@@ -626,15 +810,6 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
 }
 
 - (NSObject *) cy$getProperty:(NSString *)name {
 }
 
 - (NSObject *) cy$getProperty:(NSString *)name {

-    if ([name isEqualToString:@"length"]) {
-        NSUInteger count([self count]);
-#ifdef __APPLE__
-        return [NSNumber numberWithUnsignedInteger:count];
-#else
-        return [NSNumber numberWithUnsignedInt:count];
-#endif
-    }
-

     size_t index(CYGetIndex(name));
     if (index == _not(size_t) || index >= [self count])
         return [super cy$getProperty:name];
     size_t index(CYGetIndex(name));
     if (index == _not(size_t) || index >= [self count])
         return [super cy$getProperty:name];


@@ -642,8 +817,17 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
         return [self objectAtIndex:index];
 }
 
         return [self objectAtIndex:index];
 }
 

-- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names {
-    [super cy$getPropertyNames:names];
+- (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context {
+    CYObjectiveTry_ {
+        if ([name isEqualToString:@"length"])
+            return CYCastJSValue(context, [self count]);
+    } CYObjectiveCatch
+
+    return [super cy$getProperty:name inContext:context];
+}
+
+- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
+    [super cy$getPropertyNames:names inContext:context];

 
     for (size_t index(0), count([self count]); index != count; ++index) {
         id object([self objectAtIndex:index]);
 
     for (size_t index(0), count([self count]); index != count; ++index) {
         id object([self objectAtIndex:index]);


@@ -655,30 +839,65 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     }
 }
 
     }
 }
 

++ (bool) cy$hasImplicitProperties {
+    return false;
+}
+
+@end
+/* }}} */
+/* Bridge: NSBlock {{{ */
+#ifdef __APPLE__
+@interface NSBlock
+- (void) invoke;
+@end
+#endif
+/* }}} */
+/* Bridge: NSBoolNumber {{{ */
+#ifndef __APPLE__
+@implementation NSBoolNumber (Cycript)
+
+- (JSType) cy$JSType {
+    return kJSTypeBoolean;
+}
+
+- (NSString *) cy$toCYON:(bool)objective {
+    NSString *value([self boolValue] ? @"true" : @"false");
+    return objective ? value : [NSString stringWithFormat:@"@%@", value];
+}
+
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ {
+    return CYCastJSValue(context, (bool) [self boolValue]);
+} CYObjectiveCatch }
+

 @end
 @end

+#endif

 /* }}} */
 /* Bridge: NSDictionary {{{ */
 @implementation NSDictionary (Cycript)
 
 /* }}} */
 /* Bridge: NSDictionary {{{ */
 @implementation NSDictionary (Cycript)
 

-- (NSString *) cy$toCYON {
+- (id) cy$box {
+    return [[self mutableCopy] autorelease];
+}
+
+- (NSString *) cy$toCYON:(bool)objective {

     NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
     NSMutableString *json([[[NSMutableString alloc] init] autorelease]);

-    [json appendString:@"{"];
+    [json appendString:@"@{"];

 
     bool comma(false);
 #ifdef __APPLE__
 
     bool comma(false);
 #ifdef __APPLE__

-    for (id key in self) {
+    for (NSObject *key in self) {

 #else
     NSEnumerator *keys([self keyEnumerator]);
 #else
     NSEnumerator *keys([self keyEnumerator]);

-    while (id key = [keys nextObject]) {
+    while (NSObject *key = [keys nextObject]) {

 #endif
         if (comma)
             [json appendString:@","];
         else
             comma = true;
 #endif
         if (comma)
             [json appendString:@","];
         else
             comma = true;

-        [json appendString:[key cy$toKey]];
+        [json appendString:CYCastNSCYON(key, true)];

         [json appendString:@":"];
         NSObject *object([self objectForKey:key]);
         [json appendString:@":"];
         NSObject *object([self objectForKey:key]);

-        [json appendString:CYCastNSCYON(object)];
+        [json appendString:CYCastNSCYON(object, true)];

     }
 
     [json appendString:@"}"];
     }
 
     [json appendString:@"}"];


@@ -693,19 +912,23 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return [self objectForKey:name];
 }
 
     return [self objectForKey:name];
 }
 

-- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names {
-    [super cy$getPropertyNames:names];
+- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
+    [super cy$getPropertyNames:names inContext:context];

 
 #ifdef __APPLE__
 
 #ifdef __APPLE__

-    for (NSString *key in self) {
+    for (NSObject *key in self) {

 #else
     NSEnumerator *keys([self keyEnumerator]);
 #else
     NSEnumerator *keys([self keyEnumerator]);

-    while (NSString *key = [keys nextObject]) {
+    while (NSObject *key = [keys nextObject]) {

 #endif
 #endif

-        JSPropertyNameAccumulatorAddName(names, CYJSString(key));
+        JSPropertyNameAccumulatorAddName(names, CYJSString(context, key));

     }
 }
 
     }
 }
 

++ (bool) cy$hasImplicitProperties {
+    return false;
+}
+

 @end
 /* }}} */
 /* Bridge: NSMutableArray {{{ */
 @end
 /* }}} */
 /* Bridge: NSMutableArray {{{ */


@@ -794,16 +1017,13 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return kJSTypeNumber;
 }
 
     return kJSTypeNumber;
 }
 

-- (NSObject *) cy$toJSON:(NSString *)key {
-    return self;
-}
-
-- (NSString *) cy$toCYON {
-    return [self cy$JSType] != kJSTypeBoolean ? [self stringValue] : [self boolValue] ? @"true" : @"false";
+- (NSString *) cy$toCYON:(bool)objective {
+    NSString *value([self cy$JSType] != kJSTypeBoolean ? [self stringValue] : [self boolValue] ? @"true" : @"false");
+    return objective ? value : [NSString stringWithFormat:@"@%@", value];

 }
 
 }
 

-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
-    return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, [self boolValue]);
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ {
+    return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, static_cast<bool>([self boolValue]));

 } CYObjectiveCatch }
 
 @end
 } CYObjectiveCatch }
 
 @end


@@ -815,37 +1035,38 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return kJSTypeNull;
 }
 
     return kJSTypeNull;
 }
 

-- (NSObject *) cy$toJSON:(NSString *)key {
-    return self;
+- (NSString *) cy$toCYON:(bool)objective {
+    NSString *value(@"null");
+    return objective ? value : [NSString stringWithFormat:@"@%@", value];

 }
 
 }
 

-- (NSString *) cy$toCYON {
-    return @"null";
-}
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ {
+    return CYJSNull(context);
+} CYObjectiveCatch }

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

-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
-    return CYMakeInstance(context, self, false);
-} CYObjectiveCatch }
-
-- (JSType) cy$JSType {
-    return kJSTypeObject;
+- (id) cy$box {
+    return self;

 }
 
 }
 

-- (NSObject *) cy$toJSON:(NSString *)key {
-    return [self description];
+- (JSValueRef) cy$toJSON:(NSString *)key inContext:(JSContextRef)context {
+    return [self cy$valueOfInContext:context];

 }
 
 }
 

-- (NSString *) cy$toCYON {
-    return [[self cy$toJSON:@""] cy$toCYON];
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ {
+    return NULL;
+} CYObjectiveCatch }
+
+- (JSType) cy$JSType {
+    return kJSTypeObject;

 }
 
 }
 

-- (NSString *) cy$toKey {
-    return [self cy$toCYON];
+- (NSString *) cy$toCYON:(bool)objective {
+    return [[self description] cy$toCYON:objective];

 }
 
 - (bool) cy$hasProperty:(NSString *)name {
 }
 
 - (bool) cy$hasProperty:(NSString *)name {


@@ -856,6 +1077,12 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return nil;
 }
 
     return nil;
 }
 

+- (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context { CYObjectiveTry_ {
+    if (NSObject *value = [self cy$getProperty:name])
+        return CYCastJSValue(context, value);
+    return NULL;
+} CYObjectiveCatch }
+

 - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {
     return false;
 }
 - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {
     return false;
 }


@@ -864,7 +1091,11 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return false;
 }
 
     return false;
 }
 

-- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names {
+- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
+}
+
++ (bool) cy$hasImplicitProperties {
+    return true;

 }
 
 @end
 }
 
 @end


@@ -872,12 +1103,8 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
 /* Bridge: NSProxy {{{ */
 @implementation NSProxy (Cycript)
 
 /* Bridge: NSProxy {{{ */
 @implementation NSProxy (Cycript)
 

-- (NSObject *) cy$toJSON:(NSString *)key {
-    return [self description];
-}
-
-- (NSString *) cy$toCYON {
-    return [[self cy$toJSON:@""] cy$toCYON];
+- (NSString *) cy$toCYON:(bool)objective {
+    return [[self description] cy$toCYON:objective];

 }
 
 @end
 }
 
 @end


@@ -885,28 +1112,54 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
 /* Bridge: NSString {{{ */
 @implementation NSString (Cycript)
 
 /* Bridge: NSString {{{ */
 @implementation NSString (Cycript)
 

-- (JSType) cy$JSType {
-    return kJSTypeString;
+- (id) cy$box {
+    return [[self copy] autorelease];

 }
 
 }
 

-- (NSObject *) cy$toJSON:(NSString *)key {
-    return self;
+- (JSType) cy$JSType {
+    return kJSTypeString;

 }
 
 }
 

-- (NSString *) cy$toCYON {
+- (NSString *) cy$toCYON:(bool)objective {

     std::ostringstream str;
     std::ostringstream str;

+    if (!objective)
+        str << '@';

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

-- (NSString *) cy$toKey {
-    if (CYIsKey(CYCastUTF8String(self)))
-        return self;
-    return [self cy$toCYON];
+- (bool) cy$hasProperty:(NSString *)name {
+    size_t index(CYGetIndex(name));
+    if (index == _not(size_t) || index >= [self length])
+        return [super cy$hasProperty:name];
+    else
+        return true;
+}
+
+- (NSObject *) cy$getProperty:(NSString *)name {
+    size_t index(CYGetIndex(name));
+    if (index == _not(size_t) || index >= [self length])
+        return [super cy$getProperty:name];
+    else
+        return [self substringWithRange:NSMakeRange(index, 1)];
+}
+
+- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
+    [super cy$getPropertyNames:names inContext:context];
+
+    for (size_t index(0), length([self length]); index != length; ++index) {
+        char name[32];
+        sprintf(name, "%zu", index);
+        JSPropertyNameAccumulatorAddName(names, CYJSString(name));
+    }

 }
 
 }
 

+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ {
+    return CYCastJSValue(context, CYJSString(context, self));
+} CYObjectiveCatch }
+

 @end
 /* }}} */
 /* Bridge: WebUndefined {{{ */
 @end
 /* }}} */
 /* Bridge: WebUndefined {{{ */


@@ -916,15 +1169,13 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return kJSTypeUndefined;
 }
 
     return kJSTypeUndefined;
 }
 

-- (NSObject *) cy$toJSON:(NSString *)key {
-    return self;
-}
-
-- (NSString *) cy$toCYON {
-    return @"undefined";
+- (NSString *) cy$toCYON:(bool)objective {
+    NSString *value(@"undefined");
+    return value; // XXX: maybe use the below code, adding @undefined?
+    //return objective ? value : [NSString stringWithFormat:@"@%@", value];

 }
 
 }
 

-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ {

     return CYJSUndefined(context);
 } CYObjectiveCatch }
 
     return CYJSUndefined(context);
 } CYObjectiveCatch }
 


@@ -932,240 +1183,249 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
 /* }}} */
 
 static bool CYIsClass(id self) {
 /* }}} */
 
 static bool CYIsClass(id self) {

-    // XXX: this is a lame object_isClass
-    return class_getInstanceMethod(object_getClass(self), @selector(alloc)) != NULL;
+#ifdef __APPLE__
+    return class_isMetaClass(object_getClass(self));
+#else
+    return GSObjCIsClass(self);
+#endif

 }
 
 }
 

-Class CYCastClass(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
-    id self(CYCastNSObject(pool, context, value));
+Class CYCastClass(CYPool &pool, JSContextRef context, JSValueRef value) {
+    id self(CYCastNSObject(&pool, context, value));

     if (CYIsClass(self))
         return (Class) self;
     throw CYJSError(context, "got something that is not a Class");
     return NULL;
 }
 
     if (CYIsClass(self))
         return (Class) self;
     throw CYJSError(context, "got something that is not a Class");
     return NULL;
 }
 

-NSArray *CYCastNSArray(JSPropertyNameArrayRef names) {
+NSArray *CYCastNSArray(JSContextRef context, JSPropertyNameArrayRef names) {

     CYPool pool;
     size_t size(JSPropertyNameArrayGetCount(names));
     NSMutableArray *array([NSMutableArray arrayWithCapacity:size]);
     for (size_t index(0); index != size; ++index)
     CYPool pool;
     size_t size(JSPropertyNameArrayGetCount(names));
     NSMutableArray *array([NSMutableArray arrayWithCapacity:size]);
     for (size_t index(0); index != size; ++index)

-        [array addObject:CYCastNSString(pool, JSPropertyNameArrayGetNameAtIndex(names, index))];
+        [array addObject:CYCastNSString(&pool, context, JSPropertyNameArrayGetNameAtIndex(names, index))];

     return array;
 }
 
     return array;
 }
 

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

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

-    else if ([value respondsToSelector:@selector(cy$JSValueInContext:)])
-        return [value cy$JSValueInContext:context];

     else
         return CYMakeInstance(context, value, false);
     else
         return CYMakeInstance(context, value, false);

-} CYPoolCatch(NULL) }
+} CYPoolCatch(NULL) return /*XXX*/ NULL; }

 
 @implementation CYJSObject
 
 
 @implementation CYJSObject
 

-- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry {
+- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry_ {

     if ((self = [super init]) != nil) {
         object_ = object;
     if ((self = [super init]) != nil) {
         object_ = object;

-        context_ = context;
+        context_ = CYGetJSContext(context);
+        JSGlobalContextRetain(context_);

         JSValueProtect(context_, object_);
     } return self;
 } CYObjectiveCatch }
 
 - (void) dealloc { CYObjectiveTry {
     JSValueUnprotect(context_, object_);
         JSValueProtect(context_, object_);
     } return self;
 } CYObjectiveCatch }
 
 - (void) dealloc { CYObjectiveTry {
     JSValueUnprotect(context_, object_);

+    JSGlobalContextRelease(context_);

     [super dealloc];
 } CYObjectiveCatch }
 
     [super dealloc];
 } CYObjectiveCatch }
 

-- (NSObject *) cy$toJSON:(NSString *)key { CYObjectiveTry {
-    JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_));
-    if (!CYIsCallable(context_, toJSON))
-        return [super cy$toJSON:key];
-    else {
-        JSValueRef arguments[1] = {CYCastJSValue(context_, key)};
-        JSValueRef value(CYCallAsFunction(context_, (JSObjectRef) toJSON, object_, 1, arguments));
-        // XXX: do I really want an NSNull here?!
-        return CYCastNSObject(NULL, context_, value) ?: [NSNull null];
-    }
-} CYObjectiveCatch }
-
-- (NSString *) cy$toCYON { CYObjectiveTry {
+- (NSString *) cy$toCYON:(bool)objective { CYObjectiveTry {

     CYPool pool;
     CYPool pool;

-    JSValueRef exception(NULL);
-    const char *cyon(CYPoolCCYON(pool, context_, object_));
-    CYThrow(context_, exception);
+    const char *cyon(CYPoolCCYON(pool, context, object_));

     if (cyon == NULL)
     if (cyon == NULL)

-        return [super cy$toCYON];
+        return [super cy$toCYON:objective];

     else
         return [NSString stringWithUTF8String:cyon];
 } CYObjectiveCatch }
 
 - (NSUInteger) count { CYObjectiveTry {
     else
         return [NSString stringWithUTF8String:cyon];
 } CYObjectiveCatch }
 
 - (NSUInteger) count { CYObjectiveTry {

-    JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context_, object_));
+    JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context, object_));

     size_t size(JSPropertyNameArrayGetCount(names));
     JSPropertyNameArrayRelease(names);
     return size;
 } CYObjectiveCatch }
 
 - (id) objectForKey:(id)key { CYObjectiveTry {
     size_t size(JSPropertyNameArrayGetCount(names));
     JSPropertyNameArrayRelease(names);
     return size;
 } CYObjectiveCatch }
 
 - (id) objectForKey:(id)key { CYObjectiveTry {

-    JSValueRef value(CYGetProperty(context_, object_, CYJSString(key)));
-    if (JSValueIsUndefined(context_, value))
+    JSValueRef value(CYGetProperty(context, object_, CYJSString(context, (NSObject *) key)));
+    if (JSValueIsUndefined(context, value))

         return nil;
         return nil;

-    return CYCastNSObject(NULL, context_, value) ?: [NSNull null];
+    return CYCastNSObject(NULL, context, value) ?: [NSNull null];

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

-    JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context_, object_));
-    NSEnumerator *enumerator([CYCastNSArray(names) objectEnumerator]);
+    JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context, object_));
+    NSEnumerator *enumerator([CYCastNSArray(context, names) objectEnumerator]);

     JSPropertyNameArrayRelease(names);
     return enumerator;
 } CYObjectiveCatch }
 
 - (void) setObject:(id)object forKey:(id)key { CYObjectiveTry {
     JSPropertyNameArrayRelease(names);
     return enumerator;
 } CYObjectiveCatch }
 
 - (void) setObject:(id)object forKey:(id)key { CYObjectiveTry {

-    CYSetProperty(context_, object_, CYJSString(key), CYCastJSValue(context_, object));
+    CYSetProperty(context, object_, CYJSString(context, (NSObject *) key), CYCastJSValue(context, (NSString *) object));

 } CYObjectiveCatch }
 
 - (void) removeObjectForKey:(id)key { CYObjectiveTry {
 } CYObjectiveCatch }
 
 - (void) removeObjectForKey:(id)key { CYObjectiveTry {

-    JSValueRef exception(NULL);
-    (void) JSObjectDeleteProperty(context_, object_, CYJSString(key), &exception);
-    CYThrow(context_, exception);
+    (void) _jsccall(JSObjectDeleteProperty, context, object_, CYJSString(context, (NSObject *) key));

 } CYObjectiveCatch }
 
 @end
 
 @implementation CYJSArray
 
 } CYObjectiveCatch }
 
 @end
 
 @implementation CYJSArray
 

-- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry {
+- (NSString *) cy$toCYON:(bool)objective { CYObjectiveTry {
+    CYPool pool;
+    return [NSString stringWithUTF8String:CYPoolCCYON(pool, context, object_)];
+} CYObjectiveCatch }
+
+- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry_ {

     if ((self = [super init]) != nil) {
         object_ = object;
     if ((self = [super init]) != nil) {
         object_ = object;

-        context_ = context;
+        context_ = CYGetJSContext(context);
+        JSGlobalContextRetain(context_);

         JSValueProtect(context_, object_);
     } return self;
 } CYObjectiveCatch }
 
 - (void) dealloc { CYObjectiveTry {
     JSValueUnprotect(context_, object_);
         JSValueProtect(context_, object_);
     } return self;
 } CYObjectiveCatch }
 
 - (void) dealloc { CYObjectiveTry {
     JSValueUnprotect(context_, object_);

+    JSGlobalContextRelease(context_);

     [super dealloc];
 } CYObjectiveCatch }
 
 - (NSUInteger) count { CYObjectiveTry {
     [super dealloc];
 } CYObjectiveCatch }
 
 - (NSUInteger) count { CYObjectiveTry {

-    return CYCastDouble(context_, CYGetProperty(context_, object_, length_));
+    return CYArrayLength(context, object_);

 } CYObjectiveCatch }
 
 - (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry {
     size_t bounds([self count]);
     if (index >= bounds)
 } CYObjectiveCatch }
 
 - (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry {
     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);
-    return CYCastNSObject(NULL, context_, value) ?: [NSNull null];
+        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray objectAtIndex:]: index (%zu) beyond bounds (%zu)", static_cast<size_t>(index), bounds] userInfo:nil];
+    JSValueRef value(_jsccall(JSObjectGetPropertyAtIndex, context, object_, index));
+    return CYCastNSObject(NULL, context, value) ?: [NSNull null];

 } CYObjectiveCatch }
 
 - (void) addObject:(id)object { CYObjectiveTry {
 } CYObjectiveCatch }
 
 - (void) addObject:(id)object { CYObjectiveTry {

-    JSValueRef exception(NULL);
-    JSValueRef arguments[1];
-    arguments[0] = CYCastJSValue(context_, object);
-    JSObjectCallAsFunction(context_, Array_push_, object_, 1, arguments, &exception);
-    CYThrow(context_, exception);
+    CYArrayPush(context, object_, CYCastJSValue(context, (NSObject *) object));

 } CYObjectiveCatch }
 
 - (void) insertObject:(id)object atIndex:(NSUInteger)index { CYObjectiveTry {
     size_t bounds([self count] + 1);
     if (index >= bounds)
 } CYObjectiveCatch }
 
 - (void) insertObject:(id)object atIndex:(NSUInteger)index { CYObjectiveTry {
     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);
+        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray insertObject:atIndex:]: index (%zu) beyond bounds (%zu)", static_cast<size_t>(index), bounds] userInfo:nil];

     JSValueRef arguments[3];
     JSValueRef arguments[3];

-    arguments[0] = CYCastJSValue(context_, index);
-    arguments[1] = CYCastJSValue(context_, 0);
-    arguments[2] = CYCastJSValue(context_, object);
-    JSObjectCallAsFunction(context_, Array_splice_, object_, 3, arguments, &exception);
-    CYThrow(context_, exception);
+    arguments[0] = CYCastJSValue(context, index);
+    arguments[1] = CYCastJSValue(context, 0);
+    arguments[2] = CYCastJSValue(context, (NSObject *) object);
+    JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));
+    _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, splice_s)), object_, 3, arguments);

 } CYObjectiveCatch }
 
 - (void) removeLastObject { CYObjectiveTry {
 } CYObjectiveCatch }
 
 - (void) removeLastObject { CYObjectiveTry {

-    JSValueRef exception(NULL);
-    JSObjectCallAsFunction(context_, Array_pop_, object_, 0, NULL, &exception);
-    CYThrow(context_, exception);
+    JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));
+    _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, pop_s)), object_, 0, NULL);

 } CYObjectiveCatch }
 
 - (void) removeObjectAtIndex:(NSUInteger)index { CYObjectiveTry {
     size_t bounds([self count]);
     if (index >= bounds)
 } CYObjectiveCatch }
 
 - (void) removeObjectAtIndex:(NSUInteger)index { CYObjectiveTry {
     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);
+        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray removeObjectAtIndex:]: index (%zu) beyond bounds (%zu)", static_cast<size_t>(index), bounds] userInfo:nil];

     JSValueRef arguments[2];
     JSValueRef arguments[2];

-    arguments[0] = CYCastJSValue(context_, index);
-    arguments[1] = CYCastJSValue(context_, 1);
-    JSObjectCallAsFunction(context_, Array_splice_, object_, 2, arguments, &exception);
-    CYThrow(context_, exception);
+    arguments[0] = CYCastJSValue(context, index);
+    arguments[1] = CYCastJSValue(context, 1);
+    JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));
+    _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, splice_s)), object_, 2, arguments);

 } CYObjectiveCatch }
 
 - (void) replaceObjectAtIndex:(NSUInteger)index withObject:(id)object { CYObjectiveTry {
     size_t bounds([self count]);
     if (index >= bounds)
 } CYObjectiveCatch }
 
 - (void) replaceObjectAtIndex:(NSUInteger)index withObject:(id)object { CYObjectiveTry {
     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));
+        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray replaceObjectAtIndex:withObject:]: index (%zu) beyond bounds (%zu)", static_cast<size_t>(index), bounds] userInfo:nil];
+    CYSetProperty(context, object_, index, CYCastJSValue(context, (NSObject *) object));

 } CYObjectiveCatch }
 
 @end
 
 } CYObjectiveCatch }
 
 @end
 

-// XXX: use objc_getAssociatedObject and objc_setAssociatedObject on 10.6
-struct CYInternal :
-    CYData
-{
+// XXX: inherit from or replace with CYJSObject
+@interface CYInternal : NSObject {
+    JSGlobalContextRef context_;

     JSObjectRef object_;
     JSObjectRef object_;

+}

 
 

-    CYInternal() :
-        object_(NULL)
-    {
-    }
+@end

 
 

-    ~CYInternal() {
-        // XXX: delete object_? ;(
-    }
+@implementation CYInternal

 
 

-    static CYInternal *Get(id self) {
-        CYInternal *internal(NULL);
-        if (object_getInstanceVariable(self, "cy$internal_", reinterpret_cast<void **>(&internal)) == NULL) {
-            // XXX: do something epic? ;P
-        }
+- (void) dealloc { CYObjectiveTry {
+    JSValueUnprotect(context_, object_);
+    JSGlobalContextRelease(context_);
+    [super dealloc];
+} CYObjectiveCatch }

 
 

-        return internal;
-    }
+- (id) initInContext:(JSContextRef)context { CYObjectiveTry_ {
+    if ((self = [super init]) != nil) {
+        context_ = CYGetJSContext(context);
+        JSGlobalContextRetain(context_);
+    } return self;
+} CYObjectiveCatch }

 
 

-    static CYInternal *Set(id self) {
-        CYInternal *internal(NULL);
-        if (Ivar ivar = object_getInstanceVariable(self, "cy$internal_", reinterpret_cast<void **>(&internal))) {
-            if (internal == NULL) {
-                internal = new CYInternal();
-                object_setIvar(self, ivar, reinterpret_cast<id>(internal));
-            }
-        } else {
-            // XXX: do something epic? ;P
-        }
+- (bool) hasProperty:(JSStringRef)name inContext:(JSContextRef)context {
+    if (object_ == NULL)
+        return false;

 
 

-        return internal;
-    }
+    return JSObjectHasProperty(context, object_, name);
+}

 
 

-    bool HasProperty(JSContextRef context, JSStringRef name) {
-        if (object_ == NULL)
-            return false;
-        return JSObjectHasProperty(context, object_, name);
+- (JSValueRef) getProperty:(JSStringRef)name inContext:(JSContextRef)context {
+    if (object_ == NULL)
+        return NULL;
+
+    return CYGetProperty(context, object_, name);
+}
+
+- (void) setProperty:(JSStringRef)name toValue:(JSValueRef)value inContext:(JSContextRef)context {
+    @synchronized (self) {
+        if (object_ == NULL) {
+            object_ = JSObjectMake(context, NULL, NULL);
+            JSValueProtect(context, object_);
+        }

     }
 
     }
 

-    JSValueRef GetProperty(JSContextRef context, JSStringRef name) {
-        if (object_ == NULL)
-            return NULL;
-        return CYGetProperty(context, object_, name);
+    CYSetProperty(context, object_, name, value);
+}
+
++ (CYInternal *) get:(id)object {
+    if ($objc_getAssociatedObject == NULL)
+        return nil;
+
+    @synchronized (object) {
+        if (CYInternal *internal = $objc_getAssociatedObject(object, @selector(cy$internal)))
+            return internal;

     }
 
     }
 

-    void SetProperty(JSContextRef context, JSStringRef name, JSValueRef value) {
-        if (object_ == NULL)
-            object_ = JSObjectMake(context, NULL, NULL);
-        CYSetProperty(context, object_, name, value);
+    return nil;
+}
+
++ (CYInternal *) set:(id)object inContext:(JSContextRef)context {
+    if ($objc_getAssociatedObject == NULL)
+        return nil;
+
+    @synchronized (object) {
+        if (CYInternal *internal = $objc_getAssociatedObject(object, @selector(cy$internal)))
+            return internal;
+
+        if ($objc_setAssociatedObject == NULL)
+            return nil;
+
+        CYInternal *internal([[[CYInternal alloc] initInContext:context] autorelease]);
+        objc_setAssociatedObject(object, @selector(cy$internal), internal, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+        return internal;

     }
     }

-};
+
+    return nil;
+}
+
+@end

 
 static JSObjectRef CYMakeSelector(JSContextRef context, SEL sel) {
     Selector_privateData *internal(new Selector_privateData(sel));
 
 static JSObjectRef CYMakeSelector(JSContextRef context, SEL sel) {
     Selector_privateData *internal(new Selector_privateData(sel));


@@ -1180,30 +1440,53 @@ static SEL CYCastSEL(JSContextRef context, JSValueRef value) {
         return CYCastPointer<SEL>(context, value);
 }
 
         return CYCastPointer<SEL>(context, value);
 }
 

-void *CYObjectiveC_ExecuteStart(JSContextRef context) {
-    // XXX: deal with exceptions!
+void *CYObjectiveC_ExecuteStart(JSContextRef context) { CYSadTry {

     return (void *) [[NSAutoreleasePool alloc] init];
     return (void *) [[NSAutoreleasePool alloc] init];

-}
+} CYSadCatch(NULL) }

 
 

-void CYObjectiveC_ExecuteEnd(JSContextRef context, void *handle) {
-    // XXX: deal with exceptions!
+void CYObjectiveC_ExecuteEnd(JSContextRef context, void *handle) { CYSadTry {

     return [(NSAutoreleasePool *) handle release];
     return [(NSAutoreleasePool *) handle release];

-}
+} CYSadCatch() }

 
 

-JSValueRef CYObjectiveC_RuntimeProperty(JSContextRef context, CYUTF8String name) { CYObjectiveTry_(context) {
+JSValueRef CYObjectiveC_RuntimeProperty(JSContextRef context, CYUTF8String name) { CYPoolTry {

     if (name == "nil")
         return Instance::Make(context, nil);
     if (Class _class = objc_getClass(name.data))
         return CYMakeInstance(context, _class, true);
     if (name == "nil")
         return Instance::Make(context, nil);
     if (Class _class = objc_getClass(name.data))
         return CYMakeInstance(context, _class, true);

+    if (Protocol *protocol = objc_getProtocol(name.data))
+        return CYMakeInstance(context, protocol, true);

     return NULL;
     return NULL;

-} CYObjectiveCatch }
+} CYPoolCatch(NULL) return /*XXX*/ NULL; }

 
 

-static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { CYObjectiveTry_(context) {
+static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { CYSadTry {

     ffi_call(cif, function, value, values);
     ffi_call(cif, function, value, values);

-} CYObjectiveCatch }
+} CYSadCatch() }
+
+static bool CYObjectiveC_PoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry {
+    // XXX: assigning to an indirect id * works for return values, but not for properties and fields

 
 

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

     switch (type->primitive) {
     switch (type->primitive) {

+        case sig::block_P: {
+            _assert(type->data.signature.count != 0);
+            sig::Signature signature;
+            sig::Copy(*pool, signature, type->data.signature);
+
+            sig::Element *elements(new(*pool) sig::Element[++signature.count]);
+            elements[0] = signature.elements[0];
+            memcpy(elements + 2, signature.elements + 1, sizeof(sig::Element) * (signature.count - 2));
+            signature.elements = elements;
+
+            elements[1].name = NULL;
+            elements[1].type = new(*pool) sig::Type();
+            elements[1].offset = _not(size_t);
+
+            memset(elements[1].type, 0, sizeof(sig::Type));
+            elements[1].type->primitive = sig::object_P;
+
+            JSObjectRef function(CYCastJSObject(context, value));
+            *reinterpret_cast<id *>(data) = CYMakeBlock(context, function, signature);
+        } break;
+

         case sig::object_P:
         case sig::typename_P:
             *reinterpret_cast<id *>(data) = CYCastNSObject(pool, context, value);
         case sig::object_P:
         case sig::typename_P:
             *reinterpret_cast<id *>(data) = CYCastNSObject(pool, context, value);


@@ -1218,12 +1501,14 @@ static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Ty
     }
 
     return true;
     }
 
     return true;

-} CYObjectiveCatch }
+} CYSadCatch(false) }

 
 

-static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) { CYObjectiveTry_(context) {
+static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) { CYPoolTry {

     switch (type->primitive) {
     switch (type->primitive) {

+        // XXX: do something epic about blocks
+        case sig::block_P:

         case sig::object_P:
         case sig::object_P:

-            if (id object = *reinterpret_cast<id *>(data)) {
+            if (NSObject *object = *reinterpret_cast<NSObject **>(data)) {

                 JSValueRef value(CYCastJSValue(context, object));
                 if (initialize)
                     [object release];
                 JSValueRef value(CYCastJSValue(context, object));
                 if (initialize)
                     [object release];


@@ -1243,23 +1528,18 @@ static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ff
         default:
             return NULL;
     }
         default:
             return NULL;
     }

-} CYObjectiveCatch }
+} CYPoolCatch(NULL) return /*XXX*/ NULL; }

 
 

-static CYHooks CYObjectiveCHooks = {
-    &CYObjectiveC_ExecuteStart,
-    &CYObjectiveC_ExecuteEnd,
-    &CYObjectiveC_RuntimeProperty,
-    &CYObjectiveC_CallFunction,
-    &CYObjectiveC_PoolFFI,
-    &CYObjectiveC_FromFFI,
-};
-
-static bool CYImplements(id object, Class _class, SEL selector, bool devoid) {
+static bool CYImplements(id object, Class _class, SEL selector, bool devoid = false) {

     if (objc_method *method = class_getInstanceMethod(_class, selector)) {
         if (!devoid)
             return true;
     if (objc_method *method = class_getInstanceMethod(_class, selector)) {
         if (!devoid)
             return true;

+#if OBJC_API_VERSION >= 2

         char type[16];
         method_getReturnType(method, type, sizeof(type));
         char type[16];
         method_getReturnType(method, type, sizeof(type));

+#else
+        const char *type(method_getTypeEncoding(method));
+#endif

         if (type[0] != 'v')
             return true;
     }
         if (type[0] != 'v')
             return true;
     }


@@ -1268,59 +1548,31 @@ static bool CYImplements(id object, Class _class, SEL selector, bool devoid) {
     return false;
 }
 
     return false;
 }
 

-static const char *CYPoolTypeEncoding(apr_pool_t *pool, JSContextRef context, SEL sel, objc_method *method) {
+static const char *CYPoolTypeEncoding(CYPool &pool, JSContextRef context, SEL sel, objc_method *method) {

     if (method != NULL)
         return method_getTypeEncoding(method);
 
     const char *name(sel_getName(sel));
     if (method != NULL)
         return method_getTypeEncoding(method);
 
     const char *name(sel_getName(sel));

+    size_t length(strlen(name));

 
 

-    sqlite3_stmt *statement;
-
-    _sqlcall(sqlite3_prepare(Bridge_,
-        "select "
-            "\"bridge\".\"value\" "
-        "from \"bridge\" "
-        "where"
-            " \"bridge\".\"mode\" = -1 and"
-            " \"bridge\".\"name\" = ?"
-        " limit 1"
-    , -1, &statement, NULL));
-
-    _trace();
-    _sqlcall(sqlite3_bind_text(statement, 1, name, -1, SQLITE_STATIC));
-
-    const char *value;
-    if (_sqlcall(sqlite3_step(statement)) == SQLITE_DONE) {
-    _trace();
-        value = NULL;}
-    else {
-    _trace();
-        value = sqlite3_column_pooled(pool, statement, 0);
-        }
+    char keyed[length + 2];
+    keyed[0] = '6';
+    keyed[length + 1] = '\0';
+    memcpy(keyed + 1, name, length);

 
 

-    _sqlcall(sqlite3_finalize(statement));
+    if (CYBridgeEntry *entry = CYBridgeHash(keyed, length + 1))
+        return entry->value_;

 
 

-    if (value != NULL)
-        return value;
-_trace();

     return NULL;
 }
 
     return NULL;
 }
 

-static void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
-    Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg));
-
-    JSContextRef context(internal->context_);
-
-    size_t count(internal->cif_.nargs);
-    JSValueRef values[count];
-
-    for (size_t index(0); index != count; ++index)
-        values[index] = CYFromFFI(context, internal->signature_.elements[1 + index].type, internal->cif_.arg_types[index], arguments[index]);
-
+static JSValueRef MessageAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) {

     JSObjectRef _this(CYCastJSObject(context, values[0]));
     JSObjectRef _this(CYCastJSObject(context, values[0]));

+    return CYCallAsFunction(context, function, _this, count - 2, values + 2);
+}

 
 

-    JSValueRef value(CYCallAsFunction(context, internal->function_, _this, count - 2, values + 2));
-    CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value);
+static void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
+    CYExecuteClosure(cif, result, arguments, arg, &MessageAdapter_);

 }
 
 static JSObjectRef CYMakeMessage(JSContextRef context, SEL sel, IMP imp, const char *type) {
 }
 
 static JSObjectRef CYMakeMessage(JSContextRef context, SEL sel, IMP imp, const char *type) {


@@ -1328,9 +1580,13 @@ static JSObjectRef CYMakeMessage(JSContextRef context, SEL sel, IMP imp, const c
     return JSObjectMake(context, Message_, internal);
 }
 
     return JSObjectMake(context, Message_, internal);
 }
 

-static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *type) {
+static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *encoding) {

     JSObjectRef function(CYCastJSObject(context, value));
     JSObjectRef function(CYCastJSObject(context, value));

-    Closure_privateData *internal(CYMakeFunctor_(context, function, type, &MessageClosure_));
+    CYPool pool;
+    sig::Signature signature;
+    sig::Parse(pool, &signature, encoding, &Structor_);
+    Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &MessageClosure_));
+    // XXX: see notes in Library.cpp about needing to leak

     return reinterpret_cast<IMP>(internal->GetValue());
 }
 
     return reinterpret_cast<IMP>(internal->GetValue());
 }
 


@@ -1348,7 +1604,7 @@ static bool Messages_hasProperty(JSContextRef context, JSObjectRef object, JSStr
     return false;
 }
 
     return false;
 }
 

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

     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
     Class _class(internal->GetValue());
 
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
     Class _class(internal->GetValue());
 


@@ -1360,9 +1616,9 @@ static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object,
             return CYMakeMessage(context, sel, method_getImplementation(method), method_getTypeEncoding(method));
 
     return NULL;
             return CYMakeMessage(context, sel, method_getImplementation(method), method_getTypeEncoding(method));
 
     return NULL;

-}
+} CYCatch(NULL) }

 
 

-static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) {
+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());
 
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
     Class _class(internal->GetValue());
 


@@ -1387,19 +1643,27 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
 
     if (method != NULL)
         method_setImplementation(method, imp);
 
     if (method != NULL)
         method_setImplementation(method, imp);

-    else
-        class_replaceMethod(_class, sel, imp, type);
+    else {
+#ifdef GNU_RUNTIME
+        GSMethodList list(GSAllocMethodList(1));
+        GSAppendMethodToList(list, sel, type, imp, YES);
+        GSAddMethodList(_class, list, YES);
+        GSFlushMethodCacheForClass(_class);
+#else
+        class_addMethod(_class, sel, imp, type);
+#endif
+    }

 
     return true;
 
     return true;

-}
+} CYCatch(false) }

 
 

-#if !__OBJC2__
-static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+#if 0 && OBJC_API_VERSION < 2
+static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {

     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
     Class _class(internal->GetValue());
 
     CYPool pool;
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
     Class _class(internal->GetValue());
 
     CYPool pool;

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

 
     if (SEL sel = sel_getUid(name))
         if (objc_method *method = class_getInstanceMethod(_class, sel)) {
 
     if (SEL sel = sel_getUid(name))
         if (objc_method *method = class_getInstanceMethod(_class, sel)) {


@@ -1409,18 +1673,31 @@ static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JS
         }
 
     return false;
         }
 
     return false;

-}
+} CYCatch(false) }

 #endif
 
 static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
     Class _class(internal->GetValue());
 
 #endif
 
 static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
     Class _class(internal->GetValue());
 

+#if OBJC_API_VERSION >= 2

     unsigned int size;
     objc_method **data(class_copyMethodList(_class, &size));
     for (size_t i(0); i != size; ++i)
         JSPropertyNameAccumulatorAddName(names, CYJSString(sel_getName(method_getName(data[i]))));
     free(data);
     unsigned int size;
     objc_method **data(class_copyMethodList(_class, &size));
     for (size_t i(0); i != size; ++i)
         JSPropertyNameAccumulatorAddName(names, CYJSString(sel_getName(method_getName(data[i]))));
     free(data);

+#else
+    for (objc_method_list *methods(_class->methods); methods != NULL; methods = methods->method_next)
+        for (int i(0); i != methods->method_count; ++i)
+            JSPropertyNameAccumulatorAddName(names, CYJSString(sel_getName(method_getName(&methods->method_list[i]))));
+#endif
+}
+
+static bool CYHasImplicitProperties(Class _class) {
+    // XXX: this is an evil hack to deal with NSProxy; fix elsewhere
+    if (!CYImplements(_class, object_getClass(_class), @selector(cy$hasImplicitProperties)))
+        return true;
+    return [_class cy$hasImplicitProperties];

 }
 
 static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
 }
 
 static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {


@@ -1431,29 +1708,32 @@ static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStr
         return true;
 
     CYPool pool;
         return true;
 
     CYPool pool;

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

 
 

-    if (CYInternal *internal = CYInternal::Get(self))
-        if (internal->HasProperty(context, property))
+    if (CYInternal *internal = [CYInternal get:self])
+        if ([internal hasProperty:property inContext:context])

             return true;
 
     Class _class(object_getClass(self));
 
     CYPoolTry {
         // XXX: this is an evil hack to deal with NSProxy; fix elsewhere
             return true;
 
     Class _class(object_getClass(self));
 
     CYPoolTry {
         // XXX: this is an evil hack to deal with NSProxy; fix elsewhere

-        if (CYImplements(self, _class, @selector(cy$hasProperty:), false))
+        if (CYImplements(self, _class, @selector(cy$hasProperty:)))

             if ([self cy$hasProperty:name])
                 return true;
     } CYPoolCatch(false)
 
     const char *string(CYPoolCString(pool, context, name));
 
             if ([self cy$hasProperty:name])
                 return true;
     } CYPoolCatch(false)
 
     const char *string(CYPoolCString(pool, context, name));
 

+#ifdef __APPLE__

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

+#endif

 
 

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

 
     return false;
 }
 
     return false;
 }


@@ -1466,15 +1746,15 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object,
         return Internal::Make(context, self, object);
 
     CYPool pool;
         return Internal::Make(context, self, object);
 
     CYPool pool;

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

 
 

-    if (CYInternal *internal = CYInternal::Get(self))
-        if (JSValueRef value = internal->GetProperty(context, property))
+    if (CYInternal *internal = [CYInternal get:self])
+        if (JSValueRef value = [internal getProperty:property inContext:context])

             return value;
 
     CYPoolTry {
             return value;
 
     CYPoolTry {

-        if (NSObject *data = [self cy$getProperty:name])
-            return CYCastJSValue(context, data);
+        if (JSValueRef value = [self cy$getProperty:name inContext:context])
+            return value;

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


@@ -1484,16 +1764,17 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object,
     if (objc_property_t property = class_getProperty(_class, string)) {
         PropertyAttributes attributes(property);
         SEL sel(sel_registerName(attributes.Getter()));
     if (objc_property_t property = class_getProperty(_class, string)) {
         PropertyAttributes attributes(property);
         SEL sel(sel_registerName(attributes.Getter()));

-        return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception);
+        return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false);

     }
 #endif
 
     }
 #endif
 

-    if (SEL sel = sel_getUid(string))
-        if (CYImplements(self, _class, sel, true))
-            return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception);
+    if (CYHasImplicitProperties(_class))
+        if (SEL sel = sel_getUid(string))
+            if (CYImplements(self, _class, sel, true))
+                return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false);

 
     return NULL;
 
     return NULL;

-} CYCatch }
+} CYCatch(NULL) }

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


@@ -1501,13 +1782,13 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
 
     CYPool pool;
 
 
     CYPool pool;
 

-    NSString *name(CYCastNSString(pool, property));
-    NSObject *data(CYCastNSObject(pool, context, value));
+    NSString *name(CYCastNSString(&pool, context, property));
+    NSObject *data(CYCastNSObject(&pool, context, value));

 
     CYPoolTry {
         if ([self cy$setProperty:name to:data])
             return true;
 
     CYPoolTry {
         if ([self cy$setProperty:name to:data])
             return true;

-    } CYPoolCatch(NULL)
+    } CYPoolCatch(false)

 
     const char *string(CYPoolCString(pool, context, name));
     Class _class(object_getClass(self));
 
     const char *string(CYPoolCString(pool, context, name));
     Class _class(object_getClass(self));


@@ -1518,7 +1799,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
         if (const char *setter = attributes.Setter()) {
             SEL sel(sel_registerName(setter));
             JSValueRef arguments[1] = {value};
         if (const char *setter = attributes.Setter()) {
             SEL sel(sel_registerName(setter));
             JSValueRef arguments[1] = {value};

-            CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception);
+            CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false);

             return true;
         }
     }
             return true;
         }
     }


@@ -1541,28 +1822,41 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
     set[length + 4] = '\0';
 
     if (SEL sel = sel_getUid(set))
     set[length + 4] = '\0';
 
     if (SEL sel = sel_getUid(set))

-        if (CYImplements(self, _class, sel, false)) {
+        if (CYImplements(self, _class, sel)) {

             JSValueRef arguments[1] = {value};
             JSValueRef arguments[1] = {value};

-            CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception);
+            CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false);
+            return true;

         }
 
         }
 

-    if (CYInternal *internal = CYInternal::Set(self)) {
-        internal->SetProperty(context, property, value);
+    if (CYInternal *internal = [CYInternal set:self inContext:context]) {
+        [internal setProperty:property toValue:value inContext:context];

         return true;
     }
 
     return false;
         return true;
     }
 
     return false;

-} CYCatch }
+} CYCatch(false) }

 
 static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->GetValue());
 
     CYPoolTry {
 
 static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->GetValue());
 
     CYPoolTry {

-        NSString *name(CYCastNSString(NULL, property));
+        NSString *name(CYCastNSString(NULL, context, property));

         return [self cy$deleteProperty:name];
         return [self cy$deleteProperty:name];

-    } CYPoolCatch(NULL)
-} CYCatch }
+    } CYPoolCatch(false)
+} CYCatch(false) return /*XXX*/ false; }
+
+static void Instance_getPropertyNames_message(JSPropertyNameAccumulatorRef names, objc_method *method) {
+    const char *name(sel_getName(method_getName(method)));
+    if (strchr(name, ':') != NULL)
+        return;
+
+    const char *type(method_getTypeEncoding(method));
+    if (type == NULL || *type == '\0' || *type == 'v')
+        return;
+
+    JSPropertyNameAccumulatorAddName(names, CYJSString(name));
+}

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


@@ -1581,10 +1875,25 @@ static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object,
     }
 #endif
 
     }
 #endif
 

+    if (CYHasImplicitProperties(_class))
+        for (Class current(_class); current != nil; current = class_getSuperclass(current)) {
+#if OBJC_API_VERSION >= 2
+            unsigned int size;
+            objc_method **data(class_copyMethodList(current, &size));
+            for (size_t i(0); i != size; ++i)
+                Instance_getPropertyNames_message(names, data[i]);
+            free(data);
+#else
+            for (objc_method_list *methods(current->methods); methods != NULL; methods = methods->method_next)
+                for (int i(0); i != methods->method_count; ++i)
+                    Instance_getPropertyNames_message(names, &methods->method_list[i]);
+#endif
+        }
+

     CYPoolTry {
         // XXX: this is an evil hack to deal with NSProxy; fix elsewhere
     CYPoolTry {
         // XXX: this is an evil hack to deal with NSProxy; fix elsewhere

-        if (CYImplements(self, _class, @selector(cy$getPropertyNames:), false))
-            [self cy$getPropertyNames:names];
+        if (CYImplements(self, _class, @selector(cy$getPropertyNames:inContext:)))
+            [self cy$getPropertyNames:names inContext:context];

     } CYPoolCatch()
 }
 
     } CYPoolCatch()
 }
 


@@ -1592,7 +1901,55 @@ static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     JSObjectRef value(Instance::Make(context, [internal->GetValue() alloc], Instance::Uninitialized));
     return value;
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     JSObjectRef value(Instance::Make(context, [internal->GetValue() alloc], Instance::Uninitialized));
     return value;

-} CYCatch }
+} CYCatch(NULL) }
+
+static JSValueRef Instance_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());
+
+    if (![self isKindOfClass:NSBlock_])
+        CYThrow("non-NSBlock object is not a function");
+    // XXX: replace above logic with the following assertion
+    //_assert([self isKindOfClass:NSBlock_]);
+    // to do this, make it so FunctionInstance_ is the class of blocks
+    // to do /that/, generalize the various "is exactly Instance_" checks
+    // then, move Instance_callAsFunction to only be on FunctionInstance
+
+    BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(self));
+
+    if ((literal->flags & BLOCK_HAS_SIGNATURE) != 0) {
+        uint8_t *descriptor(reinterpret_cast<uint8_t *>(literal->descriptor));
+        descriptor += sizeof(BlockDescriptor1);
+        if ((literal->flags & BLOCK_HAS_COPY_DISPOSE) != 0)
+            descriptor += sizeof(BlockDescriptor2);
+        BlockDescriptor3 *descriptor3(reinterpret_cast<BlockDescriptor3 *>(descriptor));
+
+        if (const char *type = descriptor3->signature) {
+            CYPool pool;
+
+            void *setup[1];
+            setup[0] = &self;
+
+            sig::Signature signature;
+            sig::Parse(pool, &signature, type, &Structor_);
+
+            ffi_cif cif;
+            sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
+
+            void (*function)() = reinterpret_cast<void (*)()>(literal->invoke);
+            return CYCallFunction(pool, context, 1, setup, count, arguments, false, &signature, &cif, function);
+        }
+    }
+
+    if (count != 0)
+        CYThrow("NSBlock without signature field passed arguments");
+
+    CYPoolTry {
+        [self invoke];
+    } CYPoolCatch(NULL);
+
+    return NULL;
+} CYCatch(NULL) }

 
 static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) constructor)));
 
 static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) constructor)));


@@ -1600,14 +1957,24 @@ static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor,
     if (!CYIsClass(_class))
         return false;
 
     if (!CYIsClass(_class))
         return false;
 

-    if (JSValueIsObjectOfClass(context, instance, Instance_)) {
+    if (CYJSValueIsNSObject(context, instance)) {

         Instance *linternal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) instance)));
         // XXX: this isn't always safe
         return [linternal->GetValue() isKindOfClass:_class];
     }
 
     return false;
         Instance *linternal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) instance)));
         // XXX: this isn't always safe
         return [linternal->GetValue() isKindOfClass:_class];
     }
 
     return false;

-} CYCatch }
+} CYCatch(false) }
+
+static JSValueRef Instance_box_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    if (count == 0)
+        throw CYJSError(context, "incorrect number of arguments to Instance");
+    CYPool pool;
+    id value(CYCastNSObject(&pool, context, arguments[0]));
+    if (value == nil)
+        value = [NSNull 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 Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));


@@ -1622,6 +1989,23 @@ static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStr
     return false;
 }
 
     return false;
 }
 

+static void CYBitField(unsigned &length, unsigned &shift, id self, Ivar ivar, const char *encoding, unsigned offset) {
+    length = CYCastDouble(encoding + 1);
+    shift = 0;
+
+    unsigned int size;
+    objc_ivar **ivars(class_copyIvarList(object_getClass(self), &size));
+    for (size_t i(0); i != size; ++i)
+        if (ivars[i] == ivar)
+            break;
+        else if (ivar_getOffset(ivars[i]) == offset) {
+            const char *encoding(ivar_getTypeEncoding(ivars[i]));
+            _assert(encoding[0] == 'b');
+            shift += CYCastDouble(encoding + 1);
+        }
+    free(ivars);
+}
+

 static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
     CYPool pool;
 static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
     CYPool pool;


@@ -1629,13 +2013,31 @@ static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object,
     id self(internal->GetValue());
     const char *name(CYPoolCString(pool, context, property));
 
     id self(internal->GetValue());
     const char *name(CYPoolCString(pool, context, property));
 

-    if (Ivar ivar = object_getInstanceVariable(self, name, NULL)) {
-        Type_privateData type(pool, ivar_getTypeEncoding(ivar));
-        return CYFromFFI(context, type.type_, type.GetFFI(), reinterpret_cast<uint8_t *>(self) + ivar_getOffset(ivar));
+#ifdef __arm64__
+    if (strcmp(name, "isa") == 0)
+        return CYCastJSValue(context, object_getClass(self));
+#endif
+
+    if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {
+        ptrdiff_t offset(ivar_getOffset(ivar));
+        void *data(reinterpret_cast<uint8_t *>(self) + offset);
+
+        const char *encoding(ivar_getTypeEncoding(ivar));
+        if (encoding[0] == 'b') {
+            unsigned length, shift;
+            CYBitField(length, shift, self, ivar, encoding, offset);
+            _assert(shift + length <= sizeof(uintptr_t) * 8);
+            uintptr_t &field(*reinterpret_cast<uintptr_t *>(data));
+            uintptr_t mask((1 << length) - 1);
+            return CYCastJSValue(context, (field >> shift) & mask);
+        } else {
+            Type_privateData type(pool, ivar_getTypeEncoding(ivar));
+            return CYFromFFI(context, type.type_, type.GetFFI(), data);
+        }

     }
 
     return NULL;
     }
 
     return NULL;

-} CYCatch }
+} 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 Internal_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));


@@ -1644,24 +2046,43 @@ static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStr
     id self(internal->GetValue());
     const char *name(CYPoolCString(pool, context, property));
 
     id self(internal->GetValue());
     const char *name(CYPoolCString(pool, context, property));
 

-    if (Ivar ivar = object_getInstanceVariable(self, name, NULL)) {
-        Type_privateData type(pool, ivar_getTypeEncoding(ivar));
-        CYPoolFFI(pool, context, type.type_, type.GetFFI(), reinterpret_cast<uint8_t *>(self) + ivar_getOffset(ivar), value);
-        return true;
+    if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {
+        ptrdiff_t offset(ivar_getOffset(ivar));
+        void *data(reinterpret_cast<uint8_t *>(self) + offset);
+
+        const char *encoding(ivar_getTypeEncoding(ivar));
+        if (encoding[0] == 'b') {
+            unsigned length, shift;
+            CYBitField(length, shift, self, ivar, encoding, offset);
+            _assert(shift + length <= sizeof(uintptr_t) * 8);
+            uintptr_t &field(*reinterpret_cast<uintptr_t *>(data));
+            uintptr_t mask((1 << length) - 1);
+            field = field & ~(mask << shift) | (uintptr_t(CYCastDouble(context, value)) & mask) << shift;
+        } else {
+            Type_privateData type(pool, ivar_getTypeEncoding(ivar));
+            CYPoolFFI(&pool, context, type.type_, type.GetFFI(), reinterpret_cast<uint8_t *>(self) + ivar_getOffset(ivar), value);
+            return true;
+        }

     }
 
     return false;
     }
 
     return false;

-} CYCatch }
+} CYCatch(false) }

 
 static void Internal_getPropertyNames_(Class _class, JSPropertyNameAccumulatorRef names) {
     if (Class super = class_getSuperclass(_class))
         Internal_getPropertyNames_(super, names);
 
 
 static void Internal_getPropertyNames_(Class _class, JSPropertyNameAccumulatorRef names) {
     if (Class super = class_getSuperclass(_class))
         Internal_getPropertyNames_(super, names);
 

+#if OBJC_API_VERSION >= 2

     unsigned int size;
     unsigned int size;

-    Ivar *data(class_copyIvarList(_class, &size));
+    objc_ivar **data(class_copyIvarList(_class, &size));

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

+#else
+    if (objc_ivar_list *ivars = _class->ivars)
+        for (int i(0); i != ivars->ivar_count; ++i)
+            JSPropertyNameAccumulatorAddName(names, CYJSString(ivar_getName(&ivars->ivar_list[i])));
+#endif

 }
 
 static void Internal_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
 }
 
 static void Internal_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {


@@ -1674,40 +2095,59 @@ static void Internal_getPropertyNames(JSContextRef context, JSObjectRef object,
     Internal_getPropertyNames_(_class, names);
 }
 
     Internal_getPropertyNames_(_class, names);
 }
 

-static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+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();
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
     return internal->GetOwner();

-}
+} CYCatch(NULL) }

 
 static JSValueRef ObjectiveC_Classes_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     CYPool pool;
 
 static JSValueRef ObjectiveC_Classes_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     CYPool pool;

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

     if (Class _class = NSClassFromString(name))
         return CYMakeInstance(context, _class, true);
     return NULL;
     if (Class _class = NSClassFromString(name))
         return CYMakeInstance(context, _class, true);
     return NULL;

-} CYCatch }
+} CYCatch(NULL) }

 
 

-static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
-    size_t size(objc_getClassList(NULL, 0));
+#ifdef __APPLE__
+static Class *CYCopyClassList(size_t &size) {
+    size = objc_getClassList(NULL, 0);

     Class *data(reinterpret_cast<Class *>(malloc(sizeof(Class) * size)));
 
     Class *data(reinterpret_cast<Class *>(malloc(sizeof(Class) * size)));
 

-  get:
-    size_t writ(objc_getClassList(data, size));
-    if (size < writ) {
+    for (;;) {
+        size_t writ(objc_getClassList(data, size));
+        if (writ <= size) {
+            size = writ;
+            return data;
+        }
+
+        Class *copy(reinterpret_cast<Class *>(realloc(data, sizeof(Class) * writ)));
+        if (copy == NULL) {
+            free(data);
+            return NULL;
+        }
+
+        data = copy;

         size = writ;
         size = writ;

-        if (Class *copy = reinterpret_cast<Class *>(realloc(data, sizeof(Class) * writ))) {
-            data = copy;
-            goto get;
-        } else goto done;

     }
     }

+}
+#endif

 
 

-    for (size_t i(0); i != writ; ++i)
-        JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(data[i])));
-
-  done:
-    free(data);
+static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
+#ifdef __APPLE__
+    size_t size;
+    if (Class *data = CYCopyClassList(size)) {
+        for (size_t i(0); i != size; ++i)
+            JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(data[i])));
+        free(data);
+    }
+#else
+    void *state(NULL);
+    while (Class _class = objc_next_class(&state))
+        JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(_class)));
+#endif

 }
 
 }
 

+#if OBJC_API_VERSION >= 2

 static JSValueRef ObjectiveC_Image_Classes_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     const char *internal(reinterpret_cast<const char *>(JSObjectGetPrivate(object)));
 
 static JSValueRef ObjectiveC_Image_Classes_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     const char *internal(reinterpret_cast<const char *>(JSObjectGetPrivate(object)));
 


@@ -1728,7 +2168,7 @@ static JSValueRef ObjectiveC_Image_Classes_getProperty(JSContextRef context, JSO
   free:
     free(data);
     return value;
   free:
     free(data);
     return value;

-} CYCatch }
+} CYCatch(NULL) }

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


@@ -1757,7 +2197,7 @@ static JSValueRef ObjectiveC_Images_getProperty(JSContextRef context, JSObjectRe
     JSObjectRef value(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, value, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Image_Classes_, const_cast<char *>(name)));
     return value;
     JSObjectRef value(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, value, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Image_Classes_, const_cast<char *>(name)));
     return value;

-} CYCatch }
+} CYCatch(NULL) }

 
 static void ObjectiveC_Images_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     unsigned int size;
 
 static void ObjectiveC_Images_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     unsigned int size;


@@ -1766,39 +2206,169 @@ static void ObjectiveC_Images_getPropertyNames(JSContextRef context, JSObjectRef
         JSPropertyNameAccumulatorAddName(names, CYJSString(data[i]));
     free(data);
 }
         JSPropertyNameAccumulatorAddName(names, CYJSString(data[i]));
     free(data);
 }

+#endif

 
 static JSValueRef ObjectiveC_Protocols_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     CYPool pool;
 
 static JSValueRef ObjectiveC_Protocols_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     CYPool pool;

-    NSString *name(CYCastNSString(pool, property));
-    if (Protocol *protocol = NSProtocolFromString(name))
+    const char *name(CYPoolCString(pool, context, property));
+    if (Protocol *protocol = objc_getProtocol(name))

         return CYMakeInstance(context, protocol, true);
     return NULL;
         return CYMakeInstance(context, protocol, true);
     return NULL;

-} CYCatch }
+} CYCatch(NULL) }

 
 static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
 
 static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {

+#if OBJC_API_VERSION >= 2

     unsigned int size;
     Protocol **data(objc_copyProtocolList(&size));
     for (size_t i(0); i != size; ++i)
         JSPropertyNameAccumulatorAddName(names, CYJSString(protocol_getName(data[i])));
     free(data);
     unsigned int size;
     Protocol **data(objc_copyProtocolList(&size));
     for (size_t i(0); i != size; ++i)
         JSPropertyNameAccumulatorAddName(names, CYJSString(protocol_getName(data[i])));
     free(data);

+#else
+    // XXX: fix this!
+#endif
+}
+
+static JSValueRef ObjectiveC_Constants_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+    CYPool pool;
+    CYUTF8String name(CYPoolUTF8String(pool, context, property));
+    if (name == "nil")
+        return Instance::Make(context, nil);
+    return NULL;
+} CYCatch(NULL) }
+
+static void ObjectiveC_Constants_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
+    JSPropertyNameAccumulatorAddName(names, CYJSString("nil"));
+}
+
+#ifdef __APPLE__
+static kern_return_t CYReadMemory(task_t task, vm_address_t address, vm_size_t size, void **data) {
+    *data = reinterpret_cast<void *>(address);
+    return KERN_SUCCESS;
+}
+
+struct CYChoice {
+    std::set<Class> query_;
+    JSContextRef context_;
+    JSObjectRef results_;
+};
+
+struct CYObjectStruct {
+    Class isa_;
+};
+
+static void choose_(task_t task, void *baton, unsigned type, vm_range_t *ranges, unsigned count) {
+    CYChoice *choice(reinterpret_cast<CYChoice *>(baton));
+    JSContextRef context(choice->context_);
+
+    for (unsigned i(0); i != count; ++i) {
+        vm_range_t &range(ranges[i]);
+        void *data(reinterpret_cast<void *>(range.address));
+        size_t size(range.size);
+
+        if (size < sizeof(CYObjectStruct))
+            continue;
+
+        uintptr_t *pointers(reinterpret_cast<uintptr_t *>(data));
+#ifdef __arm64__
+        Class isa(reinterpret_cast<Class>(pointers[0] & 0x1fffffff8));
+#else
+        Class isa(reinterpret_cast<Class>(pointers[0]));
+#endif
+
+        std::set<Class>::const_iterator result(choice->query_.find(isa));
+        if (result == choice->query_.end())
+            continue;
+
+        // XXX: if (size < class_getInstanceSize(*result))
+        if ((class_getInstanceSize(*result) + 15) / 16 * 16 != size)
+            continue;
+        CYArrayPush(context, choice->results_, CYCastJSValue(context, reinterpret_cast<id>(data)));
+    }

 }
 
 }
 

+static JSValueRef choose(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    if (count != 1)
+        throw CYJSError(context, "choose() takes a class argument");
+
+    CYPool pool;
+    Class _class(CYCastNSObject(&pool, context, arguments[0]));
+
+    vm_address_t *zones(NULL);
+    unsigned size(0);
+    kern_return_t error(malloc_get_all_zones(0, &CYReadMemory, &zones, &size));
+    _assert(error == KERN_SUCCESS);
+
+    JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array")));
+    JSObjectRef results(_jsccall(JSObjectCallAsConstructor, context, Array, 0, NULL));
+
+    CYChoice choice;
+    choice.context_ = context;
+    choice.results_ = results;
+
+    size_t number;
+    Class *classes(CYCopyClassList(number));
+    _assert(classes != NULL);
+
+    for (size_t i(0); i != number; ++i)
+        for (Class current(classes[i]); current != Nil; current = class_getSuperclass(current))
+            if (current == _class) {
+                choice.query_.insert(classes[i]);
+                break;
+            }
+
+    free(classes);
+
+    for (unsigned i(0); i != size; ++i) {
+        const malloc_zone_t *zone(reinterpret_cast<const malloc_zone_t *>(zones[i]));
+        if (zone == NULL || zone->introspect == NULL)
+            continue;
+
+        zone->introspect->enumerator(mach_task_self(), &choice, MALLOC_PTR_IN_USE_RANGE_TYPE, zones[i], &CYReadMemory, &choose_);
+    }
+
+    return results;
+} CYCatch(NULL) }
+#endif
+
+#ifdef __APPLE__
+#if defined(__i386__) || defined(__x86_64__)
+#define OBJC_MAX_STRUCT_BY_VALUE 8
+static int struct_forward_array[] = {
+    0, 0, 0, 1, 0, 1, 1, 1, 0 };
+#elif defined(__arm__)
+#define OBJC_MAX_STRUCT_BY_VALUE 1
+static int struct_forward_array[] = {
+    0, 0 };
+#elif defined(__arm64__)
+#define CY_NO_STRET
+#else
+#error missing objc-runtime-info
+#endif
+
+#ifndef CY_NO_STRET

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

+#endif
+#endif

 
 

-JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class _class, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception) { CYTry {
+JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _class, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize) {

     const char *type;
 
     if (_class == NULL)
         _class = object_getClass(self);
 
     const char *type;
 
     if (_class == NULL)
         _class = object_getClass(self);
 

-    if (objc_method *method = class_getInstanceMethod(_class, _cmd))
+    IMP imp;
+
+    if (objc_method *method = class_getInstanceMethod(_class, _cmd)) {
+        imp = method_getImplementation(method);

         type = method_getTypeEncoding(method);
         type = method_getTypeEncoding(method);

-    else {
+    } else {
+        imp = NULL;
+

         CYPoolTry {
             NSMethodSignature *method([self methodSignatureForSelector:_cmd]);
             if (method == nil)
         CYPoolTry {
             NSMethodSignature *method([self methodSignatureForSelector:_cmd]);
             if (method == nil)


@@ -1807,24 +2377,55 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class
         } CYPoolCatch(NULL)
     }
 
         } CYPoolCatch(NULL)
     }
 

-    objc_super super = {self, _class};
-    void *arg0 = &super;
-

     void *setup[2];
     void *setup[2];

-    setup[0] = &arg0;
+    setup[0] = &self;

     setup[1] = &_cmd;
 
     sig::Signature signature;
     sig::Parse(pool, &signature, type, &Structor_);
 
     setup[1] = &_cmd;
 
     sig::Signature signature;
     sig::Parse(pool, &signature, type, &Structor_);
 

+    size_t used(count + 3);
+    if (used > signature.count) {
+        sig::Element *elements(new (pool) sig::Element[used]);
+        memcpy(elements, signature.elements, used * sizeof(sig::Element));
+
+        for (size_t index(signature.count); index != used; ++index) {
+            sig::Element *element(&elements[index]);
+            element->name = NULL;
+            element->offset = _not(size_t);
+
+            sig::Type *type(new (pool) sig::Type);
+            memset(type, 0, sizeof(*type));
+            type->primitive = sig::object_P;
+            element->type = type;
+        }
+
+        signature.elements = elements;
+        signature.count = used;
+    }
+

     ffi_cif cif;
     sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
 
     ffi_cif cif;
     sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
 

-    void (*function)() = stret(cif.rtype) ? reinterpret_cast<void (*)()>(&objc_msgSendSuper_stret) : reinterpret_cast<void (*)()>(&objc_msgSendSuper);
-    return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, exception, &signature, &cif, function);
-} CYCatch }
+    if (imp == NULL) {
+#ifdef __APPLE__
+#ifndef CY_NO_STRET
+        if (stret(cif.rtype))
+            imp = class_getMethodImplementation_stret(_class, _cmd);
+        else
+#endif
+            imp = class_getMethodImplementation(_class, _cmd);
+#else
+        objc_super super = {self, _class};
+        imp = objc_msg_lookup_super(&super, _cmd);
+#endif
+    }

 
 

-static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    void (*function)() = reinterpret_cast<void (*)()>(imp);
+    return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, &signature, &cif, function);
+}
+
+static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[]) {

     if (count < 2)
         throw CYJSError(context, "too few arguments to objc_msgSend");
 
     if (count < 2)
         throw CYJSError(context, "too few arguments to objc_msgSend");
 


@@ -1841,7 +2442,7 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
         self = internal->GetValue();
         _class = internal->class_;;
         uninitialized = false;
         self = internal->GetValue();
         _class = internal->class_;;
         uninitialized = false;

-    } else if (JSValueIsObjectOfClass(context, arguments[0], Instance_)) {
+    } else if (CYJSValueIsNSObject(context, arguments[0])) {

         Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));
         self = internal->GetValue();
         _class = nil;
         Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));
         self = internal->GetValue();
         _class = nil;


@@ -1849,7 +2450,7 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
         if (uninitialized)
             internal->value_ = nil;
     } else {
         if (uninitialized)
             internal->value_ = nil;
     } else {

-        self = CYCastNSObject(pool, context, arguments[0]);
+        self = CYCastNSObject(&pool, context, arguments[0]);

         _class = nil;
         uninitialized = false;
     }
         _class = nil;
         uninitialized = false;
     }


@@ -1859,73 +2460,43 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
 
     _cmd = CYCastSEL(context, arguments[1]);
 
 
     _cmd = CYCastSEL(context, arguments[1]);
 

-    return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized, exception);
-} CYCatch }
-
-/* 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));
-    if (internal != NULL)
-        delete internal;
-    _CYDealloc(self, sel);
+    return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized);

 }
 
 }
 

-MSHook(void, objc_registerClassPair, Class _class) {
-    Class super(class_getSuperclass(_class));
-    if (super == NULL || class_getInstanceVariable(super, "cy$internal_") == NULL) {
-        class_addIvar(_class, "cy$internal_", sizeof(CYInternal *), log2(sizeof(CYInternal *)), "^{CYInternal}");
-        MSHookMessage(_class, @selector(dealloc), MSHake(CYDealloc));
-    }
-
-    _objc_registerClassPair(_class);
-}
-
-static JSValueRef objc_registerClassPair_(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    if (count != 1)
-        throw CYJSError(context, "incorrect number of arguments to objc_registerClassPair");
-    CYPool pool;
-    NSObject *value(CYCastNSObject(pool, context, arguments[0]));
-    if (value == NULL || !CYIsClass(value))
-        throw CYJSError(context, "incorrect number of arguments to objc_registerClassPair");
-    Class _class((Class) value);
-    $objc_registerClassPair(_class);
-    return CYJSUndefined(context);
-} CYCatch }
-/* }}} */
+static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    return $objc_msgSend(context, object, _this, count, arguments);
+} CYCatch(NULL) }

 
 

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

     JSValueRef setup[count + 2];
     setup[0] = _this;
     setup[1] = object;
     memcpy(setup + 2, arguments, sizeof(JSValueRef) * count);
     JSValueRef setup[count + 2];
     setup[0] = _this;
     setup[1] = object;
     memcpy(setup + 2, arguments, sizeof(JSValueRef) * count);

-    return $objc_msgSend(context, NULL, NULL, count + 2, setup, exception);
-}
+    return $objc_msgSend(context, NULL, NULL, count + 2, setup);
+} CYCatch(NULL) }

 
 

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

     CYPool pool;
     Message_privateData *internal(reinterpret_cast<Message_privateData *>(JSObjectGetPrivate(object)));
 
     // XXX: handle Instance::Uninitialized?
     CYPool pool;
     Message_privateData *internal(reinterpret_cast<Message_privateData *>(JSObjectGetPrivate(object)));
 
     // XXX: handle Instance::Uninitialized?

-    id self(CYCastNSObject(pool, context, _this));
+    id self(CYCastNSObject(&pool, context, _this));

 
     void *setup[2];
     setup[0] = &self;
     setup[1] = &internal->sel_;
 
 
     void *setup[2];
     setup[0] = &self;
     setup[1] = &internal->sel_;
 

-    return CYCallFunction(pool, context, 2, setup, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue());
-}
+    return CYCallFunction(pool, context, 2, setup, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue());
+} CYCatch(NULL) }

 
 static JSObjectRef Super_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 2)
         throw CYJSError(context, "incorrect number of arguments to Super constructor");
     CYPool pool;
 
 static JSObjectRef Super_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 2)
         throw CYJSError(context, "incorrect number of arguments to Super constructor");
     CYPool pool;

-    id self(CYCastNSObject(pool, context, arguments[0]));
+    id self(CYCastNSObject(&pool, context, arguments[0]));

     Class _class(CYCastClass(pool, context, arguments[1]));
     return cy::Super::Make(context, self, _class);
     Class _class(CYCastClass(pool, context, arguments[1]));
     return cy::Super::Make(context, self, _class);

-} CYCatch }
+} CYCatch(NULL) }

 
 static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 1)
 
 static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 1)


@@ -1933,21 +2504,21 @@ static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t
     CYPool pool;
     const char *name(CYPoolCString(pool, context, arguments[0]));
     return CYMakeSelector(context, sel_registerName(name));
     CYPool pool;
     const char *name(CYPoolCString(pool, context, arguments[0]));
     return CYMakeSelector(context, sel_registerName(name));

-} CYCatch }
+} CYCatch(NULL) }

 
 static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count > 1)
         throw CYJSError(context, "incorrect number of arguments to Instance constructor");
     id self(count == 0 ? nil : CYCastPointer<id>(context, arguments[0]));
 
 static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count > 1)
         throw CYJSError(context, "incorrect number of arguments to Instance constructor");
     id self(count == 0 ? nil : CYCastPointer<id>(context, arguments[0]));

-    return Instance::Make(context, self);
-} CYCatch }
+    return CYMakeInstance(context, self, false);
+} CYCatch(NULL) }

 
 

-static 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) { CYTry {

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

-}
+} CYCatch(NULL) }

 
 

-static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+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());
 
     CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(_this)));
     Type_privateData *typical(internal->GetType());
 


@@ -1962,67 +2533,125 @@ static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef
         ffi = typical->ffi_;
     }
 
         ffi = typical->ffi_;
     }
 

-    return CYMakePointer(context, &internal->value_, type, ffi, object);
-}
+    return CYMakePointer(context, &internal->value_, _not(size_t), type, ffi, object);
+} CYCatch(NULL) }

 
 

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

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

-    return Instance::Make(context, object_getClass(internal->GetValue()));
-}
+    return Instance::Make(context, (id) object_getClass(internal->GetValue()));
+} CYCatch(NULL) }

 
 

-static JSValueRef Instance_getProperty_protocol(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+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());
     if (!CYIsClass(self))
         return CYJSUndefined(context);
     return CYGetClassPrototype(context, self);
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->GetValue());
     if (!CYIsClass(self))
         return CYJSUndefined(context);
     return CYGetClassPrototype(context, self);

-} CYCatch }
+} CYCatch(NULL) }

 
 

-static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+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());
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->GetValue());

-    if (class_getInstanceMethod(object_getClass(self), @selector(alloc)) == NULL)
+    if (!CYIsClass(self))

         return CYJSUndefined(context);
         return CYJSUndefined(context);

-    return Messages::Make(context, self);
-}
+    return Messages::Make(context, (Class) self);
+} CYCatch(NULL) }

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

-    if (!JSValueIsObjectOfClass(context, _this, Instance_))
+    if (!CYJSValueIsNSObject(context, _this))

         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));

-    return CYCastJSValue(context, CYJSString(CYCastNSCYON(internal->GetValue())));
-} CYCatch }
+    return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue(), false)));
+} CYCatch(NULL) }

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

-    if (!JSValueIsObjectOfClass(context, _this, Instance_))
+    if (!CYJSValueIsNSObject(context, _this))

         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));

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

 
     CYPoolTry {
 
     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]));
+        NSString *key;
+        if (count == 0)
+            key = nil;
+        else
+            key = CYCastNSString(NULL, context, CYJSString(context, arguments[0]));
+
+        if (!CYImplements(value, object_getClass(value), @selector(cy$toJSON:inContext:)))
+            return CYJSUndefined(context);
+        else if (JSValueRef json = [value cy$toJSON:key inContext:context])
+            return json;
+        else
+            return CYCastJSValue(context, CYJSString(context, [value description]));

     } CYPoolCatch(NULL)
     } CYPoolCatch(NULL)

-} CYCatch }
+} CYCatch(NULL) return /*XXX*/ NULL; }
+
+static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    if (!CYJSValueIsNSObject(context, _this))
+        return NULL;
+
+    Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
+    id value(internal->GetValue());
+
+    if (![value respondsToSelector:@selector(cy$valueOfInContext:)])
+        return _this;
+
+    if (JSValueRef result = [value cy$valueOfInContext:context])
+        return result;
+
+    return _this;
+} CYCatch(NULL) return /*XXX*/ NULL; }
+
+static JSValueRef Instance_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    if (!CYJSValueIsNSObject(context, _this))
+        return NULL;
+
+    Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
+    // XXX: but... but... THIS ISN'T A POINTER! :(
+    return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->GetValue()));
+} 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 {
 
 static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {

-    if (!JSValueIsObjectOfClass(context, _this, Instance_))
+    if (!CYJSValueIsNSObject(context, _this))

         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));

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

 
     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?

-        return CYCastJSValue(context, CYJSString([internal->GetValue() description]));
+        return CYCastJSValue(context, CYJSString(context, [value description]));

     } CYPoolCatch(NULL)
     } CYPoolCatch(NULL)

-} CYCatch }
+} CYCatch(NULL) return /*XXX*/ NULL; }
+
+static JSValueRef Class_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    if (!CYJSValueIsNSObject(context, _this))
+        return NULL;
+
+    Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
+    id value(internal->GetValue());
+
+    if (!CYIsClass(value))
+        CYThrow("non-Class object cannot be used as Type");
+
+    // XXX: this is a very silly implementation
+
+    std::ostringstream type;
+    type << "@\"";
+    type << class_getName(value);
+    type << "\"";
+
+    CYPoolTry {
+        return CYMakeType(context, type.str().c_str());
+    } CYPoolCatch(NULL)
+} CYCatch(NULL) return /*XXX*/ NULL; }

 
 static JSValueRef Selector_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate(_this)));
     return CYCastJSValue(context, sel_getName(internal->GetValue()));
 
 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()));

-} CYCatch }
+} CYCatch(NULL) }

 
 static JSValueRef Selector_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     return Selector_callAsFunction_toString(context, object, _this, count, arguments, exception);
 
 static JSValueRef Selector_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     return Selector_callAsFunction_toString(context, object, _this, count, arguments, exception);


@@ -2033,9 +2662,10 @@ static JSValueRef Selector_callAsFunction_toCYON(JSContextRef context, JSObjectR
     const char *name(sel_getName(internal->GetValue()));
 
     CYPoolTry {
     const char *name(sel_getName(internal->GetValue()));
 
     CYPoolTry {

-        return CYCastJSValue(context, CYJSString([NSString stringWithFormat:@"@selector(%s)", name]));
+        NSString *string([NSString stringWithFormat:@"@selector(%s)", name]);
+        return CYCastJSValue(context, CYJSString(context, string));

     } CYPoolCatch(NULL)
     } CYPoolCatch(NULL)

-} CYCatch }
+} CYCatch(NULL) return /*XXX*/ NULL; }

 
 static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 1)
 
 static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 1)


@@ -2051,11 +2681,14 @@ static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef
     else
         method = NULL;
 
     else
         method = NULL;
 

-    if (const char *type = CYPoolTypeEncoding(pool, context, sel, method))
-        return CYCastJSValue(context, CYJSString(type));
+    const char *encoding(CYPoolTypeEncoding(pool, context, sel, method));
+    if (encoding == NULL)
+        return CYJSNull(context);

 
 

-    return CYJSNull(context);
-} CYCatch }
+    sig::Signature signature;
+    sig::Parse(pool, &signature, encoding, &Structor_);
+    return CYMakeType(context, &signature);
+} CYCatch(NULL) }

 
 static JSStaticValue Selector_staticValues[2] = {
     {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete},
 
 static JSStaticValue Selector_staticValues[2] = {
     {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete},


@@ -2065,19 +2698,26 @@ static JSStaticValue Selector_staticValues[2] = {
 static JSStaticValue Instance_staticValues[5] = {
     {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"messages", &Instance_getProperty_messages, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
 static JSStaticValue Instance_staticValues[5] = {
     {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"messages", &Instance_getProperty_messages, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

-    {"prototype", &Instance_getProperty_protocol, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"prototype", &Instance_getProperty_prototype, 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}
 };
 

-static JSStaticFunction Instance_staticFunctions[5] = {
+static JSStaticFunction Instance_staticFunctions[7] = {

     {"$cya", &CYValue_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toCYON", &Instance_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toJSON", &Instance_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"$cya", &CYValue_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toCYON", &Instance_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toJSON", &Instance_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

+    {"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"toPointer", &Instance_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},

     {"toString", &Instance_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
 };
 
     {"toString", &Instance_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
 };
 

+static JSStaticFunction Class_staticFunctions[2] = {
+    {"pointerTo", &Class_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {NULL, NULL, 0}
+};
+

 static JSStaticFunction Internal_staticFunctions[2] = {
     {"$cya", &Internal_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
 static JSStaticFunction Internal_staticFunctions[2] = {
     {"$cya", &Internal_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}


@@ -2091,24 +2731,46 @@ static JSStaticFunction Selector_staticFunctions[5] = {
     {NULL, NULL, 0}
 };
 
     {NULL, NULL, 0}
 };
 

-void CYObjectiveC(JSContextRef context, JSObjectRef global) {
-    apr_pool_t *pool(CYGetGlobalPool());
+#ifdef __APPLE__
+JSValueRef NSCFType$cy$toJSON$inContext$(id self, SEL sel, JSValueRef key, JSContextRef context) { CYObjectiveTry_ {
+    return CYCastJSValue(context, [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease]);
+} CYObjectiveCatch }
+#endif
+
+void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
+    $objc_setAssociatedObject = reinterpret_cast<void (*)(id, void *, id value, objc_AssociationPolicy)>(dlsym(RTLD_DEFAULT, "objc_setAssociatedObject"));
+    $objc_getAssociatedObject = reinterpret_cast<id (*)(id, void *)>(dlsym(RTLD_DEFAULT, "objc_getAssociatedObject"));
+    $objc_removeAssociatedObjects = reinterpret_cast<void (*)(id)>(dlsym(RTLD_DEFAULT, "objc_removeAssociatedObjects"));

 
 

-    hooks_ = &CYObjectiveCHooks;
+    CYPool &pool(CYGetGlobalPool());

 
 

-    Object_type = new(pool) Type_privateData(pool, "@");
-    Selector_type = new(pool) Type_privateData(pool, ":");
+    Object_type = new(pool) Type_privateData("@");
+    Selector_type = new(pool) Type_privateData(":");
+
+    NSArray_ = objc_getClass("NSArray");
+    NSBlock_ = objc_getClass("NSBlock");
+    NSDictionary_ = objc_getClass("NSDictionary");
+    NSString_ = objc_getClass("NSString");
+    Object_ = objc_getClass("Object");

 
 #ifdef __APPLE__
 
 #ifdef __APPLE__

-    NSCFBoolean_ = objc_getClass("NSCFBoolean");
+    // XXX: apparently, iOS now has both of these
+    NSCFBoolean_ = objc_getClass("__NSCFBoolean");
+    if (NSCFBoolean_ == nil)
+        NSCFBoolean_ = objc_getClass("NSCFBoolean");
+

     NSCFType_ = objc_getClass("NSCFType");
     NSCFType_ = objc_getClass("NSCFType");

-#endif

 
 

-    NSArray_ = objc_getClass("NSArray");
-    NSDictionary_ = objc_getClass("NSDictonary");
-    NSMessageBuilder_ = objc_getClass("NSMessageBuilder");

     NSZombie_ = objc_getClass("_NSZombie_");
     NSZombie_ = objc_getClass("_NSZombie_");

-    Object_ = objc_getClass("Object");
+
+    banned_.insert(Object_);
+    banned_.insert(objc_getClass("__NSAtom"));
+    banned_.insert(objc_getClass("__NSGenericDeallocHandler"));
+    banned_.insert(objc_getClass("NSMessageBuilder"));
+    banned_.insert(objc_getClass("__NSMessageBuilder"));
+#else
+    NSBoolNumber_ = objc_getClass("NSBoolNumber");
+#endif

 
     JSClassDefinition definition;
 
 
     JSClassDefinition definition;
 


@@ -2122,10 +2784,28 @@ void CYObjectiveC(JSContextRef context, JSObjectRef global) {
     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.callAsFunction = &Instance_callAsFunction;

     definition.hasInstance = &Instance_hasInstance;
     definition.finalize = &CYFinalize;
     Instance_ = JSClassCreate(&definition);
 
     definition.hasInstance = &Instance_hasInstance;
     definition.finalize = &CYFinalize;
     Instance_ = JSClassCreate(&definition);
 

+    definition.className = "ArrayInstance";
+    ArrayInstance_ = JSClassCreate(&definition);
+
+    definition.className = "FunctionInstance";
+    FunctionInstance_ = JSClassCreate(&definition);
+
+    definition.className = "ObjectInstance";
+    ObjectInstance_ = JSClassCreate(&definition);
+
+    definition.className = "StringInstance";
+    StringInstance_ = JSClassCreate(&definition);
+
+    definition = kJSClassDefinitionEmpty;
+    definition.className = "Class";
+    definition.staticFunctions = Class_staticFunctions;
+    Class_ = JSClassCreate(&definition);
+

     definition = kJSClassDefinitionEmpty;
     definition.className = "Internal";
     definition.staticFunctions = Internal_staticFunctions;
     definition = kJSClassDefinitionEmpty;
     definition.className = "Internal";
     definition.staticFunctions = Internal_staticFunctions;


@@ -2148,7 +2828,7 @@ void CYObjectiveC(JSContextRef context, JSObjectRef global) {
     definition.hasProperty = &Messages_hasProperty;
     definition.getProperty = &Messages_getProperty;
     definition.setProperty = &Messages_setProperty;
     definition.hasProperty = &Messages_hasProperty;
     definition.getProperty = &Messages_getProperty;
     definition.setProperty = &Messages_setProperty;

-#if !__OBJC2__
+#if 0 && OBJC_API_VERSION < 2

     definition.deleteProperty = &Messages_deleteProperty;
 #endif
     definition.getPropertyNames = &Messages_getPropertyNames;
     definition.deleteProperty = &Messages_deleteProperty;
 #endif
     definition.getPropertyNames = &Messages_getPropertyNames;


@@ -2175,6 +2855,13 @@ void CYObjectiveC(JSContextRef context, JSObjectRef global) {
     definition.getPropertyNames = &ObjectiveC_Classes_getPropertyNames;
     ObjectiveC_Classes_ = JSClassCreate(&definition);
 
     definition.getPropertyNames = &ObjectiveC_Classes_getPropertyNames;
     ObjectiveC_Classes_ = JSClassCreate(&definition);
 

+    definition = kJSClassDefinitionEmpty;
+    definition.className = "ObjectiveC::Constants";
+    definition.getProperty = &ObjectiveC_Constants_getProperty;
+    definition.getPropertyNames = &ObjectiveC_Constants_getPropertyNames;
+    ObjectiveC_Constants_ = JSClassCreate(&definition);
+
+#if OBJC_API_VERSION >= 2

     definition = kJSClassDefinitionEmpty;
     definition.className = "ObjectiveC::Images";
     definition.getProperty = &ObjectiveC_Images_getProperty;
     definition = kJSClassDefinitionEmpty;
     definition.className = "ObjectiveC::Images";
     definition.getProperty = &ObjectiveC_Images_getProperty;


@@ -2186,6 +2873,7 @@ void CYObjectiveC(JSContextRef context, JSObjectRef global) {
     definition.getProperty = &ObjectiveC_Image_Classes_getProperty;
     definition.getPropertyNames = &ObjectiveC_Image_Classes_getPropertyNames;
     ObjectiveC_Image_Classes_ = JSClassCreate(&definition);
     definition.getProperty = &ObjectiveC_Image_Classes_getProperty;
     definition.getPropertyNames = &ObjectiveC_Image_Classes_getPropertyNames;
     ObjectiveC_Image_Classes_ = JSClassCreate(&definition);

+#endif

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


@@ -2193,34 +2881,132 @@ void CYObjectiveC(JSContextRef context, JSObjectRef global) {
     definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames;
     ObjectiveC_Protocols_ = JSClassCreate(&definition);
 
     definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames;
     ObjectiveC_Protocols_ = JSClassCreate(&definition);
 

+#ifdef __APPLE__
+// XXX: this is horrible; there has to be a better way to do this
+#ifdef __LP64__
+    class_addMethod(NSCFType_, @selector(cy$toJSON:inContext:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON$inContext$), "^{OpaqueJSValue=}32@0:8@16^{OpaqueJSContext=}24");
+#else
+    class_addMethod(NSCFType_, @selector(cy$toJSON:inContext:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON$inContext$), "^{OpaqueJSValue=}16@0:4@8^{OpaqueJSContext=}12");
+#endif
+#endif
+} CYPoolCatch() }
+
+void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
+    JSObjectRef global(CYGetGlobalObject(context));
+    JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));
+    JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));
+    JSObjectRef all(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("all"))));
+    JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls"))));
+

     JSObjectRef ObjectiveC(JSObjectMake(context, NULL, NULL));
     JSObjectRef ObjectiveC(JSObjectMake(context, NULL, NULL));

-    CYSetProperty(context, global, CYJSString("ObjectiveC"), ObjectiveC);
+    CYSetProperty(context, cycript, CYJSString("ObjectiveC"), ObjectiveC);
+
+    JSObjectRef protocols(JSObjectMake(context, ObjectiveC_Protocols_, NULL));
+    CYSetProperty(context, ObjectiveC, CYJSString("protocols"), protocols);
+    CYArrayPush(context, alls, protocols);
+
+    JSObjectRef classes(JSObjectMake(context, ObjectiveC_Classes_, NULL));
+    CYSetProperty(context, ObjectiveC, CYJSString("classes"), classes);
+    CYArrayPush(context, alls, classes);

 
 

-    CYSetProperty(context, ObjectiveC, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Classes_, NULL));
+    JSObjectRef constants(JSObjectMake(context, ObjectiveC_Constants_, NULL));
+    CYSetProperty(context, ObjectiveC, CYJSString("constants"), constants);
+    CYArrayPush(context, alls, constants);
+
+#if OBJC_API_VERSION >= 2

     CYSetProperty(context, ObjectiveC, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL));
     CYSetProperty(context, ObjectiveC, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL));

-    CYSetProperty(context, ObjectiveC, CYJSString("protocols"), JSObjectMake(context, ObjectiveC_Protocols_, 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 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));
 

-    Instance_prototype_ = (JSObjectRef) CYGetProperty(context, Instance, prototype_);
-    JSValueProtect(context, Instance_prototype_);
+    JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s)));
+    CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);
+
+    JSObjectRef ArrayInstance(JSObjectMakeConstructor(context, ArrayInstance_, NULL));
+    JSObjectRef ArrayInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ArrayInstance, prototype_s)));
+    CYSetProperty(context, cy, CYJSString("ArrayInstance_prototype"), ArrayInstance_prototype);
+    JSObjectRef Array_prototype(CYGetCachedObject(context, CYJSString("Array_prototype")));
+    JSObjectSetPrototype(context, ArrayInstance_prototype, Array_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 Function_prototype(CYGetCachedObject(context, CYJSString("Function_prototype")));
+    JSObjectSetPrototype(context, FunctionInstance_prototype, Function_prototype);
+
+    JSObjectRef ObjectInstance(JSObjectMakeConstructor(context, ObjectInstance_, NULL));
+    JSObjectRef ObjectInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ObjectInstance, prototype_s)));
+    CYSetProperty(context, cy, CYJSString("ObjectInstance_prototype"), ObjectInstance_prototype);
+    JSObjectRef Object_prototype(CYGetCachedObject(context, CYJSString("Object_prototype")));
+    JSObjectSetPrototype(context, ObjectInstance_prototype, Object_prototype);

 
 

-    CYSetProperty(context, global, CYJSString("Instance"), Instance);
-    CYSetProperty(context, global, CYJSString("Selector"), Selector);
-    CYSetProperty(context, global, CYJSString("Super"), Super);
+    JSObjectRef StringInstance(JSObjectMakeConstructor(context, StringInstance_, NULL));
+    JSObjectRef StringInstance_prototype(CYCastJSObject(context, CYGetProperty(context, StringInstance, prototype_s)));
+    CYSetProperty(context, cy, CYJSString("StringInstance_prototype"), StringInstance_prototype);
+    JSObjectRef String_prototype(CYGetCachedObject(context, CYJSString("String_prototype")));
+    JSObjectSetPrototype(context, StringInstance_prototype, String_prototype);

 
 

-    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));
+    JSObjectRef Class_prototype(CYCastJSObject(context, CYGetProperty(context, Class, prototype_s)));
+    CYSetProperty(context, cy, CYJSString("Class_prototype"), Class_prototype);
+    JSObjectSetPrototype(context, Class_prototype, Instance_prototype);

 
 

-    JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Message, prototype_), Function_prototype_);
-    JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Selector, prototype_), Function_prototype_);
+    CYSetProperty(context, cycript, CYJSString("Instance"), Instance);
+    CYSetProperty(context, cycript, CYJSString("Selector"), Selector);
+    CYSetProperty(context, cycript, CYJSString("Super"), Super);

 
 

-    MSHookFunction(&objc_registerClassPair, MSHake(objc_registerClassPair));
+    JSObjectRef box(JSObjectMakeFunctionWithCallback(context, CYJSString("box"), &Instance_box_callAsFunction));
+    CYSetProperty(context, Instance, CYJSString("box"), box);

 
 #ifdef __APPLE__
 
 #ifdef __APPLE__

-    class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON), "@12@0:4@8");
+    CYSetProperty(context, all, CYJSString("choose"), &choose, kJSPropertyAttributeDontEnum);

 #endif
 #endif

-}
+
+    CYSetProperty(context, all, CYJSString("objc_msgSend"), &$objc_msgSend, kJSPropertyAttributeDontEnum);
+
+    JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Message, prototype_s)), Function_prototype);
+    JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Selector, prototype_s)), Function_prototype);
+} CYPoolCatch() }
+
+static CYHooks CYObjectiveCHooks = {
+    &CYObjectiveC_ExecuteStart,
+    &CYObjectiveC_ExecuteEnd,
+    &CYObjectiveC_CallFunction,
+    &CYObjectiveC_Initialize,
+    &CYObjectiveC_SetupContext,
+    &CYObjectiveC_PoolFFI,
+    &CYObjectiveC_FromFFI,
+};
+
+struct CYObjectiveC {
+    CYObjectiveC() {
+        hooks_ = &CYObjectiveCHooks;
+        // XXX: evil magic juju to make this actually take effect on a Mac when compiled with autoconf/libtool doom!
+        _assert(hooks_ != NULL);
+    }
+} CYObjectiveC;
+
+extern "C" void CydgetSetupContext(JSGlobalContextRef context) { CYObjectiveTry_ {
+    CYSetupContext(context);
+} CYObjectiveCatch }
+
+extern "C" void CydgetMemoryParse(const uint16_t **data, size_t *size) { try {
+    CYPool pool;
+
+    CYUTF8String utf8(CYPoolUTF8String(pool, CYUTF16String(*data, *size)));
+    utf8 = CYPoolCode(pool, utf8);
+
+    CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(utf8.data, utf8.size)));
+    size_t bytes(utf16.size * sizeof(uint16_t));
+    uint16_t *copy(reinterpret_cast<uint16_t *>(malloc(bytes)));
+    memcpy(copy, utf16.data, bytes);
+
+    *data = copy;
+    *size = utf16.size;
+} catch (const CYException &exception) {
+    CYPool pool;
+    @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"%s", exception.PoolCString(pool)] userInfo:nil];
+} }