return CYGetOffset(CYPoolCString(pool, context, value), index);
}
-static JSClassRef Instance_;
-
static JSClassRef ArrayInstance_;
static JSClassRef BooleanInstance_;
+static JSClassRef ClassInstance_;
static JSClassRef FunctionInstance_;
static JSClassRef NumberInstance_;
static JSClassRef ObjectInstance_;
static JSClassRef StringInstance_;
-static JSClassRef Class_;
-static JSClassRef Internal_;
-static JSClassRef Message_;
-static JSClassRef Messages_;
-static JSClassRef Selector_;
-static JSClassRef Super_;
-
static JSClassRef ObjectiveC_Classes_;
static JSClassRef ObjectiveC_Constants_;
static JSClassRef ObjectiveC_Protocols_;
static Class NSZombie_;
static Class Object_;
-static Type_privateData *Object_type;
-static Type_privateData *Selector_type;
-
-Type_privateData *Instance::GetType() const {
- return Object_type;
-}
-
-Type_privateData *Selector_privateData::GetType() const {
- return Selector_type;
-}
-
static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception);
JSValueRef CYGetClassPrototype(JSContextRef context, 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"));
+ return CYGetCachedObject(context, CYJSString("ClassInstance_prototype"));
JSObjectRef global(CYGetGlobalObject(context));
JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));
if (!JSValueIsUndefined(context, value))
return value;
- JSClassRef _class(NULL);
JSValueRef prototype;
#ifdef __APPLE__
else
prototype = CYGetClassPrototype(context, class_getSuperclass(self), meta);
- JSObjectRef object(JSObjectMake(context, _class, NULL));
+ JSObjectRef object(JSObjectMake(context, NULL, NULL));
CYSetPrototype(context, object, prototype);
CYSetProperty(context, cy, name, object);
return CYGetClassPrototype(context, self, class_isMetaClass(self));
}
-JSObjectRef Messages::Make(JSContextRef context, Class _class) {
- JSObjectRef value(JSObjectMake(context, Messages_, new Messages(_class)));
- if (Class super = class_getSuperclass(_class))
- CYSetPrototype(context, value, Messages::Make(context, super));
- return value;
-}
-
-JSObjectRef Internal::Make(JSContextRef context, id object, JSObjectRef owner) {
- return JSObjectMake(context, Internal_, new Internal(object, context, owner));
+JSValueRef Messages::GetPrototype(JSContextRef context) const {
+ if (Class super = class_getSuperclass(value_))
+ return Messages::Make(context, super);
+ return NULL;
}
-namespace cy {
-JSObjectRef Super::Make(JSContextRef context, id object, Class _class) {
- JSObjectRef value(JSObjectMake(context, Super_, new Super(object, _class)));
- return value;
-} }
-
bool CYIsKindOfClass(id object, Class _class) {
for (Class isa(object_getClass(object)); isa != NULL; isa = class_getSuperclass(isa))
if (isa == _class)
return false;
}
-JSObjectRef Instance::Make(JSContextRef context, id object, Flags flags) {
- JSObjectRef value(JSObjectMake(context, CYIsKindOfClass(object, NSBlock_) ? FunctionInstance_ : Instance_, new Instance(object, flags)));
- CYSetPrototype(context, value, CYGetClassPrototype(context, object_getClass(object)));
- return value;
+JSValueRef Instance::GetPrototype(JSContextRef context) const {
+ return CYGetClassPrototype(context, object_getClass(value_));
+}
+
+JSClassRef Instance::GetClass(id object, Flags flags) {
+ return CYIsKindOfClass(object, NSBlock_) ? FunctionInstance_ : Instance::Class_;
+}
+
+Instance::Instance(id value, Flags flags) :
+ CYValue(value),
+ flags_(flags)
+{
+ if ((flags & Instance::Permanent) == 0)
+ value_ = [value_ retain];
}
Instance::~Instance() {
if ((flags_ & Permanent) == 0)
- [GetValue() release];
+ [value_ release];
}
struct Message_privateData :
cy::Functor
{
+ static JSClassRef Class_;
+
SEL sel_;
- Message_privateData(SEL sel, const char *type, IMP value = NULL) :
- cy::Functor(type, reinterpret_cast<void (*)()>(value)),
+ Message_privateData(SEL sel, const char *type, IMP value) :
+ cy::Functor(reinterpret_cast<void (*)()>(value), type),
sel_(sel)
{
}
+
+ static JSObjectRef Make(JSContextRef context, SEL sel, const char *type, IMP value);
};
+JSClassRef Message_privateData::Class_;
+
JSObjectRef CYMakeInstance(JSContextRef context, id object, Instance::Flags flags = Instance::None) {
_assert(object != nil);
return instance;
#endif
- if ((flags & Instance::Permanent) == 0)
- object = [object retain];
-
JSObjectRef instance(Instance::Make(context, object, flags));
#ifdef __APPLE__
/* }}} */
_finline bool CYJSValueIsNSObject(JSContextRef context, JSValueRef value) {
- return JSValueIsObjectOfClass(context, value, Instance_) || JSValueIsObjectOfClass(context, value, FunctionInstance_);
+ return JSValueIsObjectOfClass(context, value, Instance::Class_) || JSValueIsObjectOfClass(context, value, FunctionInstance_);
}
_finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) {
memset(&descriptor->d_, 0, sizeof(descriptor->d_));
descriptor->internal_ = CYMakeFunctor_(context, function, signature, &BlockAdapter_);
- literal->invoke = reinterpret_cast<void (*)(void *, ...)>(descriptor->internal_->GetValue());
+ literal->invoke = reinterpret_cast<void (*)(void *, ...)>(descriptor->internal_->value_);
literal->isa = __NSMallocBlock__;
literal->flags = BLOCK_HAS_SIGNATURE | BLOCK_HAS_COPY_DISPOSE | BLOCK_IS_GLOBAL;
NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSObjectRef object) {
if (CYJSValueIsNSObject(context, object)) {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
- return internal->GetValue();
+ return internal->value_;
}
bool array(CYJSValueIsInstanceOfCachedConstructor(context, object, Array_s));
@end
static const char *CYBlockEncoding(NSBlock *self);
-static sig::Signature *CYBlockSignature(CYPool &pool, NSBlock *self);
+static bool CYBlockSignature(CYPool &pool, NSBlock *self, sig::Signature &signature);
@implementation NSBlock (Cycript)
- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
CYLocalPool pool;
- sig::Signature *signature(CYBlockSignature(pool, self));
- // XXX: I am checking signature->count due to Decode doing it for block_P
- if (signature == NULL || signature->count == 0)
+ sig::Block type;
+ if (!CYBlockSignature(pool, self, type.signature))
return [super cy$toCYON:objective inSet:objects];
_oassert(objects.insert(self).second);
- sig::Block type;
- sig::Copy(pool, type.signature, *signature);
-
CYTypedIdentifier *typed((new(pool) CYTypeExpression(CYDecodeType(pool, &type)))->typed_);
- CYTypeFunctionWith *function(typed->Function());
- _assert(function != NULL);
-
- _assert(function->parameters_ != NULL);
- CYObjCBlock *block(new(pool) CYObjCBlock(typed, function->parameters_, NULL));
+ CYTypeModifier *&modifier(CYGetLast(typed->modifier_));
+ CYTypeBlockWith *with(dynamic_cast<CYTypeBlockWith *>(modifier));
+ _assert(with != NULL);
+ CYObjCBlock *block(new(pool) CYObjCBlock(typed, with->parameters_, NULL));
+ modifier = NULL;
std::ostringstream str;
CYOptions options;
@end
-static JSObjectRef CYMakeSelector(JSContextRef context, SEL sel) {
- Selector_privateData *internal(new Selector_privateData(sel));
- return JSObjectMake(context, Selector_, internal);
-}
-
static JSValueRef CYCastJSValue(JSContextRef context, SEL sel) {
if (sel == NULL)
return CYJSNull(context);
- return CYMakeSelector(context, sel);
+ return Selector_privateData::Make(context, sel);
}
static SEL CYCastSEL(JSContextRef context, JSValueRef value) {
- if (JSValueIsObjectOfClass(context, value, Selector_)) {
+ if (JSValueIsObjectOfClass(context, value, Selector_privateData::Class_)) {
Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate((JSObjectRef) value)));
return reinterpret_cast<SEL>(internal->value_);
} else {
JSObjectRef object(CYCastJSObject(context, value));
if (JSValueIsObjectOfClass(context, object, FunctionInstance_))
- return reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->GetValue();
+ return reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->value_;
- if (JSValueIsObjectOfClass(context, object, Instance_)) {
- _assert(reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->GetValue() == nil);
+ if (JSValueIsObjectOfClass(context, object, Instance::Class_)) {
+ _assert(reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->value_ == nil);
return nil;
}
return CYCallAsFunction(context, function, _this, count - 2, values + 2);
}
-static JSObjectRef CYMakeMessage(JSContextRef context, SEL sel, IMP imp, const char *type) {
- Message_privateData *internal(new Message_privateData(sel, type, imp));
- return JSObjectMake(context, Message_, internal);
+JSObjectRef Message_privateData::Make(JSContextRef context, SEL sel, const char *type, IMP value) {
+ Message_privateData *internal(new Message_privateData(sel, type, value));
+ return JSObjectMake(context, Message_privateData::Class_, internal);
}
static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *encoding) {
sig::Parse(pool, &signature, encoding, &Structor_);
Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &MessageAdapter_));
// XXX: see notes in Library.cpp about needing to leak
- return reinterpret_cast<IMP>(internal->GetValue());
+ return reinterpret_cast<IMP>(internal->value_);
}
static bool Messages_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
- Class _class(internal->GetValue());
+ Class _class(internal->value_);
CYPool pool;
const char *name(CYPoolCString(pool, context, property));
static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
- Class _class(internal->GetValue());
+ Class _class(internal->value_);
CYPool pool;
const char *name(CYPoolCString(pool, context, property));
if (SEL sel = sel_getUid(name))
if (objc_method *method = class_getInstanceMethod(_class, sel))
- return CYMakeMessage(context, sel, method_getImplementation(method), method_getTypeEncoding(method));
+ return Message_privateData::Make(context, sel, method_getTypeEncoding(method), method_getImplementation(method));
return NULL;
} CYCatch(NULL) }
static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
- Class _class(internal->GetValue());
+ Class _class(internal->value_);
CYPool pool;
const char *name(CYPoolCString(pool, context, property));
const char *type;
IMP imp;
- if (JSValueIsObjectOfClass(context, value, Message_)) {
+ if (JSValueIsObjectOfClass(context, value, Message_privateData::Class_)) {
Message_privateData *message(reinterpret_cast<Message_privateData *>(JSObjectGetPrivate((JSObjectRef) value)));
type = sig::Unparse(pool, &message->signature_);
- imp = reinterpret_cast<IMP>(message->GetValue());
+ imp = reinterpret_cast<IMP>(message->value_);
} else if (objc_method *method = class_getInstanceMethod(_class, sel)) {
type = method_getTypeEncoding(method);
imp = CYMakeMessage(context, value, type);
static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
- Class _class(internal->GetValue());
+ Class _class(internal->value_);
unsigned int size;
objc_method **data(class_copyMethodList(_class, &size));
static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
- id self(internal->GetValue());
+ id self(internal->value_);
if (JSStringIsEqualToUTF8CString(property, "$cyi"))
return true;
static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
- id self(internal->GetValue());
+ id self(internal->value_);
if (JSStringIsEqualToUTF8CString(property, "$cyi"))
- return Internal::Make(context, self, object);
+ return Internal::Make(context, self, context, object);
CYPool pool;
NSString *name(CYCastNSString(&pool, context, property));
static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
- id self(internal->GetValue());
+ id self(internal->value_);
CYPool pool;
static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
- id self(internal->GetValue());
+ id self(internal->value_);
CYPoolTry {
NSString *name(CYCastNSString(NULL, context, property));
static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
- id self(internal->GetValue());
+ id self(internal->value_);
CYPool pool;
Class _class(object_getClass(self));
static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
- JSObjectRef value(CYMakeInstance(context, [internal->GetValue() alloc], Instance::Uninitialized));
+ JSObjectRef value(CYMakeInstance(context, [internal->value_ alloc], Instance::Uninitialized));
return value;
} CYCatch(NULL) }
return descriptor3->signature;
}
-static sig::Signature *CYBlockSignature(CYPool &pool, NSBlock *self) {
+static bool CYBlockSignature(CYPool &pool, NSBlock *self, sig::Signature &signature) {
const char *encoding(CYBlockEncoding(self));
if (encoding == NULL)
- return NULL;
- // XXX: this should be stored on a FunctionInstance private value subclass
- sig::Signature *signature(new(pool) sig::Signature());
- sig::Parse(pool, signature, encoding, &Structor_);
- return signature;
+ return false;
+
+ sig::Parse(pool, &signature, encoding, &Structor_);
+ _assert(signature.count >= 2);
+
+ _assert(dynamic_cast<sig::Object *>(signature.elements[1].type) != NULL);
+ signature.elements[1] = signature.elements[0];
+
+ ++signature.elements;
+ --signature.count;
+
+ return true;
}
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());
+ id self(internal->value_);
if (const char *encoding = CYBlockEncoding(self)) {
CYPool pool;
sig::Parse(pool, &signature, encoding, &Structor_);
ffi_cif cif;
- sig::sig_ffi_cif(pool, &signature, &cif);
+ sig::sig_ffi_cif(pool, 0, signature, &cif);
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);
+ return CYCallFunction(pool, context, 1, setup, count, arguments, false, false, signature, &cif, function);
}
if (count != 0)
static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) constructor)));
- Class _class(internal->GetValue());
+ Class _class(internal->value_);
if (!CYIsClass(_class))
return false;
if (CYJSValueIsNSObject(context, instance)) {
Instance *linternal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) instance)));
// XXX: this isn't always safe
- return [linternal->GetValue() isKindOfClass:_class];
+ return [linternal->value_ isKindOfClass:_class];
}
return false;
Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
CYPool pool;
- id self(internal->GetValue());
+ id self(internal->value_);
const char *name(CYPoolCString(pool, context, property));
if (object_getInstanceVariable(self, name, NULL) != NULL)
Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
CYPool pool;
- id self(internal->GetValue());
+ id self(internal->value_);
const char *name(CYPoolCString(pool, context, property));
if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {
Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
CYPool pool;
- id self(internal->GetValue());
+ id self(internal->value_);
const char *name(CYPoolCString(pool, context, property));
if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {
Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
CYPool pool;
- id self(internal->GetValue());
+ id self(internal->value_);
Class _class(object_getClass(self));
Internal_getPropertyNames_(_class, names);
static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
- return internal->GetOwner();
+ return internal->owner_;
} CYCatch(NULL) }
static bool ObjectiveC_Classes_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
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);
- element->type = new(pool) sig::Object();
- }
-
- signature.elements = elements;
- signature.count = used;
- }
-
ffi_cif cif;
- sig::sig_ffi_cif(pool, &signature, &cif);
+ sig::sig_ffi_cif(pool, 0, signature, &cif);
if (imp == NULL) {
#ifndef CY_NO_STRET
}
void (*function)() = reinterpret_cast<void (*)()>(imp);
- return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, &signature, &cif, function);
+ return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, true, signature, &cif, function);
}
static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[]) {
SEL _cmd;
Class _class;
- if (JSValueIsObjectOfClass(context, arguments[0], Super_)) {
+ if (JSValueIsObjectOfClass(context, arguments[0], cy::Super::Class_)) {
cy::Super *internal(reinterpret_cast<cy::Super *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));
- self = internal->GetValue();
+ self = internal->value_;
_class = internal->class_;;
uninitialized = false;
} else if (CYJSValueIsNSObject(context, arguments[0])) {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));
- self = internal->GetValue();
+ self = internal->value_;
_class = nil;
uninitialized = internal->IsUninitialized();
if (uninitialized)
setup[0] = &self;
setup[1] = &internal->sel_;
- return CYCallFunction(pool, context, 2, setup, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue());
+ return CYCallFunction(pool, context, 2, setup, count, arguments, false, true, internal->signature_, &internal->cif_, internal->value_);
} CYCatch(NULL) }
static JSObjectRef Super_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
throw CYJSError(context, "incorrect number of arguments to Selector constructor");
CYPool pool;
const char *name(CYPoolCString(pool, context, arguments[0]));
- return CYMakeSelector(context, sel_registerName(name));
+ return Selector_privateData::Make(context, sel_registerName(name));
} CYCatch(NULL) }
static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
return CYMakeInstance(context, CYCastPointer<id>(context, arguments[0]));
} CYCatch(NULL) }
-static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
- CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(object)));
- return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->value_));
+static JSValueRef Selector_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+ return CYMakeType(context, sig::Selector());
} CYCatch(NULL) }
-static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(_this)));
- Type_privateData *typical(internal->GetType());
-
- sig::Void XXX;
-
- sig::Type *type;
- ffi_type *ffi;
-
- if (typical == NULL) {
- type = &XXX;
- ffi = NULL;
- } else {
- type = typical->type_;
- ffi = typical->ffi_;
- }
-
- return CYMakePointer(context, &internal->value_, *type, ffi, object);
+static JSValueRef Instance_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+ Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
+ id self(internal->value_);
+ if (CYIsClass(self))
+ return CYMakeType(context, sig::Meta());
+ return CYMakeType(context, sig::Object(class_getName(object_getClass(self))));
} CYCatch(NULL) }
-static JSValueRef FunctionInstance_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef FunctionInstance_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
CYPool pool;
- sig::Signature *signature(CYBlockSignature(pool, internal->GetValue()));
- if (signature == NULL)
+ sig::Block type;
+ if (!CYBlockSignature(pool, internal->value_, type.signature))
return CYJSNull(context);
- return CYMakeType(context, signature);
+ return CYMakeType(context, type);
} CYCatch(NULL) }
static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
- return CYMakeInstance(context, object_getClass(internal->GetValue()), Instance::Permanent);
+ return CYMakeInstance(context, object_getClass(internal->value_), Instance::Permanent);
} CYCatch(NULL) }
static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
- id self(internal->GetValue());
+ id self(internal->value_);
if (!CYIsClass(self))
return CYJSUndefined(context);
return CYGetClassPrototype(context, self);
static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
- id self(internal->GetValue());
+ id self(internal->value_);
if (!CYIsClass(self))
return CYJSUndefined(context);
return Messages::Make(context, (Class) self);
return NULL;
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
- return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue(), false, objects)));
+ return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->value_, false, objects)));
} CYCatch(NULL) }
static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
return NULL;
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
- id value(internal->GetValue());
+ id value(internal->value_);
CYPoolTry {
NSString *key;
return NULL;
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
- id value(internal->GetValue());
+ id value(internal->value_);
_assert(value != nil);
if (![value respondsToSelector:@selector(cy$valueOfInContext:)])
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
// XXX: but... but... THIS ISN'T A POINTER! :(
- return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->GetValue()));
+ return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->value_));
} 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 {
return NULL;
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
- id value(internal->GetValue());
+ id value(internal->value_);
CYPoolTry {
// XXX: this seems like a stupid implementation; what if it crashes? why not use the CYONifier backend?
return NULL;
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
- id value(internal->GetValue());
+ id value(internal->value_);
if (!CYIsClass(value))
CYThrow("non-Class object cannot be used as Type");
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()));
+ return CYCastJSValue(context, sel_getName(internal->value_));
} CYCatch(NULL) }
static JSValueRef Selector_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
static JSValueRef Selector_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate(_this)));
- const char *name(sel_getName(internal->GetValue()));
+ const char *name(sel_getName(internal->value_));
CYPoolTry {
NSString *string([NSString stringWithFormat:@"@selector(%s)", name]);
CYPool pool;
Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate(_this)));
- SEL sel(internal->GetValue());
+ SEL sel(internal->value_);
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_);
- return CYMakeType(context, &signature);
+ sig::Function type(false);
+ sig::Parse(pool, &type.signature, encoding, &Structor_);
+ return CYMakeType(context, type);
} CYCatch(NULL) }
static JSStaticValue Selector_staticValues[2] = {
- {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete},
+ {"$cyt", &Selector_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, NULL, 0}
};
-// XXX: this is sadly duplicated in FunctionInstance_staticValues
static JSStaticValue Instance_staticValues[5] = {
+ {"$cyt", &Instance_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ // XXX: this is sadly duplicated in FunctionInstance_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 JSStaticValue FunctionInstance_staticValues[6] = {
- {"type", &FunctionInstance_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+static JSStaticValue FunctionInstance_staticValues[5] = {
+ {"$cyt", &FunctionInstance_getProperty_$cyt, 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},
+static JSStaticFunction Instance_staticFunctions[6] = {
{"toCYON", &Instance_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toJSON", &Instance_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
#endif
void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
- CYPool &pool(CYGetGlobalPool());
-
- Object_type = new(pool) Type_privateData(sig::Object());
- Selector_type = new(pool) Type_privateData(sig::Selector());
-
NSArray_ = objc_getClass("NSArray");
NSBlock_ = objc_getClass("NSBlock");
NSDictionary_ = objc_getClass("NSDictionary");
definition.callAsConstructor = &Instance_callAsConstructor;
definition.hasInstance = &Instance_hasInstance;
definition.finalize = &CYFinalize;
- Instance_ = JSClassCreate(&definition);
+ Instance::Class_ = JSClassCreate(&definition);
definition.className = "ArrayInstance";
ArrayInstance_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Class";
definition.staticFunctions = Class_staticFunctions;
- Class_ = JSClassCreate(&definition);
+ ClassInstance_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Internal";
definition.setProperty = &Internal_setProperty;
definition.getPropertyNames = &Internal_getPropertyNames;
definition.finalize = &CYFinalize;
- Internal_ = JSClassCreate(&definition);
+ Internal::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Message";
definition.staticValues = cy::Functor::StaticValues;
definition.callAsFunction = &Message_callAsFunction;
definition.finalize = &CYFinalize;
- Message_ = JSClassCreate(&definition);
+ Message_privateData::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Messages";
definition.setProperty = &Messages_setProperty;
definition.getPropertyNames = &Messages_getPropertyNames;
definition.finalize = &CYFinalize;
- Messages_ = JSClassCreate(&definition);
+ Messages::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Selector";
definition.staticFunctions = Selector_staticFunctions;
definition.callAsFunction = &Selector_callAsFunction;
definition.finalize = &CYFinalize;
- Selector_ = JSClassCreate(&definition);
+ Selector_privateData::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Super";
- definition.staticFunctions = Internal_staticFunctions;
definition.finalize = &CYFinalize;
- Super_ = JSClassCreate(&definition);
+ cy::Super::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "ObjectiveC::Classes";
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 Super(JSObjectMakeConstructor(context, Super_, &Super_new));
+ JSObjectRef Message(JSObjectMakeConstructor(context, Message_privateData::Class_, NULL));
+ JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_privateData::Class_, &Selector_new));
+ JSObjectRef Super(JSObjectMakeConstructor(context, cy::Super::Class_, &Super_new));
+ JSObjectRef Instance(JSObjectMakeConstructor(context, Instance::Class_, &Instance_new));
JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s)));
CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);
JSObjectRef Boolean_prototype(CYGetCachedObject(context, CYJSString("Boolean_prototype")));
CYSetPrototype(context, BooleanInstance_prototype, Boolean_prototype);
+ JSObjectRef ClassInstance(JSObjectMakeConstructor(context, ClassInstance_, NULL));
+ JSObjectRef ClassInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ClassInstance, prototype_s)));
+ CYSetProperty(context, cy, CYJSString("ClassInstance_prototype"), ClassInstance_prototype);
+ // XXX: this doesn't fit the pattern of the other ones; maybe it sort of should?
+ CYSetPrototype(context, ClassInstance_prototype, Instance_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 String_prototype(CYGetCachedObject(context, CYJSString("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);
- 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);
projects / cycript.git / blobdiff