X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/4e39dc0b33914636c16dbe0940a0876ada8a40fc..cb02f8aec13cb7ffea9631c401293e80447e6ae7:/Library.mm

diff --git a/Library.mm b/Library.mm
index 66c7523..bef1661 100644
--- a/Library.mm
+++ b/Library.mm
@@ -1,4 +1,4 @@
-/* Cycript - Remove Execution Server and Disassembler
+/* Cycript - Remote Execution Server and Disassembler
  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 
@@ -37,21 +37,34 @@
 */
 /* }}} */
 
-#define _GNU_SOURCE
-
 #include <substrate.h>
+
+#include <dlfcn.h>
+#include <iconv.h>
+
 #include "cycript.hpp"
 
 #include "sig/parse.hpp"
 #include "sig/ffi_type.hpp"
 
 #include "Pooling.hpp"
+
+#ifdef __OBJC__
 #include "Struct.hpp"
+#endif
 
+#ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreFoundation/CFLogUtilities.h>
+#include <JavaScriptCore/JSStringRefCF.h>
+#endif
 
+#ifdef __OBJC__
+#ifdef __APPLE__
 #include <WebKit/WebScriptObject.h>
+#endif
+#include <Foundation/Foundation.h>
+#endif
 
 #include <sys/mman.h>
 
@@ -59,27 +72,45 @@
 #include <ext/stdio_filebuf.h>
 #include <set>
 #include <map>
-
+#include <iomanip>
 #include <sstream>
 #include <cmath>
 
 #include "Parser.hpp"
 #include "Cycript.tab.hh"
 
-#include <apr-1/apr_thread_proc.h>
-
 #undef _assert
 #undef _trace
 
+#ifdef __OBJC__
+#define _throw(name, args...) \
+    @throw [NSException exceptionWithName:name reason:[NSString stringWithFormat:@args] userInfo:nil]
+#else
+#define _throw(name, args...) \
+    throw "_throw()"
+#endif
+
 #define _assert(test) do { \
     if (!(test)) \
-        @throw [NSException exceptionWithName:NSInternalInconsistencyException reason:[NSString stringWithFormat:@"_assert(%s):%s(%u):%s", #test, __FILE__, __LINE__, __FUNCTION__] userInfo:nil]; \
+        _throw(NSInternalInconsistencyException, "*** _assert(%s):%s(%u):%s [errno=%d]", #test, __FILE__, __LINE__, __FUNCTION__, errno); \
 } while (false)
 
 #define _trace() do { \
-    CFLog(kCFLogLevelNotice, CFSTR("_trace():%u"), __LINE__); \
+    fprintf(stderr, "_trace():%u\n", __LINE__); \
 } while (false)
 
+#define CYTry \
+    try
+#define CYCatch \
+    catch (NSException *error) { \
+        CYThrow(context, error, exception); \
+        return NULL; \
+    } catch (...) { \
+        *exception = CYCastJSValue(context, "catch(...)"); \
+        return NULL; \
+    }
+
+#ifdef __OBJC__
 #define CYPoolTry { \
     id _saved(nil); \
     NSAutoreleasePool *_pool([[NSAutoreleasePool alloc] init]); \
@@ -95,9 +126,42 @@
             [_saved autorelease]; \
     } \
 }
+#else
+#define CYPoolTry {
+#define CYPoolCatch }
+#endif
+
+#ifndef __APPLE__
+#define class_getSuperclass GSObjCSuper
+#define object_getClass GSObjCClass
+#endif
 
 void CYThrow(JSContextRef context, JSValueRef value);
 
+JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception);
+
+struct CYUTF8String {
+    const char *data;
+    size_t size;
+
+    CYUTF8String(const char *data, size_t size) :
+        data(data),
+        size(size)
+    {
+    }
+};
+
+struct CYUTF16String {
+    const uint16_t *data;
+    size_t size;
+
+    CYUTF16String(const uint16_t *data, size_t size) :
+        data(data),
+        size(size)
+    {
+    }
+};
+
 /* JavaScript Properties {{{ */
 JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, size_t index) {
     JSValueRef exception(NULL);
@@ -126,11 +190,6 @@ void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, J
 }
 /* }}} */
 /* JavaScript Strings {{{ */
-JSStringRef CYCopyJSString(id value) {
-    // XXX: this definition scares me; is anyone using this?!
-    return value == NULL ? NULL : JSStringCreateWithCFString(reinterpret_cast<CFStringRef>([value description]));
-}
-
 JSStringRef CYCopyJSString(const char *value) {
     return value == NULL ? NULL : JSStringCreateWithUTF8CString(value);
 }
@@ -194,38 +253,200 @@ class CYJSString {
         return string_;
     }
 };
+/* }}} */
+/* C Strings {{{ */
+// XXX: this macro is unhygenic
+#define CYCastCString_(string) ({ \
+    char *utf8; \
+    if (string == NULL) \
+        utf8 = NULL; \
+    else { \
+        size_t size(JSStringGetMaximumUTF8CStringSize(string)); \
+        utf8 = reinterpret_cast<char *>(alloca(size)); \
+        JSStringGetUTF8CString(string, utf8, size); \
+    } \
+    utf8; \
+})
+
+// XXX: this macro is unhygenic
+#define CYCastCString(context, value) ({ \
+    char *utf8; \
+    if (value == NULL) \
+        utf8 = NULL; \
+    else if (JSStringRef string = CYCopyJSString(context, value)) { \
+        utf8 = CYCastCString_(string); \
+        JSStringRelease(string); \
+    } else \
+        utf8 = NULL; \
+    utf8; \
+})
+
+/* }}} */
+
+#ifdef __OBJC__
+/* Objective-C Pool Release {{{ */
+apr_status_t CYPoolRelease_(void *data) {
+    id object(reinterpret_cast<id>(data));
+    [object release];
+    return APR_SUCCESS;
+}
+
+id CYPoolRelease_(apr_pool_t *pool, id object) {
+    if (object == nil)
+        return nil;
+    else if (pool == NULL)
+        return [object autorelease];
+    else {
+        apr_pool_cleanup_register(pool, object, &CYPoolRelease_, &apr_pool_cleanup_null);
+        return object;
+    }
+}
+
+template <typename Type_>
+Type_ CYPoolRelease(apr_pool_t *pool, Type_ object) {
+    return (Type_) CYPoolRelease_(pool, (id) object);
+}
+/* }}} */
+/* Objective-C Strings {{{ */
+const char *CYPoolCString(apr_pool_t *pool, NSString *value) {
+    if (pool == NULL)
+        return [value UTF8String];
+    else {
+        size_t size([value maximumLengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1);
+        char *string(new(pool) char[size]);
+        if (![value getCString:string maxLength:size encoding:NSUTF8StringEncoding])
+            _throw(NSInternalInconsistencyException, "[NSString getCString:maxLength:encoding:] == NO");
+        return string;
+    }
+}
+
+JSStringRef CYCopyJSString_(NSString *value) {
+#ifdef __APPLE__
+    return JSStringCreateWithCFString(reinterpret_cast<CFStringRef>(value));
+#else
+    CYPool pool;
+    return CYCopyJSString(CYPoolCString(pool, value));
+#endif
+}
+
+JSStringRef CYCopyJSString(id value) {
+    if (value == nil)
+        return NULL;
+    // XXX: this definition scares me; is anyone using this?!
+    NSString *string([value description]);
+    return CYCopyJSString_(string);
+}
+
+NSString *CYCopyNSString(const CYUTF8String &value) {
+#ifdef __APPLE__
+    return (NSString *) CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8 *>(value.data), value.size, kCFStringEncodingUTF8, true);
+#else
+    return [[NSString alloc] initWithBytes:value.data length:value.size encoding:NSUTF8StringEncoding];
+#endif
+}
+
+NSString *CYCopyNSString(JSStringRef value) {
+#ifdef __APPLE__
+    return (NSString *) JSStringCopyCFString(kCFAllocatorDefault, value);
+#else
+    return CYCopyNSString(CYCastCString_(value));
+#endif
+}
+
+NSString *CYCopyNSString(JSContextRef context, JSValueRef value) {
+    return CYCopyNSString(CYJSString(context, value));
+}
+
+NSString *CYCastNSString(apr_pool_t *pool, const CYUTF8String &value) {
+    return CYPoolRelease(pool, CYCopyNSString(value));
+}
+
+NSString *CYCastNSString(apr_pool_t *pool, SEL sel) {
+    const char *name(sel_getName(sel));
+    return CYPoolRelease(pool, CYCopyNSString(CYUTF8String(name, strlen(name))));
+}
 
-CFStringRef CYCopyCFString(JSStringRef value) {
-    return JSStringCopyCFString(kCFAllocatorDefault, value);
+NSString *CYCastNSString(apr_pool_t *pool, JSStringRef value) {
+    return CYPoolRelease(pool, CYCopyNSString(value));
 }
 
-CFStringRef CYCopyCFString(JSContextRef context, JSValueRef value) {
-    return CYCopyCFString(CYJSString(context, value));
+CYUTF8String CYCastUTF8String(NSString *value) {
+    NSData *data([value dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:NO]);
+    return CYUTF8String(reinterpret_cast<const char *>([data bytes]), [data length]);
 }
+/* }}} */
+#endif
 
+/* JavaScript Stringify {{{ */
+void CYStringify(std::ostringstream &str, const char *data, size_t size) {
+    unsigned quot(0), apos(0);
+    for (const char *value(data), *end(data + size); value != end; ++value)
+        if (*value == '"')
+            ++quot;
+        else if (*value == '\'')
+            ++apos;
+
+    bool single(quot > apos);
+
+    str << (single ? '\'' : '"');
+
+    for (const char *value(data), *end(data + size); value != end; ++value)
+        switch (*value) {
+            case '\\': str << "\\\\"; break;
+            case '\b': str << "\\b"; break;
+            case '\f': str << "\\f"; break;
+            case '\n': str << "\\n"; break;
+            case '\r': str << "\\r"; break;
+            case '\t': str << "\\t"; break;
+            case '\v': str << "\\v"; break;
+
+            case '"':
+                if (!single)
+                    str << "\\\"";
+                else goto simple;
+            break;
+
+            case '\'':
+                if (single)
+                    str << "\\'";
+                else goto simple;
+            break;
+
+            default:
+                if (*value < 0x20 || *value >= 0x7f)
+                    str << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(*value);
+                else simple:
+                    str << *value;
+        }
+
+    str << (single ? '\'' : '"');
+}
 /* }}} */
 
 static JSGlobalContextRef Context_;
 static JSObjectRef System_;
-static JSObjectRef ObjectiveC_;
 
 static JSClassRef Functor_;
+static JSClassRef Pointer_;
+static JSClassRef Runtime_;
+static JSClassRef Struct_;
+
+#ifdef __OBJC__
 static JSClassRef Instance_;
 static JSClassRef Internal_;
 static JSClassRef Message_;
 static JSClassRef Messages_;
-static JSClassRef NSArrayPrototype_;
-static JSClassRef Pointer_;
-static JSClassRef Runtime_;
 static JSClassRef Selector_;
-static JSClassRef Struct_;
-static JSClassRef Type_;
+static JSClassRef Super_;
 
 static JSClassRef ObjectiveC_Classes_;
 static JSClassRef ObjectiveC_Image_Classes_;
 static JSClassRef ObjectiveC_Images_;
 static JSClassRef ObjectiveC_Protocols_;
 
+static JSObjectRef Instance_prototype_;
+#endif
+
 static JSObjectRef Array_;
 static JSObjectRef Function_;
 static JSObjectRef String_;
@@ -239,7 +460,6 @@ static JSStringRef prototype_;
 static JSStringRef toCYON_;
 static JSStringRef toJSON_;
 
-static JSObjectRef Instance_prototype_;
 static JSObjectRef Object_prototype_;
 
 static JSObjectRef Array_prototype_;
@@ -247,13 +467,18 @@ static JSObjectRef Array_pop_;
 static JSObjectRef Array_push_;
 static JSObjectRef Array_splice_;
 
-static Class NSArray_;
+#ifdef __OBJC__
+#ifdef __APPLE__
 static Class NSCFBoolean_;
 static Class NSCFType_;
+#endif
+
+static Class NSArray_;
 static Class NSDictionary_;
 static Class NSMessageBuilder_;
 static Class NSZombie_;
 static Class Object_;
+#endif
 
 static NSArray *Bridge_;
 
@@ -271,8 +496,8 @@ struct CYValue :
     CYValue() {
     }
 
-    CYValue(void *value) :
-        value_(value)
+    CYValue(const void *value) :
+        value_(const_cast<void *>(value))
     {
     }
 
@@ -286,6 +511,34 @@ struct CYValue :
     }
 };
 
+struct CYOwned :
+    CYValue
+{
+  private:
+    JSContextRef context_;
+    JSObjectRef owner_;
+
+  public:
+    CYOwned(void *value, JSContextRef context, JSObjectRef owner) :
+        CYValue(value),
+        context_(context),
+        owner_(owner)
+    {
+        if (owner_ != NULL)
+            JSValueProtect(context_, owner_);
+    }
+
+    virtual ~CYOwned() {
+        if (owner_ != NULL)
+            JSValueUnprotect(context_, owner_);
+    }
+
+    JSObjectRef GetOwner() const {
+        return owner_;
+    }
+};
+
+#ifdef __OBJC__
 struct Selector_privateData :
     CYValue
 {
@@ -307,7 +560,7 @@ JSValueRef CYGetClassPrototype(JSContextRef context, id self) {
         return Instance_prototype_;
 
     // XXX: I need to think through multi-context
-    typedef std::map<Class, JSValueRef> CacheMap;
+    typedef std::map<id, JSValueRef> CacheMap;
     static CacheMap cache_;
 
     JSValueRef &value(cache_[self]);
@@ -352,12 +605,13 @@ struct Instance :
     virtual ~Instance() {
         if ((flags_ & Transient) == 0)
             // XXX: does this handle background threads correctly?
+            // XXX: this simply does not work on the console because I'm stupid
             [GetValue() performSelector:@selector(release) withObject:nil afterDelay:0];
     }
 
     static JSObjectRef Make(JSContextRef context, id object, Flags flags = None) {
         JSObjectRef value(JSObjectMake(context, Instance_, new Instance(object, flags)));
-        JSObjectSetPrototype(context, value, CYGetClassPrototype(context, object == nil ? nil : object_getClass(object)));
+        JSObjectSetPrototype(context, value, CYGetClassPrototype(context, object_getClass(object)));
         return value;
     }
 
@@ -372,6 +626,23 @@ struct Instance :
     virtual Type_privateData *GetType() const;
 };
 
+struct Super :
+    Instance
+{
+    Class class_;
+
+    Super(id value, Class _class) :
+        Instance(value, Instance::Transient),
+        class_(_class)
+    {
+    }
+
+    static JSObjectRef Make(JSContextRef context, id object, Class _class) {
+        JSObjectRef value(JSObjectMake(context, Super_, new Super(object, _class)));
+        return value;
+    }
+};
+
 struct Messages :
     CYValue
 {
@@ -396,31 +667,6 @@ struct Messages :
     }
 };
 
-struct CYOwned :
-    CYValue
-{
-  private:
-    JSContextRef context_;
-    JSObjectRef owner_;
-
-  public:
-    CYOwned(void *value, JSContextRef context, JSObjectRef owner) :
-        CYValue(value),
-        context_(context),
-        owner_(owner)
-    {
-        JSValueProtect(context_, owner_);
-    }
-
-    virtual ~CYOwned() {
-        JSValueUnprotect(context_, owner_);
-    }
-
-    JSObjectRef GetOwner() const {
-        return owner_;
-    }
-};
-
 struct Internal :
     CYOwned
 {
@@ -437,6 +683,7 @@ struct Internal :
         return reinterpret_cast<id>(value_);
     }
 };
+#endif
 
 namespace sig {
 
@@ -469,9 +716,14 @@ void Copy(apr_pool_t *pool, Type &lhs, Type &rhs) {
     if (sig::IsAggregate(rhs.primitive))
         Copy(pool, lhs.data.signature, rhs.data.signature);
     else {
-        if (rhs.data.data.type != NULL) {
-            lhs.data.data.type = new(pool) Type;
-            Copy(pool, *lhs.data.data.type, *rhs.data.data.type);
+        sig::Type *&lht(lhs.data.data.type);
+        sig::Type *&rht(rhs.data.data.type);
+
+        if (rht == NULL)
+            lht = NULL;
+        else {
+            lht = new(pool) Type;
+            Copy(pool, *lht, *rht);
         }
 
         lhs.data.data.size = rhs.data.data.size;
@@ -534,8 +786,12 @@ void Structor_(apr_pool_t *pool, const char *name, const char *types, sig::Type
 struct Type_privateData :
     CYData
 {
+#ifdef __OBJC__
     static Type_privateData *Object;
     static Type_privateData *Selector;
+#endif
+
+    static JSClassRef Class_;
 
     ffi_type *ffi_;
     sig::Type *type_;
@@ -591,6 +847,9 @@ struct Type_privateData :
     }
 };
 
+JSClassRef Type_privateData::Class_;
+
+#ifdef __OBJC__
 Type_privateData *Type_privateData::Object;
 Type_privateData *Type_privateData::Selector;
 
@@ -601,6 +860,7 @@ Type_privateData *Instance::GetType() const {
 Type_privateData *Selector_privateData::GetType() const {
     return Type_privateData::Selector;
 }
+#endif
 
 struct Pointer :
     CYOwned
@@ -652,7 +912,6 @@ struct Functor_privateData :
     sig::Signature signature_;
     ffi_cif cif_;
 
-
     Functor_privateData(const char *type, void (*value)()) :
         CYValue(reinterpret_cast<void *>(value))
     {
@@ -684,6 +943,7 @@ struct Closure_privateData :
     }
 };
 
+#ifdef __OBJC__
 struct Message_privateData :
     Functor_privateData
 {
@@ -708,18 +968,7 @@ JSObjectRef CYMakeInstance(JSContextRef context, id object, bool transient) {
 
     return Instance::Make(context, object, flags);
 }
-
-const char *CYPoolCString(apr_pool_t *pool, NSString *value) {
-    if (pool == NULL)
-        return [value UTF8String];
-    else {
-        size_t size([value maximumLengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1);
-        char *string(new(pool) char[size]);
-        if (![value getCString:string maxLength:size encoding:NSUTF8StringEncoding])
-            @throw [NSException exceptionWithName:NSInternalInconsistencyException reason:@"[NSString getCString:maxLength:encoding:] == NO" userInfo:nil];
-        return string;
-    }
-}
+#endif
 
 JSValueRef CYCastJSValue(JSContextRef context, bool value) {
     return JSValueMakeBoolean(context, value);
@@ -745,19 +994,22 @@ JSValueRef CYJSUndefined(JSContextRef context) {
     return JSValueMakeUndefined(context);
 }
 
-size_t CYGetIndex(const char *value) {
-    if (value[0] != '0') {
+size_t CYGetIndex(const CYUTF8String &value) {
+    if (value.data[0] != '0') {
         char *end;
-        size_t index(strtoul(value, &end, 10));
-        if (value + strlen(value) == end)
+        size_t index(strtoul(value.data, &end, 10));
+        if (value.data + value.size == end)
             return index;
-    } else if (value[1] == '\0')
+    } else if (value.data[1] == '\0')
         return 0;
     return _not(size_t);
 }
 
-size_t CYGetIndex(apr_pool_t *pool, NSString *value) {
-    return CYGetIndex(CYPoolCString(pool, value));
+// XXX: fix this
+static CYUTF8String CYPoolUTF8String(apr_pool_t *pool, JSStringRef value);
+
+size_t CYGetIndex(apr_pool_t *pool, JSStringRef value) {
+    return CYGetIndex(CYPoolUTF8String(pool, value));
 }
 
 bool CYGetOffset(const char *value, ssize_t &index) {
@@ -774,12 +1026,17 @@ bool CYGetOffset(const char *value, ssize_t &index) {
     return false;
 }
 
+#ifdef __OBJC__
+size_t CYGetIndex(NSString *value) {
+    return CYGetIndex(CYCastUTF8String(value));
+}
+
 bool CYGetOffset(apr_pool_t *pool, NSString *value, ssize_t &index) {
     return CYGetOffset(CYPoolCString(pool, value), index);
 }
+#endif
 
-NSString *CYPoolNSCYON(apr_pool_t *pool, id value);
-
+#ifdef __OBJC__
 @interface NSMethodSignature (Cycript)
 - (NSString *) _typeString;
 @end
@@ -807,7 +1064,47 @@ NSString *CYPoolNSCYON(apr_pool_t *pool, id value);
 @interface NSString (Cycript)
 - (void *) cy$symbol;
 @end
+#endif
+
+#ifdef __OBJC__
+NSString *CYCastNSCYON(id value) {
+    NSString *string;
+
+    if (value == nil)
+        string = @"nil";
+    else {
+        Class _class(object_getClass(value));
+        SEL sel(@selector(cy$toCYON));
+
+        if (objc_method *toCYON = class_getInstanceMethod(_class, sel))
+            string = reinterpret_cast<NSString *(*)(id, SEL)>(method_getImplementation(toCYON))(value, sel);
+        else if (objc_method *methodSignatureForSelector = class_getInstanceMethod(_class, @selector(methodSignatureForSelector:))) {
+            if (reinterpret_cast<NSMethodSignature *(*)(id, SEL, SEL)>(method_getImplementation(methodSignatureForSelector))(value, @selector(methodSignatureForSelector:), sel) != nil)
+                string = [value cy$toCYON];
+            else goto fail;
+        } else fail: {
+            if (value == NSZombie_)
+                string = @"_NSZombie_";
+            else if (_class == NSZombie_)
+                string = [NSString stringWithFormat:@"<_NSZombie_: %p>", value];
+            // XXX: frowny /in/ the pants
+            else if (value == NSMessageBuilder_ || value == Object_)
+                string = nil;
+            else
+                string = [NSString stringWithFormat:@"%@", value];
+        }
+
+        // XXX: frowny pants
+        if (string == nil)
+            string = @"undefined";
+    }
+
+    return string;
+}
+#endif
 
+#ifdef __OBJC__
+#ifdef __APPLE__
 struct PropertyAttributes {
     CYPool pool_;
 
@@ -893,12 +1190,41 @@ struct PropertyAttributes {
     }
 
 };
+#endif
+#endif
 
-NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
+#ifdef __OBJC__
+#ifdef __APPLE__
+NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
     return [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease];
 }
+#endif
+#endif
 
-/* Bridge: NSArray {{{ */
+#ifdef __OBJC__
+#ifndef __APPLE__
+@interface CYWebUndefined : NSObject {
+}
+
++ (CYWebUndefined *) undefined;
+
+@end
+
+@implementation CYWebUndefined
+
++ (CYWebUndefined *) undefined {
+    static CYWebUndefined *instance_([[CYWebUndefined alloc] init]);
+    return instance_;
+}
+
+@end
+
+#define WebUndefined CYWebUndefined
+#endif
+#endif
+
+#ifdef __OBJC__
+/* Bridge: NSArray {{{ */
 @implementation NSArray (Cycript)
 
 - (NSString *) cy$toCYON {
@@ -906,13 +1232,19 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
     [json appendString:@"["];
 
     bool comma(false);
+#ifdef __APPLE__
     for (id object in self) {
+#else
+    id object;
+    for (size_t index(0), count([self count]); index != count; ++index) {
+        object = [self objectAtIndex:index];
+#endif
         if (comma)
             [json appendString:@","];
         else
             comma = true;
         if (object == nil || [object cy$JSType] != kJSTypeUndefined)
-            [json appendString:CYPoolNSCYON(NULL, object)];
+            [json appendString:CYCastNSCYON(object)];
         else {
             [json appendString:@","];
             comma = false;
@@ -927,7 +1259,7 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
     if ([name isEqualToString:@"length"])
         return true;
 
-    size_t index(CYGetIndex(NULL, name));
+    size_t index(CYGetIndex(name));
     if (index == _not(size_t) || index >= [self count])
         return [super cy$hasProperty:name];
     else
@@ -935,10 +1267,16 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 }
 
 - (NSObject *) cy$getProperty:(NSString *)name {
-    if ([name isEqualToString:@"length"])
-        return [NSNumber numberWithUnsignedInteger:[self count]];
+    if ([name isEqualToString:@"length"]) {
+        NSUInteger count([self count]);
+#ifdef __APPLE__
+        return [NSNumber numberWithUnsignedInteger:count];
+#else
+        return [NSNumber numberWithUnsignedInt:count];
+#endif
+    }
 
-    size_t index(CYGetIndex(NULL, name));
+    size_t index(CYGetIndex(name));
     if (index == _not(size_t) || index >= [self count])
         return [super cy$getProperty:name];
     else
@@ -955,7 +1293,12 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
     [json appendString:@"{"];
 
     bool comma(false);
+#ifdef __APPLE__
     for (id key in self) {
+#else
+    NSEnumerator *keys([self keyEnumerator]);
+    while (id key = [keys nextObject]) {
+#endif
         if (comma)
             [json appendString:@","];
         else
@@ -963,7 +1306,7 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
         [json appendString:[key cy$toKey]];
         [json appendString:@":"];
         NSObject *object([self objectForKey:key]);
-        [json appendString:CYPoolNSCYON(NULL, object)];
+        [json appendString:CYCastNSCYON(object)];
     }
 
     [json appendString:@"}"];
@@ -986,7 +1329,12 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 - (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {
     if ([name isEqualToString:@"length"]) {
         // XXX: is this not intelligent?
-        NSUInteger size([(NSNumber *)value unsignedIntegerValue]);
+        NSNumber *number(reinterpret_cast<NSNumber *>(value));
+#ifdef __APPLE__
+        NSUInteger size([number unsignedIntegerValue]);
+#else
+        NSUInteger size([number unsignedIntValue]);
+#endif
         NSUInteger count([self count]);
         if (size < count)
             [self removeObjectsInRange:NSMakeRange(size, count - size)];
@@ -998,7 +1346,7 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
         return true;
     }
 
-    size_t index(CYGetIndex(NULL, name));
+    size_t index(CYGetIndex(name));
     if (index == _not(size_t))
         return [super cy$setProperty:name to:value];
 
@@ -1021,7 +1369,7 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 }
 
 - (bool) cy$deleteProperty:(NSString *)name {
-    size_t index(CYGetIndex(NULL, name));
+    size_t index(CYGetIndex(name));
     if (index == _not(size_t) || index >= [self count])
         return [super cy$deleteProperty:name];
     [self replaceObjectAtIndex:index withObject:[WebUndefined undefined]];
@@ -1053,8 +1401,12 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 @implementation NSNumber (Cycript)
 
 - (JSType) cy$JSType {
+#ifdef __APPLE__
     // XXX: this just seems stupid
-    return [self class] == NSCFBoolean_ ? kJSTypeBoolean : kJSTypeNumber;
+    if ([self class] == NSCFBoolean_)
+        return kJSTypeBoolean;
+#endif
+    return kJSTypeNumber;
 }
 
 - (NSObject *) cy$toJSON:(NSString *)key {
@@ -1154,19 +1506,11 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 }
 
 - (NSString *) cy$toCYON {
-    // XXX: this should use the better code from Output.cpp
-    CFMutableStringRef json(CFStringCreateMutableCopy(kCFAllocatorDefault, 0, (CFStringRef) self));
-
-    CFStringFindAndReplace(json, CFSTR("\\"), CFSTR("\\\\"), CFRangeMake(0, CFStringGetLength(json)), 0);
-    CFStringFindAndReplace(json, CFSTR("\""), CFSTR("\\\""), CFRangeMake(0, CFStringGetLength(json)), 0);
-    CFStringFindAndReplace(json, CFSTR("\t"), CFSTR("\\t"), CFRangeMake(0, CFStringGetLength(json)), 0);
-    CFStringFindAndReplace(json, CFSTR("\r"), CFSTR("\\r"), CFRangeMake(0, CFStringGetLength(json)), 0);
-    CFStringFindAndReplace(json, CFSTR("\n"), CFSTR("\\n"), CFRangeMake(0, CFStringGetLength(json)), 0);
-
-    CFStringInsert(json, 0, CFSTR("\""));
-    CFStringAppend(json, CFSTR("\""));
-
-    return [reinterpret_cast<const NSString *>(json) autorelease];
+    std::ostringstream str;
+    CYUTF8String string(CYCastUTF8String(self));
+    CYStringify(str, string.data, string.size);
+    std::string value(str.str());
+    return CYCastNSString(NULL, CYUTF8String(value.c_str(), value.size()));
 }
 
 - (NSString *) cy$toKey {
@@ -1177,7 +1521,7 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
         goto cyon;
 
     if (DigitRange_[value[0]]) {
-        size_t index(CYGetIndex(NULL, self));
+        size_t index(CYGetIndex(self));
         if (index == _not(size_t))
             goto cyon;
     } else {
@@ -1223,6 +1567,7 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 @end
 /* }}} */
 
+/* Bridge: CYJSObject {{{ */
 @interface CYJSObject : NSMutableDictionary {
     JSObjectRef object_;
     JSContextRef context_;
@@ -1230,7 +1575,7 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context;
 
-- (NSString *) cy$toJSON:(NSString *)key;
+- (NSObject *) cy$toJSON:(NSString *)key;
 
 - (NSUInteger) count;
 - (id) objectForKey:(id)key;
@@ -1239,7 +1584,8 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 - (void) removeObjectForKey:(id)key;
 
 @end
-
+/* }}} */
+/* Bridge: CYJSArray {{{ */
 @interface CYJSArray : NSMutableArray {
     JSObjectRef object_;
     JSContextRef context_;
@@ -1257,41 +1603,11 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 - (void) replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject;
 
 @end
+/* }}} */
+#endif
 
-CYRange DigitRange_    (0x3ff000000000000LLU, 0x000000000000000LLU); // 0-9
-CYRange WordStartRange_(0x000001000000000LLU, 0x7fffffe87fffffeLLU); // A-Za-z_$
-CYRange WordEndRange_  (0x3ff001000000000LLU, 0x7fffffe87fffffeLLU); // A-Za-z_$0-9
-
-#define CYTry \
-    @try
-#define CYCatch \
-    @catch (id error) { \
-        CYThrow(context, error, exception); \
-        return NULL; \
-    }
-
-apr_status_t CYPoolRelease_(void *data) {
-    id object(reinterpret_cast<id>(data));
-    [object release];
-    return APR_SUCCESS;
-}
-
-id CYPoolRelease(apr_pool_t *pool, id object) {
-    if (object == nil)
-        return nil;
-    else if (pool == NULL)
-        return [object autorelease];
-    else {
-        apr_pool_cleanup_register(pool, object, &CYPoolRelease_, &apr_pool_cleanup_null);
-        return object;
-    }
-}
-
-CFTypeRef CYPoolRelease(apr_pool_t *pool, CFTypeRef object) {
-    return (CFTypeRef) CYPoolRelease(pool, (id) object);
-}
-
-id CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
+#ifdef __OBJC__
+NSObject *CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
     JSValueRef exception(NULL);
     bool array(JSValueIsInstanceOfConstructor(context, object, Array_, &exception));
     CYThrow(context, exception);
@@ -1299,7 +1615,7 @@ id CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
     return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]);
 }
 
-id CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
+NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
     if (!JSValueIsObjectOfClass(context, object, Instance_))
         return CYCastNSObject_(pool, context, object);
     else {
@@ -1307,6 +1623,7 @@ id CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
         return internal->GetValue();
     }
 }
+#endif
 
 double CYCastDouble(const char *value, size_t size) {
     char *end;
@@ -1327,29 +1644,19 @@ double CYCastDouble(JSContextRef context, JSValueRef value) {
     return number;
 }
 
-CFNumberRef CYCopyCFNumber(JSContextRef context, JSValueRef value) {
-    double number(CYCastDouble(context, value));
-    return CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType, &number);
-}
-
-CFStringRef CYCopyCFString(const char *value) {
-    return CFStringCreateWithCString(kCFAllocatorDefault, value, kCFStringEncodingUTF8);
-}
-
-NSString *CYCastNSString(apr_pool_t *pool, const char *value) {
-    return (NSString *) CYPoolRelease(pool, CYCopyCFString(value));
-}
-
-NSString *CYCastNSString(apr_pool_t *pool, JSStringRef value) {
-    return (NSString *) CYPoolRelease(pool, CYCopyCFString(value));
+#ifdef __OBJC__
+NSNumber *CYCopyNSNumber(JSContextRef context, JSValueRef value) {
+    return [[NSNumber alloc] initWithDouble:CYCastDouble(context, value)];
 }
+#endif
 
 bool CYCastBool(JSContextRef context, JSValueRef value) {
     return JSValueToBoolean(context, value);
 }
 
-CFTypeRef CYCFType(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cast) {
-    CFTypeRef object;
+#ifdef __OBJC__
+id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cast) {
+    id object;
     bool copy;
 
     switch (JSType type = JSValueGetType(context, value)) {
@@ -1363,28 +1670,33 @@ CFTypeRef CYCFType(apr_pool_t *pool, JSContextRef context, JSValueRef value, boo
         break;
 
         case kJSTypeBoolean:
-            object = CYCastBool(context, value) ? kCFBooleanTrue : kCFBooleanFalse;
+#ifdef __APPLE__
+            object = (id) (CYCastBool(context, value) ? kCFBooleanTrue : kCFBooleanFalse);
             copy = false;
+#else
+            object = [[NSNumber alloc] initWithBool:CYCastBool(context, value)];
+            copy = true;
+#endif
         break;
 
         case kJSTypeNumber:
-            object = CYCopyCFNumber(context, value);
+            object = CYCopyNSNumber(context, value);
             copy = true;
         break;
 
         case kJSTypeString:
-            object = CYCopyCFString(context, value);
+            object = CYCopyNSString(context, value);
             copy = true;
         break;
 
         case kJSTypeObject:
             // XXX: this might could be more efficient
-            object = (CFTypeRef) CYCastNSObject(pool, context, (JSObjectRef) value);
+            object = CYCastNSObject(pool, context, (JSObjectRef) value);
             copy = false;
         break;
 
         default:
-            @throw [NSException exceptionWithName:NSInternalInconsistencyException reason:[NSString stringWithFormat:@"JSValueGetType() == 0x%x", type] userInfo:nil];
+            _throw(NSInternalInconsistencyException, "JSValueGetType() == 0x%x", type);
         break;
     }
 
@@ -1393,15 +1705,27 @@ CFTypeRef CYCFType(apr_pool_t *pool, JSContextRef context, JSValueRef value, boo
     else if (copy)
         return CYPoolRelease(pool, object);
     else
-        return CFRetain(object);
+        return [object retain];
 }
 
-CFTypeRef CYCastCFType(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
-    return CYCFType(pool, context, value, true);
+NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
+    return CYNSObject(pool, context, value, true);
+}
+NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
+    return CYNSObject(pool, context, value, false);
 }
 
-CFTypeRef CYCopyCFType(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
-    return CYCFType(pool, context, value, false);
+static bool CYIsClass(id self) {
+    // XXX: this is a lame object_isClass
+    return class_getInstanceMethod(object_getClass(self), @selector(alloc)) != NULL;
+}
+
+Class CYCastClass(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
+    id self(CYCastNSObject(pool, context, value));
+    if (CYIsClass(self))
+        return (Class) self;
+    _throw(NSInvalidArgumentException, "got something that is not a Class");
+    return NULL;
 }
 
 NSArray *CYCastNSArray(JSPropertyNameArrayRef names) {
@@ -1412,15 +1736,17 @@ NSArray *CYCastNSArray(JSPropertyNameArrayRef names) {
         [array addObject:CYCastNSString(pool, JSPropertyNameArrayGetNameAtIndex(names, index))];
     return array;
 }
-
-id CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
-    return reinterpret_cast<const NSObject *>(CYCastCFType(pool, context, value));
-}
+#endif
 
 void CYThrow(JSContextRef context, JSValueRef value) {
     if (value == NULL)
         return;
+#ifdef __OBJC__
     @throw CYCastNSObject(NULL, context, value);
+#else
+    // XXX: why not?
+    throw value;
+#endif
 }
 
 JSValueRef CYJSNull(JSContextRef context) {
@@ -1435,6 +1761,7 @@ JSValueRef CYCastJSValue(JSContextRef context, const char *value) {
     return CYCastJSValue(context, CYJSString(value));
 }
 
+#ifdef __OBJC__
 JSValueRef CYCastJSValue(JSContextRef context, id value) {
     if (value == nil)
         return CYJSNull(context);
@@ -1443,6 +1770,7 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) {
     else
         return CYMakeInstance(context, value, false);
 }
+#endif
 
 JSObjectRef CYCastJSObject(JSContextRef context, JSValueRef value) {
     JSValueRef exception(NULL);
@@ -1465,19 +1793,25 @@ JSValueRef CYCallAsFunction(JSContextRef context, JSObjectRef function, JSObject
 }
 
 bool CYIsCallable(JSContextRef context, JSValueRef value) {
-    // XXX: this isn't actually correct
-    return value != NULL && JSValueIsObject(context, value);
+    return value != NULL && JSValueIsObject(context, value) && JSObjectIsFunction(context, (JSObjectRef) value);
 }
 
+#ifdef __OBJC__
 @implementation CYJSObject
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context {
     if ((self = [super init]) != nil) {
         object_ = object;
         context_ = context;
+        JSValueProtect(context_, object_);
     } return self;
 }
 
+- (void) dealloc {
+    JSValueUnprotect(context_, object_);
+    [super dealloc];
+}
+
 - (NSObject *) cy$toJSON:(NSString *)key {
     JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_));
     if (!CYIsCallable(context_, toJSON))
@@ -1538,9 +1872,15 @@ bool CYIsCallable(JSContextRef context, JSValueRef value) {
     if ((self = [super init]) != nil) {
         object_ = object;
         context_ = context;
+        JSValueProtect(context_, object_);
     } return self;
 }
 
+- (void) dealloc {
+    JSValueUnprotect(context_, object_);
+    [super dealloc];
+}
+
 - (NSUInteger) count {
     return CYCastDouble(context_, CYGetProperty(context_, object_, length_));
 }
@@ -1602,41 +1942,7 @@ bool CYIsCallable(JSContextRef context, JSValueRef value) {
 }
 
 @end
-
-NSString *CYCopyNSCYON(id value) {
-    NSString *string;
-
-    if (value == nil)
-        string = @"nil";
-    else {
-        Class _class(object_getClass(value));
-        SEL sel(@selector(cy$toCYON));
-
-        if (Method toCYON = class_getInstanceMethod(_class, sel))
-            string = reinterpret_cast<NSString *(*)(id, SEL)>(method_getImplementation(toCYON))(value, sel);
-        else if (Method methodSignatureForSelector = class_getInstanceMethod(_class, @selector(methodSignatureForSelector:))) {
-            if (reinterpret_cast<NSMethodSignature *(*)(id, SEL, SEL)>(method_getImplementation(methodSignatureForSelector))(value, @selector(methodSignatureForSelector:), sel) != nil)
-                string = [value cy$toCYON];
-            else goto fail;
-        } else fail: {
-            if (value == NSZombie_)
-                string = @"_NSZombie_";
-            else if (_class == NSZombie_)
-                string = [NSString stringWithFormat:@"<_NSZombie_: %p>", value];
-            // XXX: frowny /in/ the pants
-            else if (value == NSMessageBuilder_ || value == Object_)
-                string = nil;
-            else
-                string = [NSString stringWithFormat:@"%@", value];
-        }
-
-        // XXX: frowny pants
-        if (string == nil)
-            string = @"undefined";
-    }
-
-    return [string retain];
-}
+#endif
 
 NSString *CYCopyNSCYON(JSContextRef context, JSValueRef value, JSValueRef *exception) {
     if (JSValueIsNull(context, value))
@@ -1644,15 +1950,11 @@ NSString *CYCopyNSCYON(JSContextRef context, JSValueRef value, JSValueRef *excep
 
     CYTry {
         CYPoolTry {
-            return CYCopyNSCYON(CYCastNSObject(NULL, context, value));
+            return [CYCastNSCYON(CYCastNSObject(NULL, context, value)) retain];
         } CYPoolCatch(NULL)
     } CYCatch
 }
 
-NSString *CYPoolNSCYON(apr_pool_t *pool, id value) {
-    return CYPoolRelease(pool, static_cast<id>(CYCopyNSCYON(value)));
-}
-
 const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value, JSValueRef *exception) {
     if (NSString *json = CYCopyNSCYON(context, value, exception)) {
         const char *string(CYPoolCString(pool, json));
@@ -1661,6 +1963,7 @@ const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value
     } else return NULL;
 }
 
+#ifdef __OBJC__
 // XXX: use objc_getAssociatedObject and objc_setAssociatedObject on 10.6
 struct CYInternal :
     CYData
@@ -1717,58 +2020,66 @@ struct CYInternal :
         CYSetProperty(context, object_, name, value);
     }
 };
+#endif
 
-JSObjectRef CYMakeSelector(JSContextRef context, SEL sel) {
+#ifdef __OBJC__
+static JSObjectRef CYMakeSelector(JSContextRef context, SEL sel) {
     Selector_privateData *internal(new Selector_privateData(sel));
     return JSObjectMake(context, Selector_, internal);
 }
+#endif
 
-JSObjectRef CYMakePointer(JSContextRef context, void *pointer, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
+static JSObjectRef CYMakePointer(JSContextRef context, void *pointer, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
     Pointer *internal(new Pointer(pointer, context, owner, type));
     return JSObjectMake(context, Pointer_, internal);
 }
 
-JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const char *type) {
+static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const char *type) {
     Functor_privateData *internal(new Functor_privateData(type, function));
     return JSObjectMake(context, Functor_, internal);
 }
 
-const char *CYPoolCString(apr_pool_t *pool, JSStringRef value) {
-    if (pool == NULL) {
-        const char *string([CYCastNSString(NULL, value) UTF8String]);
-        return string;
-    } else {
-        size_t size(JSStringGetMaximumUTF8CStringSize(value));
-        char *string(new(pool) char[size]);
-        JSStringGetUTF8CString(value, string, size);
-        return string;
-    }
+static CYUTF16String CYCastUTF16String(JSStringRef value) {
+    return CYUTF16String(JSStringGetCharactersPtr(value), JSStringGetLength(value));
+}
+
+// XXX: sometimes pool is null
+static CYUTF8String CYPoolUTF8String(apr_pool_t *pool, JSStringRef value) {
+    CYUTF16String utf16(CYCastUTF16String(value));
+    const char *in(reinterpret_cast<const char *>(utf16.data));
+
+    iconv_t conversion(_syscall(iconv_open("UTF-8", "UCS-2-INTERNAL")));
+
+    size_t size(JSStringGetMaximumUTF8CStringSize(value));
+    char *out(new(pool) char[size]);
+    CYUTF8String utf8(out, size);
+
+    size = utf16.size * 2;
+    _syscall(iconv(conversion, const_cast<char **>(&in), &size, &out, &utf8.size));
+
+    *out = '\0';
+    utf8.size = out - utf8.data;
+
+    _syscall(iconv_close(conversion));
+
+    return utf8;
+}
+
+static const char *CYPoolCString(apr_pool_t *pool, JSStringRef value) {
+    CYUTF8String utf8(CYPoolUTF8String(pool, value));
+    _assert(memchr(utf8.data, '\0', utf8.size) == NULL);
+    return utf8.data;
 }
 
-const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
+static const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
     return JSValueIsNull(context, value) ? NULL : CYPoolCString(pool, CYJSString(context, value));
 }
 
-bool CYGetOffset(apr_pool_t *pool, JSStringRef value, ssize_t &index) {
+static bool CYGetOffset(apr_pool_t *pool, JSStringRef value, ssize_t &index) {
     return CYGetOffset(CYPoolCString(pool, value), index);
 }
 
-// XXX: this macro is unhygenic
-#define CYCastCString(context, value) ({ \
-    char *utf8; \
-    if (value == NULL) \
-        utf8 = NULL; \
-    else if (JSStringRef string = CYCopyJSString(context, value)) { \
-        size_t size(JSStringGetMaximumUTF8CStringSize(string)); \
-        utf8 = reinterpret_cast<char *>(alloca(size)); \
-        JSStringGetUTF8CString(string, utf8, size); \
-        JSStringRelease(string); \
-    } else \
-        utf8 = NULL; \
-    utf8; \
-})
-
-void *CYCastPointer_(JSContextRef context, JSValueRef value) {
+static void *CYCastPointer_(JSContextRef context, JSValueRef value) {
     switch (JSValueGetType(context, value)) {
         case kJSTypeNull:
             return NULL;
@@ -1782,25 +2093,27 @@ void *CYCastPointer_(JSContextRef context, JSValueRef value) {
         default:
             double number(CYCastDouble(context, value));
             if (std::isnan(number))
-                @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"cannot convert value to pointer" userInfo:nil];
+                _throw(NSInvalidArgumentException, "cannot convert value to pointer");
             return reinterpret_cast<void *>(static_cast<uintptr_t>(static_cast<long long>(number)));
     }
 }
 
 template <typename Type_>
-_finline Type_ CYCastPointer(JSContextRef context, JSValueRef value) {
+static _finline Type_ CYCastPointer(JSContextRef context, JSValueRef value) {
     return reinterpret_cast<Type_>(CYCastPointer_(context, value));
 }
 
-SEL CYCastSEL(JSContextRef context, JSValueRef value) {
+#ifdef __OBJC__
+static SEL CYCastSEL(JSContextRef context, JSValueRef value) {
     if (JSValueIsObjectOfClass(context, value, Selector_)) {
         Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate((JSObjectRef) value)));
         return reinterpret_cast<SEL>(internal->value_);
     } else
         return CYCastPointer<SEL>(context, value);
 }
+#endif
 
-void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) {
+static void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) {
     switch (type->primitive) {
         case sig::boolean_P:
             *reinterpret_cast<bool *>(data) = JSValueToBoolean(context, value);
@@ -1824,6 +2137,7 @@ void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type
         CYPoolFFI_(float, float)
         CYPoolFFI_(double, double)
 
+#ifdef __OBJC__
         case sig::object_P:
         case sig::typename_P:
             *reinterpret_cast<id *>(data) = CYCastNSObject(pool, context, value);
@@ -1832,6 +2146,7 @@ void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type
         case sig::selector_P:
             *reinterpret_cast<SEL *>(data) = CYCastSEL(context, value);
         break;
+#endif
 
         case sig::pointer_P:
             *reinterpret_cast<void **>(data) = CYCastPointer<void *>(context, value);
@@ -1859,7 +2174,7 @@ void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type
                         else
                             goto undefined;
                         if (JSValueIsUndefined(context, rhs)) undefined:
-                            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"unable to extract structure value" userInfo:nil];
+                            _throw(NSInvalidArgumentException, "unable to extract structure value");
                     }
                 }
 
@@ -1873,12 +2188,12 @@ void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type
         break;
 
         default:
-            NSLog(@"CYPoolFFI(%c)\n", type->primitive);
+            fprintf(stderr, "CYPoolFFI(%c)\n", type->primitive);
             _assert(false);
     }
 }
 
-JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize = false, JSObjectRef owner = NULL) {
+static JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize = false, JSObjectRef owner = NULL) {
     JSValueRef value;
 
     switch (type->primitive) {
@@ -1904,6 +2219,7 @@ JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void
         CYFromFFI_(float, float)
         CYFromFFI_(double, double)
 
+#ifdef __OBJC__
         case sig::object_P: {
             if (id object = *reinterpret_cast<id *>(data)) {
                 value = CYCastJSValue(context, object);
@@ -1921,6 +2237,7 @@ JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void
                 value = CYMakeSelector(context, sel);
             else goto null;
         break;
+#endif
 
         case sig::pointer_P:
             if (void *pointer = *reinterpret_cast<void **>(data))
@@ -1947,7 +2264,7 @@ JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void
         break;
 
         default:
-            NSLog(@"CYFromFFI(%c)\n", type->primitive);
+            fprintf(stderr, "CYFromFFI(%c)\n", type->primitive);
             _assert(false);
     }
 
@@ -1955,7 +2272,7 @@ JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void
 }
 
 static bool CYImplements(id object, Class _class, SEL selector, bool devoid) {
-    if (Method method = class_getInstanceMethod(_class, selector)) {
+    if (objc_method *method = class_getInstanceMethod(_class, selector)) {
         if (!devoid)
             return true;
         char type[16];
@@ -1968,16 +2285,16 @@ static bool CYImplements(id object, Class _class, SEL selector, bool devoid) {
     return false;
 }
 
-const char *CYPoolTypeEncoding(apr_pool_t *pool, Class _class, SEL sel, Method method) {
+static const char *CYPoolTypeEncoding(apr_pool_t *pool, Class _class, SEL sel, objc_method *method) {
     if (method != NULL)
         return method_getTypeEncoding(method);
-    else if (NSString *type = [[Bridge_ objectAtIndex:1] objectForKey:CYCastNSString(pool, sel_getName(sel))])
+    else if (NSString *type = [[Bridge_ objectAtIndex:1] objectForKey:CYCastNSString(pool, sel)])
         return CYPoolCString(pool, type);
     else
         return NULL;
 }
 
-void FunctionClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
+static void FunctionClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
     Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg));
 
     JSContextRef context(internal->context_);
@@ -1992,7 +2309,7 @@ void FunctionClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
     CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value);
 }
 
-void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
+static void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
     Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg));
 
     JSContextRef context(internal->context_);
@@ -2009,7 +2326,7 @@ void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
     CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value);
 }
 
-Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const char *type, void (*callback)(ffi_cif *, void *, void **, void *)) {
+static Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const char *type, void (*callback)(ffi_cif *, void *, void **, void *)) {
     // XXX: in case of exceptions this will leak
     // XXX: in point of fact, this may /need/ to leak :(
     Closure_privateData *internal(new Closure_privateData(CYGetJSContext(), function, type));
@@ -2030,7 +2347,7 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function,
     return internal;
 }
 
-JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const char *type) {
+static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const char *type) {
     Closure_privateData *internal(CYMakeFunctor_(context, function, type, &FunctionClosure_));
     return JSObjectMake(context, Functor_, internal);
 }
@@ -2049,6 +2366,7 @@ static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const c
     }
 }
 
+#ifdef __OBJC__
 static JSObjectRef CYMakeMessage(JSContextRef context, SEL sel, IMP imp, const char *type) {
     Message_privateData *internal(new Message_privateData(sel, type, imp));
     return JSObjectMake(context, Message_, internal);
@@ -2082,7 +2400,7 @@ static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object,
     const char *name(CYPoolCString(pool, property));
 
     if (SEL sel = sel_getUid(name))
-        if (Method method = class_getInstanceMethod(_class, sel))
+        if (objc_method *method = class_getInstanceMethod(_class, sel))
             return CYMakeMessage(context, sel, method_getImplementation(method), method_getTypeEncoding(method));
 
     return NULL;
@@ -2097,7 +2415,7 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
 
     SEL sel(sel_registerName(name));
 
-    Method method(class_getInstanceMethod(_class, sel));
+    objc_method *method(class_getInstanceMethod(_class, sel));
 
     const char *type;
     IMP imp;
@@ -2128,7 +2446,7 @@ static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JS
     const char *name(CYPoolCString(pool, property));
 
     if (SEL sel = sel_getUid(name))
-        if (Method method = class_getInstanceMethod(_class, sel)) {
+        if (objc_method *method = class_getInstanceMethod(_class, sel)) {
             objc_method_list list = {NULL, 1, {method}};
             class_removeMethods(_class, &list);
             return true;
@@ -2143,7 +2461,7 @@ static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object,
     Class _class(internal->GetValue());
 
     unsigned int size;
-    Method *data(class_copyMethodList(_class, &size));
+    objc_method **data(class_copyMethodList(_class, &size));
     for (size_t i(0); i != size; ++i)
         JSPropertyNameAccumulatorAddName(names, CYJSString(sel_getName(method_getName(data[i]))));
     free(data);
@@ -2207,15 +2525,17 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object,
         const char *string(CYPoolCString(pool, name));
         Class _class(object_getClass(self));
 
+#ifdef __APPLE__
         if (objc_property_t property = class_getProperty(_class, string)) {
             PropertyAttributes attributes(property);
             SEL sel(sel_registerName(attributes.Getter()));
-            return CYSendMessage(pool, context, self, sel, 0, NULL, false, exception);
+            return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception);
         }
+#endif
 
         if (SEL sel = sel_getUid(string))
             if (CYImplements(self, _class, sel, true))
-                return CYSendMessage(pool, context, self, sel, 0, NULL, false, exception);
+                return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception);
 
         return NULL;
     } CYCatch
@@ -2229,7 +2549,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
 
     CYTry {
         NSString *name(CYCastNSString(pool, property));
-        NSString *data(CYCastNSObject(pool, context, value));
+        NSObject *data(CYCastNSObject(pool, context, value));
 
         CYPoolTry {
             if ([self cy$setProperty:name to:data])
@@ -2239,15 +2559,17 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
         const char *string(CYPoolCString(pool, name));
         Class _class(object_getClass(self));
 
+#ifdef __APPLE__
         if (objc_property_t property = class_getProperty(_class, string)) {
             PropertyAttributes attributes(property);
             if (const char *setter = attributes.Setter()) {
                 SEL sel(sel_registerName(setter));
                 JSValueRef arguments[1] = {value};
-                CYSendMessage(pool, context, self, sel, 1, arguments, false, exception);
+                CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception);
                 return true;
             }
         }
+#endif
 
         size_t length(strlen(string));
 
@@ -2268,7 +2590,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
         if (SEL sel = sel_getUid(set))
             if (CYImplements(self, _class, sel, false)) {
                 JSValueRef arguments[1] = {value};
-                CYSendMessage(pool, context, self, sel, 1, arguments, false, exception);
+                CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception);
             }
 
         if (CYInternal *internal = CYInternal::Set(self)) {
@@ -2316,11 +2638,6 @@ static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef
     } CYCatch
 }
 
-bool CYIsClass(id self) {
-    // XXX: this is a lame object_isClass
-    return class_getInstanceMethod(object_getClass(self), @selector(alloc)) != NULL;
-}
-
 static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) constructor)));
     Class _class(internal->GetValue());
@@ -2411,8 +2728,9 @@ static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
     return internal->GetOwner();
 }
+#endif
 
-bool Index_(apr_pool_t *pool, Struct_privateData *internal, JSStringRef property, ssize_t &index, uint8_t *&base) {
+static bool Index_(apr_pool_t *pool, Struct_privateData *internal, JSStringRef property, ssize_t &index, uint8_t *&base) {
     Type_privateData *typical(internal->type_);
     sig::Type *type(typical->type_);
     if (type == NULL)
@@ -2538,12 +2856,12 @@ static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, J
     ssize_t index;
     uint8_t *base;
 
-    if (!Index_(pool, internal, property, index, base))
-        return NULL;
+    CYTry {
+        if (!Index_(pool, internal, property, index, base))
+            return NULL;
 
-    JSObjectRef owner(internal->GetOwner() ?: object);
+        JSObjectRef owner(internal->GetOwner() ?: object);
 
-    CYTry {
         return CYFromFFI(context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, false, owner);
     } CYCatch
 }
@@ -2556,10 +2874,10 @@ static bool Struct_setProperty(JSContextRef context, JSObjectRef object, JSStrin
     ssize_t index;
     uint8_t *base;
 
-    if (!Index_(pool, internal, property, index, base))
-        return false;
-
     CYTry {
+        if (!Index_(pool, internal, property, index, base))
+            return false;
+
         CYPoolFFI(NULL, context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, value);
         return true;
     } CYCatch
@@ -2594,7 +2912,7 @@ static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JS
 JSValueRef CYCallFunction(apr_pool_t *pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception, sig::Signature *signature, ffi_cif *cif, void (*function)()) {
     CYTry {
         if (setups + count != signature->count - 1)
-            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to ffi function" userInfo:nil];
+            _throw(NSInvalidArgumentException, "incorrect number of arguments to ffi function");
 
         size_t size(setups + count);
         void *values[size];
@@ -2727,6 +3045,16 @@ static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObject
     free(data);
 }
 
+static JSObjectRef CYMakeType(JSContextRef context, const char *type) {
+    Type_privateData *internal(new Type_privateData(NULL, type));
+    return JSObjectMake(context, Type_privateData::Class_, internal);
+}
+
+static JSObjectRef CYMakeType(JSContextRef context, sig::Type *type) {
+    Type_privateData *internal(new Type_privateData(type));
+    return JSObjectMake(context, Type_privateData::Class_, internal);
+}
+
 static JSValueRef Runtime_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
     if (JSStringIsEqualToUTF8CString(property, "nil"))
         return Instance::Make(context, nil);
@@ -2750,49 +3078,64 @@ static JSValueRef Runtime_getProperty(JSContextRef context, JSObjectRef object,
                     sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
                     return CYFromFFI(context, signature.elements[0].type, cif.rtype, [name cy$symbol]);
             }
+        if (NSMutableArray *entry = [[Bridge_ objectAtIndex:2] objectForKey:name])
+            switch ([[entry objectAtIndex:0] intValue]) {
+                // XXX: implement case 0
+                case 1:
+                    return CYMakeType(context, CYPoolCString(pool, [entry objectAtIndex:1]));
+            }
         return NULL;
     } CYCatch
 }
 
-bool stret(ffi_type *ffi_type) {
+#ifdef __OBJC__
+static bool stret(ffi_type *ffi_type) {
     return ffi_type->type == FFI_TYPE_STRUCT && (
         ffi_type->size > OBJC_MAX_STRUCT_BY_VALUE ||
         struct_forward_array[ffi_type->size] != 0
     );
 }
+#endif
 
 extern "C" {
     int *_NSGetArgc(void);
     char ***_NSGetArgv(void);
-    int UIApplicationMain(int argc, char *argv[], NSString *principalClassName, NSString *delegateClassName);
 }
 
 static JSValueRef System_print(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
-        NSLog(@"%s", CYCastCString(context, arguments[0]));
+        if (count == 0)
+            printf("\n");
+        else
+            printf("%s\n", CYCastCString(context, arguments[0]));
         return CYJSUndefined(context);
     } CYCatch
 }
 
-JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception) {
+JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class _class, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception) {
     const char *type;
 
-    Class _class(object_getClass(self));
-    if (Method method = class_getInstanceMethod(_class, _cmd))
+    if (_class == NULL)
+        _class = object_getClass(self);
+
+    if (objc_method *method = class_getInstanceMethod(_class, _cmd))
         type = method_getTypeEncoding(method);
     else {
         CYTry {
             CYPoolTry {
                 NSMethodSignature *method([self methodSignatureForSelector:_cmd]);
                 if (method == nil)
-                    @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"unrecognized selector %s sent to object %p", sel_getName(_cmd), self] userInfo:nil];
+                    _throw(NSInvalidArgumentException, "unrecognized selector %s sent to object %p", sel_getName(_cmd), self);
                 type = CYPoolCString(pool, [method _typeString]);
             } CYPoolCatch(NULL)
         } CYCatch
     }
 
+    objc_super super = {self, _class};
+    void *arg0 = &super;
+
     void *setup[2];
-    setup[0] = &self;
+    setup[0] = &arg0;
     setup[1] = &_cmd;
 
     sig::Signature signature;
@@ -2801,7 +3144,7 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, SEL _c
     ffi_cif cif;
     sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
 
-    void (*function)() = stret(cif.rtype) ? reinterpret_cast<void (*)()>(&objc_msgSend_stret) : reinterpret_cast<void (*)()>(&objc_msgSend);
+    void (*function)() = stret(cif.rtype) ? reinterpret_cast<void (*)()>(&objc_msgSendSuper_stret) : reinterpret_cast<void (*)()>(&objc_msgSendSuper);
     return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, exception, &signature, &cif, function);
 }
 
@@ -2820,19 +3163,27 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
 
     id self;
     SEL _cmd;
+    Class _class;
 
     CYTry {
         if (count < 2)
-            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"too few arguments to objc_msgSend" userInfo:nil];
+            _throw(NSInvalidArgumentException, "too few arguments to objc_msgSend");
 
-        if (JSValueIsObjectOfClass(context, arguments[0], Instance_)) {
+        if (JSValueIsObjectOfClass(context, arguments[0], Super_)) {
+            Super *internal(reinterpret_cast<Super *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));
+            self = internal->GetValue();
+            _class = internal->class_;;
+            uninitialized = false;
+        } else if (JSValueIsObjectOfClass(context, arguments[0], Instance_)) {
             Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));
             self = internal->GetValue();
+            _class = nil;
             uninitialized = internal->IsUninitialized();
             if (uninitialized)
                 internal->value_ = nil;
         } else {
             self = CYCastNSObject(pool, context, arguments[0]);
+            _class = nil;
             uninitialized = false;
         }
 
@@ -2842,9 +3193,10 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
         _cmd = CYCastSEL(context, arguments[1]);
     } CYCatch
 
-    return CYSendMessage(pool, context, self, _cmd, count - 2, arguments + 2, uninitialized, exception);
+    return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized, exception);
 }
 
+#ifdef __OBJC__
 /* Hook: objc_registerClassPair {{{ */
 // XXX: replace this with associated objects
 
@@ -2869,15 +3221,25 @@ MSHook(void, objc_registerClassPair, Class _class) {
 static JSValueRef objc_registerClassPair_(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
         if (count != 1)
-            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to objc_registerClassPair" userInfo:nil];
+            _throw(NSInvalidArgumentException, "incorrect number of arguments to objc_registerClassPair");
         CYPool pool;
-        Class _class(CYCastNSObject(pool, context, arguments[0]));
+        NSObject *value(CYCastNSObject(pool, context, arguments[0]));
+        if (value == NULL || !CYIsClass(value))
+            _throw(NSInvalidArgumentException, "incorrect number of arguments to objc_registerClassPair");
+        Class _class((Class) value);
         $objc_registerClassPair(_class);
         return CYJSUndefined(context);
     } CYCatch
 }
 /* }}} */
+#endif
 
+static JSValueRef Cycript_gc_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+    JSGarbageCollect(context);
+    return CYJSUndefined(context);
+}
+
+#ifdef __OBJC__
 static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     JSValueRef setup[count + 2];
     setup[0] = _this;
@@ -2899,6 +3261,7 @@ static JSValueRef Message_callAsFunction(JSContextRef context, JSObjectRef objec
 
     return CYCallFunction(pool, context, 2, setup, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue());
 }
+#endif
 
 static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYPool pool;
@@ -2906,19 +3269,30 @@ static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef objec
     return CYCallFunction(pool, context, 0, NULL, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue());
 }
 
-JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+static JSObjectRef Super_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+    CYTry {
+        if (count != 2)
+            _throw(NSInvalidArgumentException, "incorrect number of arguments to Super constructor");
+        CYPool pool;
+        NSObject *self(CYCastNSObject(pool, context, arguments[0]));
+        Class _class(CYCastClass(pool, context, arguments[1]));
+        return Super::Make(context, self, _class);
+    } CYCatch
+}
+
+static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
         if (count != 1)
-            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Selector constructor" userInfo:nil];
+            _throw(NSInvalidArgumentException, "incorrect number of arguments to Selector constructor");
         const char *name(CYCastCString(context, arguments[0]));
         return CYMakeSelector(context, sel_registerName(name));
     } CYCatch
 }
 
-JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+static JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
         if (count != 2)
-            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Functor constructor" userInfo:nil];
+            _throw(NSInvalidArgumentException, "incorrect number of arguments to Functor constructor");
 
         void *value(CYCastPointer<void *>(context, arguments[0]));
         const char *type(CYCastCString(context, arguments[1]));
@@ -2932,25 +3306,47 @@ JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t count,
     } CYCatch
 }
 
-JSObjectRef CYMakeType(JSContextRef context, JSObjectRef object, const char *type) {
-    Type_privateData *internal(new Type_privateData(NULL, type));
-    return JSObjectMake(context, Type_, internal);
-}
-
-JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
         if (count != 1)
-            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Type constructor" userInfo:nil];
+            _throw(NSInvalidArgumentException, "incorrect number of arguments to Type constructor");
         const char *type(CYCastCString(context, arguments[0]));
-        return CYMakeType(context, object, type);
+        return CYMakeType(context, type);
+    } CYCatch
+}
+
+static JSValueRef Type_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
+
+    CYTry {
+        sig::Type type;
+
+        if (JSStringIsEqualToUTF8CString(property, "$cyi")) {
+            type.primitive = sig::pointer_P;
+            type.data.data.size = 0;
+        } else {
+            size_t index(CYGetIndex(NULL, property));
+            if (index == _not(size_t))
+                return NULL;
+            type.primitive = sig::array_P;
+            type.data.data.size = index;
+        }
+
+        type.name = NULL;
+        type.flags = 0;
+
+        type.data.data.type = internal->type_;
+
+        return CYMakeType(context, &type);
     } CYCatch
 }
 
 static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
+
     CYTry {
         if (count != 1)
-            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to type cast function" userInfo:nil];
-        Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
+            _throw(NSInvalidArgumentException, "incorrect number of arguments to type cast function");
         sig::Type *type(internal->type_);
         ffi_type *ffi(internal->GetFFI());
         // XXX: alignment?
@@ -2963,35 +3359,46 @@ static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object,
 
 static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
-        if (count > 1)
-            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to type cast function" userInfo:nil];
+        if (count != 0)
+            _throw(NSInvalidArgumentException, "incorrect number of arguments to type cast function");
         Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
-        size_t size(count == 0 ? 0 : CYCastDouble(context, arguments[0]));
-        // XXX: alignment?
-        void *value(malloc(internal->GetFFI()->size * size));
-        return CYMakePointer(context, value, internal->type_, internal->ffi_, NULL);
+
+        sig::Type *type(internal->type_);
+        size_t size;
+
+        if (type->primitive != sig::array_P)
+            size = 0;
+        else {
+            size = type->data.data.size;
+            type = type->data.data.type;
+        }
+
+        void *value(malloc(internal->GetFFI()->size));
+        return CYMakePointer(context, value, type, NULL, NULL);
     } CYCatch
 }
 
-JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+#ifdef __OBJC__
+static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
         if (count > 1)
-            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Instance constructor" userInfo:nil];
+            _throw(NSInvalidArgumentException, "incorrect number of arguments to Instance constructor");
         id self(count == 0 ? nil : CYCastPointer<id>(context, arguments[0]));
         return Instance::Make(context, self);
     } CYCatch
 }
+#endif
 
-JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
         if (count != 2)
-            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Functor constructor" userInfo:nil];
+            _throw(NSInvalidArgumentException, "incorrect number of arguments to Functor constructor");
         const char *type(CYCastCString(context, arguments[1]));
         return CYMakeFunctor(context, arguments[0], type);
     } CYCatch
 }
 
-JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
     CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(object)));
     return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->value_));
 }
@@ -3036,6 +3443,7 @@ static JSValueRef CYValue_callAsFunction_toCYON(JSContextRef context, JSObjectRe
     } CYCatch
 }
 
+#ifdef __OBJC__
 static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     return Instance::Make(context, object_getClass(internal->GetValue()));
@@ -3067,7 +3475,7 @@ static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectR
 
     CYTry {
         CYPoolTry {
-            return CYCastJSValue(context, CYJSString(CYPoolNSCYON(NULL, internal->GetValue())));
+            return CYCastJSValue(context, CYJSString(CYCastNSCYON(internal->GetValue())));
         } CYPoolCatch(NULL)
     } CYCatch
 }
@@ -3126,25 +3534,28 @@ static JSValueRef Selector_callAsFunction_toCYON(JSContextRef context, JSObjectR
 static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
         if (count != 1)
-            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Selector.type" userInfo:nil];
+            _throw(NSInvalidArgumentException, "incorrect number of arguments to Selector.type");
         CYPool pool;
         Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate(_this)));
-        Class _class(CYCastNSObject(pool, context, arguments[0]));
-        SEL sel(internal->GetValue());
-        Method method(class_getInstanceMethod(_class, sel));
-        const char *type(CYPoolTypeEncoding(pool, _class, sel, method));
-        return type == NULL ? CYJSNull(context) : CYCastJSValue(context, CYJSString(type));
+        if (Class _class = CYCastClass(pool, context, arguments[0])) {
+            SEL sel(internal->GetValue());
+            if (objc_method *method = class_getInstanceMethod(_class, sel))
+                if (const char *type = CYPoolTypeEncoding(pool, _class, sel, method))
+                    return CYCastJSValue(context, CYJSString(type));
+        }
+
+        // XXX: do a lookup of some kind
+        return CYJSNull(context);
     } CYCatch
 }
+#endif
 
 static JSValueRef Type_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     CYTry {
         Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
         CYPool pool;
         const char *type(sig::Unparse(pool, internal->type_));
-        CYPoolTry {
-            return CYCastJSValue(context, CYJSString(type));
-        } CYPoolCatch(NULL)
+        return CYCastJSValue(context, CYJSString(type));
     } CYCatch
 }
 
@@ -3153,9 +3564,14 @@ static JSValueRef Type_callAsFunction_toCYON(JSContextRef context, JSObjectRef o
         Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
         CYPool pool;
         const char *type(sig::Unparse(pool, internal->type_));
-        CYPoolTry {
-            return CYCastJSValue(context, CYJSString([NSString stringWithFormat:@"new Type(%@)", [[NSString stringWithUTF8String:type] cy$toCYON]]));
-        } CYPoolCatch(NULL)
+        size_t size(strlen(type));
+        char *cyon(new(pool) char[12 + size + 1]);
+        memcpy(cyon, "new Type(\"", 10);
+        cyon[12 + size] = '\0';
+        cyon[12 + size - 2] = '"';
+        cyon[12 + size - 1] = ')';
+        memcpy(cyon + 10, type, size);
+        return CYCastJSValue(context, CYJSString(cyon));
     } CYCatch
 }
 
@@ -3192,6 +3608,7 @@ static JSStaticFunction Functor_staticFunctions[4] = {
     {NULL, NULL, 0}
 };
 
+#ifdef __OBJC__
 static JSStaticValue Instance_staticValues[5] = {
     {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"messages", &Instance_getProperty_messages, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
@@ -3220,6 +3637,7 @@ static JSStaticFunction Selector_staticFunctions[5] = {
     {"type", &Selector_callAsFunction_type, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
 };
+#endif
 
 static JSStaticFunction Type_staticFunctions[4] = {
     {"toCYON", &Type_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
@@ -3228,28 +3646,6 @@ static JSStaticFunction Type_staticFunctions[4] = {
     {NULL, NULL, 0}
 };
 
-CYDriver::CYDriver(const std::string &filename) :
-    state_(CYClear),
-    data_(NULL),
-    size_(0),
-    file_(NULL),
-    filename_(filename),
-    source_(NULL)
-{
-    ScannerInit();
-}
-
-CYDriver::~CYDriver() {
-    ScannerDestroy();
-}
-
-void cy::parser::error(const cy::parser::location_type &location, const std::string &message) {
-    CYDriver::Error error;
-    error.location_ = location;
-    error.message_ = message;
-    driver.errors_.push_back(error);
-}
-
 void CYSetArgs(int argc, const char *argv[]) {
     JSContextRef context(CYGetJSContext());
     JSValueRef args[argc];
@@ -3298,138 +3694,33 @@ const char *CYExecute(apr_pool_t *pool, const char *code) { _pooled
     return json;
 }
 
-bool CYRecvAll_(int socket, uint8_t *data, size_t size) {
-    while (size != 0) if (size_t writ = _syscall(recv(socket, data, size, 0))) {
-        data += writ;
-        size -= writ;
-    } else
-        return false;
-    return true;
-}
-
-bool CYSendAll_(int socket, const uint8_t *data, size_t size) {
-    while (size != 0) if (size_t writ = _syscall(send(socket, data, size, 0))) {
-        data += writ;
-        size -= writ;
-    } else
-        return false;
-    return true;
-}
-
-apr_pool_t *Pool_;
-
-struct CYExecute_ {
-    apr_pool_t *pool_;
-    const char * volatile data_;
-};
-
-// XXX: this is "tre lame"
-@interface CYClient_ : NSObject {
-}
-
-- (void) execute:(NSValue *)value;
+static apr_pool_t *Pool_;
 
-@end
-
-@implementation CYClient_
-
-- (void) execute:(NSValue *)value {
-    CYExecute_ *execute(reinterpret_cast<CYExecute_ *>([value pointerValue]));
-    const char *data(execute->data_);
-    execute->data_ = NULL;
-    execute->data_ = CYExecute(execute->pool_, data);
-}
-
-@end
-
-struct CYClient :
-    CYData
-{
-    int socket_;
-    apr_thread_t *thread_;
-
-    CYClient(int socket) :
-        socket_(socket)
-    {
-    }
-
-    ~CYClient() {
-        _syscall(close(socket_));
-    }
-
-    void Handle() { _pooled
-        CYClient_ *client = [[[CYClient_ alloc] init] autorelease];
-
-        for (;;) {
-            size_t size;
-            if (!CYRecvAll(socket_, &size, sizeof(size)))
-                return;
-
-            CYPool pool;
-            char *data(new(pool) char[size + 1]);
-            if (!CYRecvAll(socket_, data, size))
-                return;
-            data[size] = '\0';
-
-            CYDriver driver("");
-            cy::parser parser(driver);
-
-            driver.data_ = data;
-            driver.size_ = size;
-
-            const char *json;
-            if (parser.parse() != 0 || !driver.errors_.empty()) {
-                json = NULL;
-                size = _not(size_t);
-            } else {
-                std::ostringstream str;
-                driver.source_->Show(str);
-                std::string code(str.str());
-                CYExecute_ execute = {pool, code.c_str()};
-                [client performSelectorOnMainThread:@selector(execute:) withObject:[NSValue valueWithPointer:&execute] waitUntilDone:YES];
-                json = execute.data_;
-                size = json == NULL ? _not(size_t) : strlen(json);
-            }
-
-            if (!CYSendAll(socket_, &size, sizeof(size)))
-                return;
-            if (json != NULL)
-                if (!CYSendAll(socket_, json, size))
-                    return;
-        }
-    }
-};
-
-static void * APR_THREAD_FUNC OnClient(apr_thread_t *thread, void *data) {
-    CYClient *client(reinterpret_cast<CYClient *>(data));
-    client->Handle();
-    delete client;
-    return NULL;
-}
-
-extern "C" void CYHandleClient(apr_pool_t *pool, int socket) {
-    CYClient *client(new(pool) CYClient(socket));
-    apr_threadattr_t *attr;
-    _aprcall(apr_threadattr_create(&attr, client->pool_));
-    _aprcall(apr_thread_create(&client->thread_, attr, &OnClient, client, client->pool_));
+apr_pool_t *CYGetGlobalPool() {
+    return Pool_;
 }
 
 MSInitialize { _pooled
     _aprcall(apr_initialize());
     _aprcall(apr_pool_create(&Pool_, NULL));
 
+    Bridge_ = [[NSMutableArray arrayWithContentsOfFile:@"/usr/lib/libcycript.plist"] retain];
+
+#ifdef __OBJC__
     Type_privateData::Object = new(Pool_) Type_privateData(Pool_, "@");
     Type_privateData::Selector = new(Pool_) Type_privateData(Pool_, ":");
 
-    Bridge_ = [[NSMutableArray arrayWithContentsOfFile:@"/usr/lib/libcycript.plist"] retain];
-
-    NSArray_ = objc_getClass("NSArray");
+#ifdef __APPLE__
     NSCFBoolean_ = objc_getClass("NSCFBoolean");
     NSCFType_ = objc_getClass("NSCFType");
+#endif
+
+    NSArray_ = objc_getClass("NSArray");
     NSDictionary_ = objc_getClass("NSDictonary");
     NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
     NSZombie_ = objc_getClass("_NSZombie_");
     Object_ = objc_getClass("Object");
+#endif
 }
 
 JSGlobalContextRef CYGetJSContext() {
@@ -3443,6 +3734,92 @@ JSGlobalContextRef CYGetJSContext() {
         definition.finalize = &Finalize;
         Functor_ = JSClassCreate(&definition);
 
+        definition = kJSClassDefinitionEmpty;
+        definition.className = "Pointer";
+        definition.staticValues = Pointer_staticValues;
+        definition.staticFunctions = Pointer_staticFunctions;
+        definition.getProperty = &Pointer_getProperty;
+        definition.setProperty = &Pointer_setProperty;
+        definition.finalize = &Finalize;
+        Pointer_ = JSClassCreate(&definition);
+
+        definition = kJSClassDefinitionEmpty;
+        definition.className = "Selector";
+        definition.staticValues = CYValue_staticValues;
+        definition.staticFunctions = Selector_staticFunctions;
+        definition.callAsFunction = &Selector_callAsFunction;
+        definition.finalize = &Finalize;
+        Selector_ = JSClassCreate(&definition);
+
+        definition = kJSClassDefinitionEmpty;
+        definition.className = "Struct";
+        definition.staticFunctions = Struct_staticFunctions;
+        definition.getProperty = &Struct_getProperty;
+        definition.setProperty = &Struct_setProperty;
+        definition.getPropertyNames = &Struct_getPropertyNames;
+        definition.finalize = &Finalize;
+        Struct_ = JSClassCreate(&definition);
+
+        definition = kJSClassDefinitionEmpty;
+        definition.className = "Type";
+        definition.staticFunctions = Type_staticFunctions;
+        definition.getProperty = &Type_getProperty;
+        definition.callAsFunction = &Type_callAsFunction;
+        definition.callAsConstructor = &Type_callAsConstructor;
+        definition.finalize = &Finalize;
+        Type_privateData::Class_ = JSClassCreate(&definition);
+
+        definition = kJSClassDefinitionEmpty;
+        definition.className = "Runtime";
+        definition.getProperty = &Runtime_getProperty;
+        Runtime_ = JSClassCreate(&definition);
+
+        definition = kJSClassDefinitionEmpty;
+        //definition.getProperty = &Global_getProperty;
+        JSClassRef Global(JSClassCreate(&definition));
+
+        JSGlobalContextRef context(JSGlobalContextCreate(Global));
+        Context_ = context;
+        JSObjectRef global(CYGetGlobalObject(context));
+
+        JSObjectSetPrototype(context, global, JSObjectMake(context, Runtime_, NULL));
+
+        Array_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Array")));
+        JSValueProtect(context, Array_);
+
+        Function_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Function")));
+        JSValueProtect(context, Function_);
+
+        String_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("String")));
+        JSValueProtect(context, String_);
+
+        length_ = JSStringCreateWithUTF8CString("length");
+        message_ = JSStringCreateWithUTF8CString("message");
+        name_ = JSStringCreateWithUTF8CString("name");
+        prototype_ = JSStringCreateWithUTF8CString("prototype");
+        toCYON_ = JSStringCreateWithUTF8CString("toCYON");
+        toJSON_ = JSStringCreateWithUTF8CString("toJSON");
+
+        JSObjectRef Object(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Object"))));
+        Object_prototype_ = CYCastJSObject(context, CYGetProperty(context, Object, prototype_));
+        JSValueProtect(context, Object_prototype_);
+
+        Array_prototype_ = CYCastJSObject(context, CYGetProperty(context, Array_, prototype_));
+        Array_pop_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("pop")));
+        Array_push_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("push")));
+        Array_splice_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("splice")));
+
+        JSValueProtect(context, Array_prototype_);
+        JSValueProtect(context, Array_pop_);
+        JSValueProtect(context, Array_push_);
+        JSValueProtect(context, Array_splice_);
+
+        JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));
+
+        JSValueRef function(CYGetProperty(context, Function_, prototype_));
+
+/* Objective-C Classes {{{ */
+#ifdef __OBJC__
         definition = kJSClassDefinitionEmpty;
         definition.className = "Instance";
         definition.staticValues = Instance_staticValues;
@@ -3487,53 +3864,10 @@ JSGlobalContextRef CYGetJSContext() {
         Messages_ = JSClassCreate(&definition);
 
         definition = kJSClassDefinitionEmpty;
-        definition.className = "NSArrayPrototype";
-        //definition.hasProperty = &NSArrayPrototype_hasProperty;
-        //definition.getProperty = &NSArrayPrototype_getProperty;
-        //definition.setProperty = &NSArrayPrototype_setProperty;
-        //definition.deleteProperty = &NSArrayPrototype_deleteProperty;
-        //definition.getPropertyNames = &NSArrayPrototype_getPropertyNames;
-        NSArrayPrototype_ = JSClassCreate(&definition);
-
-        definition = kJSClassDefinitionEmpty;
-        definition.className = "Pointer";
-        definition.staticValues = Pointer_staticValues;
-        definition.staticFunctions = Pointer_staticFunctions;
-        definition.getProperty = &Pointer_getProperty;
-        definition.setProperty = &Pointer_setProperty;
-        definition.finalize = &Finalize;
-        Pointer_ = JSClassCreate(&definition);
-
-        definition = kJSClassDefinitionEmpty;
-        definition.className = "Selector";
-        definition.staticValues = CYValue_staticValues;
-        definition.staticFunctions = Selector_staticFunctions;
-        definition.callAsFunction = &Selector_callAsFunction;
-        definition.finalize = &Finalize;
-        Selector_ = JSClassCreate(&definition);
-
-        definition = kJSClassDefinitionEmpty;
-        definition.className = "Struct";
-        definition.staticFunctions = Struct_staticFunctions;
-        definition.getProperty = &Struct_getProperty;
-        definition.setProperty = &Struct_setProperty;
-        definition.getPropertyNames = &Struct_getPropertyNames;
-        definition.finalize = &Finalize;
-        Struct_ = JSClassCreate(&definition);
-
-        definition = kJSClassDefinitionEmpty;
-        definition.className = "Type";
-        definition.staticFunctions = Type_staticFunctions;
-        //definition.getProperty = &Type_getProperty;
-        definition.callAsFunction = &Type_callAsFunction;
-        definition.callAsConstructor = &Type_callAsConstructor;
+        definition.className = "Super";
+        definition.staticFunctions = Internal_staticFunctions;
         definition.finalize = &Finalize;
-        Type_ = JSClassCreate(&definition);
-
-        definition = kJSClassDefinitionEmpty;
-        definition.className = "Runtime";
-        definition.getProperty = &Runtime_getProperty;
-        Runtime_ = JSClassCreate(&definition);
+        Super_ = JSClassCreate(&definition);
 
         definition = kJSClassDefinitionEmpty;
         definition.className = "ObjectiveC::Classes";
@@ -3559,69 +3893,56 @@ JSGlobalContextRef CYGetJSContext() {
         definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames;
         ObjectiveC_Protocols_ = JSClassCreate(&definition);
 
-        definition = kJSClassDefinitionEmpty;
-        //definition.getProperty = &Global_getProperty;
-        JSClassRef Global(JSClassCreate(&definition));
-
-        JSGlobalContextRef context(JSGlobalContextCreate(Global));
-        Context_ = context;
-
-        JSObjectRef global(CYGetGlobalObject(context));
-
-        JSObjectSetPrototype(context, global, JSObjectMake(context, Runtime_, NULL));
-        ObjectiveC_ = JSObjectMake(context, NULL, NULL);
-        CYSetProperty(context, global, CYJSString("ObjectiveC"), ObjectiveC_);
-
-        CYSetProperty(context, ObjectiveC_, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Classes_, NULL));
-        CYSetProperty(context, ObjectiveC_, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL));
-        CYSetProperty(context, ObjectiveC_, CYJSString("protocols"), JSObjectMake(context, ObjectiveC_Protocols_, NULL));
-
-        Array_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Array")));
-        Function_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Function")));
-        String_ = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("String")));
-
-        length_ = JSStringCreateWithUTF8CString("length");
-        message_ = JSStringCreateWithUTF8CString("message");
-        name_ = JSStringCreateWithUTF8CString("name");
-        prototype_ = JSStringCreateWithUTF8CString("prototype");
-        toCYON_ = JSStringCreateWithUTF8CString("toCYON");
-        toJSON_ = JSStringCreateWithUTF8CString("toJSON");
+        JSObjectRef ObjectiveC(JSObjectMake(context, NULL, NULL));
+        CYSetProperty(context, global, CYJSString("ObjectiveC"), ObjectiveC);
 
-        JSObjectRef Object(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Object"))));
-        Object_prototype_ = CYCastJSObject(context, CYGetProperty(context, Object, prototype_));
+        CYSetProperty(context, ObjectiveC, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Classes_, NULL));
+        CYSetProperty(context, ObjectiveC, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL));
+        CYSetProperty(context, ObjectiveC, CYJSString("protocols"), JSObjectMake(context, ObjectiveC_Protocols_, NULL));
 
-        Array_prototype_ = CYCastJSObject(context, CYGetProperty(context, Array_, prototype_));
-        Array_pop_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("pop")));
-        Array_push_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("push")));
-        Array_splice_ = CYCastJSObject(context, CYGetProperty(context, Array_prototype_, CYJSString("splice")));
-
-        JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new));
         JSObjectRef Instance(JSObjectMakeConstructor(context, Instance_, &Instance_new));
         JSObjectRef Message(JSObjectMakeConstructor(context, Message_, NULL));
         JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new));
+        JSObjectRef Super(JSObjectMakeConstructor(context, Super_, &Super_new));
 
         Instance_prototype_ = (JSObjectRef) CYGetProperty(context, Instance, prototype_);
+        JSValueProtect(context, Instance_prototype_);
+
+        CYSetProperty(context, global, CYJSString("Instance"), Instance);
+        CYSetProperty(context, global, CYJSString("Selector"), Selector);
+        CYSetProperty(context, global, CYJSString("Super"), Super);
+
+        CYSetProperty(context, global, CYJSString("objc_registerClassPair"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_registerClassPair"), &objc_registerClassPair_));
+        CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend));
 
-        JSValueRef function(CYGetProperty(context, Function_, prototype_));
         JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Message, prototype_), function);
-        JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Functor, prototype_), function);
         JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Selector, prototype_), function);
+#endif
+/* }}} */
+
+        JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Functor, prototype_), function);
 
         CYSetProperty(context, global, CYJSString("Functor"), Functor);
-        CYSetProperty(context, global, CYJSString("Instance"), Instance);
         CYSetProperty(context, global, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer_, &Pointer_new));
-        CYSetProperty(context, global, CYJSString("Selector"), Selector);
-        CYSetProperty(context, global, CYJSString("Type"), JSObjectMakeConstructor(context, Type_, &Type_new));
+        CYSetProperty(context, global, CYJSString("Type"), JSObjectMakeConstructor(context, Type_privateData::Class_, &Type_new));
 
         MSHookFunction(&objc_registerClassPair, MSHake(objc_registerClassPair));
 
+#ifdef __OBJC__
+#ifdef __APPLE__
         class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON), "@12@0:4@8");
+#endif
+#endif
+
+        JSObjectRef cycript(JSObjectMake(context, NULL, NULL));
+        CYSetProperty(context, global, CYJSString("Cycript"), cycript);
+        CYSetProperty(context, cycript, CYJSString("gc"), JSObjectMakeFunctionWithCallback(context, CYJSString("gc"), &Cycript_gc_callAsFunction));
 
-        CYSetProperty(context, global, CYJSString("objc_registerClassPair"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_registerClassPair"), &objc_registerClassPair_));
-        CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend));
         CYSetProperty(context, global, CYJSString("$cyq"), JSObjectMakeFunctionWithCallback(context, CYJSString("$cyq"), &$cyq));
 
         System_ = JSObjectMake(context, NULL, NULL);
+        JSValueProtect(context, System_);
+
         CYSetProperty(context, global, CYJSString("system"), System_);
         CYSetProperty(context, System_, CYJSString("args"), CYJSNull(context));
         //CYSetProperty(context, System_, CYJSString("global"), global);
@@ -3629,18 +3950,6 @@ JSGlobalContextRef CYGetJSContext() {
         CYSetProperty(context, System_, CYJSString("print"), JSObjectMakeFunctionWithCallback(context, CYJSString("print"), &System_print));
 
         Result_ = JSStringCreateWithUTF8CString("_");
-
-        JSValueProtect(context, Array_);
-        JSValueProtect(context, Function_);
-        JSValueProtect(context, String_);
-
-        JSValueProtect(context, Instance_prototype_);
-        JSValueProtect(context, Object_prototype_);
-
-        JSValueProtect(context, Array_prototype_);
-        JSValueProtect(context, Array_pop_);
-        JSValueProtect(context, Array_push_);
-        JSValueProtect(context, Array_splice_);
     }
 
     return Context_;