#include <mach/mach.h>
#endif
+#include "Code.hpp"
#include "Error.hpp"
#include "JavaScript.hpp"
#include "String.hpp"
} return value; \
}
+#define _oassert(test) \
+ if (!(test)) \
+ @throw [NSException exceptionWithName:NSInternalInconsistencyException reason:@"_assert(" #test ")" userInfo:nil];
+
#ifndef __APPLE__
#define class_getSuperclass GSObjCSuper
#define class_getInstanceVariable GSCGetInstanceVariableDefinition
static id (*$objc_getAssociatedObject)(id object, void *key);
static void (*$objc_removeAssociatedObjects)(id object);
+@class NSBlock;
+
struct BlockLiteral {
Class isa;
int flags;
static JSClassRef Instance_;
static JSClassRef ArrayInstance_;
+static JSClassRef BooleanInstance_;
static JSClassRef FunctionInstance_;
+static JSClassRef NumberInstance_;
static JSClassRef ObjectInstance_;
static JSClassRef StringInstance_;
static Class NSCFType_;
static Class NSGenericDeallocHandler_;
static Class NSZombie_;
-
-static std::set<Class> banned_;
#else
static Class NSBoolNumber_;
#endif
static Class NSArray_;
static Class NSBlock_;
static Class NSDictionary_;
+static Class NSNumber_;
static Class NSString_;
static Class Object_;
JSClassRef _class(NULL);
JSValueRef prototype;
- if (self == NSArray_)
+#ifdef __APPLE__
+ if (self == NSCFBoolean_)
+#else
+ if (self == NSBoolNumber_)
+#endif
+ prototype = CYGetCachedObject(context, CYJSString("BooleanInstance_prototype"));
+ else if (self == NSArray_)
prototype = CYGetCachedObject(context, CYJSString("ArrayInstance_prototype"));
else if (self == NSBlock_)
prototype = CYGetCachedObject(context, CYJSString("FunctionInstance_prototype"));
+ else if (self == NSNumber_)
+ prototype = CYGetCachedObject(context, CYJSString("NumberInstance_prototype"));
else if (self == NSDictionary_)
prototype = CYGetCachedObject(context, CYJSString("ObjectInstance_prototype"));
else if (self == NSString_)
prototype = CYGetClassPrototype(context, class_getSuperclass(self), meta);
JSObjectRef object(JSObjectMake(context, _class, NULL));
- JSObjectSetPrototype(context, object, prototype);
+ CYSetPrototype(context, object, prototype);
CYSetProperty(context, cy, name, object);
return object;
JSObjectRef Messages::Make(JSContextRef context, Class _class) {
JSObjectRef value(JSObjectMake(context, Messages_, new Messages(_class)));
if (Class super = class_getSuperclass(_class))
- JSObjectSetPrototype(context, value, Messages::Make(context, super));
+ CYSetPrototype(context, value, Messages::Make(context, super));
return value;
}
return value;
} }
+bool CYIsKindOfClass(id object, Class _class) {
+ for (Class isa(object_getClass(object)); isa != NULL; isa = class_getSuperclass(isa))
+ if (isa == _class)
+ return true;
+ return false;
+}
+
JSObjectRef Instance::Make(JSContextRef context, id object, Flags flags) {
- JSObjectRef value(JSObjectMake(context, Instance_, new Instance(object, flags)));
- JSObjectSetPrototype(context, value, CYGetClassPrototype(context, object_getClass(object)));
+ JSObjectRef value(JSObjectMake(context, CYIsKindOfClass(object, NSBlock_) ? FunctionInstance_ : Instance_, new Instance(object, flags)));
+ CYSetPrototype(context, value, CYGetClassPrototype(context, object_getClass(object)));
return value;
}
Instance::~Instance() {
if ((flags_ & Transient) == 0)
- // XXX: does this handle background threads correctly?
- // XXX: this simply does not work on the console because I'm stupid
- [GetValue() performSelector:@selector(release) withObject:nil afterDelay:0];
+ [GetValue() release];
}
struct Message_privateData :
- (JSType) cy$JSType;
- (JSValueRef) cy$toJSON:(NSString *)key inContext:(JSContextRef)context;
-- (NSString *) cy$toCYON:(bool)objective;
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects;
- (bool) cy$hasProperty:(NSString *)name;
- (NSObject *) cy$getProperty:(NSString *)name;
- (JSValueRef) cy$valueOfInContext:(JSContextRef)context;
@end
-NSString *CYCastNSCYON(id value, bool objective) {
+NSString *CYCastNSCYON(id value, bool objective, std::set<void *> &objects) {
NSString *string;
if (value == nil)
string = @"nil";
else {
Class _class(object_getClass(value));
- SEL sel(@selector(cy$toCYON:));
+ SEL sel(@selector(cy$toCYON:inSet:));
- if (objc_method *toCYON = class_getInstanceMethod(_class, sel))
- string = reinterpret_cast<NSString *(*)(id, SEL, bool)>(method_getImplementation(toCYON))(value, sel, objective);
+ if (class_isMetaClass(_class)) {
+ const char *name(class_getName(value));
+ if (class_isMetaClass(value))
+ string = [NSString stringWithFormat:@"object_getClass(%s)", name];
+ else
+ string = [NSString stringWithUTF8String:name];
+ } else if (objc_method *toCYON = class_getInstanceMethod(_class, sel))
+ string = reinterpret_cast<NSString *(*)(id, SEL, bool, std::set<void *> &)>(method_getImplementation(toCYON))(value, sel, objective, objects);
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:objective];
+ string = [value cy$toCYON:objective inSet:objects];
else goto fail;
} else fail: {
if (false);
#ifdef __APPLE__
- else if (value == NSZombie_)
- string = @"_NSZombie_";
else if (_class == NSZombie_)
string = [NSString stringWithFormat:@"<_NSZombie_: %p>", value];
- // XXX: frowny /in/ the pants
- else if (banned_.find(value) != banned_.end())
- string = nil;
#endif
else
string = [NSString stringWithFormat:@"%@", value];
return string;
}
+NSString *CYCastNSCYON(id value, bool objective, std::set<void *> *objects) {
+ if (objects != NULL)
+ return CYCastNSCYON(value, objective, *objects);
+ else {
+ std::set<void *> objects;
+ return CYCastNSCYON(value, objective, objects);
+ }
+}
+
#ifdef __APPLE__
struct PropertyAttributes {
CYPool pool_;
/* }}} */
_finline bool CYJSValueIsNSObject(JSContextRef context, JSValueRef value) {
- return JSValueIsObjectOfClass(context, value, Instance_);
+ return JSValueIsObjectOfClass(context, value, Instance_) || JSValueIsObjectOfClass(context, value, FunctionInstance_);
}
_finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) {
CYExecuteClosure(cif, result, arguments, arg, &BlockAdapter_);
}
-NSObject *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature &signature) {
+NSBlock *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature &signature) {
_assert(__NSMallocBlock__ != Nil);
BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(malloc(sizeof(BlockLiteral))));
descriptor->d_.two_.dispose_helper = &CYDisposeBlock;
descriptor->d_.three_.signature = sig::Unparse(*descriptor->internal_->pool_, &signature);
- return reinterpret_cast<NSObject *>(literal);
+ return reinterpret_cast<NSBlock *>(literal);
}
NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSObjectRef object) {
return [[self mutableCopy] autorelease];
}
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
+ _oassert(objects.insert(self).second);
+
NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
[json appendString:@"@["];
else
comma = true;
if (object == nil || [object cy$JSType] != kJSTypeUndefined)
- [json appendString:CYCastNSCYON(object, true)];
+ [json appendString:CYCastNSCYON(object, true, objects)];
else {
[json appendString:@","];
comma = false;
return kJSTypeBoolean;
}
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
NSString *value([self boolValue] ? @"true" : @"false");
return objective ? value : [NSString stringWithFormat:@"@%@", value];
}
return [[self mutableCopy] autorelease];
}
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
+ _oassert(objects.insert(self).second);
+
NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
[json appendString:@"@{"];
[json appendString:@","];
else
comma = true;
- [json appendString:CYCastNSCYON(key, true)];
+ [json appendString:CYCastNSCYON(key, true, objects)];
[json appendString:@":"];
NSObject *object([self objectForKey:key]);
- [json appendString:CYCastNSCYON(object, true)];
+ [json appendString:CYCastNSCYON(object, true, objects)];
}
[json appendString:@"}"];
return kJSTypeNumber;
}
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
NSString *value([self cy$JSType] != kJSTypeBoolean ? [self stringValue] : [self boolValue] ? @"true" : @"false");
return objective ? value : [NSString stringWithFormat:@"@%@", value];
}
return kJSTypeNull;
}
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
NSString *value(@"null");
return objective ? value : [NSString stringWithFormat:@"@%@", value];
}
return kJSTypeObject;
}
-- (NSString *) cy$toCYON:(bool)objective {
- return [@"#" stringByAppendingString:[[self description] cy$toCYON:true]];
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
+ return [@"#" stringByAppendingString:[[self description] cy$toCYON:true inSet:objects]];
}
- (bool) cy$hasProperty:(NSString *)name {
/* Bridge: NSProxy {{{ */
@implementation NSProxy (Cycript)
-- (NSString *) cy$toCYON:(bool)objective {
- return [[self description] cy$toCYON:objective];
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
+ return [[self description] cy$toCYON:objective inSet:objects];
}
@end
/* Bridge: NSSet {{{ */
@implementation NSSet (Cycript)
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
+ _oassert(objects.insert(self).second);
+
NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
[json appendString:@"[NSSet setWithArray:"];
- [json appendString:CYCastNSCYON([self allObjects], true)];
+ [json appendString:CYCastNSCYON([self allObjects], true, objects)];
[json appendString:@"]]"];
return json;
}
return kJSTypeString;
}
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
std::ostringstream str;
if (!objective)
str << '@';
return kJSTypeUndefined;
}
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
NSString *value(@"undefined");
return value; // XXX: maybe use the below code, adding @undefined?
//return objective ? value : [NSString stringWithFormat:@"@%@", value];
[super dealloc];
} CYObjectiveCatch }
-- (NSString *) cy$toCYON:(bool)objective { CYObjectiveTry {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects { CYObjectiveTry {
CYPool pool;
- const char *cyon(CYPoolCCYON(pool, context, object_));
+ const char *cyon(CYPoolCCYON(pool, context, object_, objects));
if (cyon == NULL)
- return [super cy$toCYON:objective];
+ return [super cy$toCYON:objective inSet:objects];
else
return [NSString stringWithUTF8String:cyon];
} CYObjectiveCatch }
@implementation CYJSArray
-- (NSString *) cy$toCYON:(bool)objective { CYObjectiveTry {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects { CYObjectiveTry {
CYPool pool;
- return [NSString stringWithUTF8String:CYPoolCCYON(pool, context, object_)];
+ return [NSString stringWithUTF8String:CYPoolCCYON(pool, context, object_, objects)];
} CYObjectiveCatch }
- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry_ {
if (JSValueIsObjectOfClass(context, value, Selector_)) {
Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate((JSObjectRef) value)));
return reinterpret_cast<SEL>(internal->value_);
- } else
- return CYCastPointer<SEL>(context, value);
+ } else {
+ CYPool pool;
+ return sel_registerName(CYPoolCString(pool, context, value));
+ }
}
void *CYObjectiveC_ExecuteStart(JSContextRef context) { CYSadTry {
ffi_call(cif, function, value, values);
} CYSadCatch() }
-static bool CYObjectiveC_PoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry {
- // XXX: assigning to an indirect id * works for return values, but not for properties and fields
+static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef value, sig::Signature *signature) {
+ if (JSValueIsNull(context, value))
+ return nil;
+ JSObjectRef object(CYCastJSObject(context, value));
- switch (type->primitive) {
- case sig::block_P: {
- _assert(type->data.signature.count != 0);
- sig::Signature signature;
- sig::Copy(*pool, signature, type->data.signature);
+ if (JSValueIsObjectOfClass(context, object, FunctionInstance_))
+ return reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->GetValue();
+
+ if (JSValueIsObjectOfClass(context, object, Instance_)) {
+ _assert(reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->GetValue() == nil);
+ return nil;
+ }
+
+ _assert(JSObjectIsFunction(context, object));
+
+ _assert(signature != NULL);
+ _assert(signature->count != 0);
- sig::Element *elements(new(*pool) sig::Element[++signature.count]);
- elements[0] = signature.elements[0];
- memcpy(elements + 2, signature.elements + 1, sizeof(sig::Element) * (signature.count - 2));
- signature.elements = elements;
+ sig::Signature modified;
+ modified.count = signature->count + 1;
+ modified.elements = new(pool) sig::Element[modified.count];
- elements[1].name = NULL;
- elements[1].type = new(*pool) sig::Type();
- elements[1].offset = _not(size_t);
+ modified.elements[0] = signature->elements[0];
+ memcpy(modified.elements + 2, signature->elements + 1, sizeof(sig::Element) * (signature->count - 1));
- memset(elements[1].type, 0, sizeof(sig::Type));
- elements[1].type->primitive = sig::object_P;
+ modified.elements[1].name = NULL;
+ modified.elements[1].type = new(pool) sig::Type();
+ modified.elements[1].offset = _not(size_t);
- JSObjectRef function(CYCastJSObject(context, value));
- *reinterpret_cast<id *>(data) = CYMakeBlock(context, function, signature);
- } break;
+ memset(modified.elements[1].type, 0, sizeof(sig::Type));
+ modified.elements[1].type->primitive = sig::object_P;
+
+ return CYMakeBlock(context, object, modified);
+}
+
+static bool CYObjectiveC_PoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry {
+ // XXX: assigning to an indirect id * works for return values, but not for properties and fields
+
+ switch (type->primitive) {
+ case sig::block_P:
+ // XXX: this function might not handle the idea of a null pool
+ *reinterpret_cast<id *>(data) = CYCastNSBlock(*pool, context, value, &type->data.signature);
+ break;
case sig::object_P:
case sig::typename_P:
return false;
}
-static const char *CYPoolTypeEncoding(CYPool &pool, JSContextRef context, SEL sel, objc_method *method) {
- if (method != NULL)
- return method_getTypeEncoding(method);
-
- const char *name(sel_getName(sel));
- size_t length(strlen(name));
-
- char keyed[length + 2];
- keyed[0] = '6';
- keyed[length + 1] = '\0';
- memcpy(keyed + 1, name, length);
-
- if (CYBridgeEntry *entry = CYBridgeHash(keyed, length + 1))
- return entry->value_;
-
- return NULL;
-}
-
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);
CYPool pool;
const char *name(CYPoolCString(pool, context, property));
-
SEL sel(sel_registerName(name));
- objc_method *method(class_getInstanceMethod(_class, sel));
-
const char *type;
IMP imp;
Message_privateData *message(reinterpret_cast<Message_privateData *>(JSObjectGetPrivate((JSObjectRef) value)));
type = sig::Unparse(pool, &message->signature_);
imp = reinterpret_cast<IMP>(message->GetValue());
- } else {
- type = CYPoolTypeEncoding(pool, context, sel, method);
+ } else if (objc_method *method = class_getInstanceMethod(_class, sel)) {
+ type = method_getTypeEncoding(method);
imp = CYMakeMessage(context, value, type);
- }
+ } else _assert(false);
+
+ objc_method *method(NULL);
+#if OBJC_API_VERSION >= 2
+ unsigned int size;
+ objc_method **methods(class_copyMethodList(_class, &size));
+ for (size_t i(0); i != size; ++i)
+ if (sel_isEqual(method_getName(methods[i]), sel)) {
+ method = methods[i];
+ break;
+ }
+ free(methods);
+#else
+ for (objc_method_list *methods(_class->methods); methods != NULL; methods = methods->method_next)
+ for (int i(0); i != methods->method_count; ++i)
+ if (sel_isEqual(method_getName(&methods->method_list[i]), sel)) {
+ method = &methods->method_list[i];
+ break;
+ }
+#endif
if (method != NULL)
method_setImplementation(method, imp);
return value;
} 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
-
+static const char *CYBlockEncoding(NSBlock *self) {
BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(self));
+ if ((literal->flags & BLOCK_HAS_SIGNATURE) == 0)
+ return NULL;
+ 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));
+ return descriptor3->signature;
+}
- 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));
+static JSValueRef FunctionInstance_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 (const char *type = descriptor3->signature) {
- CYPool pool;
+ if (const char *encoding = CYBlockEncoding(self)) {
+ CYPool pool;
- void *setup[1];
- setup[0] = &self;
+ void *setup[1];
+ setup[0] = &self;
- sig::Signature signature;
- sig::Parse(pool, &signature, type, &Structor_);
+ sig::Signature signature;
+ sig::Parse(pool, &signature, encoding, &Structor_);
- ffi_cif cif;
- sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
+ 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, &signature, &cif, function);
- }
+ BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(self));
+ void (*function)() = reinterpret_cast<void (*)()>(literal->invoke);
+ return CYCallFunction(pool, context, 1, setup, count, arguments, false, &signature, &cif, function);
}
if (count != 0)
break;
else if (ivar_getOffset(ivars[i]) == offset) {
const char *encoding(ivar_getTypeEncoding(ivars[i]));
+ _assert(encoding != NULL);
_assert(encoding[0] == 'b');
shift += CYCastDouble(encoding + 1);
}
void *data(reinterpret_cast<uint8_t *>(self) + offset);
const char *encoding(ivar_getTypeEncoding(ivar));
+ _assert(encoding != NULL);
if (encoding[0] == 'b') {
unsigned length, shift;
CYBitField(length, shift, self, ivar, encoding, offset);
void *data(reinterpret_cast<uint8_t *>(self) + offset);
const char *encoding(ivar_getTypeEncoding(ivar));
+ _assert(encoding != NULL);
if (encoding[0] == 'b') {
unsigned length, shift;
CYBitField(length, shift, self, ivar, encoding, offset);
return internal->GetOwner();
} CYCatch(NULL) }
+static bool ObjectiveC_Classes_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
+ CYPool pool;
+ return objc_getClass(CYPoolCString(pool, context, property)) != Nil;
+}
+
static JSValueRef ObjectiveC_Classes_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
CYPool pool;
NSString *name(CYCastNSString(&pool, context, property));
if (result == choice->query_.end())
continue;
- // XXX: if (size < class_getInstanceSize(*result))
- if ((class_getInstanceSize(*result) + 15) / 16 * 16 != size)
+ size_t needed(class_getInstanceSize(*result));
+ // XXX: if (size < needed)
+
+ size_t boundary(496);
+#ifdef __LP64__
+ boundary *= 2;
+#endif
+ if (needed <= boundary && (needed + 15) / 16 * 16 != size || needed > boundary && (needed + 511) / 512 * 512 != size)
continue;
CYArrayPush(context, choice->results_, CYCastJSValue(context, reinterpret_cast<id>(data)));
}
if (count != 1)
throw CYJSError(context, "choose() takes a class argument");
+ CYGarbageCollect(context);
+
CYPool pool;
Class _class(CYCastNSObject(&pool, context, arguments[0]));
return CYMakePointer(context, &internal->value_, _not(size_t), type, ffi, object);
} CYCatch(NULL) }
+static JSValueRef FunctionInstance_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+ Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
+ const char *encoding(CYBlockEncoding(internal->GetValue()));
+ if (encoding == NULL)
+ return CYJSNull(context);
+ // XXX: this should be stored on a FunctionInstance private value subclass
+ CYPool pool;
+ sig::Signature signature;
+ sig::Parse(pool, &signature, encoding, &Structor_);
+ return CYMakeType(context, &signature);
+} CYCatch(NULL) }
+
static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
return Instance::Make(context, (id) object_getClass(internal->GetValue()));
} CYCatch(NULL) }
static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+ std::set<void *> *objects(CYCastObjects(context, _this, count, arguments));
+
if (!CYJSValueIsNSObject(context, _this))
return NULL;
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
- return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue(), false)));
+ return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue(), false, objects)));
} CYCatch(NULL) }
static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate(_this)));
SEL sel(internal->GetValue());
- objc_method *method;
- if (Class _class = CYCastClass(pool, context, arguments[0]))
- method = class_getInstanceMethod(_class, sel);
- else
- method = NULL;
-
- const char *encoding(CYPoolTypeEncoding(pool, context, sel, method));
- if (encoding == NULL)
- return CYJSNull(context);
+ Class _class(_require(CYCastClass(pool, context, arguments[0])));
+ objc_method *method(_require(class_getInstanceMethod(_class, sel)));
+ const char *encoding(method_getTypeEncoding(method));
sig::Signature signature;
sig::Parse(pool, &signature, encoding, &Structor_);
{NULL, NULL, NULL, 0}
};
+// XXX: this is sadly duplicated in FunctionInstance_staticValues
static JSStaticValue Instance_staticValues[5] = {
{"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"messages", &Instance_getProperty_messages, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, NULL, 0}
};
+static JSStaticValue FunctionInstance_staticValues[6] = {
+ {"type", &FunctionInstance_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ // XXX: this is sadly a duplicate of Instance_staticValues
+ {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"messages", &Instance_getProperty_messages, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"prototype", &Instance_getProperty_prototype, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {NULL, NULL, NULL, 0}
+};
+
static JSStaticFunction Instance_staticFunctions[7] = {
{"$cya", &CYValue_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toCYON", &Instance_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
NSArray_ = objc_getClass("NSArray");
NSBlock_ = objc_getClass("NSBlock");
NSDictionary_ = objc_getClass("NSDictionary");
+ NSNumber_ = objc_getClass("NSNumber");
NSString_ = objc_getClass("NSString");
Object_ = objc_getClass("Object");
NSCFType_ = objc_getClass("NSCFType");
NSZombie_ = objc_getClass("_NSZombie_");
-
- banned_.insert(Object_);
- banned_.insert(objc_getClass("__NSAtom"));
- banned_.insert(objc_getClass("__NSGenericDeallocHandler"));
- banned_.insert(objc_getClass("NSMessageBuilder"));
- banned_.insert(objc_getClass("__NSMessageBuilder"));
#else
NSBoolNumber_ = objc_getClass("NSBoolNumber");
#endif
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 = "BooleanInstance";
+ BooleanInstance_ = JSClassCreate(&definition);
+
+ definition.className = "NumberInstance";
+ NumberInstance_ = JSClassCreate(&definition);
definition.className = "ObjectInstance";
ObjectInstance_ = JSClassCreate(&definition);
definition.className = "StringInstance";
StringInstance_ = JSClassCreate(&definition);
+ definition.className = "FunctionInstance";
+ definition.staticValues = FunctionInstance_staticValues;
+ definition.callAsFunction = &FunctionInstance_callAsFunction;
+ FunctionInstance_ = JSClassCreate(&definition);
+
definition = kJSClassDefinitionEmpty;
definition.className = "Class";
definition.staticFunctions = Class_staticFunctions;
definition = kJSClassDefinitionEmpty;
definition.className = "Message";
definition.staticFunctions = cy::Functor::StaticFunctions;
+ definition.staticValues = cy::Functor::StaticValues;
definition.callAsFunction = &Message_callAsFunction;
definition.finalize = &CYFinalize;
Message_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "ObjectiveC::Classes";
+ definition.hasProperty = &ObjectiveC_Classes_hasProperty;
definition.getProperty = &ObjectiveC_Classes_getProperty;
definition.getPropertyNames = &ObjectiveC_Classes_getPropertyNames;
ObjectiveC_Classes_ = JSClassCreate(&definition);
ObjectiveC_Protocols_ = JSClassCreate(&definition);
#ifdef __APPLE__
-// XXX: this is horrible; there has to be a better way to do this
-#ifdef __LP64__
- class_addMethod(NSCFType_, @selector(cy$toJSON:inContext:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON$inContext$), "^{OpaqueJSValue=}32@0:8@16^{OpaqueJSContext=}24");
-#else
- class_addMethod(NSCFType_, @selector(cy$toJSON:inContext:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON$inContext$), "^{OpaqueJSValue=}16@0:4@8^{OpaqueJSContext=}12");
-#endif
+ class_addMethod(NSCFType_, @selector(cy$toJSON:inContext:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON$inContext$),
+ // XXX: this is horrible; there has to be a better way to do this
+ #ifdef __LP64__
+ "^{OpaqueJSValue=}32@0:8@16^{OpaqueJSContext=}24"
+ #else
+ "^{OpaqueJSValue=}16@0:4@8^{OpaqueJSContext=}12"
+ #endif
+ );
#endif
} CYPoolCatch() }
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);
+ CYSetPrototype(context, ArrayInstance_prototype, Array_prototype);
+
+ JSObjectRef BooleanInstance(JSObjectMakeConstructor(context, BooleanInstance_, NULL));
+ JSObjectRef BooleanInstance_prototype(CYCastJSObject(context, CYGetProperty(context, BooleanInstance, prototype_s)));
+ CYSetProperty(context, cy, CYJSString("BooleanInstance_prototype"), BooleanInstance_prototype);
+ JSObjectRef Boolean_prototype(CYGetCachedObject(context, CYJSString("Boolean_prototype")));
+ CYSetPrototype(context, BooleanInstance_prototype, Boolean_prototype);
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);
+ CYSetPrototype(context, FunctionInstance_prototype, Function_prototype);
+
+ JSObjectRef NumberInstance(JSObjectMakeConstructor(context, NumberInstance_, NULL));
+ JSObjectRef NumberInstance_prototype(CYCastJSObject(context, CYGetProperty(context, NumberInstance, prototype_s)));
+ CYSetProperty(context, cy, CYJSString("NumberInstance_prototype"), NumberInstance_prototype);
+ JSObjectRef Number_prototype(CYGetCachedObject(context, CYJSString("Number_prototype")));
+ CYSetPrototype(context, NumberInstance_prototype, Number_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);
+ CYSetPrototype(context, ObjectInstance_prototype, Object_prototype);
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);
+ CYSetPrototype(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);
+ CYSetPrototype(context, Class_prototype, Instance_prototype);
CYSetProperty(context, cycript, CYJSString("Instance"), Instance);
CYSetProperty(context, cycript, CYJSString("Selector"), Selector);
CYSetProperty(context, cycript, CYJSString("objc_super"), Super);
JSObjectRef box(JSObjectMakeFunctionWithCallback(context, CYJSString("box"), &Instance_box_callAsFunction));
- CYSetProperty(context, Instance, CYJSString("box"), box);
+ CYSetProperty(context, Instance, CYJSString("box"), box, kJSPropertyAttributeDontEnum);
#ifdef __APPLE__
CYSetProperty(context, all, CYJSString("choose"), &choose, kJSPropertyAttributeDontEnum);
CYSetProperty(context, all, CYJSString("objc_msgSend"), &$objc_msgSend, kJSPropertyAttributeDontEnum);
- JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Message, prototype_s)), Function_prototype);
- JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Selector, prototype_s)), Function_prototype);
+ CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Message, prototype_s)), Function_prototype);
+ CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Selector, prototype_s)), Function_prototype);
} CYPoolCatch() }
static CYHooks CYObjectiveCHooks = {
CYPool pool;
CYUTF8String utf8(CYPoolUTF8String(pool, CYUTF16String(*data, *size)));
- utf8 = CYPoolCode(pool, utf8);
+ CYStream stream(utf8.data, utf8.data + utf8.size);
+ utf8 = CYPoolCode(pool, stream);
CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(utf8.data, utf8.size)));
size_t bytes(utf16.size * sizeof(uint16_t));
projects / cycript.git / blobdiff