Various typo-fixes in the attempt to port to GNUstep.

[cycript.git] / Library.mm

diff --git a/Library.mm b/Library.mm
index 781de8eeaa0194cd555593c375a73ecdea038a14..263c73c4b3666f57419b6a037849f4cac47a26d7 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -38,6 +38,8 @@
 /* }}} */
 
 #include <substrate.h>
 /* }}} */
 
 #include <substrate.h>

+#include <dlfcn.h>
+

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


@@ -50,12 +52,11 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreFoundation/CFLogUtilities.h>
 #include <JavaScriptCore/JSStringRefCF.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreFoundation/CFLogUtilities.h>
 #include <JavaScriptCore/JSStringRefCF.h>

+#include <WebKit/WebScriptObject.h>

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

-#include <WebKit/WebScriptObject.h>
-

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


@@ -80,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 { \


@@ -99,6 +100,11 @@
     } \
 }
 
     } \
 }
 

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

 void CYThrow(JSContextRef context, JSValueRef value);
 
 const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value, JSValueRef *exception);
 void CYThrow(JSContextRef context, JSValueRef value);
 
 const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value, JSValueRef *exception);


@@ -201,12 +207,52 @@ class CYJSString {
     }
 };
 /* }}} */
     }
 };
 /* }}} */

+/* 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 {{{ */
 /* 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
 JSStringRef CYCopyJSString_(NSString *value) {
 #ifdef __APPLE__
     return JSStringCreateWithCFString(reinterpret_cast<CFStringRef>(value));
 #else

-    return CYCopyJSString([value UTF8String]);
+    CYPool pool;
+    return CYCopyJSString(CYPoolCString(pool, value));

 #endif
 }
 
 #endif
 }
 


@@ -223,10 +269,27 @@ CFStringRef CYCopyCFString(JSStringRef value) {
     return JSStringCopyCFString(kCFAllocatorDefault, 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
 }
 #endif

+
+NSString *CYCopyNSString(JSContextRef context, JSValueRef value) {
+    return CYCopyNSString(CYJSString(context, value));
+}

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


@@ -270,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_;


@@ -381,7 +447,7 @@ struct Instance :
 
     static JSObjectRef Make(JSContextRef context, id object, Flags flags = None) {
         JSObjectRef value(JSObjectMake(context, Instance_, new Instance(object, flags)));
 
     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;
     }
 


@@ -566,7 +632,7 @@ struct Type_privateData :
     static Type_privateData *Object;
     static Type_privateData *Selector;
 
     static Type_privateData *Object;
     static Type_privateData *Selector;
 

-    static JSClassRef Class;
+    static JSClassRef Class_;

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


@@ -622,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;
 


@@ -740,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);
 }


@@ -935,11 +990,31 @@ struct PropertyAttributes {
 #endif
 
 #ifdef __APPLE__
 #endif
 
 #ifdef __APPLE__

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

     return [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease];
 }
 #endif
 
     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)
 


@@ -1117,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 {


@@ -1219,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 {


@@ -1287,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_;


@@ -1294,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;


@@ -1303,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_;


@@ -1321,6 +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

+/* }}} */

 
 #define CYTry \
     @try
 
 #define CYTry \
     @try


@@ -1336,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)


@@ -1347,8 +1430,9 @@ 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) {
 }
 
 id CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {


@@ -1387,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);
-}
-
-CFStringRef CYCopyCFString(const char *value) {
-    return CFStringCreateWithCString(kCFAllocatorDefault, value, kCFStringEncodingUTF8);
+NSNumber *CYCopyNSNumber(JSContextRef context, JSValueRef value) {
+    return [[NSNumber alloc] initWithDouble:CYCastDouble(context, value)];

 }
 
 }
 

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


@@ -1423,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;
 


@@ -1453,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);
+id 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) {


@@ -1473,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;


@@ -1826,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:


@@ -2806,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_privateData::Class, 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_privateData::Class, 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) {


@@ -3517,9 +3579,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_");


@@ -3622,8 +3687,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;

-        // XXX: dude: just rename the damned variable
-        (Type_privateData::Class) = JSClassCreate(&definition);
+        Type_privateData::Class_ = JSClassCreate(&definition);

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


@@ -3706,7 +3770,7 @@ 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_privateData::Class, &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));