Use the base JavaScript CYONifier for CYJSArray.

[cycript.git] / ObjectiveC / Library.mm

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 8642ba1d7d5e80550bcf64e7ec704363a927de77..f5fdb28a872a3ce07e7706e4d110394372427f3e 100644 (file)
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -1,48 +1,24 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2010  Jay Freeman (saurik)

 */
 
 */
 

-/* Modified BSD License {{{ */
+/* GNU Lesser General Public License, Version 3 {{{ */

 /*
 /*

- *        Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * 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.

  *
  *

- * 1. Redistributions of source code must retain the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation
- *    and/or other materials provided with the
- *    distribution.
- * 3. The name of the author may not be used to endorse
- *    or promote products derived from this software
- *    without specific prior written permission.
+ * 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.

  *
  *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/

 /* }}} */
 
 /* }}} */
 

-#if defined(__APPLE__) && defined(__arm__)
-#include <substrate.h>
-#else
-#include <objc/objc-api.h>
-#endif
-

 #ifdef __APPLE__
 #include "Struct.hpp"
 #endif
 #ifdef __APPLE__
 #include "Struct.hpp"
 #endif


@@ -51,7 +27,7 @@
 
 #include "ObjectiveC/Internal.hpp"
 
 
 #include "ObjectiveC/Internal.hpp"
 

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

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


@@ -61,11 +37,13 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <JavaScriptCore/JSStringRefCF.h>
 #include <WebKit/WebScriptObject.h>
 #include <CoreFoundation/CoreFoundation.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 <cmath>
 #include <map>


@@ -130,6 +108,7 @@
 
 #define object_getInstanceVariable(object, name, value) ({ \
     objc_ivar *ivar(class_getInstanceVariable(object_getClass(object), name)); \
 
 #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; \
     if (ivar != NULL) \
         GSObjCGetVariable(object, ivar_getOffset(ivar), sizeof(void *), value); \
     ivar; \


@@ -145,8 +124,6 @@
 
 JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception);
 
 
 JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception);
 

-extern sqlite3 *Bridge_;
-

 /* Objective-C Pool Release {{{ */
 apr_status_t CYPoolRelease_(void *data) {
     id object(reinterpret_cast<id>(data));
 /* Objective-C Pool Release {{{ */
 apr_status_t CYPoolRelease_(void *data) {
     id object(reinterpret_cast<id>(data));


@@ -264,6 +241,7 @@ static JSClassRef Selector_;
 static JSClassRef Super_;
 
 static JSClassRef ObjectiveC_Classes_;
 static JSClassRef Super_;
 
 static JSClassRef ObjectiveC_Classes_;

+static JSClassRef ObjectiveC_Constants_;

 static JSClassRef ObjectiveC_Protocols_;
 
 #ifdef __APPLE__
 static JSClassRef ObjectiveC_Protocols_;
 
 #ifdef __APPLE__


@@ -274,6 +252,7 @@ static JSClassRef ObjectiveC_Images_;
 #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 NSMessageBuilder_;
 static Class NSZombie_;
 #else


@@ -282,6 +261,7 @@ static Class NSBoolNumber_;
 
 static Class NSArray_;
 static Class NSDictionary_;
 
 static Class NSArray_;
 static Class NSDictionary_;

+static Class NSString_;

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


@@ -295,6 +275,8 @@ Type_privateData *Selector_privateData::GetType() const {
     return Selector_type;
 }
 
     return Selector_type;
 }
 

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

 JSValueRef CYGetClassPrototype(JSContextRef context, id self) {
     if (self == nil)
         return CYGetCachedObject(context, CYJSString("Instance_prototype"));
 JSValueRef CYGetClassPrototype(JSContextRef context, id self) {
     if (self == nil)
         return CYGetCachedObject(context, CYJSString("Instance_prototype"));


@@ -314,15 +296,18 @@ JSValueRef CYGetClassPrototype(JSContextRef context, id self) {
     JSValueRef prototype;
 
     if (self == NSArray_)
     JSValueRef prototype;
 
     if (self == NSArray_)

-        prototype = CYGetCachedObject(context, CYJSString("Array_prototype"));
+        prototype = CYGetCachedObject(context, CYJSString("ArrayInstance_prototype"));

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

-        prototype = CYGetCachedObject(context, CYJSString("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);
     CYSetProperty(context, cy, name, object);
     else
         prototype = CYGetClassPrototype(context, class_getSuperclass(self));
 
     JSObjectRef object(JSObjectMake(context, _class, NULL));
     JSObjectSetPrototype(context, object, prototype);
     CYSetProperty(context, cy, name, object);

+

     return object;
 }
 
     return object;
 }
 


@@ -404,9 +389,12 @@ JSObjectRef CYMakeInstance(JSContextRef context, id object, bool transient) {
 - (bool) cy$deleteProperty:(NSString *)name;
 - (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context;
 
 - (bool) cy$deleteProperty:(NSString *)name;
 - (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context;
 

++ (bool) cy$hasImplicitProperties;
+

 @end
 
 @protocol Cycript
 @end
 
 @protocol Cycript

+- (id) cy$box;

 - (JSValueRef) cy$JSValueInContext:(JSContextRef)context;
 @end
 
 - (JSValueRef) cy$JSValueInContext:(JSContextRef)context;
 @end
 


@@ -433,7 +421,7 @@ NSString *CYCastNSCYON(id value) {
             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 == NSMessageBuilder_ || value == Object_)
+            else if (value == NSGenericDeallocHandler_ || value == NSMessageBuilder_ || value == Object_)

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


@@ -692,9 +680,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__


@@ -760,6 +752,10 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     }
 }
 
     }
 }
 

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

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


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

-    return [self boolValue] ? @"true" : @"false";
+    return [self boolValue] ? @"@true" : @"@false";

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


@@ -788,9 +784,13 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
 /* 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__


@@ -834,6 +834,10 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     }
 }
 
     }
 }
 

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

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


@@ -927,7 +931,7 @@ 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$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {


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

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

 }
 
 @end
 }
 
 @end


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

+- (id) cy$box {
+    return self;
+}
+

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

-    return CYMakeInstance(context, self, false);
+    return NULL;

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


@@ -995,6 +1003,10 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
 - (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
 }
 
 - (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
 }
 

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

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


@@ -1013,6 +1025,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;
 }


@@ -1023,6 +1039,7 @@ 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());
     CYUTF8String string(CYCastUTF8String(self));
     CYStringify(str, string.data, string.size);
     std::string value(str.str());


@@ -1035,6 +1052,53 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return [self cy$toCYON];
 }
 
     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$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+    return CYCastJSValue(context, CYJSString(context, self));
+} CYObjectiveCatch }
+

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


@@ -1088,8 +1152,6 @@ NSArray *CYCastNSArray(JSContextRef context, JSPropertyNameArrayRef names) {
 JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
     if (value == nil)
         return CYJSNull(context);
 JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
     if (value == nil)
         return CYJSNull(context);

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

     else
         return CYMakeInstance(context, value, false);
 } CYPoolCatch(NULL) return /*XXX*/ NULL; }
     else
         return CYMakeInstance(context, value, false);
 } CYPoolCatch(NULL) return /*XXX*/ NULL; }


@@ -1169,6 +1231,11 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *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;


@@ -1185,7 +1252,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 } CYObjectiveCatch }
 
 - (NSUInteger) count { CYObjectiveTry {
 } CYObjectiveCatch }
 
 - (NSUInteger) count { CYObjectiveTry {

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

 } CYObjectiveCatch }
 
 - (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry {
 } CYObjectiveCatch }
 
 - (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry {


@@ -1199,12 +1266,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 } CYObjectiveCatch }
 
 - (void) addObject:(id)object { CYObjectiveTry {
 } CYObjectiveCatch }
 
 - (void) addObject:(id)object { CYObjectiveTry {

-    JSValueRef exception(NULL);
-    JSValueRef arguments[1];
-    arguments[0] = CYCastJSValue(context_, (NSObject *) object);
-    JSObjectRef Array(CYGetCachedObject(context_, Array_s));
-    JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, push_s)), 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 {


@@ -1216,14 +1278,14 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
     arguments[0] = CYCastJSValue(context_, index);
     arguments[1] = CYCastJSValue(context_, 0);
     arguments[2] = CYCastJSValue(context_, (NSObject *) object);
     arguments[0] = CYCastJSValue(context_, index);
     arguments[1] = CYCastJSValue(context_, 0);
     arguments[2] = CYCastJSValue(context_, (NSObject *) object);

-    JSObjectRef Array(CYGetCachedObject(context_, Array_s));
+    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);
     JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 3, arguments, &exception);
     CYThrow(context_, exception);
 } CYObjectiveCatch }
 
 - (void) removeLastObject { CYObjectiveTry {
     JSValueRef exception(NULL);

-    JSObjectRef Array(CYGetCachedObject(context_, Array_s));
+    JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype")));

     JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, pop_s)), object_, 0, NULL, &exception);
     CYThrow(context_, exception);
 } CYObjectiveCatch }
     JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, pop_s)), object_, 0, NULL, &exception);
     CYThrow(context_, exception);
 } CYObjectiveCatch }


@@ -1236,7 +1298,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *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);

-    JSObjectRef Array(CYGetCachedObject(context_, Array_s));
+    JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype")));

     JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 2, arguments, &exception);
     CYThrow(context_, exception);
 } CYObjectiveCatch }
     JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 2, arguments, &exception);
     CYThrow(context_, exception);
 } CYObjectiveCatch }


@@ -1333,6 +1395,8 @@ JSValueRef CYObjectiveC_RuntimeProperty(JSContextRef context, CYUTF8String name)
         return Instance::Make(context, nil);
     if (Class _class = objc_getClass(name.data))
         return CYMakeInstance(context, _class, true);
         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;
 } CYPoolCatch(NULL) return /*XXX*/ NULL; }
 
     return NULL;
 } CYPoolCatch(NULL) return /*XXX*/ NULL; }
 


@@ -1342,6 +1406,8 @@ static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (
 
 static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry {
     switch (type->primitive) {
 
 static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry {
     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);


@@ -1360,6 +1426,8 @@ static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Ty
 
 static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) { CYPoolTry {
     switch (type->primitive) {
 
 static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) { CYPoolTry {
     switch (type->primitive) {

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

         case sig::object_P:
             if (NSObject *object = *reinterpret_cast<NSObject **>(data)) {
                 JSValueRef value(CYCastJSValue(context, object));
         case sig::object_P:
             if (NSObject *object = *reinterpret_cast<NSObject **>(data)) {
                 JSValueRef value(CYCastJSValue(context, object));


@@ -1406,36 +1474,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;
 }
 


@@ -1571,6 +1619,13 @@ static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object,
 #endif
 }
 
 #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) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->GetValue());
 static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->GetValue());


@@ -1601,9 +1656,10 @@ static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStr
         return true;
 #endif
 
         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;
 }


@@ -1638,9 +1694,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 }


@@ -1714,6 +1771,18 @@ static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JS
     } CYPoolCatch(NULL)
 } CYCatch return /*XXX*/ NULL; }
 
     } CYPoolCatch(NULL)
 } 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)));
     id self(internal->GetValue());
 static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->GetValue());


@@ -1731,6 +1800,21 @@ 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
         if (CYImplements(self, _class, @selector(cy$getPropertyNames:inContext:), false))
     CYPoolTry {
         // XXX: this is an evil hack to deal with NSProxy; fix elsewhere
         if (CYImplements(self, _class, @selector(cy$getPropertyNames:inContext:), false))


@@ -1759,6 +1843,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;


@@ -1952,6 +2046,18 @@ static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObject
 #endif
 }
 
 #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 && (
 #ifdef __APPLE__
 static bool stret(ffi_type *ffi_type) {
     return ffi_type->type == FFI_TYPE_STRUCT && (


@@ -1990,6 +2096,26 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class
     sig::Signature signature;
     sig::Parse(pool, &signature, type, &Structor_);
 
     sig::Signature signature;
     sig::Parse(pool, &signature, type, &Structor_);
 

+    size_t used(count + 3);
+    if (used > signature.count) {
+        sig::Element *elements(new (pool) sig::Element[used]);
+        memcpy(elements, signature.elements, used * sizeof(sig::Element));
+
+        for (size_t index(signature.count); index != used; ++index) {
+            sig::Element *element(&elements[index]);
+            element->name = NULL;
+            element->offset = _not(size_t);
+
+            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);
 


@@ -2048,7 +2174,7 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
 } CYCatch }
 
 /* Hook: objc_registerClassPair {{{ */
 } CYCatch }
 
 /* Hook: objc_registerClassPair {{{ */

-#if defined(__APPLE__) && defined(__arm__)
+#if defined(__APPLE__) && defined(__arm__) && 0

 // XXX: replace this with associated objects
 
 MSHook(void, CYDealloc, id self, SEL sel) {
 // XXX: replace this with associated objects
 
 MSHook(void, CYDealloc, id self, SEL sel) {


@@ -2126,7 +2252,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) {


@@ -2157,7 +2283,7 @@ static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjec
     return Instance::Make(context, (id) 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))


@@ -2198,15 +2324,44 @@ static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectR
     } CYPoolCatch(NULL)
 } CYCatch return /*XXX*/ NULL; }
 
     } CYPoolCatch(NULL)
 } 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$JSValueInContext:)])
+        return _this;
+
+    if (JSValueRef result = [value cy$JSValueInContext: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(context, [internal->GetValue() description]));
+        return CYCastJSValue(context, CYJSString(context, [value description]));

     } CYPoolCatch(NULL)
 } CYCatch return /*XXX*/ NULL; }
 
     } CYPoolCatch(NULL)
 } CYCatch return /*XXX*/ NULL; }
 


@@ -2257,15 +2412,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}
 };


@@ -2292,6 +2449,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
 #ifdef __APPLE__
     NSCFBoolean_ = objc_getClass("NSCFBoolean");
     NSCFType_ = objc_getClass("NSCFType");
 #ifdef __APPLE__
     NSCFBoolean_ = objc_getClass("NSCFBoolean");
     NSCFType_ = objc_getClass("NSCFType");

+    NSGenericDeallocHandler_ = objc_getClass("__NSGenericDeallocHandler");

     NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
     NSZombie_ = objc_getClass("_NSZombie_");
 #else
     NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
     NSZombie_ = objc_getClass("_NSZombie_");
 #else


@@ -2300,6 +2458,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
 
     NSArray_ = objc_getClass("NSArray");
     NSDictionary_ = objc_getClass("NSDictionary");
 
     NSArray_ = objc_getClass("NSArray");
     NSDictionary_ = objc_getClass("NSDictionary");

+    NSString_ = objc_getClass("NSString");

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


@@ -2367,6 +2526,12 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     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";
 #if OBJC_API_VERSION >= 2
     definition = kJSClassDefinitionEmpty;
     definition.className = "ObjectiveC::Images";


@@ -2387,7 +2552,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames;
     ObjectiveC_Protocols_ = JSClassCreate(&definition);
 
     definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames;
     ObjectiveC_Protocols_ = JSClassCreate(&definition);
 

-#if defined(__APPLE__) && defined(__arm__)
+#if defined(__APPLE__) && defined(__arm__) && 0

     MSHookFunction(&objc_registerClassPair, MSHake(objc_registerClassPair));
 #endif
 
     MSHookFunction(&objc_registerClassPair, MSHake(objc_registerClassPair));
 #endif
 


@@ -2401,12 +2566,22 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
     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 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));
     CYSetProperty(context, cycript, CYJSString("ObjectiveC"), ObjectiveC);
 
 
     JSObjectRef ObjectiveC(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, cycript, CYJSString("ObjectiveC"), ObjectiveC);
 

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

 
 #if OBJC_API_VERSION >= 2
     CYSetProperty(context, ObjectiveC, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL));
 
 #if OBJC_API_VERSION >= 2
     CYSetProperty(context, ObjectiveC, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL));


@@ -2420,11 +2595,32 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
     JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s)));
     CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);
 
     JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s)));
     CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);
 

+    JSObjectRef ArrayInstance(JSObjectMakeConstructor(context, Instance_, 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 ObjectInstance(JSObjectMakeConstructor(context, Instance_, 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, Instance_, 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);
 
     CYSetProperty(context, cycript, CYJSString("Instance"), Instance);
     CYSetProperty(context, cycript, CYJSString("Selector"), Selector);
     CYSetProperty(context, cycript, CYJSString("Super"), Super);
 

-#if defined(__APPLE__) && defined(__arm__)
+    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, all, CYJSString("objc_registerClassPair"), &objc_registerClassPair_, kJSPropertyAttributeDontEnum);
 #endif
 


@@ -2438,7 +2634,6 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
 static CYHooks CYObjectiveCHooks = {
     &CYObjectiveC_ExecuteStart,
     &CYObjectiveC_ExecuteEnd,
 static CYHooks CYObjectiveCHooks = {
     &CYObjectiveC_ExecuteStart,
     &CYObjectiveC_ExecuteEnd,

-    &CYObjectiveC_RuntimeProperty,

     &CYObjectiveC_CallFunction,
     &CYObjectiveC_Initialize,
     &CYObjectiveC_SetupContext,
     &CYObjectiveC_CallFunction,
     &CYObjectiveC_Initialize,
     &CYObjectiveC_SetupContext,


@@ -2449,5 +2644,7 @@ static CYHooks CYObjectiveCHooks = {
 struct CYObjectiveC {
     CYObjectiveC() {
         hooks_ = &CYObjectiveCHooks;
 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;
     }
 } CYObjectiveC;