/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2010 Jay Freeman (saurik)
+ * Copyright (C) 2009-2013 Jay Freeman (saurik)
*/
-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */
/*
- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
*
- * Cycript is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
+ * Cycript is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
* along with Cycript. If not, see <http://www.gnu.org/licenses/>.
**/
/* }}} */
-#ifdef __APPLE__
-#include "Struct.hpp"
-#endif
-
#include <Foundation/Foundation.h>
#include "ObjectiveC/Internal.hpp"
#include <cmath>
#include <map>
+#include <dlfcn.h>
+
#define CYObjectiveTry_(context) { \
JSContextRef context_(context); \
try
#define protocol_getName(protocol) [(protocol) name]
#endif
-JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception);
+static void (*$objc_setAssociatedObject)(id object, void *key, id value, objc_AssociationPolicy policy);
+static id (*$objc_getAssociatedObject)(id object, void *key);
+static void (*$objc_removeAssociatedObjects)(id object);
+
+struct BlockLiteral {
+ Class isa;
+ int flags;
+ int reserved;
+ void (*invoke)(void *, ...);
+ void *descriptor;
+};
+
+struct BlockDescriptor1 {
+ unsigned long int reserved;
+ unsigned long int size;
+};
+
+struct BlockDescriptor2 {
+ void (*copy_helper)(BlockLiteral *dst, BlockLiteral *src);
+ void (*dispose_helper)(BlockLiteral *src);
+};
+
+struct BlockDescriptor3 {
+ const char *signature;
+ const char *layout;
+};
+
+enum {
+ BLOCK_DEALLOCATING = 0x0001,
+ BLOCK_REFCOUNT_MASK = 0xfffe,
+ BLOCK_NEEDS_FREE = 1 << 24,
+ BLOCK_HAS_COPY_DISPOSE = 1 << 25,
+ BLOCK_HAS_CTOR = 1 << 26,
+ BLOCK_IS_GC = 1 << 27,
+ BLOCK_IS_GLOBAL = 1 << 28,
+ BLOCK_HAS_STRET = 1 << 29,
+ BLOCK_HAS_SIGNATURE = 1 << 30,
+};
+
+JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception);
/* Objective-C Pool Release {{{ */
apr_status_t CYPoolRelease_(void *data) {
return APR_SUCCESS;
}
-id CYPoolRelease_(apr_pool_t *pool, id object) {
+id CYPoolRelease_(CYPool *pool, id object) {
if (object == nil)
return nil;
else if (pool == NULL)
return [object autorelease];
else {
- apr_pool_cleanup_register(pool, object, &CYPoolRelease_, &apr_pool_cleanup_null);
+ apr_pool_cleanup_register(*pool, object, &CYPoolRelease_, &apr_pool_cleanup_null);
return object;
}
}
template <typename Type_>
-Type_ CYPoolRelease(apr_pool_t *pool, Type_ object) {
+Type_ CYPoolRelease(CYPool *pool, Type_ object) {
return (Type_) CYPoolRelease_(pool, (id) object);
}
/* }}} */
/* Objective-C Strings {{{ */
-const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, NSString *value) {
+const char *CYPoolCString(CYPool &pool, JSContextRef context, NSString *value) {
if (pool == NULL)
return [value UTF8String];
else {
return CYCopyNSString(context, CYJSString(context, value));
}
-NSString *CYCastNSString(apr_pool_t *pool, const CYUTF8String &value) {
+NSString *CYCastNSString(CYPool *pool, const CYUTF8String &value) {
return CYPoolRelease(pool, CYCopyNSString(value));
}
-NSString *CYCastNSString(apr_pool_t *pool, SEL sel) {
+NSString *CYCastNSString(CYPool *pool, SEL sel) {
const char *name(sel_getName(sel));
return CYPoolRelease(pool, CYCopyNSString(CYUTF8String(name, strlen(name))));
}
-NSString *CYCastNSString(apr_pool_t *pool, JSContextRef context, JSStringRef value) {
+NSString *CYCastNSString(CYPool *pool, JSContextRef context, JSStringRef value) {
return CYPoolRelease(pool, CYCopyNSString(context, value));
}
return CYGetIndex(CYCastUTF8String(value));
}
-bool CYGetOffset(apr_pool_t *pool, JSContextRef context, NSString *value, ssize_t &index) {
+bool CYGetOffset(CYPool &pool, JSContextRef context, NSString *value, ssize_t &index) {
return CYGetOffset(CYPoolCString(pool, context, value), index);
}
static JSClassRef Instance_;
+
+static JSClassRef ArrayInstance_;
+static JSClassRef FunctionInstance_;
+static JSClassRef ObjectInstance_;
+static JSClassRef StringInstance_;
+
+static JSClassRef Class_;
static JSClassRef Internal_;
static JSClassRef Message_;
static JSClassRef Messages_;
#endif
static Class NSArray_;
+static Class NSBlock_;
static Class NSDictionary_;
static Class NSString_;
static Class Object_;
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) {
+JSValueRef CYGetClassPrototype(JSContextRef context, Class self, bool meta) {
if (self == nil)
return CYGetCachedObject(context, CYJSString("Instance_prototype"));
+ else if (meta && !class_isMetaClass(self))
+ return CYGetCachedObject(context, CYJSString("Class_prototype"));
JSObjectRef global(CYGetGlobalObject(context));
JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));
if (self == NSArray_)
prototype = CYGetCachedObject(context, CYJSString("ArrayInstance_prototype"));
+ else if (self == NSBlock_)
+ prototype = CYGetCachedObject(context, CYJSString("FunctionInstance_prototype"));
else if (self == NSDictionary_)
prototype = CYGetCachedObject(context, CYJSString("ObjectInstance_prototype"));
else if (self == NSString_)
prototype = CYGetCachedObject(context, CYJSString("StringInstance_prototype"));
else
- prototype = CYGetClassPrototype(context, class_getSuperclass(self));
+ prototype = CYGetClassPrototype(context, class_getSuperclass(self), meta);
JSObjectRef object(JSObjectMake(context, _class, NULL));
JSObjectSetPrototype(context, object, prototype);
return object;
}
-JSObjectRef Messages::Make(JSContextRef context, Class _class, bool array) {
+_finline JSValueRef CYGetClassPrototype(JSContextRef context, Class self) {
+ return CYGetClassPrototype(context, self, class_isMetaClass(self));
+}
+
+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;
}
@interface NSObject (Cycript)
-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context;
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context;
- (JSType) cy$JSType;
-- (NSObject *) cy$toJSON:(NSString *)key;
-- (NSString *) cy$toCYON;
-- (NSString *) cy$toKey;
+- (JSValueRef) cy$toJSON:(NSString *)key inContext:(JSContextRef)context;
+- (NSString *) cy$toCYON:(bool)objective;
- (bool) cy$hasProperty:(NSString *)name;
- (NSObject *) cy$getProperty:(NSString *)name;
+- (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context;
- (bool) cy$setProperty:(NSString *)name to:(NSObject *)value;
- (bool) cy$deleteProperty:(NSString *)name;
- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context;
@protocol Cycript
- (id) cy$box;
-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context;
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context;
@end
-NSString *CYCastNSCYON(id value) {
+NSString *CYCastNSCYON(id value, bool objective) {
NSString *string;
if (value == nil)
string = @"nil";
else {
Class _class(object_getClass(value));
- SEL sel(@selector(cy$toCYON));
+ SEL sel(@selector(cy$toCYON:));
if (objc_method *toCYON = class_getInstanceMethod(_class, sel))
- string = reinterpret_cast<NSString *(*)(id, SEL)>(method_getImplementation(toCYON))(value, sel);
+ string = reinterpret_cast<NSString *(*)(id, SEL, bool)>(method_getImplementation(toCYON))(value, sel, objective);
else if (objc_method *methodSignatureForSelector = class_getInstanceMethod(_class, @selector(methodSignatureForSelector:))) {
if (reinterpret_cast<NSMethodSignature *(*)(id, SEL, SEL)>(method_getImplementation(methodSignatureForSelector))(value, @selector(methodSignatureForSelector:), sel) != nil)
- string = [value cy$toCYON];
+ string = [value cy$toCYON:objective];
else goto fail;
} else fail: {
if (false);
name = property_getName(property);
const char *attributes(property_getAttributes(property));
- for (char *state, *token(apr_strtok(apr_pstrdup(pool_, attributes), ",", &state)); token != NULL; token = apr_strtok(NULL, ",", &state)) {
+ for (char *token(pool_.strdup(attributes)), *next; token != NULL; token = next) {
+ if ((next = strchr(token, ',')) != NULL)
+ *next++ = '\0';
switch (*token) {
case 'R': readonly = true; break;
case 'C': copy = true; break;
const char *Getter() {
if (getter_ == NULL)
- getter_ = apr_pstrdup(pool_, name);
+ getter_ = pool_.strdup(name);
return getter_;
}
};
#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 {
}
/* Bridge: CYJSObject {{{ */
@interface CYJSObject : NSMutableDictionary {
JSObjectRef object_;
- JSContextRef context_;
+ JSGlobalContextRef context_;
}
- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context;
-- (NSObject *) cy$toJSON:(NSString *)key;
-
- (NSUInteger) count;
- (id) objectForKey:(id)key;
- (NSEnumerator *) keyEnumerator;
/* Bridge: CYJSArray {{{ */
@interface CYJSArray : NSMutableArray {
JSObjectRef object_;
- JSContextRef context_;
+ JSGlobalContextRef context_;
}
- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context;
@end
/* }}} */
-NSObject *CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
- JSObjectRef Array(CYGetCachedObject(context, Array_s));
+_finline bool CYJSValueIsNSObject(JSContextRef context, JSValueRef value) {
+ return JSValueIsObjectOfClass(context, value, Instance_);
+}
+
+_finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) {
JSValueRef exception(NULL);
- bool array(JSValueIsInstanceOfConstructor(context, object, Array, &exception));
+ JSObjectRef constructor(CYGetCachedObject(context, cache));
+ bool is(JSValueIsInstanceOfConstructor(context, value, constructor, &exception));
CYThrow(context, exception);
- id value(array ? [CYJSArray alloc] : [CYJSObject alloc]);
- return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]);
+ return is;
}
-NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
- if (!JSValueIsObjectOfClass(context, object, Instance_))
- return CYCastNSObject_(pool, context, object);
- else {
+NSObject *CYMakeBlock(void (*invoke)(), sig::Signature &signature) {
+ BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(malloc(sizeof(BlockLiteral))));
+
+ struct Descriptor {
+ struct {
+ BlockDescriptor1 one_;
+ BlockDescriptor2 two_;
+ BlockDescriptor3 three_;
+ } d_;
+
+ CYPool pool_;
+ };
+
+ Descriptor *descriptor(new Descriptor);
+ memset(&descriptor->d_, 0, sizeof(descriptor->d_));
+
+ literal->isa = objc_getClass("__NSGlobalBlock__");
+ literal->flags = BLOCK_HAS_SIGNATURE | BLOCK_HAS_COPY_DISPOSE | BLOCK_IS_GLOBAL;
+ literal->reserved = 0;
+ literal->invoke = reinterpret_cast<void (*)(void *, ...)>(invoke);
+ literal->descriptor = descriptor;
+
+ descriptor->d_.one_.size = sizeof(descriptor->d_);
+ descriptor->d_.three_.signature = sig::Unparse(descriptor->pool_, &signature);
+
+ return reinterpret_cast<NSObject *>(literal);
+}
+
+NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSObjectRef object) {
+ if (CYJSValueIsNSObject(context, object)) {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
return internal->GetValue();
}
+
+ if (JSValueIsObjectOfClass(context, object, Functor_)) {
+ cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(object)));
+ return CYMakeBlock(internal->GetValue(), internal->signature_);
+ }
+
+ bool array(CYJSValueIsInstanceOfCachedConstructor(context, object, Array_s));
+ id value(array ? [CYJSArray alloc] : [CYJSObject alloc]);
+ return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]);
}
NSNumber *CYCopyNSNumber(JSContextRef context, JSValueRef value) {
@end
#endif
-id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cast) {
+id CYNSObject(CYPool *pool, JSContextRef context, JSValueRef value, bool cast) {
id object;
bool copy;
return [object retain];
}
-NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
+NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSValueRef value) {
return CYNSObject(pool, context, value, true);
}
-NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
- return CYNSObject(pool, context, value, false);
+NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
+ return CYNSObject(&pool, context, value, false);
}
/* Bridge: NSArray {{{ */
return [[self mutableCopy] autorelease];
}
-- (NSString *) cy$toCYON {
+- (NSString *) cy$toCYON:(bool)objective {
NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
[json appendString:@"@["];
else
comma = true;
if (object == nil || [object cy$JSType] != kJSTypeUndefined)
- [json appendString:CYCastNSCYON(object)];
+ [json appendString:CYCastNSCYON(object, true)];
else {
[json appendString:@","];
comma = false;
}
- (NSObject *) cy$getProperty:(NSString *)name {
- if ([name isEqualToString:@"length"]) {
- NSUInteger count([self count]);
-#ifdef __APPLE__
- return [NSNumber numberWithUnsignedInteger:count];
-#else
- return [NSNumber numberWithUnsignedInt:count];
-#endif
- }
-
size_t index(CYGetIndex(name));
if (index == _not(size_t) || index >= [self count])
return [super cy$getProperty:name];
return [self objectAtIndex:index];
}
+- (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context {
+ CYObjectiveTry_(context) {
+ if ([name isEqualToString:@"length"])
+ return CYCastJSValue(context, [self count]);
+ } CYObjectiveCatch
+
+ return [super cy$getProperty:name inContext:context];
+}
+
- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
[super cy$getPropertyNames:names inContext:context];
@end
/* }}} */
+/* Bridge: NSBlock {{{ */
+#ifdef __APPLE__
+@interface NSBlock
+- (void) invoke;
+@end
+#endif
+/* }}} */
/* Bridge: NSBoolNumber {{{ */
#ifndef __APPLE__
@implementation NSBoolNumber (Cycript)
return kJSTypeBoolean;
}
-- (NSObject *) cy$toJSON:(NSString *)key {
- return self;
-}
-
-- (NSString *) cy$toCYON {
- return [self boolValue] ? @"@true" : @"@false";
+- (NSString *) cy$toCYON:(bool)objective {
+ NSString *value([self boolValue] ? @"true" : @"false");
+ return objective ? value : [NSString stringWithFormat:@"@%@", value];
}
-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
return CYCastJSValue(context, (bool) [self boolValue]);
} CYObjectiveCatch }
return [[self mutableCopy] autorelease];
}
-- (NSString *) cy$toCYON {
+- (NSString *) cy$toCYON:(bool)objective {
NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
[json appendString:@"@{"];
[json appendString:@","];
else
comma = true;
- [json appendString:[key cy$toKey]];
+ [json appendString:CYCastNSCYON(key, true)];
[json appendString:@":"];
NSObject *object([self objectForKey:key]);
- [json appendString:CYCastNSCYON(object)];
+ [json appendString:CYCastNSCYON(object, true)];
}
[json appendString:@"}"];
return kJSTypeNumber;
}
-- (NSObject *) cy$toJSON:(NSString *)key {
- return self;
-}
-
-- (NSString *) cy$toCYON {
- return [self cy$JSType] != kJSTypeBoolean ? [NSString stringWithFormat:@"@%@", self] : [self boolValue] ? @"@true" : @"@false";
+- (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$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
- return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, [self boolValue]);
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+ 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];
}
-- (NSString *) cy$toCYON {
- return @"@null";
-}
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+ return CYJSNull(context);
+} CYObjectiveCatch }
@end
/* }}} */
return self;
}
-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+- (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 {
- return [[self cy$toJSON:@""] cy$toCYON];
-}
-
-- (NSString *) cy$toKey {
- return [self cy$toCYON];
+- (NSString *) cy$toCYON:(bool)objective {
+ return [[self description] cy$toCYON:objective];
}
- (bool) cy$hasProperty:(NSString *)name {
return nil;
}
+- (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context { CYObjectiveTry_(context) {
+ if (NSObject *value = [self cy$getProperty:name])
+ return CYCastJSValue(context, value);
+ return NULL;
+} CYObjectiveCatch }
+
- (bool) cy$setProperty:(NSString *)name to:(NSObject *)value {
return false;
}
/* Bridge: NSProxy {{{ */
@implementation NSProxy (Cycript)
-- (NSObject *) cy$toJSON:(NSString *)key {
- return [self description];
-}
-
-- (NSString *) cy$toCYON {
- return [[self cy$toJSON:@""] cy$toCYON];
+- (NSString *) cy$toCYON:(bool)objective {
+ return [[self description] cy$toCYON:objective];
}
@end
return kJSTypeString;
}
-- (NSObject *) cy$toJSON:(NSString *)key {
- return self;
-}
-
-- (NSString *) cy$toCYON {
+- (NSString *) cy$toCYON:(bool)objective {
std::ostringstream str;
- str << '@';
+ if (!objective)
+ str << '@';
CYUTF8String string(CYCastUTF8String(self));
CYStringify(str, string.data, string.size);
std::string value(str.str());
return CYCastNSString(NULL, CYUTF8String(value.c_str(), value.size()));
}
-- (NSString *) cy$toKey {
- if (CYIsKey(CYCastUTF8String(self)))
- return self;
- 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];
}
- (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$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+- (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 {
- return @"undefined";
+- (NSString *) cy$toCYON:(bool)objective {
+ NSString *value(@"undefined");
+ return value; // XXX: maybe use the below code, adding @undefined?
+ //return objective ? value : [NSString stringWithFormat:@"@%@", value];
}
-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
return CYJSUndefined(context);
} CYObjectiveCatch }
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
}
-Class CYCastClass(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
- id self(CYCastNSObject(pool, context, value));
+Class CYCastClass(CYPool &pool, JSContextRef context, JSValueRef value) {
+ id self(CYCastNSObject(&pool, context, value));
if (CYIsClass(self))
return (Class) self;
throw CYJSError(context, "got something that is not a Class");
size_t size(JSPropertyNameArrayGetCount(names));
NSMutableArray *array([NSMutableArray arrayWithCapacity:size]);
for (size_t index(0); index != size; ++index)
- [array addObject:CYCastNSString(pool, context, JSPropertyNameArrayGetNameAtIndex(names, index))];
+ [array addObject:CYCastNSString(&pool, context, JSPropertyNameArrayGetNameAtIndex(names, index))];
return array;
}
if ((self = [super init]) != nil) {
object_ = object;
context_ = CYGetJSContext(context);
- //XXX:JSGlobalContextRetain(context_);
+ JSGlobalContextRetain(context_);
JSValueProtect(context_, object_);
} return self;
} CYObjectiveCatch }
- (void) dealloc { CYObjectiveTry {
JSValueUnprotect(context_, object_);
- //XXX:JSGlobalContextRelease(context_);
+ JSGlobalContextRelease(context_);
[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 { CYObjectiveTry {
+- (NSString *) cy$toCYON:(bool)objective { CYObjectiveTry {
CYPool pool;
JSValueRef exception(NULL);
const char *cyon(CYPoolCCYON(pool, context_, object_));
CYThrow(context_, exception);
if (cyon == NULL)
- return [super cy$toCYON];
+ return [super cy$toCYON:objective];
else
return [NSString stringWithUTF8String:cyon];
} CYObjectiveCatch }
@implementation CYJSArray
+- (NSString *) cy$toCYON:(bool)objective {
+ CYPool pool;
+ return [NSString stringWithUTF8String:CYPoolCCYON(pool, context_, object_)];
+}
+
- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry {
if ((self = [super init]) != nil) {
object_ = object;
context_ = CYGetJSContext(context);
- //XXX:JSGlobalContextRetain(context_);
+ JSGlobalContextRetain(context_);
JSValueProtect(context_, object_);
} return self;
} CYObjectiveCatch }
- (void) dealloc { CYObjectiveTry {
JSValueUnprotect(context_, object_);
- //XXX:JSGlobalContextRelease(context_);
+ JSGlobalContextRelease(context_);
[super dealloc];
} CYObjectiveCatch }
- (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry {
size_t bounds([self count]);
if (index >= bounds)
- @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray objectAtIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];
+ @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray objectAtIndex:]: index (%zu) beyond bounds (%zu)", static_cast<size_t>(index), bounds] userInfo:nil];
JSValueRef exception(NULL);
JSValueRef value(JSObjectGetPropertyAtIndex(context_, object_, index, &exception));
CYThrow(context_, exception);
- (void) insertObject:(id)object atIndex:(NSUInteger)index { CYObjectiveTry {
size_t bounds([self count] + 1);
if (index >= bounds)
- @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray insertObject:atIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];
+ @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray insertObject:atIndex:]: index (%zu) beyond bounds (%zu)", static_cast<size_t>(index), bounds] userInfo:nil];
JSValueRef exception(NULL);
JSValueRef arguments[3];
arguments[0] = CYCastJSValue(context_, index);
- (void) removeObjectAtIndex:(NSUInteger)index { CYObjectiveTry {
size_t bounds([self count]);
if (index >= bounds)
- @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray removeObjectAtIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];
+ @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray removeObjectAtIndex:]: index (%zu) beyond bounds (%zu)", static_cast<size_t>(index), bounds] userInfo:nil];
JSValueRef exception(NULL);
JSValueRef arguments[2];
arguments[0] = CYCastJSValue(context_, index);
- (void) replaceObjectAtIndex:(NSUInteger)index withObject:(id)object { CYObjectiveTry {
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];
+ @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray replaceObjectAtIndex:withObject:]: index (%zu) beyond bounds (%zu)", static_cast<size_t>(index), bounds] userInfo:nil];
CYSetProperty(context_, object_, index, CYCastJSValue(context_, (NSObject *) object));
} CYObjectiveCatch }
@end
-// XXX: use objc_getAssociatedObject and objc_setAssociatedObject on 10.6
-struct CYInternal :
- CYData
-{
+// XXX: inherit from or replace with CYJSObject
+@interface CYInternal : NSObject {
+ JSGlobalContextRef context_;
JSObjectRef object_;
+}
- CYInternal() :
- object_(NULL)
- {
- }
+@end
- ~CYInternal() {
- // XXX: delete object_? ;(
- }
+@implementation CYInternal
- static CYInternal *Get(id self) {
- CYInternal *internal(NULL);
- if (object_getInstanceVariable(self, "cy$internal_", reinterpret_cast<void **>(&internal)) == NULL) {
- // XXX: do something epic? ;P
- }
+- (void) dealloc {
+ JSValueUnprotect(context_, object_);
+ JSGlobalContextRelease(context_);
+ [super dealloc];
+}
- return internal;
- }
+- (id) initInContext:(JSContextRef)context {
+ if ((self = [super init]) != nil) {
+ context_ = CYGetJSContext(context);
+ JSGlobalContextRetain(context_);
+ } return self;
+}
- static CYInternal *Set(id self) {
- CYInternal *internal(NULL);
- if (objc_ivar *ivar = object_getInstanceVariable(self, "cy$internal_", reinterpret_cast<void **>(&internal))) {
- if (internal == NULL) {
- internal = new CYInternal();
- object_setIvar(self, ivar, reinterpret_cast<id>(internal));
- }
- } else {
- // XXX: do something epic? ;P
- }
+- (bool) hasProperty:(JSStringRef)name inContext:(JSContextRef)context {
+ if (object_ == NULL)
+ return false;
- return internal;
- }
+ return JSObjectHasProperty(context, object_, name);
+}
- bool HasProperty(JSContextRef context, JSStringRef name) {
- if (object_ == NULL)
- return false;
- return JSObjectHasProperty(context, object_, name);
+- (JSValueRef) getProperty:(JSStringRef)name inContext:(JSContextRef)context {
+ if (object_ == NULL)
+ return NULL;
+
+ return CYGetProperty(context, object_, name);
+}
+
+- (void) setProperty:(JSStringRef)name toValue:(JSValueRef)value inContext:(JSContextRef)context {
+ @synchronized (self) {
+ if (object_ == NULL) {
+ object_ = JSObjectMake(context, NULL, NULL);
+ JSValueProtect(context, object_);
+ }
}
- JSValueRef GetProperty(JSContextRef context, JSStringRef name) {
- if (object_ == NULL)
- return NULL;
- return CYGetProperty(context, object_, name);
+ CYSetProperty(context, object_, name, value);
+}
+
++ (CYInternal *) get:(id)object {
+ if ($objc_getAssociatedObject == NULL)
+ return nil;
+
+ @synchronized (object) {
+ if (CYInternal *internal = $objc_getAssociatedObject(object, @selector(cy$internal)))
+ return internal;
}
- void SetProperty(JSContextRef context, JSStringRef name, JSValueRef value) {
- if (object_ == NULL)
- object_ = JSObjectMake(context, NULL, NULL);
- CYSetProperty(context, object_, name, value);
+ return nil;
+}
+
++ (CYInternal *) set:(id)object inContext:(JSContextRef)context {
+ if ($objc_getAssociatedObject == NULL)
+ return nil;
+
+ @synchronized (object) {
+ if (CYInternal *internal = $objc_getAssociatedObject(object, @selector(cy$internal)))
+ return internal;
+
+ if ($objc_setAssociatedObject == NULL)
+ return nil;
+
+ CYInternal *internal([[[CYInternal alloc] initInContext:context] autorelease]);
+ objc_setAssociatedObject(object, @selector(cy$internal), internal, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+ return internal;
}
-};
+
+ return nil;
+}
+
+@end
static JSObjectRef CYMakeSelector(JSContextRef context, SEL sel) {
Selector_privateData *internal(new Selector_privateData(sel));
ffi_call(cif, function, value, values);
} CYSadCatch() }
-static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry {
+static bool CYObjectiveC_PoolFFI(CYPool *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:
+ // XXX: this works for return values, but not for properties and fields
*reinterpret_cast<id *>(data) = CYCastNSObject(pool, context, value);
break;
}
} CYPoolCatch(NULL) return /*XXX*/ NULL; }
-static bool CYImplements(id object, Class _class, SEL selector, bool devoid) {
+static bool CYImplements(id object, Class _class, SEL selector, bool devoid = false) {
if (objc_method *method = class_getInstanceMethod(_class, selector)) {
if (!devoid)
return true;
return false;
}
-static const char *CYPoolTypeEncoding(apr_pool_t *pool, JSContextRef context, SEL sel, objc_method *method) {
+static const char *CYPoolTypeEncoding(CYPool &pool, JSContextRef context, SEL sel, objc_method *method) {
if (method != NULL)
return method_getTypeEncoding(method);
return NULL;
}
-static void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
- Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg));
-
- JSContextRef context(internal->context_);
-
- size_t count(internal->cif_.nargs);
- JSValueRef values[count];
-
- for (size_t index(0); index != count; ++index)
- values[index] = CYFromFFI(context, internal->signature_.elements[1 + index].type, internal->cif_.arg_types[index], arguments[index]);
-
+static JSValueRef MessageAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) {
JSObjectRef _this(CYCastJSObject(context, values[0]));
+ return CYCallAsFunction(context, function, _this, count - 2, values + 2);
+}
- JSValueRef value(CYCallAsFunction(context, internal->function_, _this, count - 2, values + 2));
- CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value);
+static void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
+ CYExecuteClosure(cif, result, arguments, arg, &MessageAdapter_);
}
static JSObjectRef CYMakeMessage(JSContextRef context, SEL sel, IMP imp, const char *type) {
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))
+ if (!CYImplements(_class, object_getClass(_class), @selector(cy$hasImplicitProperties)))
return true;
return [_class cy$hasImplicitProperties];
}
return true;
CYPool pool;
- NSString *name(CYCastNSString(pool, context, property));
+ NSString *name(CYCastNSString(&pool, context, property));
- if (CYInternal *internal = CYInternal::Get(self))
- if (internal->HasProperty(context, property))
+ if (CYInternal *internal = [CYInternal get:self])
+ if ([internal hasProperty:property inContext:context])
return true;
Class _class(object_getClass(self));
CYPoolTry {
// XXX: this is an evil hack to deal with NSProxy; fix elsewhere
- if (CYImplements(self, _class, @selector(cy$hasProperty:), false))
+ if (CYImplements(self, _class, @selector(cy$hasProperty:)))
if ([self cy$hasProperty:name])
return true;
} CYPoolCatch(false)
return Internal::Make(context, self, object);
CYPool pool;
- NSString *name(CYCastNSString(pool, context, property));
+ NSString *name(CYCastNSString(&pool, context, property));
- if (CYInternal *internal = CYInternal::Get(self))
- if (JSValueRef value = internal->GetProperty(context, property))
+ if (CYInternal *internal = [CYInternal get:self])
+ if (JSValueRef value = [internal getProperty:property inContext:context])
return value;
CYPoolTry {
- if (NSObject *data = [self cy$getProperty:name])
- return CYCastJSValue(context, data);
+ if (JSValueRef value = [self cy$getProperty:name inContext:context])
+ return value;
} CYPoolCatch(NULL)
const char *string(CYPoolCString(pool, context, name));
return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception);
return NULL;
-} CYCatch }
+} CYCatch(NULL) }
static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
CYPool pool;
- NSString *name(CYCastNSString(pool, context, property));
- NSObject *data(CYCastNSObject(pool, context, value));
+ NSString *name(CYCastNSString(&pool, context, property));
+ NSObject *data(CYCastNSObject(&pool, context, value));
CYPoolTry {
if ([self cy$setProperty:name to:data])
return true;
- } CYPoolCatch(NULL)
+ } CYPoolCatch(false)
const char *string(CYPoolCString(pool, context, name));
Class _class(object_getClass(self));
set[length + 4] = '\0';
if (SEL sel = sel_getUid(set))
- if (CYImplements(self, _class, sel, false)) {
+ if (CYImplements(self, _class, sel)) {
JSValueRef arguments[1] = {value};
CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception);
+ return true;
}
- if (CYInternal *internal = CYInternal::Set(self)) {
- internal->SetProperty(context, property, value);
+ if (CYInternal *internal = [CYInternal set:self inContext:context]) {
+ [internal setProperty:property toValue:value inContext:context];
return true;
}
return false;
-} CYCatch }
+} CYCatch(false) }
static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
CYPoolTry {
NSString *name(CYCastNSString(NULL, context, property));
return [self cy$deleteProperty:name];
- } CYPoolCatch(NULL)
-} CYCatch return /*XXX*/ NULL; }
+ } CYPoolCatch(false)
+} CYCatch(false) return /*XXX*/ false; }
static void Instance_getPropertyNames_message(JSPropertyNameAccumulatorRef names, objc_method *method) {
const char *name(sel_getName(method_getName(method)));
CYPoolTry {
// XXX: this is an evil hack to deal with NSProxy; fix elsewhere
- if (CYImplements(self, _class, @selector(cy$getPropertyNames:inContext:), false))
+ if (CYImplements(self, _class, @selector(cy$getPropertyNames:inContext:)))
[self cy$getPropertyNames:names inContext:context];
} CYPoolCatch()
}
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
JSObjectRef value(Instance::Make(context, [internal->GetValue() alloc], Instance::Uninitialized));
return value;
-} CYCatch }
+} CYCatch(NULL) }
+
+static JSValueRef Instance_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+ Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
+ id self(internal->GetValue());
+
+ if (![self isKindOfClass:NSBlock_])
+ CYThrow("non-NSBlock object is not a function");
+ // XXX: replace above logic with the following assertion
+ //_assert([self isKindOfClass:NSBlock_]);
+ // to do this, make it so FunctionInstance_ is the class of blocks
+ // to do /that/, generalize the various "is exactly Instance_" checks
+ // then, move Instance_callAsFunction to only be on FunctionInstance
+
+ BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(self));
+
+ if ((literal->flags & BLOCK_HAS_SIGNATURE) != 0) {
+ uint8_t *descriptor(reinterpret_cast<uint8_t *>(literal->descriptor));
+ descriptor += sizeof(BlockDescriptor1);
+ if ((literal->flags & BLOCK_HAS_COPY_DISPOSE) != 0)
+ descriptor += sizeof(BlockDescriptor2);
+ BlockDescriptor3 *descriptor3(reinterpret_cast<BlockDescriptor3 *>(descriptor));
+
+ if (const char *type = descriptor3->signature) {
+ CYPool pool;
+
+ void *setup[1];
+ setup[0] = &self;
+
+ sig::Signature signature;
+ sig::Parse(pool, &signature, type, &Structor_);
+
+ ffi_cif cif;
+ sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
+
+ void (*function)() = reinterpret_cast<void (*)()>(literal->invoke);
+ return CYCallFunction(pool, context, 1, setup, count, arguments, false, exception, &signature, &cif, function);
+ }
+ }
+
+ if (count != 0)
+ CYThrow("NSBlock without signature field passed arguments");
+
+ CYPoolTry {
+ [self invoke];
+ } CYPoolCatch(NULL);
+
+ return NULL;
+} CYCatch(NULL) }
static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) constructor)));
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];
}
return false;
-} CYCatch }
+} CYCatch(false) }
static JSValueRef Instance_box_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (count == 0)
throw CYJSError(context, "incorrect number of arguments to Instance");
CYPool pool;
- id value(CYCastNSObject(pool, context, arguments[0]));
+ id value(CYCastNSObject(&pool, context, arguments[0]));
if (value == nil)
value = [NSNull null];
return CYCastJSValue(context, [value cy$box]);
-} CYCatch }
+} CYCatch(NULL) }
static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
}
return NULL;
-} CYCatch }
+} CYCatch(NULL) }
static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {
Type_privateData type(pool, ivar_getTypeEncoding(ivar));
- CYPoolFFI(pool, context, type.type_, type.GetFFI(), reinterpret_cast<uint8_t *>(self) + ivar_getOffset(ivar), value);
+ CYPoolFFI(&pool, context, type.type_, type.GetFFI(), reinterpret_cast<uint8_t *>(self) + ivar_getOffset(ivar), value);
return true;
}
return false;
-} CYCatch }
+} CYCatch(false) }
static void Internal_getPropertyNames_(Class _class, JSPropertyNameAccumulatorRef names) {
if (Class super = class_getSuperclass(_class))
static JSValueRef ObjectiveC_Classes_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
CYPool pool;
- NSString *name(CYCastNSString(pool, context, property));
+ NSString *name(CYCastNSString(&pool, context, property));
if (Class _class = NSClassFromString(name))
return CYMakeInstance(context, _class, true);
return NULL;
-} CYCatch }
+} CYCatch(NULL) }
static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
#ifdef __APPLE__
free:
free(data);
return value;
-} CYCatch }
+} CYCatch(NULL) }
static void ObjectiveC_Image_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
const char *internal(reinterpret_cast<const char *>(JSObjectGetPrivate(object)));
JSObjectRef value(JSObjectMake(context, NULL, NULL));
CYSetProperty(context, value, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Image_Classes_, const_cast<char *>(name)));
return value;
-} CYCatch }
+} CYCatch(NULL) }
static void ObjectiveC_Images_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
unsigned int size;
if (Protocol *protocol = objc_getProtocol(name))
return CYMakeInstance(context, protocol, true);
return NULL;
-} CYCatch }
+} CYCatch(NULL) }
static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
#if OBJC_API_VERSION >= 2
if (name == "nil")
return Instance::Make(context, nil);
return NULL;
-} CYCatch }
+} CYCatch(NULL) }
static void ObjectiveC_Constants_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
JSPropertyNameAccumulatorAddName(names, CYJSString("nil"));
}
#ifdef __APPLE__
+#if defined(__i386__) || defined(__x86_64__)
+#define OBJC_MAX_STRUCT_BY_VALUE 8
+static int struct_forward_array[] = {
+ 0, 0, 0, 1, 0, 1, 1, 1, 0 };
+#elif defined(__arm__)
+#define OBJC_MAX_STRUCT_BY_VALUE 1
+static int struct_forward_array[] = {
+ 0, 0 };
+#else
+#error missing objc-runtime-info
+#endif
+
static bool stret(ffi_type *ffi_type) {
return ffi_type->type == FFI_TYPE_STRUCT && (
ffi_type->size > OBJC_MAX_STRUCT_BY_VALUE ||
}
#endif
-JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class _class, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception) { CYTry {
+JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _class, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception) { CYTry {
const char *type;
if (_class == NULL)
sig::Signature signature;
sig::Parse(pool, &signature, type, &Structor_);
+ size_t used(count + 3);
+ if (used > signature.count) {
+ sig::Element *elements(new (pool) sig::Element[used]);
+ memcpy(elements, signature.elements, used * sizeof(sig::Element));
+
+ for (size_t index(signature.count); index != used; ++index) {
+ sig::Element *element(&elements[index]);
+ element->name = NULL;
+ element->offset = _not(size_t);
+
+ sig::Type *type(new (pool) sig::Type);
+ memset(type, 0, sizeof(*type));
+ type->primitive = sig::object_P;
+ element->type = type;
+ }
+
+ signature.elements = elements;
+ signature.count = used;
+ }
+
ffi_cif cif;
sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
void (*function)() = reinterpret_cast<void (*)()>(imp);
return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, exception, &signature, &cif, function);
-} CYCatch }
+} CYCatch(NULL) }
static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (count < 2)
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;
if (uninitialized)
internal->value_ = nil;
} else {
- self = CYCastNSObject(pool, context, arguments[0]);
+ self = CYCastNSObject(&pool, context, arguments[0]);
_class = nil;
uninitialized = false;
}
_cmd = CYCastSEL(context, arguments[1]);
return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized, exception);
-} CYCatch }
-
-/* Hook: objc_registerClassPair {{{ */
-#if defined(__APPLE__) && defined(__arm__) && 0
-// XXX: replace this with associated objects
-
-MSHook(void, CYDealloc, id self, SEL sel) {
- CYInternal *internal;
- object_getInstanceVariable(self, "cy$internal_", reinterpret_cast<void **>(&internal));
- if (internal != NULL)
- delete internal;
- _CYDealloc(self, sel);
-}
-
-MSHook(void, objc_registerClassPair, Class _class) {
- Class super(class_getSuperclass(_class));
- if (super == NULL || class_getInstanceVariable(super, "cy$internal_") == NULL) {
- class_addIvar(_class, "cy$internal_", sizeof(CYInternal *), log2(sizeof(CYInternal *)), "^{CYInternal}");
- MSHookMessage(_class, @selector(dealloc), MSHake(CYDealloc));
- }
-
- _objc_registerClassPair(_class);
-}
-
-static JSValueRef objc_registerClassPair_(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- if (count != 1)
- throw CYJSError(context, "incorrect number of arguments to objc_registerClassPair");
- CYPool pool;
- NSObject *value(CYCastNSObject(pool, context, arguments[0]));
- if (value == NULL || !CYIsClass(value))
- throw CYJSError(context, "incorrect number of arguments to objc_registerClassPair");
- Class _class((Class) value);
- $objc_registerClassPair(_class);
- return CYJSUndefined(context);
-} CYCatch }
-#endif
-/* }}} */
+} CYCatch(NULL) }
static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
JSValueRef setup[count + 2];
Message_privateData *internal(reinterpret_cast<Message_privateData *>(JSObjectGetPrivate(object)));
// XXX: handle Instance::Uninitialized?
- id self(CYCastNSObject(pool, context, _this));
+ id self(CYCastNSObject(&pool, context, _this));
void *setup[2];
setup[0] = &self;
if (count != 2)
throw CYJSError(context, "incorrect number of arguments to Super constructor");
CYPool pool;
- id self(CYCastNSObject(pool, context, arguments[0]));
+ id self(CYCastNSObject(&pool, context, arguments[0]));
Class _class(CYCastClass(pool, context, arguments[1]));
return cy::Super::Make(context, self, _class);
-} CYCatch }
+} CYCatch(NULL) }
static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (count != 1)
CYPool pool;
const char *name(CYPoolCString(pool, context, arguments[0]));
return CYMakeSelector(context, sel_registerName(name));
-} CYCatch }
+} CYCatch(NULL) }
static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (count > 1)
throw CYJSError(context, "incorrect number of arguments to Instance constructor");
id self(count == 0 ? nil : CYCastPointer<id>(context, arguments[0]));
return CYMakeInstance(context, self, false);
-} CYCatch }
+} CYCatch(NULL) }
static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(object)));
if (!CYIsClass(self))
return CYJSUndefined(context);
return CYGetClassPrototype(context, self);
-} CYCatch }
+} CYCatch(NULL) }
static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
}
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)));
- return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue())));
-} CYCatch }
+ return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue(), false)));
+} CYCatch(NULL) }
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; }
+} CYCatch(NULL) 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)));
id value(internal->GetValue());
- if (![value respondsToSelector:@selector(cy$JSValueInContext:)])
+ if (![value respondsToSelector:@selector(cy$valueOfInContext:)])
return _this;
- if (JSValueRef result = [value cy$JSValueInContext:context])
+ if (JSValueRef result = [value cy$valueOfInContext:context])
return result;
return _this;
-} CYCatch return /*XXX*/ NULL; }
+} CYCatch(NULL) 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)));
// XXX: but... but... THIS ISN'T A POINTER! :(
return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->GetValue()));
-} CYCatch return /*XXX*/ NULL; }
+} CYCatch(NULL) 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)));
id value(internal->GetValue());
- if (value == nil)
- return CYCastJSValue(context, "nil");
-
CYPoolTry {
// XXX: this seems like a stupid implementation; what if it crashes? why not use the CYONifier backend?
return CYCastJSValue(context, CYJSString(context, [value description]));
} CYPoolCatch(NULL)
-} CYCatch return /*XXX*/ NULL; }
+} CYCatch(NULL) return /*XXX*/ NULL; }
+
+static JSValueRef Class_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+ if (!CYJSValueIsNSObject(context, _this))
+ return NULL;
+
+ Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
+ id value(internal->GetValue());
+
+ if (!CYIsClass(value))
+ CYThrow("non-Class object cannot be used as Type");
+
+ // XXX: this is a very silly implementation
+
+ std::ostringstream type;
+ type << "@\"";
+ type << class_getName(value);
+ type << "\"";
+
+ CYPoolTry {
+ return CYMakeType(context, type.str().c_str());
+ } CYPoolCatch(NULL)
+} CYCatch(NULL) 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)));
return CYCastJSValue(context, sel_getName(internal->GetValue()));
-} CYCatch }
+} CYCatch(NULL) }
static JSValueRef Selector_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
return Selector_callAsFunction_toString(context, object, _this, count, arguments, exception);
NSString *string([NSString stringWithFormat:@"@selector(%s)", name]);
return CYCastJSValue(context, CYJSString(context, string));
} CYPoolCatch(NULL)
-} CYCatch return /*XXX*/ NULL; }
+} CYCatch(NULL) 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)
return CYCastJSValue(context, CYJSString(type));
return CYJSNull(context);
-} CYCatch }
+} CYCatch(NULL) }
static JSStaticValue Selector_staticValues[2] = {
{"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete},
{NULL, NULL, 0}
};
+static JSStaticFunction Class_staticFunctions[2] = {
+ {"pointerTo", &Class_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {NULL, NULL, 0}
+};
+
static JSStaticFunction Internal_staticFunctions[2] = {
{"$cya", &Internal_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, 0}
{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 {
- apr_pool_t *pool(CYGetGlobalPool());
+ $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"));
+ $objc_removeAssociatedObjects = reinterpret_cast<void (*)(id)>(dlsym(RTLD_DEFAULT, "objc_removeAssociatedObjects"));
+
+ CYPool &pool(CYGetGlobalPool());
Object_type = new(pool) Type_privateData("@");
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");
+
NSCFType_ = objc_getClass("NSCFType");
NSGenericDeallocHandler_ = objc_getClass("__NSGenericDeallocHandler");
NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
#endif
NSArray_ = objc_getClass("NSArray");
+ NSBlock_ = objc_getClass("NSBlock");
NSDictionary_ = objc_getClass("NSDictionary");
NSString_ = objc_getClass("NSString");
Object_ = objc_getClass("Object");
definition.deleteProperty = &Instance_deleteProperty;
definition.getPropertyNames = &Instance_getPropertyNames;
definition.callAsConstructor = &Instance_callAsConstructor;
+ definition.callAsFunction = &Instance_callAsFunction;
definition.hasInstance = &Instance_hasInstance;
definition.finalize = &CYFinalize;
Instance_ = JSClassCreate(&definition);
+ definition.className = "ArrayInstance";
+ ArrayInstance_ = JSClassCreate(&definition);
+
+ definition.className = "FunctionInstance";
+ FunctionInstance_ = JSClassCreate(&definition);
+
+ definition.className = "ObjectInstance";
+ ObjectInstance_ = JSClassCreate(&definition);
+
+ definition.className = "StringInstance";
+ StringInstance_ = JSClassCreate(&definition);
+
+ definition = kJSClassDefinitionEmpty;
+ definition.className = "Class";
+ definition.staticFunctions = Class_staticFunctions;
+ Class_ = JSClassCreate(&definition);
+
definition = kJSClassDefinitionEmpty;
definition.className = "Internal";
definition.staticFunctions = Internal_staticFunctions;
definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames;
ObjectiveC_Protocols_ = JSClassCreate(&definition);
-#if defined(__APPLE__) && defined(__arm__) && 0
- 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");
+ class_addMethod(NSCFType_, @selector(cy$toJSON:inContext:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON$inContext$), "^{OpaqueJSValue=}16@0:4@8^{OpaqueJSContext=}12");
#endif
} CYPoolCatch() }
CYSetProperty(context, ObjectiveC, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL));
#endif
+ JSObjectRef Class(JSObjectMakeConstructor(context, Class_, NULL));
JSObjectRef Instance(JSObjectMakeConstructor(context, Instance_, &Instance_new));
JSObjectRef Message(JSObjectMakeConstructor(context, Message_, NULL));
JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new));
JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s)));
CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);
- JSObjectRef ArrayInstance(JSObjectMakeConstructor(context, Instance_, NULL));
+ JSObjectRef ArrayInstance(JSObjectMakeConstructor(context, ArrayInstance_, NULL));
JSObjectRef ArrayInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ArrayInstance, prototype_s)));
CYSetProperty(context, cy, CYJSString("ArrayInstance_prototype"), ArrayInstance_prototype);
JSObjectRef Array_prototype(CYGetCachedObject(context, CYJSString("Array_prototype")));
JSObjectSetPrototype(context, ArrayInstance_prototype, Array_prototype);
- JSObjectRef ObjectInstance(JSObjectMakeConstructor(context, Instance_, NULL));
+ JSObjectRef FunctionInstance(JSObjectMakeConstructor(context, FunctionInstance_, NULL));
+ JSObjectRef FunctionInstance_prototype(CYCastJSObject(context, CYGetProperty(context, FunctionInstance, prototype_s)));
+ CYSetProperty(context, cy, CYJSString("FunctionInstance_prototype"), FunctionInstance_prototype);
+ JSObjectRef Function_prototype(CYGetCachedObject(context, CYJSString("Function_prototype")));
+ JSObjectSetPrototype(context, FunctionInstance_prototype, Function_prototype);
+
+ JSObjectRef ObjectInstance(JSObjectMakeConstructor(context, ObjectInstance_, NULL));
JSObjectRef ObjectInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ObjectInstance, prototype_s)));
CYSetProperty(context, cy, CYJSString("ObjectInstance_prototype"), ObjectInstance_prototype);
JSObjectRef Object_prototype(CYGetCachedObject(context, CYJSString("Object_prototype")));
JSObjectSetPrototype(context, ObjectInstance_prototype, Object_prototype);
- JSObjectRef StringInstance(JSObjectMakeConstructor(context, Instance_, NULL));
+ JSObjectRef StringInstance(JSObjectMakeConstructor(context, StringInstance_, NULL));
JSObjectRef StringInstance_prototype(CYCastJSObject(context, CYGetProperty(context, StringInstance, prototype_s)));
CYSetProperty(context, cy, CYJSString("StringInstance_prototype"), StringInstance_prototype);
JSObjectRef String_prototype(CYGetCachedObject(context, CYJSString("String_prototype")));
JSObjectSetPrototype(context, StringInstance_prototype, String_prototype);
+ JSObjectRef Class_prototype(CYCastJSObject(context, CYGetProperty(context, Class, prototype_s)));
+ CYSetProperty(context, cy, CYJSString("Class_prototype"), Class_prototype);
+ JSObjectSetPrototype(context, Class_prototype, Instance_prototype);
+
CYSetProperty(context, cycript, CYJSString("Instance"), Instance);
CYSetProperty(context, cycript, CYJSString("Selector"), Selector);
CYSetProperty(context, cycript, CYJSString("Super"), Super);
CYSetProperty(context, all, CYJSString("objc_msgSend"), &$objc_msgSend, kJSPropertyAttributeDontEnum);
- 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() }
projects / cycript.git / blobdiff