Port to the now modern version of GNUstep (Linux).

diff --git a/Cycript.yy.in b/Cycript.yy.in
index d963589e56257ad6c5a1d3d57d37be5d9bbda64d..29a375548ad86be029b461a6eb56bf59fbe53510 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -473,7 +473,9 @@ int cylex(YYSTYPE *, CYLocation *, void *);
 %type <statement_> VariableStatement
 %type <statement_> WithStatement
 %type <word_> Word
+@begin ObjectiveC
 %type <word_> WordOpt
+@end
 %type <expression_> Variable
 
 @begin C
@@ -658,10 +660,12 @@ Word
     | "with" { $$ = $1; }
     ;
 
+@begin ObjectiveC
 WordOpt
     : Word { $$ = $1; }
     | { $$ = NULL; }
     ;
+@end
 
 IdentifierType
     : Identifier_ { $$ = $1; }

diff --git a/Exception.hpp b/Exception.hpp
index 67feb2e91f0ced37bc96a5f455c06809ca9a6058..c23267dee69fc935c863727f7911d729243a9e47 100644 (file)
--- a/Exception.hpp
+++ b/Exception.hpp
@@ -88,11 +88,11 @@ static _finline bool CYContains(int value, size_t many, const int *okay) {
     return false;
 }
 
-#define _syscall_(expr, many, okay) ({ \
+#define _syscall_(expr, many, ...) ({ \
     __typeof__(expr) _value; \
     do if ((long) (_value = (expr)) != -1) \
         break; \
-    else if (CYContains(errno, many, ((const int [many]) okay))) \
+    else if (CYContains(errno, many, ((const int [many + 1]) {0, ##__VA_ARGS__} + 1))) \
         break; \
     else \
         _assert_("syscall", errno == EINTR, #expr, " [errno=%d]", errno); \
@@ -101,7 +101,7 @@ static _finline bool CYContains(int value, size_t many, const int *okay) {
 })
 
 #define _syscall(expr) \
-    _syscall_(expr, 0, {})
+    _syscall_(expr, 0)
 
 #define _sqlcall(expr) ({ \
     __typeof__(expr) _value = (expr); \

diff --git a/Execute.cpp b/Execute.cpp
index 522aca4a862386e7ff6c6a01addc77a2b2c04f0e..1c7b833ab560cc69e37c08b9a665ef2a7edc00d3 100644 (file)
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -1754,7 +1754,7 @@ JSGlobalContextRef CYGetJSContext(JSContextRef context) {
 extern "C" bool CydgetMemoryParse(const uint16_t **data, size_t *size);
 
 void *CYMapFile(const char *path, size_t *psize) {
-    int fd(_syscall_(open(path, O_RDONLY), 1, {ENOENT}));
+    int fd(_syscall_(open(path, O_RDONLY), 1, ENOENT));
     if (fd == -1)
         return NULL;
 
@@ -1930,10 +1930,12 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     //CYSetProperty(context, System, CYJSString("global"), global);
     CYSetProperty(context, System, CYJSString("print"), &System_print);
 
+#ifdef __APPLE__
     if (&JSWeakObjectMapCreate != NULL) {
         JSWeakObjectMapRef weak(JSWeakObjectMapCreate(context, NULL, NULL));
         CYSetProperty(context, cy, weak_s, CYCastJSValue(context, reinterpret_cast<uintptr_t>(weak)));
     }
+#endif
 
     if (CYBridgeEntry *entry = CYBridgeHash("1dlerror", 8))
         entry->cache_ = new cy::Functor(entry->value_, reinterpret_cast<void (*)()>(&dlerror));

diff --git a/JavaScript.hpp b/JavaScript.hpp
index a94dbb9e22bb4192fea564f6618307182bdaf262..e4af17bf8074ad09f2a2acfe7cb9bdf81a0e8935 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -205,6 +205,7 @@ class CYJSString {
     }
 };
 
+#ifdef __APPLE__
 typedef struct OpaqueJSWeakObjectMap *JSWeakObjectMapRef;
 typedef void (*JSWeakMapDestroyedCallback)(JSWeakObjectMapRef map, void *data);
 
@@ -213,5 +214,6 @@ extern "C" void JSWeakObjectMapSet(JSContextRef ctx, JSWeakObjectMapRef map, voi
 extern "C" JSObjectRef JSWeakObjectMapGet(JSContextRef ctx, JSWeakObjectMapRef map, void *key) __attribute__((__weak_import__));
 extern "C" bool JSWeakObjectMapClear(JSContextRef ctx, JSWeakObjectMapRef map, void *key, JSObjectRef object) __attribute__((__weak_import__));
 extern "C" void JSWeakObjectMapRemove(JSContextRef ctx, JSWeakObjectMapRef map, void* key) __attribute__((__weak_import__));
+#endif
 
 #endif/*CYCRIPT_JAVASCRIPT_HPP*/

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 16a97e522a06b55963d98bac4f61695075481ea2..4ef7be89c76ea9c8b1af1f937ee17a3dd3b50ae4 100644 (file)
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -19,20 +19,18 @@
 **/
 /* }}} */
 
-#include <Foundation/Foundation.h>
+#include "cycript.hpp"
 
 #include "ObjectiveC/Internal.hpp"
 
-#include <objc/objc-api.h>
-
-#include "cycript.hpp"
+#include <objc/message.h>
+#include <objc/runtime.h>
 
-#include "ObjectiveC/Internal.hpp"
+#include <Foundation/Foundation.h>
 
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
 #include <JavaScriptCore/JSStringRefCF.h>
-#include <objc/runtime.h>
 #endif
 
 #ifdef __APPLE__
@@ -91,45 +89,6 @@
     if (!(test)) \
         @throw [NSException exceptionWithName:NSInternalInconsistencyException reason:@"_assert(" #test ")" userInfo:nil];
 
-#ifndef __APPLE__
-#define class_getSuperclass GSObjCSuper
-#define class_getInstanceVariable GSCGetInstanceVariableDefinition
-#define class_getName GSNameFromClass
-
-#define class_removeMethods(cls, list) GSRemoveMethodList(cls, list, YES)
-
-#define ivar_getName(ivar) ((ivar)->ivar_name)
-#define ivar_getOffset(ivar) ((ivar)->ivar_offset)
-#define ivar_getTypeEncoding(ivar) ((ivar)->ivar_type)
-
-#define method_getName(method) ((method)->method_name)
-#define method_getImplementation(method) ((method)->method_imp)
-#define method_getTypeEncoding(method) ((method)->method_types)
-#define method_setImplementation(method, imp) ((void) ((method)->method_imp = (imp)))
-
-#undef objc_getClass
-#define objc_getClass GSClassFromName
-
-#define objc_getProtocol GSProtocolFromName
-
-#define object_getClass GSObjCClass
-
-#define object_getInstanceVariable(object, name, value) ({ \
-    objc_ivar *ivar(class_getInstanceVariable(object_getClass(object), name)); \
-    _assert(value != NULL); \
-    if (ivar != NULL) \
-        GSObjCGetVariable(object, ivar_getOffset(ivar), sizeof(void *), value); \
-    ivar; \
-})
-
-#define object_setIvar(object, ivar, value) ({ \
-    void *data = (value); \
-    GSObjCSetVariable(object, ivar_getOffset(ivar), sizeof(void *), &data); \
-})
-
-#define protocol_getName(protocol) [(protocol) name]
-#endif
-
 @class NSBlock;
 
 struct BlockLiteral {
@@ -200,21 +159,23 @@ const char *CYPoolCString(CYPool &pool, JSContextRef context, NSString *value) {
     return string;
 }
 
-JSStringRef CYCopyJSString(JSContextRef context, NSString *value) {
 #ifdef __APPLE__
+JSStringRef CYCopyJSString(JSContextRef context, NSString *value) {
     return JSStringCreateWithCFString(reinterpret_cast<CFStringRef>(value));
-#else
-    CYPool pool;
-    return CYCopyJSString(CYPoolCString(pool, context, value));
-#endif
 }
+#endif
 
 JSStringRef CYCopyJSString(JSContextRef context, NSObject *value) {
     if (value == nil)
         return NULL;
     // XXX: this definition scares me; is anyone using this?!
     NSString *string([value description]);
+#ifdef __APPLE__
     return CYCopyJSString(context, string);
+#else
+    CYPool pool;
+    return CYCopyJSString(CYPoolCString(pool, context, string));
+#endif
 }
 
 NSString *CYCopyNSString(const CYUTF8String &value) {
@@ -428,19 +389,23 @@ struct Message_privateData :
 JSObjectRef CYMakeInstance(JSContextRef context, id object, Instance::Flags flags = Instance::None) {
     _assert(object != nil);
 
+#ifdef __APPLE__
     JSWeakObjectMapRef weak(CYCastPointer<JSWeakObjectMapRef>(context, CYGetCachedValue(context, weak_s)));
 
     if (weak != NULL && &JSWeakObjectMapGet != NULL)
         if (JSObjectRef instance = JSWeakObjectMapGet(context, weak, object))
             return instance;
+#endif
 
     if ((flags & Instance::Permanent) == 0)
         object = [object retain];
 
     JSObjectRef instance(Instance::Make(context, object, flags));
 
+#ifdef __APPLE__
     if (weak != NULL && &JSWeakObjectMapSet != NULL)
         JSWeakObjectMapSet(context, weak, object, instance);
+#endif
 
     return instance;
 }
@@ -663,6 +628,7 @@ _finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSVal
     return _jsccall(JSValueIsInstanceOfConstructor, context, value, CYGetCachedObject(context, cache));
 }
 
+#ifdef __APPLE__
 struct CYBlockDescriptor {
     struct {
         BlockDescriptor1 one_;
@@ -707,6 +673,7 @@ NSBlock *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature
 
     return reinterpret_cast<NSBlock *>(literal);
 }
+#endif
 
 NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSObjectRef object) {
     if (CYJSValueIsNSObject(context, object)) {
@@ -1440,6 +1407,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 }
 
 + (CYInternal *) get:(id)object {
+#ifdef __APPLE__
     if (&objc_getAssociatedObject == NULL)
         return nil;
 
@@ -1447,11 +1415,13 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
         if (CYInternal *internal = objc_getAssociatedObject(object, @selector(cy$internal)))
             return internal;
     }
+#endif
 
     return nil;
 }
 
 + (CYInternal *) set:(id)object inContext:(JSContextRef)context {
+#ifdef __APPLE__
     if (&objc_getAssociatedObject == NULL)
         return nil;
 
@@ -1466,6 +1436,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
         objc_setAssociatedObject(object, @selector(cy$internal), internal, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
         return internal;
     }
+#endif
 
     return nil;
 }
@@ -1499,6 +1470,7 @@ static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (
     ffi_call(cif, function, value, values);
 } CYSadCatch() }
 
+#ifdef __APPLE__
 static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef value, sig::Signature *signature) {
     if (JSValueIsNull(context, value))
         return nil;
@@ -1533,15 +1505,18 @@ static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef val
 
     return CYMakeBlock(context, object, modified);
 }
+#endif
 
 static bool CYObjectiveC_PoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry {
     // XXX: assigning to an indirect id * works for return values, but not for properties and fields
 
     switch (type->primitive) {
+#ifdef __APPLE__
         case sig::block_P:
             // XXX: this function might not handle the idea of a null pool
             *reinterpret_cast<id *>(data) = CYCastNSBlock(*pool, context, value, &type->data.signature);
         break;
+#endif
 
         case sig::object_P:
         case sig::typename_P:
@@ -1690,7 +1665,6 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
     } else _assert(false);
 
     objc_method *method(NULL);
-#if OBJC_API_VERSION >= 2
     unsigned int size;
     objc_method **methods(class_copyMethodList(_class, &size));
     for (size_t i(0); i != size; ++i)
@@ -1699,65 +1673,24 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
             break;
         }
     free(methods);
-#else
-    for (objc_method_list *methods(_class->methods); methods != NULL; methods = methods->method_next)
-        for (int i(0); i != methods->method_count; ++i)
-            if (sel_isEqual(method_getName(&methods->method_list[i]), sel)) {
-                method = &methods->method_list[i];
-                break;
-            }
-#endif
 
     if (method != NULL)
         method_setImplementation(method, imp);
-    else {
-#ifdef GNU_RUNTIME
-        GSMethodList list(GSAllocMethodList(1));
-        GSAppendMethodToList(list, sel, type, imp, YES);
-        GSAddMethodList(_class, list, YES);
-        GSFlushMethodCacheForClass(_class);
-#else
+    else
         class_addMethod(_class, sel, imp, type);
-#endif
-    }
 
     return true;
 } CYCatch(false) }
 
-#if 0 && OBJC_API_VERSION < 2
-static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
-    Class _class(internal->GetValue());
-
-    CYPool pool;
-    const char *name(CYPoolCString(pool, context, property));
-
-    if (SEL sel = sel_getUid(name))
-        if (objc_method *method = class_getInstanceMethod(_class, sel)) {
-            objc_method_list list = {NULL, 1, {method}};
-            class_removeMethods(_class, &list);
-            return true;
-        }
-
-    return false;
-} CYCatch(false) }
-#endif
-
 static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
     Class _class(internal->GetValue());
 
-#if OBJC_API_VERSION >= 2
     unsigned int 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);
-#else
-    for (objc_method_list *methods(_class->methods); methods != NULL; methods = methods->method_next)
-        for (int i(0); i != methods->method_count; ++i)
-            JSPropertyNameAccumulatorAddName(names, CYJSString(sel_getName(method_getName(&methods->method_list[i]))));
-#endif
 }
 
 static bool CYHasImplicitProperties(Class _class) {
@@ -1944,17 +1877,11 @@ static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object,
 
     if (CYHasImplicitProperties(_class))
         for (Class current(_class); current != nil; current = class_getSuperclass(current)) {
-#if OBJC_API_VERSION >= 2
             unsigned int size;
             objc_method **data(class_copyMethodList(current, &size));
             for (size_t i(0); i != size; ++i)
                 Instance_getPropertyNames_message(names, data[i]);
             free(data);
-#else
-            for (objc_method_list *methods(current->methods); methods != NULL; methods = methods->method_next)
-                for (int i(0); i != methods->method_count; ++i)
-                    Instance_getPropertyNames_message(names, &methods->method_list[i]);
-#endif
         }
 
     CYPoolTry {
@@ -2138,17 +2065,11 @@ static void Internal_getPropertyNames_(Class _class, JSPropertyNameAccumulatorRe
     if (Class super = class_getSuperclass(_class))
         Internal_getPropertyNames_(super, names);
 
-#if OBJC_API_VERSION >= 2
     unsigned int size;
     objc_ivar **data(class_copyIvarList(_class, &size));
     for (size_t i(0); i != size; ++i)
         JSPropertyNameAccumulatorAddName(names, CYJSString(ivar_getName(data[i])));
     free(data);
-#else
-    if (objc_ivar_list *ivars = _class->ivars)
-        for (int i(0); i != ivars->ivar_count; ++i)
-            JSPropertyNameAccumulatorAddName(names, CYJSString(ivar_getName(&ivars->ivar_list[i])));
-#endif
 }
 
 static void Internal_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
@@ -2179,7 +2100,6 @@ static JSValueRef ObjectiveC_Classes_getProperty(JSContextRef context, JSObjectR
     return NULL;
 } CYCatch(NULL) }
 
-#ifdef __APPLE__
 static Class *CYCopyClassList(size_t &size) {
     size = objc_getClassList(NULL, 0);
     Class *data(reinterpret_cast<Class *>(malloc(sizeof(Class) * size)));
@@ -2201,21 +2121,14 @@ static Class *CYCopyClassList(size_t &size) {
         size = writ;
     }
 }
-#endif
 
 static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
-#ifdef __APPLE__
     size_t size;
     if (Class *data = CYCopyClassList(size)) {
         for (size_t i(0); i != size; ++i)
             JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(data[i])));
         free(data);
     }
-#else
-    void *state(NULL);
-    while (Class _class = objc_next_class(&state))
-        JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(_class)));
-#endif
 }
 
 #if OBJC_API_VERSION >= 2
@@ -2923,9 +2836,6 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     definition.hasProperty = &Messages_hasProperty;
     definition.getProperty = &Messages_getProperty;
     definition.setProperty = &Messages_setProperty;
-#if 0 && OBJC_API_VERSION < 2
-    definition.deleteProperty = &Messages_deleteProperty;
-#endif
     definition.getPropertyNames = &Messages_getPropertyNames;
     definition.finalize = &CYFinalize;
     Messages_ = JSClassCreate(&definition);