static JSClassRef ObjectiveC_Images_;
#endif
-static JSObjectRef Instance_prototype_;
-
#ifdef __APPLE__
static Class NSCFBoolean_;
static Class NSCFType_;
// XXX: trick this out with associated objects!
JSValueRef CYGetClassPrototype(JSContextRef context, id self) {
if (self == nil)
- return Instance_prototype_;
+ return CYGetCachedObject(context, CYJSString("Instance_prototype"));
// XXX: I need to think through multi-context
typedef std::map<id, JSValueRef> CacheMap;
JSValueRef prototype;
if (self == NSArray_)
- prototype = Array_prototype_;
+ prototype = CYGetCachedObject(context, CYJSString("Array_prototype"));
else if (self == NSDictionary_)
- prototype = Object_prototype_;
+ prototype = CYGetCachedObject(context, CYJSString("Object_prototype"));
else
prototype = CYGetClassPrototype(context, class_getSuperclass(self));
/* }}} */
NSObject *CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
+ JSObjectRef Array(CYGetCachedObject(context, Array_s));
JSValueRef exception(NULL);
- bool array(JSValueIsInstanceOfConstructor(context, object, Array_, &exception));
+ bool array(JSValueIsInstanceOfConstructor(context, object, Array, &exception));
CYThrow(context, exception);
id value(array ? [CYJSArray alloc] : [CYJSObject alloc]);
return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]);
bool comma(false);
#ifdef __APPLE__
- for (id key in self) {
+ for (NSObject *key in self) {
#else
NSEnumerator *keys([self keyEnumerator]);
- while (id key = [keys nextObject]) {
+ while (NSObject *key = [keys nextObject]) {
#endif
if (comma)
[json appendString:@","];
[super cy$getPropertyNames:names inContext:context];
#ifdef __APPLE__
- for (NSString *key in self) {
+ for (NSObject *key in self) {
#else
NSEnumerator *keys([self keyEnumerator]);
- while (NSString *key = [keys nextObject]) {
+ while (NSObject *key = [keys nextObject]) {
#endif
JSPropertyNameAccumulatorAddName(names, CYJSString(context, key));
}
- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry {
if ((self = [super init]) != nil) {
object_ = object;
- context_ = context;
+ context_ = CYGetJSContext(context);
+ //XXX:JSGlobalContextRetain(context_);
JSValueProtect(context_, object_);
} return self;
} CYObjectiveCatch }
- (void) dealloc { CYObjectiveTry {
JSValueUnprotect(context_, object_);
+ //XXX:JSGlobalContextRelease(context_);
[super dealloc];
} CYObjectiveCatch }
- (NSObject *) cy$toJSON:(NSString *)key { CYObjectiveTry {
- JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_));
+ JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_s));
if (!CYIsCallable(context_, toJSON))
return [super cy$toJSON:key];
else {
} CYObjectiveCatch }
- (id) objectForKey:(id)key { CYObjectiveTry {
- // XXX: are NSDictionary keys always NSString *?
- JSValueRef value(CYGetProperty(context_, object_, CYJSString(context_, (NSString *) key)));
+ JSValueRef value(CYGetProperty(context_, object_, CYJSString(context_, (NSObject *) key)));
if (JSValueIsUndefined(context_, value))
return nil;
return CYCastNSObject(NULL, context_, value) ?: [NSNull null];
} CYObjectiveCatch }
- (void) setObject:(id)object forKey:(id)key { CYObjectiveTry {
- // XXX: are NSDictionary keys always NSString *?
- CYSetProperty(context_, object_, CYJSString(context_, (NSString *) key), CYCastJSValue(context_, (NSString *) object));
+ CYSetProperty(context_, object_, CYJSString(context_, (NSObject *) 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(context_, (NSString *) key), &exception);
+ (void) JSObjectDeleteProperty(context_, object_, CYJSString(context_, (NSObject *) key), &exception);
CYThrow(context_, exception);
} CYObjectiveCatch }
- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry {
if ((self = [super init]) != nil) {
object_ = object;
- context_ = context;
+ context_ = CYGetJSContext(context);
+ //XXX:JSGlobalContextRetain(context_);
JSValueProtect(context_, object_);
} return self;
} CYObjectiveCatch }
- (void) dealloc { CYObjectiveTry {
JSValueUnprotect(context_, object_);
+ //XXX:JSGlobalContextRelease(context_);
[super dealloc];
} CYObjectiveCatch }
- (NSUInteger) count { CYObjectiveTry {
- return CYCastDouble(context_, CYGetProperty(context_, object_, length_));
+ return CYCastDouble(context_, CYGetProperty(context_, object_, length_s));
} CYObjectiveCatch }
- (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry {
JSValueRef exception(NULL);
JSValueRef arguments[1];
arguments[0] = CYCastJSValue(context_, (NSObject *) object);
- JSObjectCallAsFunction(context_, Array_push_, object_, 1, arguments, &exception);
+ JSObjectRef Array(CYGetCachedObject(context_, Array_s));
+ JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, push_s)), object_, 1, arguments, &exception);
CYThrow(context_, exception);
} CYObjectiveCatch }
arguments[0] = CYCastJSValue(context_, index);
arguments[1] = CYCastJSValue(context_, 0);
arguments[2] = CYCastJSValue(context_, (NSObject *) object);
- JSObjectCallAsFunction(context_, Array_splice_, object_, 3, arguments, &exception);
+ JSObjectRef Array(CYGetCachedObject(context_, Array_s));
+ JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 3, arguments, &exception);
CYThrow(context_, exception);
} CYObjectiveCatch }
- (void) removeLastObject { CYObjectiveTry {
JSValueRef exception(NULL);
- JSObjectCallAsFunction(context_, Array_pop_, object_, 0, NULL, &exception);
+ JSObjectRef Array(CYGetCachedObject(context_, Array_s));
+ JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, pop_s)), object_, 0, NULL, &exception);
CYThrow(context_, exception);
} CYObjectiveCatch }
JSValueRef arguments[2];
arguments[0] = CYCastJSValue(context_, index);
arguments[1] = CYCastJSValue(context_, 1);
- JSObjectCallAsFunction(context_, Array_splice_, object_, 2, arguments, &exception);
+ JSObjectRef Array(CYGetCachedObject(context_, Array_s));
+ JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 2, arguments, &exception);
CYThrow(context_, exception);
} CYObjectiveCatch }
return NULL;
} CYPoolCatch(NULL) return /*XXX*/ NULL; }
-static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { CYPoolTry {
+static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { @try {
ffi_call(cif, function, value, values);
-} CYPoolCatch() }
+} @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) { CYPoolTry {
switch (type->primitive) {
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));
}
ffi = typical->ffi_;
}
- return CYMakePointer(context, &internal->value_, type, ffi, object);
+ return CYMakePointer(context, &internal->value_, _not(size_t), type, ffi, object);
}
static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
{NULL, NULL, 0}
};
-void CYObjectiveC_SetupContext(JSContextRef context) {
- JSObjectRef global(CYGetGlobalObject(context));
+void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
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");
definition.getPropertyNames = &ObjectiveC_Classes_getPropertyNames;
ObjectiveC_Classes_ = JSClassCreate(&definition);
- definition = kJSClassDefinitionEmpty;
- definition.className = "ObjectiveC::Protocols";
- definition.getProperty = &ObjectiveC_Protocols_getProperty;
- definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames;
- ObjectiveC_Protocols_ = JSClassCreate(&definition);
-
- JSObjectRef ObjectiveC(JSObjectMake(context, NULL, NULL));
- CYSetProperty(context, global, CYJSString("ObjectiveC"), ObjectiveC);
-
- CYSetProperty(context, ObjectiveC, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Classes_, NULL));
- CYSetProperty(context, ObjectiveC, CYJSString("protocols"), JSObjectMake(context, ObjectiveC_Protocols_, NULL));
-
#if OBJC_API_VERSION >= 2
definition = kJSClassDefinitionEmpty;
definition.className = "ObjectiveC::Images";
definition.getProperty = &ObjectiveC_Image_Classes_getProperty;
definition.getPropertyNames = &ObjectiveC_Image_Classes_getPropertyNames;
ObjectiveC_Image_Classes_ = JSClassCreate(&definition);
+#endif
+
+ definition = kJSClassDefinitionEmpty;
+ definition.className = "ObjectiveC::Protocols";
+ definition.getProperty = &ObjectiveC_Protocols_getProperty;
+ definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames;
+ ObjectiveC_Protocols_ = JSClassCreate(&definition);
+
+#if defined(__APPLE__) && defined(__arm__)
+ MSHookFunction(&objc_registerClassPair, MSHake(objc_registerClassPair));
+#endif
+
+#ifdef __APPLE__
+ class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON), "@12@0:4@8");
+#endif
+} CYPoolCatch() }
+
+void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
+ JSObjectRef global(CYGetGlobalObject(context));
+ JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));
+
+ JSObjectRef ObjectiveC(JSObjectMake(context, NULL, NULL));
+ CYSetProperty(context, global, CYJSString("ObjectiveC"), ObjectiveC);
+
+ CYSetProperty(context, ObjectiveC, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Classes_, NULL));
+ CYSetProperty(context, ObjectiveC, CYJSString("protocols"), JSObjectMake(context, ObjectiveC_Protocols_, NULL));
+#if OBJC_API_VERSION >= 2
CYSetProperty(context, ObjectiveC, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL));
#endif
JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new));
JSObjectRef Super(JSObjectMakeConstructor(context, Super_, &Super_new));
- Instance_prototype_ = (JSObjectRef) CYGetProperty(context, Instance, prototype_);
- JSValueProtect(context, Instance_prototype_);
+ JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s)));
+ CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);
CYSetProperty(context, global, CYJSString("Instance"), Instance);
CYSetProperty(context, global, CYJSString("Selector"), Selector);
#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
CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend));
- JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Message, prototype_), Function_prototype_);
- JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Selector, prototype_), Function_prototype_);
-
-#ifdef __APPLE__
- class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON), "@12@0:4@8");
-#endif
-}
+ JSObjectRef Function_prototype(CYGetCachedObject(context, CYJSString("Function_prototype")));
+ JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Message, prototype_s)), Function_prototype);
+ JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Selector, prototype_s)), Function_prototype);
+} CYPoolCatch() }
static CYHooks CYObjectiveCHooks = {
&CYObjectiveC_ExecuteStart,
&CYObjectiveC_ExecuteEnd,
&CYObjectiveC_RuntimeProperty,
&CYObjectiveC_CallFunction,
+ &CYObjectiveC_Initialize,
&CYObjectiveC_SetupContext,
&CYObjectiveC_PoolFFI,
&CYObjectiveC_FromFFI,
projects / cycript.git / blobdiff