Fixed the ::Class bug and attempted to further abstract GNUstep.

diff --git a/Library.mm b/Library.mm
index 781de8eeaa0194cd555593c375a73ecdea038a14..065908bf85df529cab12b4d85362b58723bf538c 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -566,7 +566,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 +622,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;
 


@@ -940,6 +941,26 @@ NSString *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 }
 #endif
 
 }
 #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)
 


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


@@ -1303,7 +1325,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 +1344,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


@@ -2806,12 +2830,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) {


@@ -3622,8 +3646,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 +3729,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));
 

diff --git a/Linux.mk b/Linux.mk
index 56bbb6cedd0848cf20952f8af319f04cd76bf083..26b27ed57f88692c18a75bb46bd6d8ae80832665 100644 (file)
--- a/Linux.mk
+++ b/Linux.mk
@@ -1,4 +1,3 @@
 export PATH := /usr/local/bin:$(PATH)
 flags += -I/usr/include/webkit-1.0
 depends += libffi4 libreadline5
 export PATH := /usr/local/bin:$(PATH)
 flags += -I/usr/include/webkit-1.0
 depends += libffi4 libreadline5

-include GNUstep.mk

diff --git a/makefile b/makefile
index a77d33053408c40244db1aa6fcb61d7acb3df097..84a03f869d5bf370920e05d9de86201a5cacdc47 100644 (file)
--- a/makefile
+++ b/makefile
@@ -39,6 +39,12 @@ uname_p := $(shell uname -p)
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk
 
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk
 

+ifeq ($(filter ObjectiveC,$(filters)),)
+ifneq ($(shell which gnustep-config 2>/dev/null),)
+include GNUstep.mk
+endif
+endif
+

 flags += -g3 -O0 -DYYDEBUG=1
 #flags += -g0 -O3
 flags += -Wall -Werror -Wno-parentheses
 flags += -g3 -O0 -DYYDEBUG=1
 #flags += -g0 -O3
 flags += -Wall -Werror -Wno-parentheses