-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__arm__)
#include <substrate.h>
+#else
+#include <objc/objc-api.h>
#endif
#include "ObjectiveC/Internal.hpp"
#ifdef __APPLE__
#include <CoreFoundation/CoreFoundation.h>
-#include <CoreFoundation/CFLogUtilities.h>
#include <JavaScriptCore/JSStringRefCF.h>
#include <WebKit/WebScriptObject.h>
#endif
#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)); \
- GSObjCGetVariable(object, ivar_getOffset(ivar), sizeof(void *), value); \
+ if (ivar != NULL) \
+ GSObjCGetVariable(object, ivar_getOffset(ivar), sizeof(void *), value); \
ivar; \
})
#endif
}
-JSStringRef CYCopyJSString(NSObject *value) {
+JSStringRef CYCopyJSString(JSContextRef context, NSObject *value) {
if (value == nil)
return NULL;
// XXX: this definition scares me; is anyone using this?!
NSString *string([value description]);
- return CYCopyJSString(string);
+ return CYCopyJSString(context, string);
}
NSString *CYCopyNSString(const CYUTF8String &value) {
}
/* }}} */
+JSValueRef CYCastJSValue(JSContextRef context, NSObject *value);
+
void CYThrow(JSContextRef context, NSException *error, JSValueRef *exception) {
if (exception == NULL)
throw error;
static Class NSCFType_;
static Class NSMessageBuilder_;
static Class NSZombie_;
+#else
+static Class NSBoolNumber_;
#endif
static Class NSArray_;
- (NSObject *) cy$getProperty:(NSString *)name;
- (bool) cy$setProperty:(NSString *)name to:(NSObject *)value;
- (bool) cy$deleteProperty:(NSString *)name;
-- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names;
+- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context;
@end
return [[NSNumber alloc] initWithDouble:CYCastDouble(context, value)];
}
+#ifndef __APPLE__
+@interface NSBoolNumber : NSNumber {
+}
+@end
+#endif
+
id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cast) {
id object;
bool copy;
object = (id) (CYCastBool(context, value) ? kCFBooleanTrue : kCFBooleanFalse);
copy = false;
#else
- object = [[NSNumber alloc] initWithBool:CYCastBool(context, value)];
+ object = [[NSBoolNumber alloc] initWithBool:CYCastBool(context, value)];
copy = true;
#endif
break;
return [self objectAtIndex:index];
}
-- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names {
- [super cy$getPropertyNames:names];
+- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
+ [super cy$getPropertyNames:names inContext:context];
for (size_t index(0), count([self count]); index != count; ++index) {
id object([self objectAtIndex:index]);
@end
/* }}} */
+/* Bridge: NSBoolNumber {{{ */
+#ifndef __APPLE__
+@implementation NSBoolNumber (Cycript)
+
+- (JSType) cy$JSType {
+ return kJSTypeBoolean;
+}
+
+- (NSObject *) cy$toJSON:(NSString *)key {
+ return self;
+}
+
+- (NSString *) cy$toCYON {
+ return [self boolValue] ? @"true" : @"false";
+}
+
+- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+ return CYCastJSValue(context, (bool) [self boolValue]);
+} CYObjectiveCatch }
+
+@end
+#endif
+/* }}} */
/* Bridge: NSDictionary {{{ */
@implementation NSDictionary (Cycript)
return [self objectForKey:name];
}
-- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names {
- [super cy$getPropertyNames:names];
+- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
+ [super cy$getPropertyNames:names inContext:context];
#ifdef __APPLE__
for (NSString *key in self) {
NSEnumerator *keys([self keyEnumerator]);
while (NSString *key = [keys nextObject]) {
#endif
- JSPropertyNameAccumulatorAddName(names, CYJSString(key));
+ JSPropertyNameAccumulatorAddName(names, CYJSString(context, key));
}
}
return false;
}
-- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names {
+- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
}
@end
return array;
}
-JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry {
+JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
if (value == nil)
return CYJSNull(context);
else if ([value respondsToSelector:@selector(cy$JSValueInContext:)])
return [value cy$JSValueInContext:context];
else
return CYMakeInstance(context, value, false);
-} CYPoolCatch(NULL) }
+} CYPoolCatch(NULL) return /*XXX*/ NULL; }
@implementation CYJSObject
- (id) objectForKey:(id)key { CYObjectiveTry {
// XXX: are NSDictionary keys always NSString *?
- JSValueRef value(CYGetProperty(context_, object_, CYJSString((NSString *) key)));
+ JSValueRef value(CYGetProperty(context_, object_, CYJSString(context_, (NSString *) key)));
if (JSValueIsUndefined(context_, value))
return nil;
return CYCastNSObject(NULL, context_, value) ?: [NSNull null];
- (void) setObject:(id)object forKey:(id)key { CYObjectiveTry {
// XXX: are NSDictionary keys always NSString *?
- CYSetProperty(context_, object_, CYJSString((NSString *) key), CYCastJSValue(context_, object));
+ CYSetProperty(context_, object_, CYJSString(context_, (NSString *) key), CYCastJSValue(context_, (NSString *) object));
} CYObjectiveCatch }
- (void) removeObjectForKey:(id)key { CYObjectiveTry {
JSValueRef exception(NULL);
// XXX: are NSDictionary keys always NSString *?
- (void) JSObjectDeleteProperty(context_, object_, CYJSString((NSString *) key), &exception);
+ (void) JSObjectDeleteProperty(context_, object_, CYJSString(context_, (NSString *) key), &exception);
CYThrow(context_, exception);
} CYObjectiveCatch }
- (void) addObject:(id)object { CYObjectiveTry {
JSValueRef exception(NULL);
JSValueRef arguments[1];
- arguments[0] = CYCastJSValue(context_, object);
+ arguments[0] = CYCastJSValue(context_, (NSObject *) object);
JSObjectCallAsFunction(context_, Array_push_, object_, 1, arguments, &exception);
CYThrow(context_, exception);
} CYObjectiveCatch }
JSValueRef arguments[3];
arguments[0] = CYCastJSValue(context_, index);
arguments[1] = CYCastJSValue(context_, 0);
- arguments[2] = CYCastJSValue(context_, object);
+ arguments[2] = CYCastJSValue(context_, (NSObject *) object);
JSObjectCallAsFunction(context_, Array_splice_, object_, 3, arguments, &exception);
CYThrow(context_, exception);
} CYObjectiveCatch }
size_t bounds([self count]);
if (index >= bounds)
@throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray replaceObjectAtIndex:withObject:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];
- CYSetProperty(context_, object_, index, CYCastJSValue(context_, object));
+ CYSetProperty(context_, object_, index, CYCastJSValue(context_, (NSObject *) object));
} CYObjectiveCatch }
@end
return [(NSAutoreleasePool *) handle release];
}
-JSValueRef CYObjectiveC_RuntimeProperty(JSContextRef context, CYUTF8String name) { CYObjectiveTry_(context) {
+JSValueRef CYObjectiveC_RuntimeProperty(JSContextRef context, CYUTF8String name) { CYPoolTry {
if (name == "nil")
return Instance::Make(context, nil);
if (Class _class = objc_getClass(name.data))
return CYMakeInstance(context, _class, true);
return NULL;
-} CYObjectiveCatch }
+} CYPoolCatch(NULL) return /*XXX*/ NULL; }
-static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { CYObjectiveTry_(context) {
+static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { @try {
ffi_call(cif, function, value, values);
-} CYObjectiveCatch }
+} @catch (NSException *error ) {
+ throw CYJSError(context, CYCastJSValue(context, error));
+} }
-static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYObjectiveTry_(context) {
+static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYPoolTry {
switch (type->primitive) {
case sig::object_P:
case sig::typename_P:
}
return true;
-} CYObjectiveCatch }
+} CYPoolCatch(false) return /*XXX*/ NULL; }
-static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) { CYObjectiveTry_(context) {
+static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) { CYPoolTry {
switch (type->primitive) {
case sig::object_P:
- if (id object = *reinterpret_cast<id *>(data)) {
+ if (NSObject *object = *reinterpret_cast<NSObject **>(data)) {
JSValueRef value(CYCastJSValue(context, object));
if (initialize)
[object release];
default:
return NULL;
}
-} CYObjectiveCatch }
+} CYPoolCatch(NULL) return /*XXX*/ NULL; }
static bool CYImplements(id object, Class _class, SEL selector, bool devoid) {
if (objc_method *method = class_getInstanceMethod(_class, selector)) {
if (!devoid)
return true;
-#ifdef __OBJC2__
+#if OBJC_API_VERSION >= 2
char type[16];
method_getReturnType(method, type, sizeof(type));
#else
return true;
}
-#if 0 && !__OBJC2__
+#if 0 && OBJC_API_VERSION < 2
static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
Class _class(internal->GetValue());
Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
Class _class(internal->GetValue());
-#ifdef __OBJC2__
+#if OBJC_API_VERSION >= 2
unsigned int size;
objc_method **data(class_copyMethodList(_class, &size));
for (size_t i(0); i != size; ++i)
NSString *name(CYCastNSString(NULL, context, property));
return [self cy$deleteProperty:name];
} CYPoolCatch(NULL)
-} CYCatch }
+} CYCatch return /*XXX*/ NULL; }
static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
CYPoolTry {
// XXX: this is an evil hack to deal with NSProxy; fix elsewhere
- if (CYImplements(self, _class, @selector(cy$getPropertyNames:), false))
- [self cy$getPropertyNames:names];
+ if (CYImplements(self, _class, @selector(cy$getPropertyNames:inContext:), false))
+ [self cy$getPropertyNames:names inContext:context];
} CYPoolCatch()
}
if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {
Type_privateData type(pool, ivar_getTypeEncoding(ivar));
+ // XXX: if this fails and throws an exception the person we are throwing it to gets the wrong exception
return CYFromFFI(context, type.type_, type.GetFFI(), reinterpret_cast<uint8_t *>(self) + ivar_getOffset(ivar));
}
if (Class super = class_getSuperclass(_class))
Internal_getPropertyNames_(super, names);
-#ifdef __OBJC2__
+#if OBJC_API_VERSION >= 2
unsigned int size;
objc_ivar **data(class_copyIvarList(_class, &size));
for (size_t i(0); i != size; ++i)
#endif
}
-#ifdef __OBJC2__
+#if OBJC_API_VERSION >= 2
static JSValueRef ObjectiveC_Image_Classes_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
const char *internal(reinterpret_cast<const char *>(JSObjectGetPrivate(object)));
} CYCatch }
static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
-#ifdef __OBJC2__
+#if OBJC_API_VERSION >= 2
unsigned int size;
Protocol **data(objc_copyProtocolList(&size));
for (size_t i(0); i != size; ++i)
} CYCatch }
/* Hook: objc_registerClassPair {{{ */
-#ifdef __OBJC2__
+#if defined(__APPLE__) && defined(__arm__)
// XXX: replace this with associated objects
MSHook(void, CYDealloc, id self, SEL sel) {
return NULL;
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
- return CYCastJSValue(context, CYJSString(CYCastNSCYON(internal->GetValue())));
+ return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue())));
} CYCatch }
static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
else
key = CYCastNSString(NULL, context, CYJSString(context, arguments[0]));
// XXX: check for support of cy$toJSON?
- return CYCastJSValue(context, CYJSString([internal->GetValue() cy$toJSON:key]));
+ return CYCastJSValue(context, CYJSString(context, [internal->GetValue() cy$toJSON:key]));
} CYPoolCatch(NULL)
-} CYCatch }
+} CYCatch return /*XXX*/ NULL; }
static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (!JSValueIsObjectOfClass(context, _this, Instance_))
CYPoolTry {
// XXX: this seems like a stupid implementation; what if it crashes? why not use the CYONifier backend?
- return CYCastJSValue(context, CYJSString([internal->GetValue() description]));
+ return CYCastJSValue(context, CYJSString(context, [internal->GetValue() description]));
} CYPoolCatch(NULL)
-} CYCatch }
+} CYCatch return /*XXX*/ NULL; }
static JSValueRef Selector_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate(_this)));
const char *name(sel_getName(internal->GetValue()));
CYPoolTry {
- return CYCastJSValue(context, CYJSString((NSString *) [NSString stringWithFormat:@"@selector(%s)", name]));
+ NSString *string([NSString stringWithFormat:@"@selector(%s)", name]);
+ return CYCastJSValue(context, CYJSString(context, string));
} CYPoolCatch(NULL)
-} CYCatch }
+} CYCatch return /*XXX*/ NULL; }
static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (count != 1)
JSObjectRef global(CYGetGlobalObject(context));
apr_pool_t *pool(CYGetGlobalPool());
- Object_type = new(pool) Type_privateData(pool, "@");
- Selector_type = new(pool) Type_privateData(pool, ":");
+ Object_type = new(pool) Type_privateData("@");
+ Selector_type = new(pool) Type_privateData(":");
#ifdef __APPLE__
NSCFBoolean_ = objc_getClass("NSCFBoolean");
NSCFType_ = objc_getClass("NSCFType");
NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
NSZombie_ = objc_getClass("_NSZombie_");
+#else
+ NSBoolNumber_ = objc_getClass("NSBoolNumber");
#endif
NSArray_ = objc_getClass("NSArray");
definition.hasProperty = &Messages_hasProperty;
definition.getProperty = &Messages_getProperty;
definition.setProperty = &Messages_setProperty;
-#if 0 && !__OBJC2__
+#if 0 && OBJC_API_VERSION < 2
definition.deleteProperty = &Messages_deleteProperty;
#endif
definition.getPropertyNames = &Messages_getPropertyNames;
CYSetProperty(context, ObjectiveC, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Classes_, NULL));
CYSetProperty(context, ObjectiveC, CYJSString("protocols"), JSObjectMake(context, ObjectiveC_Protocols_, NULL));
-#ifdef __OBJC2__
+#if OBJC_API_VERSION >= 2
definition = kJSClassDefinitionEmpty;
definition.className = "ObjectiveC::Images";
definition.getProperty = &ObjectiveC_Images_getProperty;
CYSetProperty(context, global, CYJSString("Selector"), Selector);
CYSetProperty(context, global, CYJSString("Super"), Super);
-#ifdef __OBJC2__
+#if defined(__APPLE__) && defined(__arm__)
CYSetProperty(context, global, CYJSString("objc_registerClassPair"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_registerClassPair"), &objc_registerClassPair_));
MSHookFunction(&objc_registerClassPair, MSHake(objc_registerClassPair));
#endif
projects / cycript.git / blobdiff