static JSClassRef Message_;
static JSClassRef Messages_;
static JSClassRef Selector_;
-static JSClassRef StringInstance_;
static JSClassRef Super_;
static JSClassRef ObjectiveC_Classes_;
+static JSClassRef ObjectiveC_Constants_;
static JSClassRef ObjectiveC_Protocols_;
#ifdef __APPLE__
JSValueRef prototype;
if (self == NSArray_)
- prototype = CYGetCachedObject(context, CYJSString("Array_prototype"));
+ prototype = CYGetCachedObject(context, CYJSString("ArrayInstance_prototype"));
else if (self == NSDictionary_)
- prototype = CYGetCachedObject(context, CYJSString("Object_prototype"));
+ prototype = CYGetCachedObject(context, CYJSString("ObjectInstance_prototype"));
else if (self == NSString_)
prototype = CYGetCachedObject(context, CYJSString("StringInstance_prototype"));
else
@end
@protocol Cycript
+- (id) cy$box;
- (JSValueRef) cy$JSValueInContext:(JSContextRef)context;
@end
/* Bridge: NSArray {{{ */
@implementation NSArray (Cycript)
+- (id) cy$box {
+ return [[self mutableCopy] autorelease];
+}
+
- (NSString *) cy$toCYON {
NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
- [json appendString:@"["];
+ [json appendString:@"@["];
bool comma(false);
#ifdef __APPLE__
}
- (NSString *) cy$toCYON {
- return [self boolValue] ? @"true" : @"false";
+ return [self boolValue] ? @"@true" : @"@false";
}
- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
/* Bridge: NSDictionary {{{ */
@implementation NSDictionary (Cycript)
+- (id) cy$box {
+ return [[self mutableCopy] autorelease];
+}
+
- (NSString *) cy$toCYON {
NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
- [json appendString:@"{"];
+ [json appendString:@"@{"];
bool comma(false);
#ifdef __APPLE__
}
- (NSString *) cy$toCYON {
- return [self cy$JSType] != kJSTypeBoolean ? [self stringValue] : [self boolValue] ? @"true" : @"false";
+ return [self cy$JSType] != kJSTypeBoolean ? [NSString stringWithFormat:@"@%@", self] : [self boolValue] ? @"@true" : @"@false";
}
- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
}
- (NSString *) cy$toCYON {
- return @"null";
+ return @"@null";
}
@end
/* Bridge: NSObject {{{ */
@implementation NSObject (Cycript)
+- (id) cy$box {
+ return self;
+}
+
- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
- return CYMakeInstance(context, self, false);
+ return NULL;
} CYObjectiveCatch }
- (JSType) cy$JSType {
/* Bridge: NSString {{{ */
@implementation NSString (Cycript)
+- (id) cy$box {
+ return [[self copy] autorelease];
+}
+
- (JSType) cy$JSType {
return kJSTypeString;
}
- (NSString *) cy$toCYON {
std::ostringstream str;
+ str << '@';
CYUTF8String string(CYCastUTF8String(self));
CYStringify(str, string.data, string.size);
std::string value(str.str());
return false;
}
+- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+ return CYCastJSValue(context, CYJSString(context, self));
+} CYObjectiveCatch }
+
@end
/* }}} */
/* Bridge: WebUndefined {{{ */
JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
if (value == nil)
return CYJSNull(context);
- else if ([value respondsToSelector:@selector(cy$JSValueInContext:)])
- return [value cy$JSValueInContext:context];
else
return CYMakeInstance(context, value, false);
} CYPoolCatch(NULL) return /*XXX*/ NULL; }
@implementation CYJSArray
+- (NSString *) cy$toCYON {
+ CYPool pool;
+ return [NSString stringWithUTF8String:CYPoolCCYON(pool, context_, object_)];
+}
+
- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry {
if ((self = [super init]) != nil) {
object_ = object;
} CYObjectiveCatch }
- (NSUInteger) count { CYObjectiveTry {
- return CYCastDouble(context_, CYGetProperty(context_, object_, length_s));
+ return CYArrayLength(context_, object_);
} CYObjectiveCatch }
- (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry {
} CYObjectiveCatch }
- (void) addObject:(id)object { CYObjectiveTry {
- JSValueRef exception(NULL);
- JSValueRef arguments[1];
- arguments[0] = CYCastJSValue(context_, (NSObject *) object);
- JSObjectRef Array(CYGetCachedObject(context_, Array_s));
- JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, push_s)), object_, 1, arguments, &exception);
- CYThrow(context_, exception);
+ CYArrayPush(context_, object_, CYCastJSValue(context_, (NSObject *) object));
} CYObjectiveCatch }
- (void) insertObject:(id)object atIndex:(NSUInteger)index { CYObjectiveTry {
arguments[0] = CYCastJSValue(context_, index);
arguments[1] = CYCastJSValue(context_, 0);
arguments[2] = CYCastJSValue(context_, (NSObject *) object);
- JSObjectRef Array(CYGetCachedObject(context_, Array_s));
+ JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype")));
JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 3, arguments, &exception);
CYThrow(context_, exception);
} CYObjectiveCatch }
- (void) removeLastObject { CYObjectiveTry {
JSValueRef exception(NULL);
- JSObjectRef Array(CYGetCachedObject(context_, Array_s));
+ JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype")));
JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, pop_s)), object_, 0, NULL, &exception);
CYThrow(context_, exception);
} CYObjectiveCatch }
JSValueRef arguments[2];
arguments[0] = CYCastJSValue(context_, index);
arguments[1] = CYCastJSValue(context_, 1);
- JSObjectRef Array(CYGetCachedObject(context_, Array_s));
+ JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype")));
JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 2, arguments, &exception);
CYThrow(context_, exception);
} CYObjectiveCatch }
return false;
} CYCatch }
+static JSValueRef Instance_box_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+ if (count == 0)
+ throw CYJSError(context, "incorrect number of arguments to Instance");
+ CYPool pool;
+ id value(CYCastNSObject(pool, context, arguments[0]));
+ if (value == nil)
+ value = [NSNull null];
+ return CYCastJSValue(context, [value cy$box]);
+} CYCatch }
+
static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
CYPool pool;
#endif
}
+static JSValueRef ObjectiveC_Constants_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+ CYPool pool;
+ CYUTF8String name(CYPoolUTF8String(pool, context, property));
+ if (name == "nil")
+ return Instance::Make(context, nil);
+ return NULL;
+} CYCatch }
+
+static void ObjectiveC_Constants_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
+ JSPropertyNameAccumulatorAddName(names, CYJSString("nil"));
+}
+
#ifdef __APPLE__
static bool stret(ffi_type *ffi_type) {
return ffi_type->type == FFI_TYPE_STRUCT && (
sig::Signature signature;
sig::Parse(pool, &signature, type, &Structor_);
+ size_t used(count + 3);
+ if (used > signature.count) {
+ sig::Element *elements(new (pool) sig::Element[used]);
+ memcpy(elements, signature.elements, used * sizeof(sig::Element));
+
+ for (size_t index(signature.count); index != used; ++index) {
+ sig::Element *element(&elements[index]);
+ element->name = NULL;
+ element->offset = _not(size_t);
+
+ sig::Type *type(new (pool) sig::Type);
+ memset(type, 0, sizeof(*type));
+ type->primitive = sig::object_P;
+ element->type = type;
+ }
+
+ signature.elements = elements;
+ signature.count = used;
+ }
+
ffi_cif cif;
sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
} CYPoolCatch(NULL)
} CYCatch return /*XXX*/ NULL; }
-#if 0
static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (!JSValueIsObjectOfClass(context, _this, Instance_))
return NULL;
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
- return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->GetValue()));
+ id value(internal->GetValue());
+
+ if (![value respondsToSelector:@selector(cy$JSValueInContext:)])
+ return _this;
+
+ if (JSValueRef result = [value cy$JSValueInContext:context])
+ return result;
+
+ return _this;
} CYCatch return /*XXX*/ NULL; }
-#endif
static JSValueRef Instance_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (!JSValueIsObjectOfClass(context, _this, Instance_))
return NULL;
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
-
id value(internal->GetValue());
+
if (value == nil)
return CYCastJSValue(context, "nil");
CYPoolTry {
// XXX: this seems like a stupid implementation; what if it crashes? why not use the CYONifier backend?
- return CYCastJSValue(context, CYJSString(context, [internal->GetValue() description]));
+ return CYCastJSValue(context, CYJSString(context, [value description]));
} CYPoolCatch(NULL)
} CYCatch return /*XXX*/ NULL; }
{NULL, NULL, NULL, 0}
};
-static JSStaticFunction Instance_staticFunctions[6] = {
+static JSStaticFunction Instance_staticFunctions[7] = {
{"$cya", &CYValue_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toCYON", &Instance_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toJSON", &Instance_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
- //{"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toPointer", &Instance_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toString", &Instance_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, 0}
{NULL, NULL, 0}
};
-static JSStaticFunction StringInstance_staticFunctions[2] = {
- //{"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
- {"toString", &Instance_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
- {NULL, NULL, 0}
-};
-
void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
apr_pool_t *pool(CYGetGlobalPool());
definition.finalize = &CYFinalize;
Selector_ = JSClassCreate(&definition);
- definition = kJSClassDefinitionEmpty;
- definition.className = "StringInstance";
- definition.staticFunctions = StringInstance_staticFunctions;
- StringInstance_ = JSClassCreate(&definition);
-
definition = kJSClassDefinitionEmpty;
definition.className = "Super";
definition.staticFunctions = Internal_staticFunctions;
definition.getPropertyNames = &ObjectiveC_Classes_getPropertyNames;
ObjectiveC_Classes_ = JSClassCreate(&definition);
+ definition = kJSClassDefinitionEmpty;
+ definition.className = "ObjectiveC::Constants";
+ definition.getProperty = &ObjectiveC_Constants_getProperty;
+ definition.getPropertyNames = &ObjectiveC_Constants_getPropertyNames;
+ ObjectiveC_Constants_ = JSClassCreate(&definition);
+
#if OBJC_API_VERSION >= 2
definition = kJSClassDefinitionEmpty;
definition.className = "ObjectiveC::Images";
JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));
JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));
JSObjectRef all(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("all"))));
+ JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls"))));
JSObjectRef ObjectiveC(JSObjectMake(context, NULL, NULL));
CYSetProperty(context, cycript, CYJSString("ObjectiveC"), ObjectiveC);
- CYSetProperty(context, ObjectiveC, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Classes_, NULL));
- CYSetProperty(context, ObjectiveC, CYJSString("protocols"), JSObjectMake(context, ObjectiveC_Protocols_, NULL));
+ JSObjectRef protocols(JSObjectMake(context, ObjectiveC_Protocols_, NULL));
+ CYSetProperty(context, ObjectiveC, CYJSString("protocols"), protocols);
+ CYArrayPush(context, alls, protocols);
+
+ JSObjectRef classes(JSObjectMake(context, ObjectiveC_Classes_, NULL));
+ CYSetProperty(context, ObjectiveC, CYJSString("classes"), classes);
+ CYArrayPush(context, alls, classes);
+
+ JSObjectRef constants(JSObjectMake(context, ObjectiveC_Constants_, NULL));
+ CYSetProperty(context, ObjectiveC, CYJSString("constants"), constants);
+ CYArrayPush(context, alls, constants);
#if OBJC_API_VERSION >= 2
CYSetProperty(context, ObjectiveC, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL));
JSObjectRef Instance(JSObjectMakeConstructor(context, Instance_, &Instance_new));
JSObjectRef Message(JSObjectMakeConstructor(context, Message_, NULL));
JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new));
- JSObjectRef StringInstance(JSObjectMakeConstructor(context, StringInstance_, NULL));
JSObjectRef Super(JSObjectMakeConstructor(context, Super_, &Super_new));
JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s)));
CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);
+ JSObjectRef ArrayInstance(JSObjectMakeConstructor(context, Instance_, NULL));
+ JSObjectRef ArrayInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ArrayInstance, prototype_s)));
+ CYSetProperty(context, cy, CYJSString("ArrayInstance_prototype"), ArrayInstance_prototype);
+ JSObjectRef Array_prototype(CYGetCachedObject(context, CYJSString("Array_prototype")));
+ JSObjectSetPrototype(context, ArrayInstance_prototype, Array_prototype);
+
+ JSObjectRef ObjectInstance(JSObjectMakeConstructor(context, Instance_, NULL));
+ JSObjectRef ObjectInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ObjectInstance, prototype_s)));
+ CYSetProperty(context, cy, CYJSString("ObjectInstance_prototype"), ObjectInstance_prototype);
+ JSObjectRef Object_prototype(CYGetCachedObject(context, CYJSString("Object_prototype")));
+ JSObjectSetPrototype(context, ObjectInstance_prototype, Object_prototype);
+
+ JSObjectRef StringInstance(JSObjectMakeConstructor(context, Instance_, NULL));
JSObjectRef StringInstance_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);
CYSetProperty(context, cycript, CYJSString("Selector"), Selector);
CYSetProperty(context, cycript, CYJSString("Super"), Super);
+ JSObjectRef box(JSObjectMakeFunctionWithCallback(context, CYJSString("box"), &Instance_box_callAsFunction));
+ CYSetProperty(context, Instance, CYJSString("box"), box);
+
#if defined(__APPLE__) && defined(__arm__) && 0
CYSetProperty(context, all, CYJSString("objc_registerClassPair"), &objc_registerClassPair_, kJSPropertyAttributeDontEnum);
#endif
static CYHooks CYObjectiveCHooks = {
&CYObjectiveC_ExecuteStart,
&CYObjectiveC_ExecuteEnd,
- &CYObjectiveC_RuntimeProperty,
&CYObjectiveC_CallFunction,
&CYObjectiveC_Initialize,
&CYObjectiveC_SetupContext,
projects / cycript.git / blobdiff