return object;
}
-JSObjectRef Messages::Make(JSContextRef context, Class _class, bool array) {
+JSObjectRef Messages::Make(JSContextRef context, Class _class) {
JSObjectRef value(JSObjectMake(context, Messages_, new Messages(_class)));
- if (_class == NSArray_)
- array = true;
if (Class super = class_getSuperclass(_class))
- JSObjectSetPrototype(context, value, Messages::Make(context, super, array));
- /*else if (array)
- JSObjectSetPrototype(context, value, Array_prototype_);*/
+ JSObjectSetPrototype(context, value, Messages::Make(context, super));
return value;
}
- (JSValueRef) cy$valueOfInContext:(JSContextRef)context;
- (JSType) cy$JSType;
-- (NSObject *) cy$toJSON:(NSString *)key;
+- (JSValueRef) cy$toJSON:(NSString *)key inContext:(JSContextRef)context;
- (NSString *) cy$toCYON:(bool)objective;
- (bool) cy$hasProperty:(NSString *)name;
};
#endif
-#ifdef __APPLE__
-NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
- return [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease];
-}
-#endif
-
#ifndef __APPLE__
@interface CYWebUndefined : NSObject {
}
- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context;
-- (NSObject *) cy$toJSON:(NSString *)key;
-
- (NSUInteger) count;
- (id) objectForKey:(id)key;
- (NSEnumerator *) keyEnumerator;
@end
/* }}} */
+_finline bool CYJSValueIsNSObject(JSContextRef context, JSValueRef value) {
+ return JSValueIsObjectOfClass(context, value, Instance_);
+}
+
_finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) {
JSValueRef exception(NULL);
JSObjectRef constructor(CYGetCachedObject(context, cache));
}
NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
- if (JSValueIsObjectOfClass(context, object, Instance_)) {
+ if (CYJSValueIsNSObject(context, object)) {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
return internal->GetValue();
}
return kJSTypeBoolean;
}
-- (NSObject *) cy$toJSON:(NSString *)key {
- return self;
-}
-
- (NSString *) cy$toCYON:(bool)objective {
NSString *value([self boolValue] ? @"true" : @"false");
return objective ? value : [NSString stringWithFormat:@"@%@", value];
return kJSTypeNumber;
}
-- (NSObject *) cy$toJSON:(NSString *)key {
- return self;
-}
-
- (NSString *) cy$toCYON:(bool)objective {
NSString *value([self cy$JSType] != kJSTypeBoolean ? [self stringValue] : [self boolValue] ? @"true" : @"false");
return objective ? value : [NSString stringWithFormat:@"@%@", value];
}
- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
- return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, [self boolValue]);
+ return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, static_cast<bool>([self boolValue]));
} CYObjectiveCatch }
@end
return kJSTypeNull;
}
-- (NSObject *) cy$toJSON:(NSString *)key {
- return self;
-}
-
- (NSString *) cy$toCYON:(bool)objective {
NSString *value(@"null");
return objective ? value : [NSString stringWithFormat:@"@%@", value];
}
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+ return CYJSNull(context);
+} CYObjectiveCatch }
+
@end
/* }}} */
/* Bridge: NSObject {{{ */
return self;
}
+- (JSValueRef) cy$toJSON:(NSString *)key inContext:(JSContextRef)context {
+ return [self cy$valueOfInContext:context];
+}
+
- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
return NULL;
} CYObjectiveCatch }
return kJSTypeObject;
}
-- (NSObject *) cy$toJSON:(NSString *)key {
- return [self description];
-}
-
- (NSString *) cy$toCYON:(bool)objective {
- return [[self cy$toJSON:@""] cy$toCYON:objective];
+ return [[self description] cy$toCYON:objective];
}
- (bool) cy$hasProperty:(NSString *)name {
/* Bridge: NSProxy {{{ */
@implementation NSProxy (Cycript)
-- (NSObject *) cy$toJSON:(NSString *)key {
- return [self description];
-}
-
- (NSString *) cy$toCYON:(bool)objective {
- return [[self cy$toJSON:@""] cy$toCYON:objective];
+ return [[self description] cy$toCYON:objective];
}
@end
return kJSTypeString;
}
-- (NSObject *) cy$toJSON:(NSString *)key {
- return self;
-}
-
- (NSString *) cy$toCYON:(bool)objective {
std::ostringstream str;
if (!objective)
}
- (bool) cy$hasProperty:(NSString *)name {
- if ([name isEqualToString:@"length"])
- return true;
-
size_t index(CYGetIndex(name));
if (index == _not(size_t) || index >= [self length])
return [super cy$hasProperty:name];
}
- (NSObject *) cy$getProperty:(NSString *)name {
- if ([name isEqualToString:@"length"]) {
- NSUInteger count([self length]);
-#ifdef __APPLE__
- return [NSNumber numberWithUnsignedInteger:count];
-#else
- return [NSNumber numberWithUnsignedInt:count];
-#endif
- }
-
size_t index(CYGetIndex(name));
if (index == _not(size_t) || index >= [self length])
return [super cy$getProperty:name];
}
}
-// XXX: this might be overly restrictive for NSString; I think I need a half-way between /injecting/ implicit properties and /accepting/ implicit properties
-+ (bool) cy$hasImplicitProperties {
- return false;
-}
-
- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
return CYCastJSValue(context, CYJSString(context, self));
} CYObjectiveCatch }
return kJSTypeUndefined;
}
-- (NSObject *) cy$toJSON:(NSString *)key {
- return self;
-}
-
-- (NSString *) cy$toCYON {
+- (NSString *) cy$toCYON:(bool)objective {
NSString *value(@"undefined");
return value; // XXX: maybe use the below code, adding @undefined?
//return objective ? value : [NSString stringWithFormat:@"@%@", value];
static bool CYIsClass(id self) {
#ifdef __APPLE__
- // XXX: this is a lame object_isClass
- return class_getInstanceMethod(object_getClass(self), @selector(alloc)) != NULL;
+ return class_isMetaClass(object_getClass(self));
#else
return GSObjCIsClass(self);
#endif
[super dealloc];
} CYObjectiveCatch }
-- (NSObject *) cy$toJSON:(NSString *)key { CYObjectiveTry {
- JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_s));
- if (!CYIsCallable(context_, toJSON))
- return [super cy$toJSON:key];
- else {
- JSValueRef arguments[1] = {CYCastJSValue(context_, key)};
- JSValueRef value(CYCallAsFunction(context_, (JSObjectRef) toJSON, object_, 1, arguments));
- // XXX: do I really want an NSNull here?!
- return CYCastNSObject(NULL, context_, value) ?: [NSNull null];
- }
-} CYObjectiveCatch }
-
- (NSString *) cy$toCYON:(bool)objective { CYObjectiveTry {
CYPool pool;
JSValueRef exception(NULL);
if (!CYIsClass(_class))
return false;
- if (JSValueIsObjectOfClass(context, instance, Instance_)) {
+ if (CYJSValueIsNSObject(context, instance)) {
Instance *linternal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) instance)));
// XXX: this isn't always safe
return [linternal->GetValue() isKindOfClass:_class];
self = internal->GetValue();
_class = internal->class_;;
uninitialized = false;
- } else if (JSValueIsObjectOfClass(context, arguments[0], Instance_)) {
+ } else if (CYJSValueIsNSObject(context, arguments[0])) {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));
self = internal->GetValue();
_class = nil;
}
static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- if (!JSValueIsObjectOfClass(context, _this, Instance_))
+ if (!CYJSValueIsNSObject(context, _this))
return NULL;
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
} CYCatch }
static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- if (!JSValueIsObjectOfClass(context, _this, Instance_))
+ if (!CYJSValueIsNSObject(context, _this))
return NULL;
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
+ id value(internal->GetValue());
CYPoolTry {
NSString *key;
key = nil;
else
key = CYCastNSString(NULL, context, CYJSString(context, arguments[0]));
- // XXX: check for support of cy$toJSON?
- return CYCastJSValue(context, CYJSString(context, [internal->GetValue() cy$toJSON:key]));
+
+ if (!CYImplements(value, object_getClass(value), @selector(cy$toJSON:inContext:)))
+ return CYJSUndefined(context);
+ else if (JSValueRef json = [value cy$toJSON:key inContext:context])
+ return json;
+ else
+ return CYCastJSValue(context, CYJSString(context, [value description]));
} CYPoolCatch(NULL)
} CYCatch return /*XXX*/ NULL; }
static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- if (!JSValueIsObjectOfClass(context, _this, Instance_))
+ if (!CYJSValueIsNSObject(context, _this))
return NULL;
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
} CYCatch return /*XXX*/ NULL; }
static JSValueRef Instance_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- if (!JSValueIsObjectOfClass(context, _this, Instance_))
+ if (!CYJSValueIsNSObject(context, _this))
return NULL;
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
} 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_))
+ if (!CYJSValueIsNSObject(context, _this))
return NULL;
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
{NULL, NULL, 0}
};
+#ifdef __APPLE__
+JSValueRef NSCFType$cy$toJSON$inContext$(id self, SEL sel, JSValueRef key, JSContextRef context) { CYObjectiveTry_(context) {
+ return CYCastJSValue(context, [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease]);
+} CYObjectiveCatch }
+#endif
+
void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
$objc_setAssociatedObject = reinterpret_cast<void (*)(id, void *, id value, objc_AssociationPolicy)>(dlsym(RTLD_DEFAULT, "objc_setAssociatedObject"));
$objc_getAssociatedObject = reinterpret_cast<id (*)(id, void *)>(dlsym(RTLD_DEFAULT, "objc_getAssociatedObject"));
Selector_type = new(pool) Type_privateData(":");
#ifdef __APPLE__
- NSCFBoolean_ = objc_getClass("NSCFBoolean");
+ // XXX: apparently, iOS now has both of these
+ NSCFBoolean_ = objc_getClass("__NSCFBoolean");
if (NSCFBoolean_ == nil)
- NSCFBoolean_ = objc_getClass("__NSCFBoolean");
+ NSCFBoolean_ = objc_getClass("NSCFBoolean");
NSCFType_ = objc_getClass("NSCFType");
NSGenericDeallocHandler_ = objc_getClass("__NSGenericDeallocHandler");
ObjectiveC_Protocols_ = JSClassCreate(&definition);
#ifdef __APPLE__
- class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON), "@12@0:4@8");
+ class_addMethod(NSCFType_, @selector(cy$toJSON:inContext:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON$inContext$), "^{OpaqueJSValue=}16@0:4@8^{OpaqueJSContext=}12");
#endif
} CYPoolCatch() }
projects / cycript.git / blobdiff