-[NSCFType cy$toJSON:inContext:] 64-bit encoding.

[cycript.git] / ObjectiveC / Library.mm

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 24269e2e9f4a3434900418305449c67095ba937a..7c364adca3fd591d5cbedec8091eb2c59c4c0fc4 100644 (file)
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -32,7 +32,6 @@
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
 #include <JavaScriptCore/JSStringRefCF.h>
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
 #include <JavaScriptCore/JSStringRefCF.h>

-#include <WebKit/WebScriptObject.h>

 #include <objc/runtime.h>
 #endif
 
 #include <objc/runtime.h>
 #endif
 


@@ -43,17 +42,18 @@
 
 #include <cmath>
 #include <map>
 
 #include <cmath>
 #include <map>

+#include <set>

 
 #include <dlfcn.h>
 
 
 #include <dlfcn.h>
 

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

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

+    JSContextRef context(context_); \

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

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

     } \
 }
 
     } \
 }
 


@@ -159,7 +159,7 @@ enum {
     BLOCK_HAS_SIGNATURE = 1 << 30,
 };
 
     BLOCK_HAS_SIGNATURE = 1 << 30,
 };
 

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

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


@@ -292,8 +292,9 @@ static JSClassRef ObjectiveC_Images_;
 static Class NSCFBoolean_;
 static Class NSCFType_;
 static Class NSGenericDeallocHandler_;
 static Class NSCFBoolean_;
 static Class NSCFType_;
 static Class NSGenericDeallocHandler_;

-static Class NSMessageBuilder_;

 static Class NSZombie_;
 static Class NSZombie_;

+
+static std::set<Class> banned_;

 #else
 static Class NSBoolNumber_;
 #endif
 #else
 static Class NSBoolNumber_;
 #endif


@@ -465,7 +466,7 @@ NSString *CYCastNSCYON(id value, bool objective) {
             else if (_class == NSZombie_)
                 string = [NSString stringWithFormat:@"<_NSZombie_: %p>", value];
             // XXX: frowny /in/ the pants
             else if (_class == NSZombie_)
                 string = [NSString stringWithFormat:@"<_NSZombie_: %p>", value];
             // XXX: frowny /in/ the pants

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

                 string = nil;
 #endif
             else
                 string = nil;
 #endif
             else


@@ -570,7 +571,6 @@ struct PropertyAttributes {
 };
 #endif
 
 };
 #endif
 

-#ifndef __APPLE__

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


@@ -588,7 +588,6 @@ struct PropertyAttributes {
 @end
 
 #define WebUndefined CYWebUndefined
 @end
 
 #define WebUndefined CYWebUndefined

-#endif

 
 /* Bridge: CYJSObject {{{ */
 @interface CYJSObject : NSMutableDictionary {
 
 /* Bridge: CYJSObject {{{ */
 @interface CYJSObject : NSMutableDictionary {


@@ -631,11 +630,7 @@ _finline bool CYJSValueIsNSObject(JSContextRef context, JSValueRef value) {
 }
 
 _finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) {
 }
 
 _finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) {

-    JSValueRef exception(NULL);
-    JSObjectRef constructor(CYGetCachedObject(context, cache));
-    bool is(JSValueIsInstanceOfConstructor(context, value, constructor, &exception));
-    CYThrow(context, exception);
-    return is;
+    return _jsccall(JSValueIsInstanceOfConstructor, context, value, CYGetCachedObject(context, cache));

 }
 
 NSObject *CYMakeBlock(void (*invoke)(), sig::Signature &signature) {
 }
 
 NSObject *CYMakeBlock(void (*invoke)(), sig::Signature &signature) {


@@ -807,7 +802,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
 }
 
 - (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context {
 }
 
 - (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context {

-    CYObjectiveTry_(context) {
+    CYObjectiveTry_ {

         if ([name isEqualToString:@"length"])
             return CYCastJSValue(context, [self count]);
     } CYObjectiveCatch
         if ([name isEqualToString:@"length"])
             return CYCastJSValue(context, [self count]);
     } CYObjectiveCatch


@@ -854,7 +849,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
     return objective ? value : [NSString stringWithFormat:@"@%@", value];
 }
 
     return objective ? value : [NSString stringWithFormat:@"@%@", value];
 }
 

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

     return CYCastJSValue(context, (bool) [self boolValue]);
 } CYObjectiveCatch }
 
     return CYCastJSValue(context, (bool) [self boolValue]);
 } CYObjectiveCatch }
 


@@ -1011,7 +1006,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
     return objective ? value : [NSString stringWithFormat:@"@%@", value];
 }
 
     return objective ? value : [NSString stringWithFormat:@"@%@", value];
 }
 

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

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


@@ -1029,7 +1024,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
     return objective ? value : [NSString stringWithFormat:@"@%@", value];
 }
 
     return objective ? value : [NSString stringWithFormat:@"@%@", value];
 }
 

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

     return CYJSNull(context);
 } CYObjectiveCatch }
 
     return CYJSNull(context);
 } CYObjectiveCatch }
 


@@ -1046,7 +1041,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
     return [self cy$valueOfInContext:context];
 }
 
     return [self cy$valueOfInContext:context];
 }
 

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

     return NULL;
 } CYObjectiveCatch }
 
     return NULL;
 } CYObjectiveCatch }
 


@@ -1066,7 +1061,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
     return nil;
 }
 
     return nil;
 }
 

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

     if (NSObject *value = [self cy$getProperty:name])
         return CYCastJSValue(context, value);
     return NULL;
     if (NSObject *value = [self cy$getProperty:name])
         return CYCastJSValue(context, value);
     return NULL;


@@ -1145,7 +1140,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
     }
 }
 
     }
 }
 

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

     return CYCastJSValue(context, CYJSString(context, self));
 } CYObjectiveCatch }
 
     return CYCastJSValue(context, CYJSString(context, self));
 } CYObjectiveCatch }
 


@@ -1164,7 +1159,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
     //return objective ? value : [NSString stringWithFormat:@"@%@", value];
 }
 
     //return objective ? value : [NSString stringWithFormat:@"@%@", value];
 }
 

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

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


@@ -1205,7 +1200,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 
 @implementation CYJSObject
 
 
 @implementation CYJSObject
 

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

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


@@ -1222,9 +1217,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 
 - (NSString *) cy$toCYON:(bool)objective { CYObjectiveTry {
     CYPool pool;
 
 - (NSString *) cy$toCYON:(bool)objective { CYObjectiveTry {
     CYPool pool;

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

     if (cyon == NULL)
         return [super cy$toCYON:objective];
     else
     if (cyon == NULL)
         return [super cy$toCYON:objective];
     else


@@ -1232,46 +1225,44 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 } CYObjectiveCatch }
 
 - (NSUInteger) count { CYObjectiveTry {
 } CYObjectiveCatch }
 
 - (NSUInteger) count { CYObjectiveTry {

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

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

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

         return nil;
         return nil;

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

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

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

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

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

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

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

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

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

     CYPool pool;
     CYPool pool;

-    return [NSString stringWithUTF8String:CYPoolCCYON(pool, context_, object_)];
-}
+    return [NSString stringWithUTF8String:CYPoolCCYON(pool, context, object_)];
+} CYObjectiveCatch }

 
 

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

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


@@ -1287,62 +1278,54 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 } CYObjectiveCatch }
 
 - (NSUInteger) count { CYObjectiveTry {
 } CYObjectiveCatch }
 
 - (NSUInteger) count { CYObjectiveTry {

-    return CYArrayLength(context_, object_);
+    return CYArrayLength(context, object_);

 } CYObjectiveCatch }
 
 - (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry {
     size_t bounds([self count]);
     if (index >= bounds)
         @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray objectAtIndex:]: index (%zu) beyond bounds (%zu)", static_cast<size_t>(index), bounds] userInfo:nil];
 } CYObjectiveCatch }
 
 - (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry {
     size_t bounds([self count]);
     if (index >= bounds)
         @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray objectAtIndex:]: index (%zu) beyond bounds (%zu)", static_cast<size_t>(index), bounds] userInfo:nil];

-    JSValueRef exception(NULL);
-    JSValueRef value(JSObjectGetPropertyAtIndex(context_, object_, index, &exception));
-    CYThrow(context_, exception);
-    return CYCastNSObject(NULL, context_, value) ?: [NSNull null];
+    JSValueRef value(_jsccall(JSObjectGetPropertyAtIndex, context, object_, index));
+    return CYCastNSObject(NULL, context, value) ?: [NSNull null];

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

-    CYArrayPush(context_, object_, CYCastJSValue(context_, (NSObject *) object));
+    CYArrayPush(context, object_, CYCastJSValue(context, (NSObject *) object));

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

-    JSValueRef exception(NULL);

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

-    arguments[0] = CYCastJSValue(context_, index);
-    arguments[1] = CYCastJSValue(context_, 0);
-    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);
+    arguments[0] = CYCastJSValue(context, index);
+    arguments[1] = CYCastJSValue(context, 0);
+    arguments[2] = CYCastJSValue(context, (NSObject *) object);
+    JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));
+    _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, splice_s)), object_, 3, arguments);

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

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

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

-    JSValueRef exception(NULL);

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

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

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

-    CYSetProperty(context_, object_, index, CYCastJSValue(context_, (NSObject *) object));
+    CYSetProperty(context, object_, index, CYCastJSValue(context, (NSObject *) object));

 } CYObjectiveCatch }
 
 @end
 } CYObjectiveCatch }
 
 @end


@@ -1357,18 +1340,18 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 
 @implementation CYInternal
 
 
 @implementation CYInternal
 

-- (void) dealloc {
+- (void) dealloc { CYObjectiveTry {

     JSValueUnprotect(context_, object_);
     JSGlobalContextRelease(context_);
     [super dealloc];
     JSValueUnprotect(context_, object_);
     JSGlobalContextRelease(context_);
     [super dealloc];

-}
+} CYObjectiveCatch }

 
 

-- (id) initInContext:(JSContextRef)context {
+- (id) initInContext:(JSContextRef)context { CYObjectiveTry_ {

     if ((self = [super init]) != nil) {
         context_ = CYGetJSContext(context);
         JSGlobalContextRetain(context_);
     } return self;
     if ((self = [super init]) != nil) {
         context_ = CYGetJSContext(context);
         JSGlobalContextRetain(context_);
     } return self;

-}
+} CYObjectiveCatch }

 
 - (bool) hasProperty:(JSStringRef)name inContext:(JSContextRef)context {
     if (object_ == NULL)
 
 - (bool) hasProperty:(JSStringRef)name inContext:(JSContextRef)context {
     if (object_ == NULL)


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

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

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


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

-}
+} CYCatch(NULL) }

 
 

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

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


@@ -1633,10 +1616,10 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
     }
 
     return true;
     }
 
     return true;

-}
+} CYCatch(false) }

 
 #if 0 && OBJC_API_VERSION < 2
 
 #if 0 && OBJC_API_VERSION < 2

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

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


@@ -1651,7 +1634,7 @@ static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JS
         }
 
     return false;
         }
 
     return false;

-}
+} CYCatch(false) }

 #endif
 
 static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
 #endif
 
 static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {


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

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

     }
 #endif
 
     if (CYHasImplicitProperties(_class))
         if (SEL sel = sel_getUid(string))
             if (CYImplements(self, _class, sel, true))
     }
 #endif
 
     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 CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false);

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


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

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

             return true;
         }
     }
             return true;
         }
     }


@@ -1802,7 +1785,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
     if (SEL sel = sel_getUid(set))
         if (CYImplements(self, _class, sel)) {
             JSValueRef arguments[1] = {value};
     if (SEL sel = sel_getUid(set))
         if (CYImplements(self, _class, sel)) {
             JSValueRef arguments[1] = {value};

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

             return true;
         }
 
             return true;
         }
 


@@ -1915,7 +1898,7 @@ static JSValueRef Instance_callAsFunction(JSContextRef context, JSObjectRef obje
             sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
 
             void (*function)() = reinterpret_cast<void (*)()>(literal->invoke);
             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);
+            return CYCallFunction(pool, context, 1, setup, count, arguments, false, &signature, &cif, function);

         }
     }
 
         }
     }
 


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

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

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


@@ -1974,10 +1974,27 @@ 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));
 

+#ifdef __arm64__
+    if (strcmp(name, "isa") == 0)
+        return CYCastJSValue(context, object_getClass(self));
+#endif
+

     if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {
     if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {

-        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));
+        ptrdiff_t offset(ivar_getOffset(ivar));
+        void *data(reinterpret_cast<uint8_t *>(self) + offset);
+
+        const char *encoding(ivar_getTypeEncoding(ivar));
+        if (encoding[0] == 'b') {
+            unsigned length, shift;
+            CYBitField(length, shift, self, ivar, encoding, offset);
+            _assert(shift + length <= sizeof(uintptr_t) * 8);
+            uintptr_t &field(*reinterpret_cast<uintptr_t *>(data));
+            uintptr_t mask((1 << length) - 1);
+            return CYCastJSValue(context, (field >> shift) & mask);
+        } else {
+            Type_privateData type(pool, ivar_getTypeEncoding(ivar));
+            return CYFromFFI(context, type.type_, type.GetFFI(), data);
+        }

     }
 
     return NULL;
     }
 
     return NULL;


@@ -1991,9 +2008,22 @@ static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStr
     const char *name(CYPoolCString(pool, context, property));
 
     if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {
     const char *name(CYPoolCString(pool, context, property));
 
     if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {

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

     }
 
     return false;
     }
 
     return false;


@@ -2026,10 +2056,10 @@ static void Internal_getPropertyNames(JSContextRef context, JSObjectRef object,
     Internal_getPropertyNames_(_class, names);
 }
 
     Internal_getPropertyNames_(_class, names);
 }
 

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

     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
     return internal->GetOwner();
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
     return internal->GetOwner();

-}
+} CYCatch(NULL) }

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


@@ -2168,10 +2198,13 @@ static int struct_forward_array[] = {
 #define OBJC_MAX_STRUCT_BY_VALUE 1
 static int struct_forward_array[] = {
     0, 0 };
 #define OBJC_MAX_STRUCT_BY_VALUE 1
 static int struct_forward_array[] = {
     0, 0 };

+#elif defined(__arm64__)
+#define CY_NO_STRET

 #else
 #error missing objc-runtime-info
 #endif
 
 #else
 #error missing objc-runtime-info
 #endif
 

+#ifndef CY_NO_STRET

 static bool stret(ffi_type *ffi_type) {
     return ffi_type->type == FFI_TYPE_STRUCT && (
         ffi_type->size > OBJC_MAX_STRUCT_BY_VALUE ||
 static bool stret(ffi_type *ffi_type) {
     return ffi_type->type == FFI_TYPE_STRUCT && (
         ffi_type->size > OBJC_MAX_STRUCT_BY_VALUE ||


@@ -2179,8 +2212,9 @@ static bool stret(ffi_type *ffi_type) {
     );
 }
 #endif
     );
 }
 #endif

+#endif

 
 

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

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


@@ -2234,9 +2268,11 @@ JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _cla
 
     if (imp == NULL) {
 #ifdef __APPLE__
 
     if (imp == NULL) {
 #ifdef __APPLE__

+#ifndef CY_NO_STRET

         if (stret(cif.rtype))
             imp = class_getMethodImplementation_stret(_class, _cmd);
         else
         if (stret(cif.rtype))
             imp = class_getMethodImplementation_stret(_class, _cmd);
         else

+#endif

             imp = class_getMethodImplementation(_class, _cmd);
 #else
         objc_super super = {self, _class};
             imp = class_getMethodImplementation(_class, _cmd);
 #else
         objc_super super = {self, _class};


@@ -2245,8 +2281,8 @@ JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _cla
     }
 
     void (*function)() = reinterpret_cast<void (*)()>(imp);
     }
 
     void (*function)() = reinterpret_cast<void (*)()>(imp);

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

 
 static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count < 2)
 
 static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count < 2)


@@ -2283,18 +2319,18 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
 
     _cmd = CYCastSEL(context, arguments[1]);
 
 
     _cmd = CYCastSEL(context, arguments[1]);
 

-    return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized, exception);
+    return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized);

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

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

     JSValueRef setup[count + 2];
     setup[0] = _this;
     setup[1] = object;
     memcpy(setup + 2, arguments, sizeof(JSValueRef) * count);
     return $objc_msgSend(context, NULL, NULL, count + 2, setup, exception);
     JSValueRef setup[count + 2];
     setup[0] = _this;
     setup[1] = object;
     memcpy(setup + 2, arguments, sizeof(JSValueRef) * count);
     return $objc_msgSend(context, NULL, NULL, count + 2, setup, exception);

-}
+} CYCatch(NULL) }

 
 

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

     CYPool pool;
     Message_privateData *internal(reinterpret_cast<Message_privateData *>(JSObjectGetPrivate(object)));
 
     CYPool pool;
     Message_privateData *internal(reinterpret_cast<Message_privateData *>(JSObjectGetPrivate(object)));
 


@@ -2305,8 +2341,8 @@ static JSValueRef Message_callAsFunction(JSContextRef context, JSObjectRef objec
     setup[0] = &self;
     setup[1] = &internal->sel_;
 
     setup[0] = &self;
     setup[1] = &internal->sel_;
 

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

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


@@ -2332,12 +2368,12 @@ static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t
     return CYMakeInstance(context, self, false);
 } CYCatch(NULL) }
 
     return CYMakeInstance(context, self, false);
 } CYCatch(NULL) }
 

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

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

-}
+} CYCatch(NULL) }

 
 

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

     CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(_this)));
     Type_privateData *typical(internal->GetType());
 
     CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(_this)));
     Type_privateData *typical(internal->GetType());
 


@@ -2353,12 +2389,12 @@ static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef
     }
 
     return CYMakePointer(context, &internal->value_, _not(size_t), type, ffi, object);
     }
 
     return CYMakePointer(context, &internal->value_, _not(size_t), type, ffi, object);

-}
+} CYCatch(NULL) }

 
 

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

     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     return Instance::Make(context, (id) object_getClass(internal->GetValue()));
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     return Instance::Make(context, (id) object_getClass(internal->GetValue()));

-}
+} CYCatch(NULL) }

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


@@ -2368,13 +2404,13 @@ static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectR
     return CYGetClassPrototype(context, self);
 } CYCatch(NULL) }
 
     return CYGetClassPrototype(context, self);
 } CYCatch(NULL) }
 

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

     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->GetValue());
     if (!CYIsClass(self))
         return CYJSUndefined(context);
     return Messages::Make(context, (Class) self);
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->GetValue());
     if (!CYIsClass(self))
         return CYJSUndefined(context);
     return Messages::Make(context, (Class) self);

-}
+} CYCatch(NULL) }

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


@@ -2472,9 +2508,9 @@ static JSValueRef Selector_callAsFunction_toString(JSContextRef context, JSObjec
     return CYCastJSValue(context, sel_getName(internal->GetValue()));
 } CYCatch(NULL) }
 
     return CYCastJSValue(context, sel_getName(internal->GetValue()));
 } CYCatch(NULL) }
 

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

     return Selector_callAsFunction_toString(context, object, _this, count, arguments, exception);
     return Selector_callAsFunction_toString(context, object, _this, count, arguments, exception);

-}
+} CYCatch(NULL) }

 
 static JSValueRef Selector_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate(_this)));
 
 static JSValueRef Selector_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate(_this)));


@@ -2548,7 +2584,7 @@ static JSStaticFunction Selector_staticFunctions[5] = {
 };
 
 #ifdef __APPLE__
 };
 
 #ifdef __APPLE__

-JSValueRef NSCFType$cy$toJSON$inContext$(id self, SEL sel, JSValueRef key, JSContextRef context) { CYObjectiveTry_(context) {
+JSValueRef NSCFType$cy$toJSON$inContext$(id self, SEL sel, JSValueRef key, JSContextRef context) { CYObjectiveTry_ {

     return CYCastJSValue(context, [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease]);
 } CYObjectiveCatch }
 #endif
     return CYCastJSValue(context, [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease]);
 } CYObjectiveCatch }
 #endif


@@ -2563,6 +2599,12 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     Object_type = new(pool) Type_privateData("@");
     Selector_type = new(pool) Type_privateData(":");
 
     Object_type = new(pool) Type_privateData("@");
     Selector_type = new(pool) Type_privateData(":");
 

+    NSArray_ = objc_getClass("NSArray");
+    NSBlock_ = objc_getClass("NSBlock");
+    NSDictionary_ = objc_getClass("NSDictionary");
+    NSString_ = objc_getClass("NSString");
+    Object_ = objc_getClass("Object");
+

 #ifdef __APPLE__
     // XXX: apparently, iOS now has both of these
     NSCFBoolean_ = objc_getClass("__NSCFBoolean");
 #ifdef __APPLE__
     // XXX: apparently, iOS now has both of these
     NSCFBoolean_ = objc_getClass("__NSCFBoolean");


@@ -2570,19 +2612,18 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
         NSCFBoolean_ = objc_getClass("NSCFBoolean");
 
     NSCFType_ = objc_getClass("NSCFType");
         NSCFBoolean_ = objc_getClass("NSCFBoolean");
 
     NSCFType_ = objc_getClass("NSCFType");

-    NSGenericDeallocHandler_ = objc_getClass("__NSGenericDeallocHandler");
-    NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
+

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

+
+    banned_.insert(Object_);
+    banned_.insert(objc_getClass("__NSAtom"));
+    banned_.insert(objc_getClass("__NSGenericDeallocHandler"));
+    banned_.insert(objc_getClass("NSMessageBuilder"));
+    banned_.insert(objc_getClass("__NSMessageBuilder"));

 #else
     NSBoolNumber_ = objc_getClass("NSBoolNumber");
 #endif
 
 #else
     NSBoolNumber_ = objc_getClass("NSBoolNumber");
 #endif
 

-    NSArray_ = objc_getClass("NSArray");
-    NSBlock_ = objc_getClass("NSBlock");
-    NSDictionary_ = objc_getClass("NSDictionary");
-    NSString_ = objc_getClass("NSString");
-    Object_ = objc_getClass("Object");
-

     JSClassDefinition definition;
 
     definition = kJSClassDefinitionEmpty;
     JSClassDefinition definition;
 
     definition = kJSClassDefinitionEmpty;


@@ -2693,8 +2734,13 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     ObjectiveC_Protocols_ = JSClassCreate(&definition);
 
 #ifdef __APPLE__
     ObjectiveC_Protocols_ = JSClassCreate(&definition);
 
 #ifdef __APPLE__

+// XXX: this is horrible; there has to be a better way to do this
+#ifdef __LP64__
+    class_addMethod(NSCFType_, @selector(cy$toJSON:inContext:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON$inContext$), "^{OpaqueJSValue=}32@0:8@16^{OpaqueJSContext=}24");
+#else

     class_addMethod(NSCFType_, @selector(cy$toJSON:inContext:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON$inContext$), "^{OpaqueJSValue=}16@0:4@8^{OpaqueJSContext=}12");
 #endif
     class_addMethod(NSCFType_, @selector(cy$toJSON:inContext:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON$inContext$), "^{OpaqueJSValue=}16@0:4@8^{OpaqueJSContext=}12");
 #endif

+#endif

 } CYPoolCatch() }
 
 void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
 } CYPoolCatch() }
 
 void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {