Rename uint64_6 to uint64_t, correcting a typo.

[cycript.git] / ObjectiveC / Library.mm

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index bec1730e63d85d36fabd85937cfde23b2d7014d0..377af6d64f4970b8c0992f7bd8292a6b7403e543 100644 (file)
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -1,27 +1,55 @@
-#include <substrate.h>
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2012  Jay Freeman (saurik)
+*/
+
+/* GNU Lesser General Public License, Version 3 {{{ */
+/*
+ * Cycript is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser 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 Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/
+/* }}} */

 
 

-#include "ObjectiveC/Internal.hpp"
+#ifdef __APPLE__

 #include "Struct.hpp"
 #include "Struct.hpp"

+#endif

 
 #include <Foundation/Foundation.h>
 
 
 #include <Foundation/Foundation.h>
 

+#include "ObjectiveC/Internal.hpp"
+
+#include <objc/objc-api.h>
+

 #include "cycript.hpp"
 
 #include "ObjectiveC/Internal.hpp"
 
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
 #include "cycript.hpp"
 
 #include "ObjectiveC/Internal.hpp"
 
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>

-#include <CoreFoundation/CFLogUtilities.h>

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

+#include <objc/runtime.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 <dlfcn.h>
+

 #define CYObjectiveTry_(context) { \
     JSContextRef context_(context); \
     try
 #define CYObjectiveTry_(context) { \
     JSContextRef context_(context); \
     try


@@ -49,14 +77,58 @@
     } \
 }
 
     } \
 }
 

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

 
 

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

 
 /* Objective-C Pool Release {{{ */
 apr_status_t CYPoolRelease_(void *data) {
 
 /* Objective-C Pool Release {{{ */
 apr_status_t CYPoolRelease_(void *data) {


@@ -94,21 +166,21 @@ const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, NSString *valu
     }
 }
 
     }
 }
 

-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,16 +191,17 @@ 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(apr_pool_t *pool, const CYUTF8String &value) {


@@ -140,8 +213,8 @@ NSString *CYCastNSString(apr_pool_t *pool, SEL sel) {
     return CYPoolRelease(pool, CYCopyNSString(CYUTF8String(name, strlen(name))));
 }
 
     return CYPoolRelease(pool, CYCopyNSString(CYUTF8String(name, strlen(name))));
 }
 

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

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


@@ -150,6 +223,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;


@@ -165,6 +240,12 @@ bool CYGetOffset(apr_pool_t *pool, JSContextRef context, NSString *value, ssize_
 }
 
 static JSClassRef Instance_;
 }
 
 static JSClassRef Instance_;

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

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


@@ -172,21 +253,28 @@ 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 NSMessageBuilder_;
+static Class NSZombie_;
+#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,34 +288,41 @@ Type_privateData *Selector_privateData::GetType() const {
     return Selector_type;
 }
 
     return Selector_type;
 }
 

-// XXX: trick this out with associated objects!
+static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception);
+

 JSValueRef CYGetClassPrototype(JSContextRef context, id self) {
     if (self == nil)
 JSValueRef CYGetClassPrototype(JSContextRef context, id self) {
     if (self == nil)

-        return Instance_prototype_;
+        return CYGetCachedObject(context, CYJSString("Instance_prototype"));
+
+    JSObjectRef global(CYGetGlobalObject(context));
+    JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));

 
 

-    // XXX: I need to think through multi-context
-    typedef std::map<id, JSValueRef> CacheMap;
-    static CacheMap cache_;
+    char label[32];
+    sprintf(label, "i%p", self);
+    CYJSString name(label);

 
 

-    JSValueRef &value(cache_[self]);
-    if (value != NULL)
+    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
         prototype = CYGetClassPrototype(context, class_getSuperclass(self));
 
     JSObjectRef object(JSObjectMake(context, _class, NULL));
     JSObjectSetPrototype(context, object, prototype);
     else
         prototype = CYGetClassPrototype(context, class_getSuperclass(self));
 
     JSObjectRef object(JSObjectMake(context, _class, NULL));
     JSObjectSetPrototype(context, object, prototype);

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

 
 

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

     return object;
 }
 
     return object;
 }
 


@@ -296,23 +391,25 @@ 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;
 
 - (NSObject *) cy$toJSON:(NSString *)key;
 - (NSString *) cy$toCYON;
 - (JSType) cy$JSType;
 
 - (NSObject *) cy$toJSON:(NSString *)key;
 - (NSString *) cy$toCYON;

-- (NSString *) cy$toKey;

 
 - (bool) cy$hasProperty:(NSString *)name;
 - (NSObject *) cy$getProperty:(NSString *)name;
 - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value;
 - (bool) cy$deleteProperty:(NSString *)name;
 
 - (bool) cy$hasProperty:(NSString *)name;
 - (NSObject *) cy$getProperty:(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
 
 NSString *CYCastNSCYON(id value) {
 @end
 
 NSString *CYCastNSCYON(id value) {


@@ -331,13 +428,16 @@ NSString *CYCastNSCYON(id value) {
                 string = [value cy$toCYON];
             else goto fail;
         } else fail: {
                 string = [value cy$toCYON];
             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 (value == NSGenericDeallocHandler_ || value == NSMessageBuilder_ || value == Object_)

                 string = nil;
                 string = nil;

+#endif

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


@@ -503,8 +603,9 @@ NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 /* }}} */
 
 NSObject *CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
 /* }}} */
 
 NSObject *CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {

+    JSObjectRef Array(CYGetCachedObject(context, Array_s));

     JSValueRef exception(NULL);
     JSValueRef exception(NULL);

-    bool array(JSValueIsInstanceOfConstructor(context, object, Array_, &exception));
+    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]);
     CYThrow(context, exception);
     id value(array ? [CYJSArray alloc] : [CYJSObject alloc]);
     return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]);


@@ -523,6 +624,12 @@ NSNumber *CYCopyNSNumber(JSContextRef context, JSValueRef value) {
     return [[NSNumber alloc] initWithDouble:CYCastDouble(context, value)];
 }
 
     return [[NSNumber alloc] initWithDouble:CYCastDouble(context, value)];
 }
 

+#ifndef __APPLE__
+@interface NSBoolNumber : NSNumber {
+}
+@end
+#endif
+

 id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cast) {
     id object;
     bool copy;
 id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cast) {
     id object;
     bool copy;


@@ -542,7 +649,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;


@@ -587,9 +694,13 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
 /* Bridge: NSArray {{{ */
 @implementation NSArray (Cycript)
 
 /* Bridge: NSArray {{{ */
 @implementation NSArray (Cycript)
 

+- (id) cy$box {
+    return [[self mutableCopy] autorelease];
+}
+

 - (NSString *) cy$toCYON {
     NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
 - (NSString *) cy$toCYON {
     NSMutableString *json([[[NSMutableString alloc] init] autorelease]);

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

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


@@ -642,8 +753,8 @@ 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];
+- (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,27 +766,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;
+}
+
+- (NSObject *) cy$toJSON:(NSString *)key {
+    return self;
+}
+
+- (NSString *) cy$toCYON {
+    return [self boolValue] ? @"@true" : @"@false";
+}
+
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+    return CYCastJSValue(context, (bool) [self boolValue]);
+} CYObjectiveCatch }
+

 @end
 @end

+#endif

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

+- (id) cy$box {
+    return [[self mutableCopy] autorelease];
+}
+

 - (NSString *) cy$toCYON {
     NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
 - (NSString *) cy$toCYON {
     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)];

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


@@ -693,19 +842,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 {{{ */


@@ -799,10 +952,10 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
 }
 
 - (NSString *) cy$toCYON {
 }
 
 - (NSString *) cy$toCYON {

-    return [self cy$JSType] != kJSTypeBoolean ? [self stringValue] : [self boolValue] ? @"true" : @"false";
+    return [self cy$JSType] != kJSTypeBoolean ? [NSString stringWithFormat:@"@%@", self] : [self boolValue] ? @"@true" : @"@false";

 }
 
 }
 

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

     return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, [self boolValue]);
 } CYObjectiveCatch }
 
     return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, [self boolValue]);
 } CYObjectiveCatch }
 


@@ -820,7 +973,7 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
 }
 
 - (NSString *) cy$toCYON {
 }
 
 - (NSString *) cy$toCYON {

-    return @"null";
+    return @"@null";

 }
 
 @end
 }
 
 @end


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

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

 } CYObjectiveCatch }
 
 - (JSType) cy$JSType {
 } CYObjectiveCatch }
 
 - (JSType) cy$JSType {


@@ -844,10 +1001,6 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return [[self cy$toJSON:@""] cy$toCYON];
 }
 
     return [[self cy$toJSON:@""] cy$toCYON];
 }
 

-- (NSString *) cy$toKey {
-    return [self cy$toCYON];
-}
-

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


@@ -864,7 +1017,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


@@ -885,6 +1042,10 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
 /* Bridge: NSString {{{ */
 @implementation NSString (Cycript)
 
 /* Bridge: NSString {{{ */
 @implementation NSString (Cycript)
 

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

 - (JSType) cy$JSType {
     return kJSTypeString;
 }
 - (JSType) cy$JSType {
     return kJSTypeString;
 }


@@ -895,18 +1056,60 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
 
 - (NSString *) cy$toCYON {
     std::ostringstream str;
 
 - (NSString *) cy$toCYON {
     std::ostringstream str;

+    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 {
+    if ([name isEqualToString:@"length"])
+        return true;
+
+    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 {
+    if ([name isEqualToString:@"length"]) {
+        NSUInteger count([self length]);
+#ifdef __APPLE__
+        return [NSNumber numberWithUnsignedInteger:count];
+#else
+        return [NSNumber numberWithUnsignedInt:count];
+#endif
+    }
+
+    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));
+    }
+}
+
+// XXX: this might be overly restrictive for NSString; I think I need a half-way between /injecting/ implicit properties and /accepting/ implicit properties
++ (bool) cy$hasImplicitProperties {
+    return false;

 }
 
 }
 

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

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


@@ -924,7 +1127,7 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return @"undefined";
 }
 
     return @"undefined";
 }
 

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

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


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

+#ifdef __APPLE__

     // XXX: this is a lame object_isClass
     return class_getInstanceMethod(object_getClass(self), @selector(alloc)) != NULL;
     // XXX: this is a lame object_isClass
     return class_getInstanceMethod(object_getClass(self), @selector(alloc)) != NULL;

+#else
+    return GSObjCIsClass(self);
+#endif

 }
 
 Class CYCastClass(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
 }
 
 Class CYCastClass(apr_pool_t *pool, JSContextRef context, JSValueRef value) {


@@ -944,41 +1151,41 @@ Class CYCastClass(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
     return NULL;
 }
 
     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
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry {
     if ((self = [super init]) != nil) {
         object_ = object;
 
 @implementation CYJSObject
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry {
     if ((self = [super init]) != nil) {
         object_ = object;

-        context_ = context;
+        context_ = CYGetJSContext(context);
+        //XXX: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_);

+    //XXX:JSGlobalContextRelease(context_);

     [super dealloc];
 } CYObjectiveCatch }
 
 - (NSObject *) cy$toJSON:(NSString *)key { CYObjectiveTry {
     [super dealloc];
 } CYObjectiveCatch }
 
 - (NSObject *) cy$toJSON:(NSString *)key { CYObjectiveTry {

-    JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_));
+    JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_s));

     if (!CYIsCallable(context_, toJSON))
         return [super cy$toJSON:key];
     else {
     if (!CYIsCallable(context_, toJSON))
         return [super cy$toJSON:key];
     else {


@@ -1008,7 +1215,7 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry {
 } CYObjectiveCatch }
 
 - (id) objectForKey:(id)key { CYObjectiveTry {
 } CYObjectiveCatch }
 
 - (id) objectForKey:(id)key { CYObjectiveTry {

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

     if (JSValueIsUndefined(context_, value))
         return nil;
     return CYCastNSObject(NULL, context_, value) ?: [NSNull null];
     if (JSValueIsUndefined(context_, value))
         return nil;
     return CYCastNSObject(NULL, context_, value) ?: [NSNull null];


@@ -1016,18 +1223,18 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry {
 
 - (NSEnumerator *) keyEnumerator { CYObjectiveTry {
     JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context_, object_));
 
 - (NSEnumerator *) keyEnumerator { CYObjectiveTry {
     JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context_, object_));

-    NSEnumerator *enumerator([CYCastNSArray(names) objectEnumerator]);
+    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 {
     JSValueRef exception(NULL);
 } CYObjectiveCatch }
 
 - (void) removeObjectForKey:(id)key { CYObjectiveTry {
     JSValueRef exception(NULL);

-    (void) JSObjectDeleteProperty(context_, object_, CYJSString(key), &exception);
+    (void) JSObjectDeleteProperty(context_, object_, CYJSString(context_, (NSObject *) key), &exception);

     CYThrow(context_, exception);
 } CYObjectiveCatch }
 
     CYThrow(context_, exception);
 } CYObjectiveCatch }
 


@@ -1035,21 +1242,28 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry {
 
 @implementation CYJSArray
 
 
 @implementation CYJSArray
 

+- (NSString *) cy$toCYON {
+    CYPool pool;
+    return [NSString stringWithUTF8String:CYPoolCCYON(pool, context_, object_)];
+}
+

 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry {
     if ((self = [super init]) != nil) {
         object_ = object;
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry {
     if ((self = [super init]) != nil) {
         object_ = object;

-        context_ = context;
+        context_ = CYGetJSContext(context);
+        //XXX: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_);

+    //XXX: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 {
 } CYObjectiveCatch }
 
 - (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry {


@@ -1063,11 +1277,7 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry {
 } 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 {
 } CYObjectiveCatch }
 
 - (void) insertObject:(id)object atIndex:(NSUInteger)index { CYObjectiveTry {


@@ -1078,14 +1288,16 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry {
     JSValueRef arguments[3];
     arguments[0] = CYCastJSValue(context_, index);
     arguments[1] = CYCastJSValue(context_, 0);
     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);
+    arguments[2] = CYCastJSValue(context_, (NSObject *) object);
+    JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype")));
+    JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 3, arguments, &exception);

     CYThrow(context_, exception);
 } CYObjectiveCatch }
 
 - (void) removeLastObject { CYObjectiveTry {
     JSValueRef exception(NULL);
     CYThrow(context_, exception);
 } CYObjectiveCatch }
 
 - (void) removeLastObject { CYObjectiveTry {
     JSValueRef exception(NULL);

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

     CYThrow(context_, exception);
 } CYObjectiveCatch }
 
     CYThrow(context_, exception);
 } CYObjectiveCatch }
 


@@ -1097,7 +1309,8 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry {
     JSValueRef arguments[2];
     arguments[0] = CYCastJSValue(context_, index);
     arguments[1] = CYCastJSValue(context_, 1);
     JSValueRef arguments[2];
     arguments[0] = CYCastJSValue(context_, index);
     arguments[1] = CYCastJSValue(context_, 1);

-    JSObjectCallAsFunction(context_, Array_splice_, object_, 2, arguments, &exception);
+    JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype")));
+    JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 2, arguments, &exception);

     CYThrow(context_, exception);
 } CYObjectiveCatch }
 
     CYThrow(context_, exception);
 } CYObjectiveCatch }
 


@@ -1105,67 +1318,91 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry {
     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];
     size_t bounds([self count]);
     if (index >= bounds)
         @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray replaceObjectAtIndex:withObject:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];

-    CYSetProperty(context_, object_, index, CYCastJSValue(context_, object));
+    CYSetProperty(context_, object_, index, CYCastJSValue(context_, (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 {
+    JSContextRef 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 {
+    JSValueUnprotect(context_, object_);
+    //XXX:JSGlobalContextRelease(context_);
+    [super dealloc];
+}

 
 

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

 
 

-    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 +1417,32 @@ 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(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYObjectiveTry_(context) {
+static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry {

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

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

         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 +1457,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 +1484,18 @@ static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ff
         default:
             return NULL;
     }
         default:
             return NULL;
     }

-} CYObjectiveCatch }
-
-static CYHooks CYObjectiveCHooks = {
-    &CYObjectiveC_ExecuteStart,
-    &CYObjectiveC_ExecuteEnd,
-    &CYObjectiveC_RuntimeProperty,
-    &CYObjectiveC_CallFunction,
-    &CYObjectiveC_PoolFFI,
-    &CYObjectiveC_FromFFI,
-};
+} CYPoolCatch(NULL) return /*XXX*/ NULL; }

 
 static bool CYImplements(id object, Class _class, SEL selector, bool devoid) {
     if (objc_method *method = class_getInstanceMethod(_class, selector)) {
         if (!devoid)
             return true;
 
 static bool CYImplements(id object, Class _class, SEL selector, bool devoid) {
     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;
     }


@@ -1273,36 +1509,16 @@ static const char *CYPoolTypeEncoding(apr_pool_t *pool, JSContextRef context, SE
         return method_getTypeEncoding(method);
 
     const char *name(sel_getName(sel));
         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;
 }
 


@@ -1331,6 +1547,7 @@ static JSObjectRef CYMakeMessage(JSContextRef context, SEL sel, IMP imp, const c
 static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *type) {
     JSObjectRef function(CYCastJSObject(context, value));
     Closure_privateData *internal(CYMakeFunctor_(context, function, type, &MessageClosure_));
 static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *type) {
     JSObjectRef function(CYCastJSObject(context, value));
     Closure_privateData *internal(CYMakeFunctor_(context, function, type, &MessageClosure_));

+    // XXX: see notes in Library.cpp about needing to leak

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


@@ -1387,19 +1604,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;
 }
 

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

 static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
     Class _class(internal->GetValue());
 
     CYPool pool;
 static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
     Class _class(internal->GetValue());
 
     CYPool pool;

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


@@ -1416,11 +1641,24 @@ static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object,
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
     Class _class(internal->GetValue());
 
     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), false))
+        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,10 +1669,10 @@ 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));
             return true;
 
     Class _class(object_getClass(self));


@@ -1448,12 +1686,15 @@ static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStr
 
     const char *string(CYPoolCString(pool, context, name));
 
 
     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,10 +1707,10 @@ 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 {


@@ -1488,9 +1729,10 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object,
     }
 #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, exception);

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


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

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

     NSObject *data(CYCastNSObject(pool, context, value));
 
     CYPoolTry {
     NSObject *data(CYCastNSObject(pool, context, value));
 
     CYPoolTry {


@@ -1546,8 +1788,8 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
             CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception);
         }
 
             CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception);
         }
 

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


@@ -1559,10 +1801,22 @@ static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JS
     id self(internal->GetValue());
 
     CYPoolTry {
     id self(internal->GetValue());
 
     CYPoolTry {

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

         return [self cy$deleteProperty:name];
     } CYPoolCatch(NULL)
         return [self cy$deleteProperty:name];
     } CYPoolCatch(NULL)

-} CYCatch }
+} CYCatch return /*XXX*/ NULL; }
+
+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 +1835,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:), false))
+            [self cy$getPropertyNames:names inContext:context];

     } CYPoolCatch()
 }
 
     } CYPoolCatch()
 }
 


@@ -1594,6 +1863,82 @@ static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef
     return value;
 } CYCatch }
 
     return value;
 } CYCatch }
 

+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");
+
+    struct BlockDescriptor1 {
+        unsigned long int reserved;
+        unsigned long int size;
+    };
+
+    struct BlockDescriptor2 {
+        void (*copy_helper)(void *dst, void *src);
+        void (*dispose_helper)(void *src);
+    };
+
+    struct BlockDescriptor3 {
+        const char *signature;
+        const char *layout;
+    };
+
+    struct BlockLiteral {
+        Class isa;
+        int flags;
+        int reserved;
+        void (*invoke)(void *, ...);
+        void *descriptor;
+    } *literal = reinterpret_cast<BlockLiteral *>(self);
+
+    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,
+    };
+
+    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, exception, &signature, &cif, function);
+        }
+    }
+
+    if (count != 0)
+        CYThrow("NSBlock without signature field passed arguments");
+
+    CYPoolTry {
+        [self invoke];
+    } CYPoolCatch(NULL);
+
+    return NULL;
+} CYCatch }
+

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


@@ -1609,6 +1954,16 @@ static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor,
     return false;
 } CYCatch }
 
     return false;
 } CYCatch }
 

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

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


@@ -1629,8 +1984,9 @@ 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)) {
+    if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {

         Type_privateData type(pool, ivar_getTypeEncoding(ivar));
         Type_privateData type(pool, ivar_getTypeEncoding(ivar));

+        // XXX: if this fails and throws an exception the person we are throwing it to gets the wrong exception

         return CYFromFFI(context, type.type_, type.GetFFI(), reinterpret_cast<uint8_t *>(self) + ivar_getOffset(ivar));
     }
 
         return CYFromFFI(context, type.type_, type.GetFFI(), reinterpret_cast<uint8_t *>(self) + ivar_getOffset(ivar));
     }
 


@@ -1644,7 +2000,7 @@ 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)) {
+    if (objc_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;
         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;


@@ -1657,11 +2013,17 @@ static void Internal_getPropertyNames_(Class _class, JSPropertyNameAccumulatorRe
     if (Class super = class_getSuperclass(_class))
         Internal_getPropertyNames_(super, 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) {


@@ -1681,13 +2043,14 @@ static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef
 
 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;
 } CYCatch }
 
 static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     if (Class _class = NSClassFromString(name))
         return CYMakeInstance(context, _class, true);
     return NULL;
 } CYCatch }
 
 static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {

+#ifdef __APPLE__

     size_t size(objc_getClassList(NULL, 0));
     Class *data(reinterpret_cast<Class *>(malloc(sizeof(Class) * size)));
 
     size_t size(objc_getClassList(NULL, 0));
     Class *data(reinterpret_cast<Class *>(malloc(sizeof(Class) * size)));
 


@@ -1706,8 +2069,14 @@ static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRe
 
   done:
     free(data);
 
   done:
     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)));
 


@@ -1766,29 +2135,48 @@ 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;
 } CYCatch }
 
 static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
         return CYMakeInstance(context, protocol, true);
     return NULL;
 } CYCatch }
 
 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 }
+
+static void ObjectiveC_Constants_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
+    JSPropertyNameAccumulatorAddName(names, CYJSString("nil"));

 }
 
 }
 

+#ifdef __APPLE__

 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

 
 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 {
     const char *type;
 
 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 {
     const char *type;


@@ -1796,9 +2184,14 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class
     if (_class == NULL)
         _class = object_getClass(self);
 
     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,20 +2200,49 @@ 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);
+    if (imp == NULL) {
+#ifdef __APPLE__
+        if (stret(cif.rtype))
+            imp = class_getMethodImplementation_stret(_class, _cmd);
+        else
+            imp = class_getMethodImplementation(_class, _cmd);
+#else
+        objc_super super = {self, _class};
+        imp = objc_msg_lookup_super(&super, _cmd);
+#endif
+    }
+
+    void (*function)() = reinterpret_cast<void (*)()>(imp);

     return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, exception, &signature, &cif, function);
 } CYCatch }
 
     return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, exception, &signature, &cif, function);
 } CYCatch }
 


@@ -1862,40 +2284,6 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
     return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized, exception);
 } CYCatch }
 
     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);
-}
-
-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 Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     JSValueRef setup[count + 2];
     setup[0] = _this;
 static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     JSValueRef setup[count + 2];
     setup[0] = _this;


@@ -1939,7 +2327,7 @@ static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t
     if (count > 1)
         throw CYJSError(context, "incorrect number of arguments to Instance constructor");
     id self(count == 0 ? nil : CYCastPointer<id>(context, arguments[0]));
     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);
+    return CYMakeInstance(context, self, false);

 } CYCatch }
 
 static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
 } CYCatch }
 
 static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {


@@ -1962,15 +2350,15 @@ 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);

 }
 
 static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
 }
 
 static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));

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

 }
 
 }
 

-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))
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->GetValue());
     if (!CYIsClass(self))


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

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


@@ -1991,7 +2379,7 @@ static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectR
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));

-    return CYCastJSValue(context, CYJSString(CYCastNSCYON(internal->GetValue())));
+    return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue())));

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


@@ -2001,23 +2389,56 @@ static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectR
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
 
     CYPoolTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
 
     CYPoolTry {

-        NSString *key(count == 0 ? nil : CYCastNSString(NULL, CYJSString(context, arguments[0])));
+        NSString *key;
+        if (count == 0)
+            key = nil;
+        else
+            key = CYCastNSString(NULL, context, CYJSString(context, arguments[0]));

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

-        return CYCastJSValue(context, CYJSString([internal->GetValue() cy$toJSON:key]));
+        return CYCastJSValue(context, CYJSString(context, [internal->GetValue() cy$toJSON:key]));

     } CYPoolCatch(NULL)
     } CYPoolCatch(NULL)

-} CYCatch }
+} CYCatch return /*XXX*/ NULL; }
+
+static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    if (!JSValueIsObjectOfClass(context, _this, Instance_))
+        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 return /*XXX*/ NULL; }
+
+static JSValueRef Instance_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    if (!JSValueIsObjectOfClass(context, _this, Instance_))
+        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 return /*XXX*/ NULL; }

 
 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_))
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
 
 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_))
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));

+    id value(internal->GetValue());
+
+    if (value == nil)
+        return CYCastJSValue(context, "nil");

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


@@ -2033,9 +2454,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 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)


@@ -2065,15 +2487,17 @@ 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}
 };


@@ -2091,23 +2515,33 @@ static JSStaticFunction Selector_staticFunctions[5] = {
     {NULL, NULL, 0}
 };
 
     {NULL, NULL, 0}
 };
 

-void CYObjectiveC(JSContextRef context, JSObjectRef global) {
-    apr_pool_t *pool(CYGetGlobalPool());
+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;
+    apr_pool_t *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(":");

 
 #ifdef __APPLE__
     NSCFBoolean_ = objc_getClass("NSCFBoolean");
 
 #ifdef __APPLE__
     NSCFBoolean_ = objc_getClass("NSCFBoolean");

+    if (NSCFBoolean_ == nil)
+        NSCFBoolean_ = objc_getClass("__NSCFBoolean");
+

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

+    NSGenericDeallocHandler_ = objc_getClass("__NSGenericDeallocHandler");
+    NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
+    NSZombie_ = objc_getClass("_NSZombie_");
+#else
+    NSBoolNumber_ = objc_getClass("NSBoolNumber");

 #endif
 
     NSArray_ = objc_getClass("NSArray");
 #endif
 
     NSArray_ = objc_getClass("NSArray");

-    NSDictionary_ = objc_getClass("NSDictonary");
-    NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
-    NSZombie_ = objc_getClass("_NSZombie_");
+    NSBlock_ = objc_getClass("NSBlock");
+    NSDictionary_ = objc_getClass("NSDictionary");
+    NSString_ = objc_getClass("NSString");

     Object_ = objc_getClass("Object");
 
     JSClassDefinition definition;
     Object_ = objc_getClass("Object");
 
     JSClassDefinition definition;


@@ -2122,10 +2556,23 @@ 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 = "Internal";
     definition.staticFunctions = Internal_staticFunctions;
     definition = kJSClassDefinitionEmpty;
     definition.className = "Internal";
     definition.staticFunctions = Internal_staticFunctions;


@@ -2148,7 +2595,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 +2622,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 +2640,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 +2648,100 @@ 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__
+    class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON), "@12@0:4@8");
+#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);
+
+    JSObjectRef constants(JSObjectMake(context, ObjectiveC_Constants_, NULL));
+    CYSetProperty(context, ObjectiveC, CYJSString("constants"), constants);
+    CYArrayPush(context, alls, constants);

 
 

-    CYSetProperty(context, ObjectiveC, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Classes_, NULL));
+#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 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_);
-
-    CYSetProperty(context, global, CYJSString("Instance"), Instance);
-    CYSetProperty(context, global, CYJSString("Selector"), Selector);
-    CYSetProperty(context, global, CYJSString("Super"), Super);
+    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);
+
+    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, cycript, CYJSString("Instance"), Instance);
+    CYSetProperty(context, cycript, CYJSString("Selector"), Selector);
+    CYSetProperty(context, cycript, CYJSString("Super"), Super);
+
+    JSObjectRef box(JSObjectMakeFunctionWithCallback(context, CYJSString("box"), &Instance_box_callAsFunction));
+    CYSetProperty(context, Instance, CYJSString("box"), box);
+
+#if defined(__APPLE__) && defined(__arm__) && 0
+    CYSetProperty(context, all, CYJSString("objc_registerClassPair"), &objc_registerClassPair_, kJSPropertyAttributeDontEnum);
+#endif

 
 

-    CYSetProperty(context, global, CYJSString("objc_registerClassPair"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_registerClassPair"), &objc_registerClassPair_));
-    CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend));
+    CYSetProperty(context, all, CYJSString("objc_msgSend"), &$objc_msgSend, kJSPropertyAttributeDontEnum);

 
 

-    JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Message, prototype_), Function_prototype_);
-    JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Selector, prototype_), Function_prototype_);
+    JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Message, prototype_s)), Function_prototype);
+    JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Selector, prototype_s)), Function_prototype);
+} CYPoolCatch() }

 
 

-    MSHookFunction(&objc_registerClassPair, MSHake(objc_registerClassPair));
+static CYHooks CYObjectiveCHooks = {
+    &CYObjectiveC_ExecuteStart,
+    &CYObjectiveC_ExecuteEnd,
+    &CYObjectiveC_CallFunction,
+    &CYObjectiveC_Initialize,
+    &CYObjectiveC_SetupContext,
+    &CYObjectiveC_PoolFFI,
+    &CYObjectiveC_FromFFI,
+};

 
 

-#ifdef __APPLE__
-    class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON), "@12@0:4@8");
-#endif
-}
+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;