Fixed some type errors that changing the return types to fix the gcc compiler issue...

[cycript.git] / Library.mm

diff --git a/Library.mm b/Library.mm
index faed79e0d273da98d24d6034de558d08adc3e89e..973f4412cbea1dd962972e6621dff7867f8c311b 100644 (file)
--- 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)
 */
 
  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 


@@ -37,9 +37,9 @@
 */
 /* }}} */
 
 */
 /* }}} */
 

-#define _GNU_SOURCE
-

 #include <substrate.h>
 #include <substrate.h>

+#include <dlfcn.h>
+

 #include "cycript.hpp"
 
 #include "sig/parse.hpp"
 #include "cycript.hpp"
 
 #include "sig/parse.hpp"


@@ -48,10 +48,14 @@
 #include "Pooling.hpp"
 #include "Struct.hpp"
 
 #include "Pooling.hpp"
 #include "Struct.hpp"
 

+#ifdef __APPLE__

 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreFoundation/CFLogUtilities.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreFoundation/CFLogUtilities.h>

-
+#include <JavaScriptCore/JSStringRefCF.h>

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

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

 
 #include <sys/mman.h>
 
 
 #include <sys/mman.h>
 


@@ -66,7 +70,7 @@
 #include "Parser.hpp"
 #include "Cycript.tab.hh"
 
 #include "Parser.hpp"
 #include "Cycript.tab.hh"
 

-#include <apr-1/apr_thread_proc.h>
+#include <apr_thread_proc.h>

 
 #undef _assert
 #undef _trace
 
 #undef _assert
 #undef _trace


@@ -77,7 +81,7 @@
 } while (false)
 
 #define _trace() do { \
 } while (false)
 
 #define _trace() do { \

-    CFLog(kCFLogLevelNotice, CFSTR("_trace():%u"), __LINE__); \
+    fprintf(stderr, "_trace():%u\n", __LINE__); \

 } while (false)
 
 #define CYPoolTry { \
 } while (false)
 
 #define CYPoolTry { \


@@ -96,8 +100,21 @@
     } \
 }
 
     } \
 }
 

+#ifndef __APPLE__
+#define class_getSuperclass GSObjCSuper
+#define object_getClass GSObjCClass
+#endif
+

 void CYThrow(JSContextRef context, JSValueRef value);
 
 void CYThrow(JSContextRef context, JSValueRef value);
 

+const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value, JSValueRef *exception);
+JSStringRef CYCopyJSString(const char *value);
+
+void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef value);
+
+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)());
+JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception);
+

 /* JavaScript Properties {{{ */
 JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, size_t index) {
     JSValueRef exception(NULL);
 /* JavaScript Properties {{{ */
 JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, size_t index) {
     JSValueRef exception(NULL);


@@ -126,11 +143,6 @@ void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, J
 }
 /* }}} */
 /* JavaScript Strings {{{ */
 }
 /* }}} */
 /* 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);
 }
 JSStringRef CYCopyJSString(const char *value) {
     return value == NULL ? NULL : JSStringCreateWithUTF8CString(value);
 }


@@ -194,15 +206,90 @@ class CYJSString {
         return string_;
     }
 };
         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; \
+})
+/* }}} */
+/* 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 [NSException exceptionWithName:NSInternalInconsistencyException reason:@"[NSString getCString:maxLength:encoding:] == NO" userInfo:nil];
+        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);
+}
+
+#ifdef __APPLE__

 CFStringRef CYCopyCFString(JSStringRef value) {
     return JSStringCopyCFString(kCFAllocatorDefault, value);
 }
 
 CFStringRef CYCopyCFString(JSStringRef value) {
     return JSStringCopyCFString(kCFAllocatorDefault, value);
 }
 

-CFStringRef CYCopyCFString(JSContextRef context, JSValueRef value) {
-    return CYCopyCFString(CYJSString(context, value));
+CFStringRef CYCopyCFString(const char *value) {
+    return CFStringCreateWithCString(kCFAllocatorDefault, value, kCFStringEncodingUTF8);

 }
 
 }
 

+template <typename Type_>
+NSString *CYCopyNSString(Type_ value) {
+    return (NSString *) CYCopyCFString(value);
+}
+#else
+NSString *CYCopyNSString(const char *value) {
+    return [NSString stringWithUTF8String:value];
+}
+
+NSString *CYCopyNSString(JSStringRef value) {
+    return CYCopyNSString(CYCastCString_(value));
+}
+#endif
+
+NSString *CYCopyNSString(JSContextRef context, JSValueRef value) {
+    return CYCopyNSString(CYJSString(context, value));
+}

 /* }}} */
 
 static JSGlobalContextRef Context_;
 /* }}} */
 
 static JSGlobalContextRef Context_;


@@ -219,7 +306,6 @@ static JSClassRef Pointer_;
 static JSClassRef Runtime_;
 static JSClassRef Selector_;
 static JSClassRef Struct_;
 static JSClassRef Runtime_;
 static JSClassRef Selector_;
 static JSClassRef Struct_;

-static JSClassRef Type_;

 
 static JSClassRef ObjectiveC_Classes_;
 static JSClassRef ObjectiveC_Image_Classes_;
 
 static JSClassRef ObjectiveC_Classes_;
 static JSClassRef ObjectiveC_Image_Classes_;


@@ -247,9 +333,12 @@ static JSObjectRef Array_pop_;
 static JSObjectRef Array_push_;
 static JSObjectRef Array_splice_;
 
 static JSObjectRef Array_push_;
 static JSObjectRef Array_splice_;
 

-static Class NSArray_;
+#ifdef __APPLE__

 static Class NSCFBoolean_;
 static Class NSCFType_;
 static Class NSCFBoolean_;
 static Class NSCFType_;

+#endif
+
+static Class NSArray_;

 static Class NSDictionary_;
 static Class NSMessageBuilder_;
 static Class NSZombie_;
 static Class NSDictionary_;
 static Class NSMessageBuilder_;
 static Class NSZombie_;


@@ -271,8 +360,8 @@ struct CYValue :
     CYValue() {
     }
 
     CYValue() {
     }
 

-    CYValue(void *value) :
-        value_(value)
+    CYValue(const void *value) :
+        value_(const_cast<void *>(value))

     {
     }
 
     {
     }
 


@@ -307,7 +396,7 @@ JSValueRef CYGetClassPrototype(JSContextRef context, id self) {
         return Instance_prototype_;
 
     // XXX: I need to think through multi-context
         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]);
     static CacheMap cache_;
 
     JSValueRef &value(cache_[self]);


@@ -352,12 +441,13 @@ struct Instance :
     virtual ~Instance() {
         if ((flags_ & Transient) == 0)
             // XXX: does this handle background threads correctly?
     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)));
             [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;
     }
 
         return value;
     }
 


@@ -542,6 +632,8 @@ struct Type_privateData :
     static Type_privateData *Object;
     static Type_privateData *Selector;
 
     static Type_privateData *Object;
     static Type_privateData *Selector;
 

+    static JSClassRef Class_;
+

     ffi_type *ffi_;
     sig::Type *type_;
 
     ffi_type *ffi_;
     sig::Type *type_;
 


@@ -596,6 +688,7 @@ struct Type_privateData :
     }
 };
 
     }
 };
 

+JSClassRef Type_privateData::Class_;

 Type_privateData *Type_privateData::Object;
 Type_privateData *Type_privateData::Selector;
 
 Type_privateData *Type_privateData::Object;
 Type_privateData *Type_privateData::Selector;
 


@@ -714,18 +807,6 @@ JSObjectRef CYMakeInstance(JSContextRef context, id object, bool transient) {
     return Instance::Make(context, object, flags);
 }
 
     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;
-    }
-}
-

 JSValueRef CYCastJSValue(JSContextRef context, bool value) {
     return JSValueMakeBoolean(context, value);
 }
 JSValueRef CYCastJSValue(JSContextRef context, bool value) {
     return JSValueMakeBoolean(context, value);
 }


@@ -820,6 +901,7 @@ NSString *CYPoolNSCYON(apr_pool_t *pool, id value);
 - (void *) cy$symbol;
 @end
 
 - (void *) cy$symbol;
 @end
 

+#ifdef __APPLE__

 struct PropertyAttributes {
     CYPool pool_;
 
 struct PropertyAttributes {
     CYPool pool_;
 


@@ -905,10 +987,33 @@ struct PropertyAttributes {
     }
 
 };
     }
 
 };

+#endif

 
 

-NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
+#ifdef __APPLE__
+NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {

     return [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease];
 }
     return [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease];
 }

+#endif
+
+#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

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


@@ -918,7 +1023,13 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
     [json appendString:@"["];
 
     bool comma(false);
     [json appendString:@"["];
 
     bool comma(false);

+#ifdef __APPLE__

     for (id object in self) {
     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
         if (comma)
             [json appendString:@","];
         else


@@ -947,8 +1058,14 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 }
 
 - (NSObject *) cy$getProperty:(NSString *)name {
 }
 
 - (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));
     if (index == _not(size_t) || index >= [self count])
 
     size_t index(CYGetIndex(NULL, name));
     if (index == _not(size_t) || index >= [self count])


@@ -967,7 +1084,12 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
     [json appendString:@"{"];
 
     bool comma(false);
     [json appendString:@"{"];
 
     bool comma(false);

+#ifdef __APPLE__

     for (id key in self) {
     for (id key in self) {

+#else
+    NSEnumerator *keys([self keyEnumerator]);
+    while (id key = [keys nextObject]) {
+#endif

         if (comma)
             [json appendString:@","];
         else
         if (comma)
             [json appendString:@","];
         else


@@ -998,7 +1120,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?
 - (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)];
         NSUInteger count([self count]);
         if (size < count)
             [self removeObjectsInRange:NSMakeRange(size, count - size)];


@@ -1065,8 +1192,12 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 @implementation NSNumber (Cycript)
 
 - (JSType) cy$JSType {
 @implementation NSNumber (Cycript)
 
 - (JSType) cy$JSType {

+#ifdef __APPLE__

     // XXX: this just seems stupid
     // 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 {
 }
 
 - (NSObject *) cy$toJSON:(NSString *)key {


@@ -1167,18 +1298,19 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 
 - (NSString *) cy$toCYON {
     // XXX: this should use the better code from Output.cpp
 
 - (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);
+    NSMutableString *json([self mutableCopy]);

 
 

-    CFStringInsert(json, 0, CFSTR("\""));
-    CFStringAppend(json, CFSTR("\""));
+    [json replaceOccurrencesOfString:@"\\" withString:@"\\\\" options:NSLiteralSearch range:NSMakeRange(0, [json length])];
+    [json replaceOccurrencesOfString:@"\"" withString:@"\\\"" options:NSLiteralSearch range:NSMakeRange(0, [json length])];
+    [json replaceOccurrencesOfString:@"\t" withString:@"\\t" options:NSLiteralSearch range:NSMakeRange(0, [json length])];
+    [json replaceOccurrencesOfString:@"\r" withString:@"\\r" options:NSLiteralSearch range:NSMakeRange(0, [json length])];
+    [json replaceOccurrencesOfString:@"\n" withString:@"\\n" options:NSLiteralSearch range:NSMakeRange(0, [json length])];

 
 

-    return [reinterpret_cast<const NSString *>(json) autorelease];
+    [json appendString:@"\""];
+    [json insertString:@"\"" atIndex:0];
+
+    return json;

 }
 
 - (NSString *) cy$toKey {
 }
 
 - (NSString *) cy$toKey {


@@ -1235,6 +1367,7 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 @end
 /* }}} */
 
 @end
 /* }}} */
 

+/* Bridge: CYJSObject {{{ */

 @interface CYJSObject : NSMutableDictionary {
     JSObjectRef object_;
     JSContextRef context_;
 @interface CYJSObject : NSMutableDictionary {
     JSObjectRef object_;
     JSContextRef context_;


@@ -1242,7 +1375,7 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context;
 
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context;
 

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

 
 - (NSUInteger) count;
 - (id) objectForKey:(id)key;
 
 - (NSUInteger) count;
 - (id) objectForKey:(id)key;


@@ -1251,7 +1384,8 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 - (void) removeObjectForKey:(id)key;
 
 @end
 - (void) removeObjectForKey:(id)key;
 
 @end

-
+/* }}} */
+/* Bridge: CYJSArray {{{ */

 @interface CYJSArray : NSMutableArray {
     JSObjectRef object_;
     JSContextRef context_;
 @interface CYJSArray : NSMutableArray {
     JSObjectRef object_;
     JSContextRef context_;


@@ -1269,10 +1403,7 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 - (void) replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject;
 
 @end
 - (void) replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject;
 
 @end

-
-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 CYTry \
     @try


@@ -1288,7 +1419,7 @@ apr_status_t CYPoolRelease_(void *data) {
     return APR_SUCCESS;
 }
 
     return APR_SUCCESS;
 }
 

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

     if (object == nil)
         return nil;
     else if (pool == NULL)
     if (object == nil)
         return nil;
     else if (pool == NULL)


@@ -1299,11 +1430,12 @@ id CYPoolRelease(apr_pool_t *pool, id object) {
     }
 }
 
     }
 }
 

-CFTypeRef CYPoolRelease(apr_pool_t *pool, CFTypeRef object) {
-    return (CFTypeRef) CYPoolRelease(pool, (id) object);
+template <typename Type_>
+Type_ CYPoolRelease(apr_pool_t *pool, Type_ object) {
+    return (Type_) CYPoolRelease_(pool, (id) object);

 }
 
 }
 

-id CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
+NSObject *CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {

     JSValueRef exception(NULL);
     bool array(JSValueIsInstanceOfConstructor(context, object, Array_, &exception));
     CYThrow(context, exception);
     JSValueRef exception(NULL);
     bool array(JSValueIsInstanceOfConstructor(context, object, Array_, &exception));
     CYThrow(context, exception);


@@ -1311,7 +1443,7 @@ id CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
     return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]);
 }
 
     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 {
     if (!JSValueIsObjectOfClass(context, object, Instance_))
         return CYCastNSObject_(pool, context, object);
     else {


@@ -1339,29 +1471,21 @@ double CYCastDouble(JSContextRef context, JSValueRef value) {
     return number;
 }
 
     return number;
 }
 

-CFNumberRef CYCopyCFNumber(JSContextRef context, JSValueRef value) {
-    double number(CYCastDouble(context, value));
-    return CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType, &number);
+NSNumber *CYCopyNSNumber(JSContextRef context, JSValueRef value) {
+    return [[NSNumber alloc] initWithDouble:CYCastDouble(context, value)];

 }
 
 }
 

-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));
+template <typename Type_>
+NSString *CYCastNSString(apr_pool_t *pool, Type_ value) {
+    return CYPoolRelease(pool, CYCopyNSString(value));

 }
 
 bool CYCastBool(JSContextRef context, JSValueRef value) {
     return JSValueToBoolean(context, value);
 }
 
 }
 
 bool CYCastBool(JSContextRef context, JSValueRef value) {
     return JSValueToBoolean(context, value);
 }
 

-CFTypeRef CYCFType(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cast) {
-    CFTypeRef object;
+id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cast) {
+    id object;

     bool copy;
 
     switch (JSType type = JSValueGetType(context, value)) {
     bool copy;
 
     switch (JSType type = JSValueGetType(context, value)) {


@@ -1375,23 +1499,28 @@ CFTypeRef CYCFType(apr_pool_t *pool, JSContextRef context, JSValueRef value, boo
         break;
 
         case kJSTypeBoolean:
         break;
 
         case kJSTypeBoolean:

-            object = CYCastBool(context, value) ? kCFBooleanTrue : kCFBooleanFalse;
+#ifdef __APPLE__
+            object = (id) (CYCastBool(context, value) ? kCFBooleanTrue : kCFBooleanFalse);

             copy = false;
             copy = false;

+#else
+            object = [[NSNumber alloc] initWithBool:CYCastBool(context, value)];
+            copy = true;
+#endif

         break;
 
         case kJSTypeNumber:
         break;
 
         case kJSTypeNumber:

-            object = CYCopyCFNumber(context, value);
+            object = CYCopyNSNumber(context, value);

             copy = true;
         break;
 
         case kJSTypeString:
             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
             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;
 
             copy = false;
         break;
 


@@ -1405,15 +1534,15 @@ CFTypeRef CYCFType(apr_pool_t *pool, JSContextRef context, JSValueRef value, boo
     else if (copy)
         return CYPoolRelease(pool, object);
     else
     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);

 }
 
 }
 

-CFTypeRef CYCopyCFType(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
-    return CYCFType(pool, context, value, false);
+id CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
+    return CYNSObject(pool, context, value, false);

 }
 
 NSArray *CYCastNSArray(JSPropertyNameArrayRef names) {
 }
 
 NSArray *CYCastNSArray(JSPropertyNameArrayRef names) {


@@ -1425,10 +1554,6 @@ NSArray *CYCastNSArray(JSPropertyNameArrayRef names) {
     return array;
 }
 
     return array;
 }
 

-id CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
-    return reinterpret_cast<const NSObject *>(CYCastCFType(pool, context, value));
-}
-

 void CYThrow(JSContextRef context, JSValueRef value) {
     if (value == NULL)
         return;
 void CYThrow(JSContextRef context, JSValueRef value) {
     if (value == NULL)
         return;


@@ -1636,9 +1761,9 @@ NSString *CYCopyNSCYON(id value) {
         Class _class(object_getClass(value));
         SEL sel(@selector(cy$toCYON));
 
         Class _class(object_getClass(value));
         SEL sel(@selector(cy$toCYON));
 

-        if (Method toCYON = class_getInstanceMethod(_class, sel))
+        if (objc_method *toCYON = class_getInstanceMethod(_class, sel))

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

-        else if (Method methodSignatureForSelector = class_getInstanceMethod(_class, @selector(methodSignatureForSelector:))) {
+        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;
             if (reinterpret_cast<NSMethodSignature *(*)(id, SEL, SEL)>(method_getImplementation(methodSignatureForSelector))(value, @selector(methodSignatureForSelector:), sel) != nil)
                 string = [value cy$toCYON];
             else goto fail;


@@ -1778,21 +1903,6 @@ static bool CYGetOffset(apr_pool_t *pool, JSStringRef value, ssize_t &index) {
     return CYGetOffset(CYPoolCString(pool, value), 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; \
-})
-

 static void *CYCastPointer_(JSContextRef context, JSValueRef value) {
     switch (JSValueGetType(context, value)) {
         case kJSTypeNull:
 static void *CYCastPointer_(JSContextRef context, JSValueRef value) {
     switch (JSValueGetType(context, value)) {
         case kJSTypeNull:


@@ -1980,7 +2090,7 @@ static JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi
 }
 
 static bool CYImplements(id object, Class _class, SEL selector, bool devoid) {
 }
 
 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];
         if (!devoid)
             return true;
         char type[16];


@@ -1993,7 +2103,7 @@ static bool CYImplements(id object, Class _class, SEL selector, bool devoid) {
     return false;
 }
 
     return false;
 }
 

-static 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))])
     if (method != NULL)
         return method_getTypeEncoding(method);
     else if (NSString *type = [[Bridge_ objectAtIndex:1] objectForKey:CYCastNSString(pool, sel_getName(sel))])


@@ -2107,7 +2217,7 @@ static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object,
     const char *name(CYPoolCString(pool, property));
 
     if (SEL sel = sel_getUid(name))
     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;
             return CYMakeMessage(context, sel, method_getImplementation(method), method_getTypeEncoding(method));
 
     return NULL;


@@ -2122,7 +2232,7 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
 
     SEL sel(sel_registerName(name));
 
 
     SEL sel(sel_registerName(name));
 

-    Method method(class_getInstanceMethod(_class, sel));
+    objc_method *method(class_getInstanceMethod(_class, sel));

 
     const char *type;
     IMP imp;
 
     const char *type;
     IMP imp;


@@ -2153,7 +2263,7 @@ static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JS
     const char *name(CYPoolCString(pool, property));
 
     if (SEL sel = sel_getUid(name))
     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;
             objc_method_list list = {NULL, 1, {method}};
             class_removeMethods(_class, &list);
             return true;


@@ -2168,7 +2278,7 @@ static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object,
     Class _class(internal->GetValue());
 
     unsigned int size;
     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);
     for (size_t i(0); i != size; ++i)
         JSPropertyNameAccumulatorAddName(names, CYJSString(sel_getName(method_getName(data[i]))));
     free(data);


@@ -2232,11 +2342,13 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object,
         const char *string(CYPoolCString(pool, name));
         Class _class(object_getClass(self));
 
         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);
         }
         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);
         }

+#endif

 
         if (SEL sel = sel_getUid(string))
             if (CYImplements(self, _class, sel, true))
 
         if (SEL sel = sel_getUid(string))
             if (CYImplements(self, _class, sel, true))


@@ -2254,7 +2366,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
 
     CYTry {
         NSString *name(CYCastNSString(pool, property));
 
     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])
 
         CYPoolTry {
             if ([self cy$setProperty:name to:data])


@@ -2264,6 +2376,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
         const char *string(CYPoolCString(pool, name));
         Class _class(object_getClass(self));
 
         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()) {
         if (objc_property_t property = class_getProperty(_class, string)) {
             PropertyAttributes attributes(property);
             if (const char *setter = attributes.Setter()) {


@@ -2273,6 +2386,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
                 return true;
             }
         }
                 return true;
             }
         }

+#endif

 
         size_t length(strlen(string));
 
 
         size_t length(strlen(string));
 


@@ -2754,12 +2868,12 @@ static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObject
 
 static JSObjectRef CYMakeType(JSContextRef context, const char *type) {
     Type_privateData *internal(new Type_privateData(NULL, type));
 
 static JSObjectRef CYMakeType(JSContextRef context, const char *type) {
     Type_privateData *internal(new Type_privateData(NULL, type));

-    return JSObjectMake(context, Type_, internal);
+    return JSObjectMake(context, Type_privateData::Class_, internal);

 }
 
 static JSObjectRef CYMakeType(JSContextRef context, sig::Type *type) {
     Type_privateData *internal(new Type_privateData(type));
 }
 
 static JSObjectRef CYMakeType(JSContextRef context, sig::Type *type) {
     Type_privateData *internal(new Type_privateData(type));

-    return JSObjectMake(context, Type_, internal);
+    return JSObjectMake(context, Type_privateData::Class_, internal);

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


@@ -2805,12 +2919,14 @@ static bool stret(ffi_type *ffi_type) {
 extern "C" {
     int *_NSGetArgc(void);
     char ***_NSGetArgv(void);
 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 {
 }
 
 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)
+            NSLog(@"");
+        else
+            NSLog(@"%s", CYCastCString(context, arguments[0]));

         return CYJSUndefined(context);
     } CYCatch
 }
         return CYJSUndefined(context);
     } CYCatch
 }


@@ -2819,7 +2935,7 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, SEL _c
     const char *type;
 
     Class _class(object_getClass(self));
     const char *type;
 
     Class _class(object_getClass(self));

-    if (Method method = class_getInstanceMethod(_class, _cmd))
+    if (objc_method *method = class_getInstanceMethod(_class, _cmd))

         type = method_getTypeEncoding(method);
     else {
         CYTry {
         type = method_getTypeEncoding(method);
     else {
         CYTry {


@@ -2912,13 +3028,21 @@ static JSValueRef objc_registerClassPair_(JSContextRef context, JSObjectRef obje
         if (count != 1)
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to objc_registerClassPair" userInfo:nil];
         CYPool pool;
         if (count != 1)
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to objc_registerClassPair" userInfo:nil];
         CYPool pool;

-        Class _class(CYCastNSObject(pool, context, arguments[0]));
+        NSObject *value(CYCastNSObject(pool, context, arguments[0]));
+        if (value == NULL || !CYIsClass(value))
+            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to objc_registerClassPair" userInfo:nil];
+        Class _class((Class) value);

         $objc_registerClassPair(_class);
         return CYJSUndefined(context);
     } CYCatch
 }
 /* }}} */
 
         $objc_registerClassPair(_class);
         return CYJSUndefined(context);
     } CYCatch
 }
 /* }}} */
 

+static JSValueRef Cycript_gc_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+    JSGarbageCollect(context);
+    return CYJSUndefined(context);
+}
+

 static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     JSValueRef setup[count + 2];
     setup[0] = _this;
 static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     JSValueRef setup[count + 2];
     setup[0] = _this;


@@ -3201,11 +3325,20 @@ static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Selector.type" userInfo:nil];
         CYPool pool;
         Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate(_this)));
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to Selector.type" userInfo:nil];
         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));
+        NSObject *value(CYCastNSObject(pool, context, arguments[0]));
+        if (value == NULL) lookup:
+            // XXX: do a lookup of some kind
+            return CYJSNull(context);
+        else if (!CYIsClass(value))
+            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Selector.type takes a Class" userInfo:nil];
+        else {
+            Class _class((Class) value);
+            SEL sel(internal->GetValue());
+            if (objc_method *method = class_getInstanceMethod(_class, sel)) {
+                const char *type(CYPoolTypeEncoding(pool, _class, sel, method));
+                return type == NULL ? CYJSNull(context) : CYCastJSValue(context, CYJSString(type));
+            } else goto lookup;
+        }

     } CYCatch
 }
 
     } CYCatch
 }
 


@@ -3300,41 +3433,6 @@ static JSStaticFunction Type_staticFunctions[4] = {
     {NULL, NULL, 0}
 };
 
     {NULL, NULL, 0}
 };
 

-CYDriver::CYDriver(const std::string &filename) :
-    state_(CYClear),
-    data_(NULL),
-    size_(0),
-    file_(NULL),
-    strict_(false),
-    filename_(filename),
-    program_(NULL)
-{
-    ScannerInit();
-}
-
-CYDriver::~CYDriver() {
-    ScannerDestroy();
-}
-
-void CYDriver::Warning(const cy::location &location, const char *message) {
-    if (!strict_)
-        return;
-
-    CYDriver::Error error;
-    error.warning_ = true;
-    error.location_ = location;
-    error.message_ = message;
-    errors_.push_back(error);
-}
-
-void cy::parser::error(const cy::parser::location_type &location, const std::string &message) {
-    CYDriver::Error error;
-    error.warning_ = false;
-    error.location_ = location;
-    error.message_ = message;
-    driver.errors_.push_back(error);
-}
-

 void CYSetArgs(int argc, const char *argv[]) {
     JSContextRef context(CYGetJSContext());
     JSValueRef args[argc];
 void CYSetArgs(int argc, const char *argv[]) {
     JSContextRef context(CYGetJSContext());
     JSValueRef args[argc];


@@ -3383,24 +3481,6 @@ const char *CYExecute(apr_pool_t *pool, const char *code) { _pooled
     return json;
 }
 
     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;
-}
-

 static apr_pool_t *Pool_;
 
 struct CYExecute_ {
 static apr_pool_t *Pool_;
 
 struct CYExecute_ {


@@ -3467,9 +3547,11 @@ struct CYClient :
                 json = NULL;
                 size = _not(size_t);
             } else {
                 json = NULL;
                 size = _not(size_t);
             } else {

+                CYContext context(driver.pool_);
+                driver.program_->Replace(context);

                 std::ostringstream str;
                 CYOutput out(str);
                 std::ostringstream str;
                 CYOutput out(str);

-                driver.program_->Multiple(out);
+                out << *driver.program_;

                 std::string code(str.str());
                 CYExecute_ execute = {pool, code.c_str()};
                 [client performSelectorOnMainThread:@selector(execute:) withObject:[NSValue valueWithPointer:&execute] waitUntilDone:YES];
                 std::string code(str.str());
                 CYExecute_ execute = {pool, code.c_str()};
                 [client performSelectorOnMainThread:@selector(execute:) withObject:[NSValue valueWithPointer:&execute] waitUntilDone:YES];


@@ -3509,9 +3591,12 @@ MSInitialize { _pooled
 
     Bridge_ = [[NSMutableArray arrayWithContentsOfFile:@"/usr/lib/libcycript.plist"] retain];
 
 
     Bridge_ = [[NSMutableArray arrayWithContentsOfFile:@"/usr/lib/libcycript.plist"] retain];
 

-    NSArray_ = objc_getClass("NSArray");
+#ifdef __APPLE__

     NSCFBoolean_ = objc_getClass("NSCFBoolean");
     NSCFType_ = objc_getClass("NSCFType");
     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_");
     NSDictionary_ = objc_getClass("NSDictonary");
     NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
     NSZombie_ = objc_getClass("_NSZombie_");


@@ -3614,7 +3699,7 @@ JSGlobalContextRef CYGetJSContext() {
         definition.callAsFunction = &Type_callAsFunction;
         definition.callAsConstructor = &Type_callAsConstructor;
         definition.finalize = &Finalize;
         definition.callAsFunction = &Type_callAsFunction;
         definition.callAsConstructor = &Type_callAsConstructor;
         definition.finalize = &Finalize;

-        Type_ = JSClassCreate(&definition);
+        Type_privateData::Class_ = JSClassCreate(&definition);

 
         definition = kJSClassDefinitionEmpty;
         definition.className = "Runtime";
 
         definition = kJSClassDefinitionEmpty;
         definition.className = "Runtime";


@@ -3697,11 +3782,17 @@ JSGlobalContextRef CYGetJSContext() {
         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("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));
 
 
         MSHookFunction(&objc_registerClassPair, MSHake(objc_registerClassPair));
 

+#ifdef __APPLE__

         class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON), "@12@0:4@8");
         class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON), "@12@0:4@8");

+#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("objc_registerClassPair"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_registerClassPair"), &objc_registerClassPair_));
         CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend));