static Class NSArray_;
static Class NSDictionary_;
+static Class NSString_;
static Class Object_;
static Type_privateData *Object_type;
return Selector_type;
}
+static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception);
+
JSValueRef CYGetClassPrototype(JSContextRef context, id self) {
if (self == nil)
return CYGetCachedObject(context, CYJSString("Instance_prototype"));
JSClassRef _class(NULL);
JSValueRef prototype;
+ JSObjectRef object(JSObjectMake(context, _class, NULL));
+
if (self == NSArray_)
prototype = CYGetCachedObject(context, CYJSString("Array_prototype"));
else if (self == NSDictionary_)
prototype = CYGetCachedObject(context, CYJSString("Object_prototype"));
- else
+ else if (self == NSString_) {
+ prototype = CYGetCachedObject(context, CYJSString("String_prototype"));
+
+ CYSetProperty(context, object, toString_s, &Instance_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete);
+ } else
prototype = CYGetClassPrototype(context, class_getSuperclass(self));
- JSObjectRef object(JSObjectMake(context, _class, NULL));
JSObjectSetPrototype(context, object, prototype);
CYSetProperty(context, cy, name, object);
+
return object;
}
- (bool) cy$deleteProperty:(NSString *)name;
- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context;
++ (bool) cy$hasImplicitProperties;
+
@end
@protocol Cycript
}
}
++ (bool) cy$hasImplicitProperties {
+ return false;
+}
+
@end
/* }}} */
/* Bridge: NSBoolNumber {{{ */
}
}
++ (bool) cy$hasImplicitProperties {
+ return false;
+}
+
@end
/* }}} */
/* Bridge: NSMutableArray {{{ */
- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
}
++ (bool) cy$hasImplicitProperties {
+ return true;
+}
+
@end
/* }}} */
/* Bridge: NSProxy {{{ */
return [self cy$toCYON];
}
+- (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];
+ else
+ return true;
+}
+
+- (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];
+ else
+ return [self substringWithRange:NSMakeRange(index, 1)];
+}
+
+- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
+ [super cy$getPropertyNames:names inContext:context];
+
+ for (size_t index(0), length([self length]); index != length; ++index) {
+ char name[32];
+ sprintf(name, "%zu", index);
+ JSPropertyNameAccumulatorAddName(names, CYJSString(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;
+}
+
@end
/* }}} */
/* Bridge: WebUndefined {{{ */
static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry {
switch (type->primitive) {
+ // XXX: do something epic about blocks
+ case sig::block_P:
case sig::object_P:
case sig::typename_P:
*reinterpret_cast<id *>(data) = CYCastNSObject(pool, context, value);
static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) { CYPoolTry {
switch (type->primitive) {
+ // XXX: do something epic about blocks
+ case sig::block_P:
case sig::object_P:
if (NSObject *object = *reinterpret_cast<NSObject **>(data)) {
JSValueRef value(CYCastJSValue(context, object));
#endif
}
+static bool CYHasImplicitProperties(Class _class) {
+ // XXX: this is an evil hack to deal with NSProxy; fix elsewhere
+ if (!CYImplements(_class, object_getClass(_class), @selector(cy$hasImplicitProperties), false))
+ return true;
+ return [_class cy$hasImplicitProperties];
+}
+
static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
id self(internal->GetValue());
return true;
#endif
- if (SEL sel = sel_getUid(string))
- if (CYImplements(self, _class, sel, true))
- return true;
+ if (CYHasImplicitProperties(_class))
+ if (SEL sel = sel_getUid(string))
+ if (CYImplements(self, _class, sel, true))
+ return true;
return false;
}
}
#endif
- if (SEL sel = sel_getUid(string))
- if (CYImplements(self, _class, sel, true))
- return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception);
+ if (CYHasImplicitProperties(_class))
+ if (SEL sel = sel_getUid(string))
+ if (CYImplements(self, _class, sel, true))
+ return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception);
return NULL;
} CYCatch }
} CYPoolCatch(NULL)
} CYCatch return /*XXX*/ NULL; }
+static void Instance_getPropertyNames_message(JSPropertyNameAccumulatorRef names, objc_method *method) {
+ const char *name(sel_getName(method_getName(method)));
+ if (strchr(name, ':') != NULL)
+ return;
+
+ const char *type(method_getTypeEncoding(method));
+ if (type == NULL || *type == '\0' || *type == 'v')
+ return;
+
+ JSPropertyNameAccumulatorAddName(names, CYJSString(name));
+}
+
static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
id self(internal->GetValue());
}
#endif
+ 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 {
// XXX: this is an evil hack to deal with NSProxy; fix elsewhere
if (CYImplements(self, _class, @selector(cy$getPropertyNames:inContext:), false))
NSArray_ = objc_getClass("NSArray");
NSDictionary_ = objc_getClass("NSDictionary");
+ NSString_ = objc_getClass("NSString");
Object_ = objc_getClass("Object");
JSClassDefinition definition;