#include "Code.hpp"
#include "Decode.hpp"
#include "Error.hpp"
+#include "Functor.hpp"
#include "JavaScript.hpp"
#include "String.hpp"
#include "Execute.hpp"
BLOCK_HAS_SIGNATURE = 1 << 30,
};
+static bool CYIsClass(id self) {
+ return class_isMetaClass(object_getClass(self));
+}
+
JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize);
/* Objective-C Pool Release {{{ */
return CYGetOffset(CYPoolCString(pool, context, value), index);
}
-static JSClassRef ArrayInstance_;
-static JSClassRef BooleanInstance_;
-static JSClassRef ClassInstance_;
-static JSClassRef FunctionInstance_;
-static JSClassRef NumberInstance_;
-static JSClassRef ObjectInstance_;
-static JSClassRef StringInstance_;
-
static JSClassRef ObjectiveC_Classes_;
static JSClassRef ObjectiveC_Constants_;
static JSClassRef ObjectiveC_Protocols_;
static Class NSBlock_;
static Class NSDictionary_;
static Class NSNumber_;
+static Class NSObject_;
static Class NSString_;
static Class NSZombie_;
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, Class self, bool meta) {
- if (self == nil)
- return CYGetCachedObject(context, CYJSString("Instance_prototype"));
- else if (meta && !class_isMetaClass(self))
- return CYGetCachedObject(context, CYJSString("ClassInstance_prototype"));
-
- JSObjectRef global(CYGetGlobalObject(context));
- JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));
-
- char label[32];
- sprintf(label, "i%p", self);
- CYJSString name(label);
-
- JSValueRef value(CYGetProperty(context, cy, name));
- if (!JSValueIsUndefined(context, value))
- return value;
-
- JSValueRef prototype;
-
+JSValueRef Messages::GetPrototype(JSContextRef context) const {
#ifdef __APPLE__
- if (self == NSCFBoolean_)
+ if (value_ == NSCFBoolean_)
#else
- if (self == NSBoolNumber_)
+ if (value_ == 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 = CYGetCachedObject(context, CYJSString("StringInstance_prototype"));
- else
- prototype = CYGetClassPrototype(context, class_getSuperclass(self), meta);
+ return CYGetCachedObject(context, CYJSString("BooleanInstance_prototype"));
+ if (value_ == NSArray_)
+ return CYGetCachedObject(context, CYJSString("ArrayInstance_prototype"));
+ if (value_ == NSBlock_)
+ return CYGetCachedObject(context, CYJSString("FunctionInstance_prototype"));
+ if (value_ == NSNumber_)
+ return CYGetCachedObject(context, CYJSString("NumberInstance_prototype"));
+ if (value_ == NSDictionary_)
+ return CYGetCachedObject(context, CYJSString("ObjectInstance_prototype"));
+ if (value_ == NSString_)
+ return CYGetCachedObject(context, CYJSString("StringInstance_prototype"));
- JSObjectRef object(JSObjectMake(context, NULL, NULL));
- CYSetPrototype(context, object, prototype);
- CYSetProperty(context, cy, name, object);
-
- return object;
-}
-
-_finline JSValueRef CYGetClassPrototype(JSContextRef context, Class self) {
- return CYGetClassPrototype(context, self, class_isMetaClass(self));
-}
-
-JSValueRef Messages::GetPrototype(JSContextRef context) const {
if (Class super = class_getSuperclass(value_))
- return Messages::Make(context, super);
- return NULL;
+ if (class_isMetaClass(value_) && !class_isMetaClass(super))
+ return CYGetCachedObject(context, CYJSString("TypeInstance_prototype"));
+ else
+ return CYPrivate<Messages>::Cache(context, super);
+ else
+ return CYGetCachedObject(context, CYJSString("Instance_prototype"));
}
bool CYIsKindOfClass(id object, Class _class) {
}
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_;
+ return CYPrivate<Messages>::Cache(context, object_getClass(value_));
}
Instance::Instance(id value, Flags flags) :
- CYValue(value),
+ value_(value),
flags_(flags)
{
if (IsPermanent());
{
}
+ virtual CYPropertyName *GetName(CYPool &pool) const;
+
static JSObjectRef Make(JSContextRef context, SEL sel, const char *type, IMP value);
};
return instance;
#endif
- JSObjectRef instance(Instance::Make(context, object, flags));
+ JSObjectRef instance;
+ if (false);
+ else if (CYIsKindOfClass(object, NSBlock_))
+ instance = CYPrivate<Block>::Make(context, object, flags);
+ else if (CYIsClass(object))
+ instance = CYPrivate<Constructor>::Make(context, object, flags);
+ else
+ instance = CYPrivate<Instance>::Make(context, object, flags);
#ifdef __APPLE__
if (weak != NULL && &JSWeakObjectMapSet != NULL)
/* }}} */
_finline bool CYJSValueIsNSObject(JSContextRef context, JSValueRef value) {
- return JSValueIsObjectOfClass(context, value, Instance::Class_) || JSValueIsObjectOfClass(context, value, FunctionInstance_);
+ return JSValueIsObjectOfClass(context, value, CYPrivate<Instance>::Class_);
}
_finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) {
return internal->value_;
}
+ if (NSObject *pointer = CYCastPointerEx<NSObject *>(context, object))
+ return pointer;
+
bool array(CYJSValueIsInstanceOfCachedConstructor(context, object, Array_s));
id value(array ? [CYJSArray alloc] : [CYJSObject alloc]);
return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]);
if (!objective)
str << '@';
CYUTF8String string(CYCastUTF8String(self));
- CYStringify(str, string.data, string.size, true);
+ CYStringify(str, string.data, string.size, CYStringifyModeNative);
std::string value(str.str());
return CYCastNSString(NULL, CYUTF8String(value.c_str(), value.size()));
}
@end
/* }}} */
-static bool CYIsClass(id self) {
- return class_isMetaClass(object_getClass(self));
-}
-
Class CYCastClass(CYPool &pool, JSContextRef context, JSValueRef value) {
id self(CYCastNSObject(&pool, context, value));
if (CYIsClass(self))
static JSValueRef CYCastJSValue(JSContextRef context, SEL sel) {
if (sel == NULL)
return CYJSNull(context);
- return Selector_privateData::Make(context, sel);
+ return CYPrivate<Selector_privateData>::Make(context, sel);
}
static SEL CYCastSEL(JSContextRef context, JSValueRef value) {
- if (JSValueIsObjectOfClass(context, value, Selector_privateData::Class_)) {
+ if (JSValueIsObjectOfClass(context, value, CYPrivate<Selector_privateData>::Class_)) {
Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate((JSObjectRef) value)));
return reinterpret_cast<SEL>(internal->value_);
} else {
return nil;
JSObjectRef object(CYCastJSObject(context, value));
- if (JSValueIsObjectOfClass(context, object, FunctionInstance_))
+ if (JSValueIsObjectOfClass(context, object, CYPrivate<Block>::Class_))
return reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->value_;
- if (JSValueIsObjectOfClass(context, object, Instance::Class_)) {
+ if (JSValueIsObjectOfClass(context, object, CYPrivate<Instance>::Class_)) {
_assert(reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->value_ == nil);
return nil;
}
namespace sig {
void Block::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
- // XXX: this function might not handle the idea of a null pool
+ // XXX: this function actually needs to handle null pools as it is an autorelease
+ _assert(pool != NULL);
*reinterpret_cast<id *>(data) = CYCastNSBlock(*pool, context, value, &signature);
}
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);
+ JSObjectRef object(JSObjectMake(context, Message_privateData::Class_, internal));
+ CYSetPrototype(context, object, CYGetCachedValue(context, CYJSString("Functor_prototype")));
+ return object;
}
static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *encoding) {
}
static bool Messages_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
- Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
+ auto internal(CYPrivate<Messages>::Get(context, object));
Class _class(internal->value_);
CYPool pool;
}
static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
- Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
+ auto internal(CYPrivate<Messages>::Get(context, object));
Class _class(internal->value_);
CYPool pool;
} CYCatch(NULL) }
static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
- Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
+ auto internal(CYPrivate<Messages>::Get(context, object));
Class _class(internal->value_);
CYPool pool;
} else if (objc_method *method = class_getInstanceMethod(_class, sel)) {
type = method_getTypeEncoding(method);
imp = CYMakeMessage(context, value, type);
- } else _assert(false);
+ } else return false;
objc_method *method(NULL);
unsigned int size;
return true;
} CYCatch(false) }
-static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
- Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
+static JSValueRef Messages_complete_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+ if (count == 2) {
+ if (!CYCastBool(context, arguments[1]))
+ return CYObjectMakeArray(context, 0, NULL);
+ count = 1;
+ }
+
+ _assert(count == 1);
CYPool pool;
+ CYUTF8String prefix(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0])));
+
+ auto internal(CYPrivate<Messages>::Get(context, _this));
Class _class(internal->value_);
unsigned int size;
objc_method **data(class_copyMethodList(_class, &size));
pool.atexit(free, data);
- for (size_t i(0); i != size; ++i)
- JSPropertyNameAccumulatorAddName(names, CYJSString(sel_getName(method_getName(data[i]))));
- free(data);
-}
+ JSObjectRef array(NULL); {
+ CYArrayBuilder<1024> values(context, array);
+
+ for (size_t i(0); i != size; ++i) {
+ CYUTF8String name(sel_getName(method_getName(data[i])));
+ if (CYStartsWith(name, prefix))
+ values(CYCastJSValue(context, CYJSString(name)));
+ }
+ } return array;
+} CYCatch(NULL) }
static bool CYHasImplicitProperties(JSContextRef context, Class _class) {
if (!CYCastBool(context, CYGetCachedValue(context, CYJSString("cydget"))))
- return false;
+ if (class_getProperty(NSObject_, "description") != NULL)
+ return false;
// XXX: this is an evil hack to deal with NSProxy; fix elsewhere
if (!CYImplements(_class, object_getClass(_class), @selector(cy$hasImplicitProperties)))
return true;
id self(internal->value_);
if (JSStringIsEqualToUTF8CString(property, "$cyi"))
- return Interior::Make(context, self, context, object);
+ return CYPrivate<Interior>::Make(context, self, context, object);
CYPool pool;
NSString *name(CYCastNSString(&pool, context, property));
} 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)));
- if (strchr(name, ':') != NULL)
- return;
+static void CYForEachProperty(CYPool &pool, Class _class, const Functor<void (objc_method *, const char *)> &code) {
+ for (; _class != Nil; _class = class_getSuperclass(_class)) {
+ unsigned int size;
+ objc_method **data(class_copyMethodList(_class, &size));
+ pool.atexit(free, data);
+
+ for (size_t i(0); i != size; ++i) {
+ objc_method *method(data[i]);
- const char *type(method_getTypeEncoding(method));
- if (type == NULL || *type == '\0' || *type == 'v')
- return;
+ const char *name(sel_getName(method_getName(method)));
+ if (strchr(name, ':') != NULL)
+ continue;
- JSPropertyNameAccumulatorAddName(names, CYJSString(name));
+ code(method, name);
+ }
+ }
}
static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
CYPool pool;
Class _class(object_getClass(self));
- {
+ for (Class current(_class); current != Nil; current = class_getSuperclass(current)) {
unsigned int size;
- objc_property_t *data(class_copyPropertyList(_class, &size));
+ objc_property_t *data(class_copyPropertyList(current, &size));
pool.atexit(free, data);
for (size_t i(0); i != size; ++i)
}
if (CYHasImplicitProperties(context, _class))
- for (Class current(_class); current != nil; current = class_getSuperclass(current)) {
- unsigned int size;
- objc_method **data(class_copyMethodList(current, &size));
- pool.atexit(free, data);
-
- for (size_t i(0); i != size; ++i)
- Instance_getPropertyNames_message(names, data[i]);
- }
+ CYForEachProperty(pool, _class, fun([&](objc_method *method, const char *name) {
+ JSPropertyNameAccumulatorAddName(names, CYJSString(name));
+ }));
CYPoolTry {
// XXX: this is an evil hack to deal with NSProxy; fix elsewhere
} CYPoolCatch()
}
-static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
+static JSValueRef Instance_complete_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+ if (!CYJSValueIsNSObject(context, _this))
+ return CYObjectMakeArray(context, 0, NULL);
+
+ Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
+ id self(internal->value_);
+
+ _assert(count == 1 || count == 2);
+ CYPool pool;
+ Class _class(object_getClass(self));
+
+ CYUTF8String prefix(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0])));
+
+ JSObjectRef array(NULL); {
+ CYArrayBuilder<1024> values(context, array);
+
+ CYForEachProperty(pool, _class, fun([&](objc_method *method, const char *name) {
+ if (!CYStartsWith(name, prefix))
+ return;
+ const char *type(method_getTypeEncoding(method));
+ if (type == NULL || *type == '\0' || *type == 'v')
+ return;
+ if (class_getProperty(_class, name) != NULL)
+ return;
+ values(CYCastJSValue(context, CYJSString(pool.strcat(name, "()", NULL))));
+ }));
+ } return array;
+} CYCatchObject() }
+
+static JSObjectRef Constructor_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+ auto internal(CYPrivate<Constructor>::Get(context, object));
JSObjectRef value(CYMakeInstance(context, [internal->value_ alloc], Instance::Uninitialized));
return value;
-} CYCatch(NULL) }
+} CYCatchObject() }
static const char *CYBlockEncoding(NSBlock *self) {
BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(self));
return true;
}
-static JSValueRef FunctionInstance_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+static JSValueRef Block_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->value_);
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)));
+static bool Constructor_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) { CYTry {
+ auto internal(CYPrivate<Constructor>::Get(context, constructor));
Class _class(internal->value_);
- if (!CYIsClass(_class))
- return false;
if (CYJSValueIsNSObject(context, instance)) {
Instance *linternal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) instance)));
SEL _cmd;
Class _class;
- if (JSValueIsObjectOfClass(context, arguments[0], cy::Super::Class_)) {
+ if (JSValueIsObjectOfClass(context, arguments[0], CYPrivate<cy::Super>::Class_)) {
cy::Super *internal(reinterpret_cast<cy::Super *>(JSObjectGetPrivate((JSObjectRef) arguments[0])));
self = internal->value_;
_class = internal->class_;;
return CYCallFunction(pool, context, 2, setup, count, arguments, false, true, internal->signature_, &internal->cif_, internal->value_);
} CYCatch(NULL) }
+CYPropertyName *Message_privateData::GetName(CYPool &pool) const {
+ return new(pool) CYString(pool.strcat(":", sel_getName(sel_), NULL));
+}
+
static JSObjectRef Super_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (count != 2)
throw CYJSError(context, "incorrect number of arguments to objc_super constructor");
CYPool pool;
id self(CYCastNSObject(&pool, context, arguments[0]));
Class _class(CYCastClass(pool, context, arguments[1]));
- return cy::Super::Make(context, self, _class);
-} CYCatch(NULL) }
+ return CYPrivate<cy::Super>::Make(context, self, _class);
+} CYCatchObject() }
static JSObjectRef Selector_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 Selector constructor");
CYPool pool;
const char *name(CYPoolCString(pool, context, arguments[0]));
- return Selector_privateData::Make(context, sel_registerName(name));
-} CYCatch(NULL) }
+ return CYPrivate<Selector_privateData>::Make(context, sel_registerName(name));
+} CYCatchObject() }
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");
return CYMakeInstance(context, CYCastPointer<id>(context, arguments[0]));
-} CYCatch(NULL) }
+} CYCatchObject() }
static JSValueRef Selector_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
return CYMakeType(context, sig::Selector());
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) }
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->value_), Instance::Permanent);
+static JSValueRef Constructor_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+ return CYMakeType(context, sig::Meta());
} CYCatch(NULL) }
-static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
- id self(internal->value_);
- if (!CYIsClass(self))
- return CYJSUndefined(context);
- return CYGetClassPrototype(context, self);
+ return CYMakeInstance(context, object_getClass(internal->value_), Instance::Permanent);
} CYCatch(NULL) }
-static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef Constructor_getProperty_prototype(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
id self(internal->value_);
- if (!CYIsClass(self))
- return CYJSUndefined(context);
- return Messages::Make(context, (Class) self);
+ return CYPrivate<Messages>::Cache(context, self);
} CYCatch(NULL) }
static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
static JSValueRef Instance_callAsFunction_toPointer(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)));
- // XXX: but... but... THIS ISN'T A POINTER! :(
- return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->value_));
+ return CYMakePointer(context, internal->value_, sig::Void(true), NULL, object);
} 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 {
{NULL, NULL, NULL, 0}
};
-static JSStaticValue Instance_staticValues[5] = {
+static JSStaticValue Instance_staticValues[3] = {
{"$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},
{NULL, NULL, NULL, 0}
};
-static JSStaticValue FunctionInstance_staticValues[5] = {
+static JSStaticValue Block_staticValues[3] = {
{"$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},
{NULL, NULL, NULL, 0}
};
-static JSStaticFunction Instance_staticFunctions[6] = {
+static JSStaticFunction Instance_staticFunctions[7] = {
+ {"cy$complete", &Instance_complete_callAsFunction, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {NULL, NULL, 0}
+};
+
+static JSStaticFunction Prototype_staticFunctions[6] = {
{"toCYON", &Instance_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toJSON", &Instance_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, 0}
};
-static JSStaticFunction Class_staticFunctions[2] = {
+static JSStaticFunction Messages_staticFunctions[2] = {
+ {"cy$complete", &Messages_complete_callAsFunction, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {NULL, NULL, 0}
+};
+
+static JSStaticValue Constructor_staticValues[3] = {
+ {"$cyt", &Constructor_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"prototype", &Constructor_getProperty_prototype, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {NULL, NULL, NULL, 0}
+};
+
+static JSStaticFunction Constructor_staticFunctions[2] = {
{"pointerTo", &Class_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, 0}
};
NSBlock_ = objc_getClass("NSBlock");
NSDictionary_ = objc_getClass("NSDictionary");
NSNumber_ = objc_getClass("NSNumber");
+ NSObject_ = objc_getClass("NSObject");
NSString_ = objc_getClass("NSString");
Object_ = objc_getClass("Object");
JSClassDefinition definition;
definition = kJSClassDefinitionEmpty;
+ definition.attributes = kJSClassAttributeNoAutomaticPrototype;
+ definition.className = "Messages";
+ definition.staticFunctions = Messages_staticFunctions;
+ definition.hasProperty = &Messages_hasProperty;
+ definition.getProperty = &Messages_getProperty;
+ definition.setProperty = &Messages_setProperty;
+ CYPrivate<Messages>::Class_ = JSClassCreate(&definition);
+
+ definition = kJSClassDefinitionEmpty;
+ definition.attributes = kJSClassAttributeNoAutomaticPrototype;
definition.className = "Instance";
definition.staticValues = Instance_staticValues;
definition.staticFunctions = Instance_staticFunctions;
definition.setProperty = &Instance_setProperty;
definition.deleteProperty = &Instance_deleteProperty;
definition.getPropertyNames = &Instance_getPropertyNames;
- definition.callAsConstructor = &Instance_callAsConstructor;
- definition.hasInstance = &Instance_hasInstance;
definition.finalize = &CYFinalize;
- Instance::Class_ = JSClassCreate(&definition);
-
- definition.className = "ArrayInstance";
- ArrayInstance_ = JSClassCreate(&definition);
-
- definition.className = "BooleanInstance";
- BooleanInstance_ = JSClassCreate(&definition);
-
- definition.className = "NumberInstance";
- NumberInstance_ = JSClassCreate(&definition);
+ CYPrivate<Instance>::Class_ = 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.attributes = kJSClassAttributeNoAutomaticPrototype;
+ definition.className = "Block";
+ definition.parentClass = CYPrivate<Instance>::Class_;
+ definition.staticValues = Block_staticValues;
+ definition.callAsFunction = &Block_callAsFunction;
+ CYPrivate<Block>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
- definition.className = "Class";
- definition.staticFunctions = Class_staticFunctions;
- ClassInstance_ = JSClassCreate(&definition);
+ definition.attributes = kJSClassAttributeNoAutomaticPrototype;
+ definition.className = "Constructor";
+ definition.parentClass = CYPrivate<Instance>::Class_;
+ definition.staticValues = Constructor_staticValues;
+ definition.staticFunctions = Constructor_staticFunctions;
+ definition.hasInstance = &Constructor_hasInstance;
+ definition.callAsConstructor = &Constructor_callAsConstructor;
+ CYPrivate<Constructor>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
+ definition.attributes = kJSClassAttributeNoAutomaticPrototype;
definition.className = "Interior";
definition.staticFunctions = Interior_staticFunctions;
definition.hasProperty = &Interior_hasProperty;
definition.setProperty = &Interior_setProperty;
definition.getPropertyNames = &Interior_getPropertyNames;
definition.finalize = &CYFinalize;
- Interior::Class_ = JSClassCreate(&definition);
+ CYPrivate<Interior>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Message";
- definition.staticFunctions = cy::Functor::StaticFunctions;
- definition.staticValues = cy::Functor::StaticValues;
+ definition.parentClass = cy::Functor::Class_;
definition.callAsFunction = &Message_callAsFunction;
definition.finalize = &CYFinalize;
Message_privateData::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
- definition.className = "Messages";
- definition.hasProperty = &Messages_hasProperty;
- definition.getProperty = &Messages_getProperty;
- definition.setProperty = &Messages_setProperty;
- definition.getPropertyNames = &Messages_getPropertyNames;
+ definition.attributes = kJSClassAttributeNoAutomaticPrototype;
+ definition.className = "Prototype";
+ definition.staticFunctions = Prototype_staticFunctions;
definition.finalize = &CYFinalize;
- Messages::Class_ = JSClassCreate(&definition);
+ CYPrivate<Prototype>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Selector";
definition.staticFunctions = Selector_staticFunctions;
definition.callAsFunction = &Selector_callAsFunction;
definition.finalize = &CYFinalize;
- Selector_privateData::Class_ = JSClassCreate(&definition);
+ CYPrivate<Selector_privateData>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
+ definition.attributes = kJSClassAttributeNoAutomaticPrototype;
definition.className = "Super";
definition.finalize = &CYFinalize;
- cy::Super::Class_ = JSClassCreate(&definition);
+ CYPrivate<cy::Super>::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
+ definition.attributes = kJSClassAttributeNoAutomaticPrototype;
definition.className = "ObjectiveC::Classes";
definition.hasProperty = &ObjectiveC_Classes_hasProperty;
definition.getProperty = &ObjectiveC_Classes_getProperty;
ObjectiveC_Classes_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
+ definition.attributes = kJSClassAttributeNoAutomaticPrototype;
definition.className = "ObjectiveC::Constants";
definition.getProperty = &ObjectiveC_Constants_getProperty;
definition.getPropertyNames = &ObjectiveC_Constants_getPropertyNames;
#ifdef __APPLE__
definition = kJSClassDefinitionEmpty;
+ definition.attributes = kJSClassAttributeNoAutomaticPrototype;
definition.className = "ObjectiveC::Images";
definition.getProperty = &ObjectiveC_Images_getProperty;
definition.getPropertyNames = &ObjectiveC_Images_getPropertyNames;
ObjectiveC_Images_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
+ definition.attributes = kJSClassAttributeNoAutomaticPrototype;
definition.className = "ObjectiveC::Image::Classes";
definition.getProperty = &ObjectiveC_Image_Classes_getProperty;
definition.getPropertyNames = &ObjectiveC_Image_Classes_getPropertyNames;
#endif
definition = kJSClassDefinitionEmpty;
+ definition.attributes = kJSClassAttributeNoAutomaticPrototype;
definition.className = "ObjectiveC::Protocols";
definition.getProperty = &ObjectiveC_Protocols_getProperty;
definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames;
#endif
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 Selector(JSObjectMakeConstructor(context, CYPrivate<Selector_privateData>::Class_, &Selector_new));
+ JSObjectRef Super(JSObjectMakeConstructor(context, CYPrivate<cy::Super>::Class_, &Super_new));
- JSObjectRef Instance(JSObjectMakeConstructor(context, Instance::Class_, &Instance_new));
- JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s)));
+ JSObjectRef Instance(JSObjectMakeConstructor(context, CYPrivate<::Instance>::Class_, &Instance_new));
+ JSObjectRef Instance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));
CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);
+ CYSetProperty(context, Instance, prototype_s, Instance_prototype);
- JSObjectRef ArrayInstance(JSObjectMakeConstructor(context, ArrayInstance_, NULL));
- JSObjectRef ArrayInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ArrayInstance, prototype_s)));
+ JSObjectRef ArrayInstance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));
CYSetProperty(context, cy, CYJSString("ArrayInstance_prototype"), ArrayInstance_prototype);
JSObjectRef Array_prototype(CYGetCachedObject(context, CYJSString("Array_prototype")));
CYSetPrototype(context, ArrayInstance_prototype, Array_prototype);
- JSObjectRef BooleanInstance(JSObjectMakeConstructor(context, BooleanInstance_, NULL));
- JSObjectRef BooleanInstance_prototype(CYCastJSObject(context, CYGetProperty(context, BooleanInstance, prototype_s)));
+ JSObjectRef BooleanInstance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));
CYSetProperty(context, cy, CYJSString("BooleanInstance_prototype"), BooleanInstance_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)));
+ JSObjectRef FunctionInstance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));
CYSetProperty(context, cy, CYJSString("FunctionInstance_prototype"), FunctionInstance_prototype);
JSObjectRef Function_prototype(CYGetCachedObject(context, CYJSString("Function_prototype")));
CYSetPrototype(context, FunctionInstance_prototype, Function_prototype);
- JSObjectRef NumberInstance(JSObjectMakeConstructor(context, NumberInstance_, NULL));
- JSObjectRef NumberInstance_prototype(CYCastJSObject(context, CYGetProperty(context, NumberInstance, prototype_s)));
+ JSObjectRef NumberInstance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));
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)));
+ JSObjectRef ObjectInstance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));
CYSetProperty(context, cy, CYJSString("ObjectInstance_prototype"), ObjectInstance_prototype);
JSObjectRef Object_prototype(CYGetCachedObject(context, CYJSString("Object_prototype")));
CYSetPrototype(context, ObjectInstance_prototype, Object_prototype);
- JSObjectRef StringInstance(JSObjectMakeConstructor(context, StringInstance_, NULL));
- JSObjectRef StringInstance_prototype(CYCastJSObject(context, CYGetProperty(context, StringInstance, prototype_s)));
+ JSObjectRef StringInstance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));
CYSetProperty(context, cy, CYJSString("StringInstance_prototype"), StringInstance_prototype);
JSObjectRef String_prototype(CYGetCachedObject(context, CYJSString("String_prototype")));
CYSetPrototype(context, StringInstance_prototype, String_prototype);
+ JSObjectRef TypeInstance_prototype(JSObjectMake(context, CYPrivate<Prototype>::Class_, NULL));
+ CYSetProperty(context, cy, CYJSString("TypeInstance_prototype"), TypeInstance_prototype);
+ // XXX: maybe TypeInstance should have Type as its prototype? FWIW, that's why I named it like this ;P
+
CYSetProperty(context, cycript, CYJSString("Instance"), Instance);
+ CYSetProperty(context, cycript, CYJSString("Message"), Message);
CYSetProperty(context, cycript, CYJSString("Selector"), Selector);
CYSetProperty(context, cycript, CYJSString("objc_super"), Super);
projects / cycript.git / blobdiff