-#include <substrate.h>
-
-#include "ObjectiveC/Internal.hpp"
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2010 Jay Freeman (saurik)
+*/
+
+/* GNU Lesser General Public License, Version 3 {{{ */
+/*
+ * Cycript is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Cycript is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Cycript. If not, see <http://www.gnu.org/licenses/>.
+**/
+/* }}} */
#ifdef __APPLE__
#include "Struct.hpp"
#include <Foundation/Foundation.h>
-#include <objc/Protocol.h>
+#include "ObjectiveC/Internal.hpp"
+
+#include <objc/objc-api.h>
#include "cycript.hpp"
#ifdef __APPLE__
#include <CoreFoundation/CoreFoundation.h>
-#include <CoreFoundation/CFLogUtilities.h>
#include <JavaScriptCore/JSStringRefCF.h>
#include <WebKit/WebScriptObject.h>
+#include <objc/runtime.h>
#endif
#include "Error.hpp"
#include "JavaScript.hpp"
#include "String.hpp"
+#include "Execute.hpp"
#include <cmath>
#include <map>
} \
}
+#define CYSadTry { \
+ @try
+#define CYSadCatch(value) \
+ @catch (NSException *error ) { \
+ throw CYJSError(context, CYCastJSValue(context, error)); \
+ } return value; \
+}
+
#ifndef __APPLE__
#define class_getSuperclass GSObjCSuper
#define class_getInstanceVariable GSCGetInstanceVariableDefinition
#define method_getTypeEncoding(method) ((method)->method_types)
#define method_setImplementation(method, imp) ((void) ((method)->method_imp = (imp)))
+#undef objc_getClass
+#define objc_getClass GSClassFromName
+
#define objc_getProtocol GSProtocolFromName
#define object_getClass GSObjCClass
#define object_getInstanceVariable(object, name, value) ({ \
objc_ivar *ivar(class_getInstanceVariable(object_getClass(object), name)); \
- GSObjCGetVariable(object, ivar_getOffset(ivar), sizeof(void *), value); \
+ _assert(value != NULL); \
+ if (ivar != NULL) \
+ GSObjCGetVariable(object, ivar_getOffset(ivar), sizeof(void *), value); \
ivar; \
})
JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception);
-extern sqlite3 *Bridge_;
-
/* Objective-C Pool Release {{{ */
apr_status_t CYPoolRelease_(void *data) {
id object(reinterpret_cast<id>(data));
#endif
}
-JSStringRef CYCopyJSString(NSObject *value) {
+JSStringRef CYCopyJSString(JSContextRef context, NSObject *value) {
if (value == nil)
return NULL;
// XXX: this definition scares me; is anyone using this?!
NSString *string([value description]);
- return CYCopyJSString(string);
+ return CYCopyJSString(context, string);
}
NSString *CYCopyNSString(const CYUTF8String &value) {
}
/* }}} */
+JSValueRef CYCastJSValue(JSContextRef context, NSObject *value);
+
void CYThrow(JSContextRef context, NSException *error, JSValueRef *exception) {
if (exception == NULL)
throw error;
}
static JSClassRef Instance_;
+
+static JSClassRef ArrayInstance_;
+static JSClassRef FunctionInstance_;
+static JSClassRef ObjectInstance_;
+static JSClassRef StringInstance_;
+
static JSClassRef Internal_;
static JSClassRef Message_;
static JSClassRef Messages_;
static JSClassRef Super_;
static JSClassRef ObjectiveC_Classes_;
+static JSClassRef ObjectiveC_Constants_;
static JSClassRef ObjectiveC_Protocols_;
#ifdef __APPLE__
static JSClassRef ObjectiveC_Images_;
#endif
-static JSObjectRef Instance_prototype_;
-
#ifdef __APPLE__
static Class NSCFBoolean_;
static Class NSCFType_;
+static Class NSGenericDeallocHandler_;
+static Class NSMessageBuilder_;
+static Class NSZombie_;
+#else
+static Class NSBoolNumber_;
#endif
static Class NSArray_;
+static Class NSBlock_;
static Class NSDictionary_;
-static Class NSMessageBuilder_;
-static Class NSZombie_;
+static Class NSString_;
static Class Object_;
static Type_privateData *Object_type;
return Selector_type;
}
-// XXX: trick this out with associated objects!
+static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception);
+
JSValueRef CYGetClassPrototype(JSContextRef context, id self) {
if (self == nil)
- return Instance_prototype_;
+ return CYGetCachedObject(context, CYJSString("Instance_prototype"));
- // XXX: I need to think through multi-context
- typedef std::map<id, JSValueRef> CacheMap;
- static CacheMap cache_;
+ JSObjectRef global(CYGetGlobalObject(context));
+ JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));
- JSValueRef &value(cache_[self]);
- if (value != NULL)
+ char label[32];
+ sprintf(label, "i%p", self);
+ CYJSString name(label);
+
+ JSValueRef value(CYGetProperty(context, cy, name));
+ if (!JSValueIsUndefined(context, value))
return value;
JSClassRef _class(NULL);
JSValueRef prototype;
if (self == NSArray_)
- prototype = Array_prototype_;
+ prototype = CYGetCachedObject(context, CYJSString("ArrayInstance_prototype"));
+ else if (self == NSBlock_)
+ prototype = CYGetCachedObject(context, CYJSString("FunctionInstance_prototype"));
else if (self == NSDictionary_)
- prototype = Object_prototype_;
+ prototype = CYGetCachedObject(context, CYJSString("ObjectInstance_prototype"));
+ else if (self == NSString_)
+ prototype = CYGetCachedObject(context, CYJSString("StringInstance_prototype"));
else
prototype = CYGetClassPrototype(context, class_getSuperclass(self));
JSObjectRef object(JSObjectMake(context, _class, NULL));
JSObjectSetPrototype(context, object, prototype);
+ CYSetProperty(context, cy, name, object);
- JSValueProtect(context, object);
- value = object;
return object;
}
@interface NSObject (Cycript)
-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context;
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context;
- (JSType) cy$JSType;
- (NSObject *) cy$toJSON:(NSString *)key;
- (NSString *) cy$toCYON;
-- (NSString *) cy$toKey;
- (bool) cy$hasProperty:(NSString *)name;
- (NSObject *) cy$getProperty:(NSString *)name;
- (bool) cy$setProperty:(NSString *)name to:(NSObject *)value;
- (bool) cy$deleteProperty:(NSString *)name;
-- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names;
+- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context;
+
++ (bool) cy$hasImplicitProperties;
@end
@protocol Cycript
-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context;
+- (id) cy$box;
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context;
@end
NSString *CYCastNSCYON(id value) {
string = [value cy$toCYON];
else goto fail;
} else fail: {
- if (value == NSZombie_)
+ 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 (value == NSMessageBuilder_ || value == Object_)
+ else if (value == NSGenericDeallocHandler_ || value == NSMessageBuilder_ || value == Object_)
string = nil;
+#endif
else
string = [NSString stringWithFormat:@"%@", value];
}
/* }}} */
NSObject *CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
+ JSObjectRef Array(CYGetCachedObject(context, Array_s));
JSValueRef exception(NULL);
- bool array(JSValueIsInstanceOfConstructor(context, object, Array_, &exception));
+ bool array(JSValueIsInstanceOfConstructor(context, object, Array, &exception));
CYThrow(context, exception);
id value(array ? [CYJSArray alloc] : [CYJSObject alloc]);
return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]);
return [[NSNumber alloc] initWithDouble:CYCastDouble(context, value)];
}
+#ifndef __APPLE__
+@interface NSBoolNumber : NSNumber {
+}
+@end
+#endif
+
id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cast) {
id object;
bool copy;
object = (id) (CYCastBool(context, value) ? kCFBooleanTrue : kCFBooleanFalse);
copy = false;
#else
- object = [[NSNumber alloc] initWithBool:CYCastBool(context, value)];
+ object = [[NSBoolNumber alloc] initWithBool:CYCastBool(context, value)];
copy = true;
#endif
break;
/* 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__
return [self objectAtIndex:index];
}
-- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names {
- [super cy$getPropertyNames:names];
+- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
+ [super cy$getPropertyNames:names inContext:context];
for (size_t index(0), count([self count]); index != count; ++index) {
id object([self objectAtIndex:index]);
}
}
++ (bool) cy$hasImplicitProperties {
+ return false;
+}
+
+@end
+/* }}} */
+/* Bridge: NSBlock {{{ */
+#ifdef __APPLE__
+@interface NSBlock
+- (void) invoke;
+@end
+#endif
+/* }}} */
+/* Bridge: NSBoolNumber {{{ */
+#ifndef __APPLE__
+@implementation NSBoolNumber (Cycript)
+
+- (JSType) cy$JSType {
+ return kJSTypeBoolean;
+}
+
+- (NSObject *) cy$toJSON:(NSString *)key {
+ return self;
+}
+
+- (NSString *) cy$toCYON {
+ return [self boolValue] ? @"@true" : @"@false";
+}
+
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+ return CYCastJSValue(context, (bool) [self boolValue]);
+} CYObjectiveCatch }
+
@end
+#endif
/* }}} */
/* 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__
- for (id key in self) {
+ for (NSObject *key in self) {
#else
NSEnumerator *keys([self keyEnumerator]);
- while (id key = [keys nextObject]) {
+ while (NSObject *key = [keys nextObject]) {
#endif
if (comma)
[json appendString:@","];
else
comma = true;
- [json appendString:[key cy$toKey]];
+ [json appendString:CYCastNSCYON(key)];
[json appendString:@":"];
NSObject *object([self objectForKey:key]);
[json appendString:CYCastNSCYON(object)];
return [self objectForKey:name];
}
-- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names {
- [super cy$getPropertyNames:names];
+- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
+ [super cy$getPropertyNames:names inContext:context];
#ifdef __APPLE__
- for (NSString *key in self) {
+ for (NSObject *key in self) {
#else
NSEnumerator *keys([self keyEnumerator]);
- while (NSString *key = [keys nextObject]) {
+ while (NSObject *key = [keys nextObject]) {
#endif
- JSPropertyNameAccumulatorAddName(names, CYJSString(key));
+ JSPropertyNameAccumulatorAddName(names, CYJSString(context, key));
}
}
++ (bool) cy$hasImplicitProperties {
+ return false;
+}
+
@end
/* }}} */
/* Bridge: NSMutableArray {{{ */
}
- (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) {
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, [self boolValue]);
} CYObjectiveCatch }
}
- (NSString *) cy$toCYON {
- return @"null";
+ return @"@null";
}
@end
/* Bridge: NSObject {{{ */
@implementation NSObject (Cycript)
-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
- return CYMakeInstance(context, self, false);
+- (id) cy$box {
+ return self;
+}
+
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+ return NULL;
} CYObjectiveCatch }
- (JSType) cy$JSType {
return [[self cy$toJSON:@""] cy$toCYON];
}
-- (NSString *) cy$toKey {
- return [self cy$toCYON];
-}
-
- (bool) cy$hasProperty:(NSString *)name {
return false;
}
return false;
}
-- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names {
+- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
+}
+
++ (bool) cy$hasImplicitProperties {
+ return true;
}
@end
/* 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 CYCastNSString(NULL, CYUTF8String(value.c_str(), value.size()));
}
-- (NSString *) cy$toKey {
- if (CYIsKey(CYCastUTF8String(self)))
- return self;
- return [self cy$toCYON];
+- (bool) cy$hasProperty:(NSString *)name {
+ if ([name isEqualToString:@"length"])
+ return true;
+
+ size_t index(CYGetIndex(name));
+ if (index == _not(size_t) || index >= [self length])
+ return [super cy$hasProperty:name];
+ else
+ return true;
+}
+
+- (NSObject *) cy$getProperty:(NSString *)name {
+ if ([name isEqualToString:@"length"]) {
+ NSUInteger count([self length]);
+#ifdef __APPLE__
+ return [NSNumber numberWithUnsignedInteger:count];
+#else
+ return [NSNumber numberWithUnsignedInt:count];
+#endif
+ }
+
+ size_t index(CYGetIndex(name));
+ if (index == _not(size_t) || index >= [self length])
+ return [super cy$getProperty:name];
+ else
+ return [self substringWithRange:NSMakeRange(index, 1)];
+}
+
+- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
+ [super cy$getPropertyNames:names inContext:context];
+
+ for (size_t index(0), length([self length]); index != length; ++index) {
+ char name[32];
+ sprintf(name, "%zu", index);
+ JSPropertyNameAccumulatorAddName(names, CYJSString(name));
+ }
+}
+
+// XXX: this might be overly restrictive for NSString; I think I need a half-way between /injecting/ implicit properties and /accepting/ implicit properties
++ (bool) cy$hasImplicitProperties {
+ return false;
}
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+ return CYCastJSValue(context, CYJSString(context, self));
+} CYObjectiveCatch }
+
@end
/* }}} */
/* Bridge: WebUndefined {{{ */
return @"undefined";
}
-- (JSValueRef) cy$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
return CYJSUndefined(context);
} CYObjectiveCatch }
return array;
}
-JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry {
+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) }
+} CYPoolCatch(NULL) return /*XXX*/ NULL; }
@implementation CYJSObject
- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry {
if ((self = [super init]) != nil) {
object_ = object;
- context_ = context;
+ context_ = CYGetJSContext(context);
+ //XXX:JSGlobalContextRetain(context_);
JSValueProtect(context_, object_);
} return self;
} CYObjectiveCatch }
- (void) dealloc { CYObjectiveTry {
JSValueUnprotect(context_, object_);
+ //XXX:JSGlobalContextRelease(context_);
[super dealloc];
} CYObjectiveCatch }
- (NSObject *) cy$toJSON:(NSString *)key { CYObjectiveTry {
- JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_));
+ JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_s));
if (!CYIsCallable(context_, toJSON))
return [super cy$toJSON:key];
else {
} CYObjectiveCatch }
- (id) objectForKey:(id)key { CYObjectiveTry {
- // XXX: are NSDictionary keys always NSString *?
- JSValueRef value(CYGetProperty(context_, object_, CYJSString((NSString *) key)));
+ JSValueRef value(CYGetProperty(context_, object_, CYJSString(context_, (NSObject *) key)));
if (JSValueIsUndefined(context_, value))
return nil;
return CYCastNSObject(NULL, context_, value) ?: [NSNull null];
- (NSEnumerator *) keyEnumerator { CYObjectiveTry {
JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context_, object_));
- NSEnumerator *enumerator([CYCastNSArray(names) objectEnumerator]);
+ NSEnumerator *enumerator([CYCastNSArray(context_, names) objectEnumerator]);
JSPropertyNameArrayRelease(names);
return enumerator;
} CYObjectiveCatch }
- (void) setObject:(id)object forKey:(id)key { CYObjectiveTry {
- // XXX: are NSDictionary keys always NSString *?
- CYSetProperty(context_, object_, CYJSString((NSString *) key), CYCastJSValue(context_, object));
+ CYSetProperty(context_, object_, CYJSString(context_, (NSObject *) key), CYCastJSValue(context_, (NSString *) object));
} CYObjectiveCatch }
- (void) removeObjectForKey:(id)key { CYObjectiveTry {
JSValueRef exception(NULL);
- // XXX: are NSDictionary keys always NSString *?
- (void) JSObjectDeleteProperty(context_, object_, CYJSString((NSString *) key), &exception);
+ (void) JSObjectDeleteProperty(context_, object_, CYJSString(context_, (NSObject *) key), &exception);
CYThrow(context_, exception);
} CYObjectiveCatch }
@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;
- context_ = context;
+ context_ = CYGetJSContext(context);
+ //XXX:JSGlobalContextRetain(context_);
JSValueProtect(context_, object_);
} return self;
} CYObjectiveCatch }
- (void) dealloc { CYObjectiveTry {
JSValueUnprotect(context_, object_);
+ //XXX:JSGlobalContextRelease(context_);
[super dealloc];
} CYObjectiveCatch }
- (NSUInteger) count { CYObjectiveTry {
- return CYCastDouble(context_, CYGetProperty(context_, object_, length_));
+ 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_, object);
- JSObjectCallAsFunction(context_, Array_push_, object_, 1, arguments, &exception);
- CYThrow(context_, exception);
+ CYArrayPush(context_, object_, CYCastJSValue(context_, (NSObject *) object));
} CYObjectiveCatch }
- (void) insertObject:(id)object atIndex:(NSUInteger)index { CYObjectiveTry {
JSValueRef arguments[3];
arguments[0] = CYCastJSValue(context_, index);
arguments[1] = CYCastJSValue(context_, 0);
- arguments[2] = CYCastJSValue(context_, object);
- JSObjectCallAsFunction(context_, Array_splice_, object_, 3, arguments, &exception);
+ arguments[2] = CYCastJSValue(context_, (NSObject *) object);
+ 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);
- JSObjectCallAsFunction(context_, Array_pop_, object_, 0, NULL, &exception);
+ 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);
- JSObjectCallAsFunction(context_, Array_splice_, object_, 2, arguments, &exception);
+ JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype")));
+ JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 2, arguments, &exception);
CYThrow(context_, exception);
} CYObjectiveCatch }
size_t bounds([self count]);
if (index >= bounds)
@throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray replaceObjectAtIndex:withObject:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];
- CYSetProperty(context_, object_, index, CYCastJSValue(context_, object));
+ CYSetProperty(context_, object_, index, CYCastJSValue(context_, (NSObject *) object));
} CYObjectiveCatch }
@end
return CYCastPointer<SEL>(context, value);
}
-void *CYObjectiveC_ExecuteStart(JSContextRef context) {
- // XXX: deal with exceptions!
+void *CYObjectiveC_ExecuteStart(JSContextRef context) { CYSadTry {
return (void *) [[NSAutoreleasePool alloc] init];
-}
+} CYSadCatch(NULL) }
-void CYObjectiveC_ExecuteEnd(JSContextRef context, void *handle) {
- // XXX: deal with exceptions!
+void CYObjectiveC_ExecuteEnd(JSContextRef context, void *handle) { CYSadTry {
return [(NSAutoreleasePool *) handle release];
-}
+} CYSadCatch() }
-JSValueRef CYObjectiveC_RuntimeProperty(JSContextRef context, CYUTF8String name) { CYObjectiveTry_(context) {
+JSValueRef CYObjectiveC_RuntimeProperty(JSContextRef context, CYUTF8String name) { CYPoolTry {
if (name == "nil")
return Instance::Make(context, nil);
if (Class _class = objc_getClass(name.data))
return CYMakeInstance(context, _class, true);
+ if (Protocol *protocol = objc_getProtocol(name.data))
+ return CYMakeInstance(context, protocol, true);
return NULL;
-} CYObjectiveCatch }
+} CYPoolCatch(NULL) return /*XXX*/ NULL; }
-static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { CYObjectiveTry_(context) {
+static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { CYSadTry {
ffi_call(cif, function, value, values);
-} CYObjectiveCatch }
+} CYSadCatch() }
-static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYObjectiveTry_(context) {
+static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry {
switch (type->primitive) {
+ // XXX: do something epic about blocks
+ case sig::block_P:
case sig::object_P:
case sig::typename_P:
*reinterpret_cast<id *>(data) = CYCastNSObject(pool, context, value);
}
return true;
-} CYObjectiveCatch }
+} CYSadCatch(false) }
-static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) { CYObjectiveTry_(context) {
+static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) { CYPoolTry {
switch (type->primitive) {
+ // XXX: do something epic about blocks
+ case sig::block_P:
case sig::object_P:
- if (id object = *reinterpret_cast<id *>(data)) {
+ if (NSObject *object = *reinterpret_cast<NSObject **>(data)) {
JSValueRef value(CYCastJSValue(context, object));
if (initialize)
[object release];
default:
return NULL;
}
-} CYObjectiveCatch }
-
-static CYHooks CYObjectiveCHooks = {
- &CYObjectiveC_ExecuteStart,
- &CYObjectiveC_ExecuteEnd,
- &CYObjectiveC_RuntimeProperty,
- &CYObjectiveC_CallFunction,
- &CYObjectiveC_PoolFFI,
- &CYObjectiveC_FromFFI,
-};
+} CYPoolCatch(NULL) return /*XXX*/ NULL; }
static bool CYImplements(id object, Class _class, SEL selector, bool devoid) {
if (objc_method *method = class_getInstanceMethod(_class, selector)) {
if (!devoid)
return true;
+#if OBJC_API_VERSION >= 2
char type[16];
method_getReturnType(method, type, sizeof(type));
+#else
+ const char *type(method_getTypeEncoding(method));
+#endif
if (type[0] != 'v')
return true;
}
return method_getTypeEncoding(method);
const char *name(sel_getName(sel));
+ size_t length(strlen(name));
- sqlite3_stmt *statement;
-
- _sqlcall(sqlite3_prepare(Bridge_,
- "select "
- "\"bridge\".\"value\" "
- "from \"bridge\" "
- "where"
- " \"bridge\".\"mode\" = -1 and"
- " \"bridge\".\"name\" = ?"
- " limit 1"
- , -1, &statement, NULL));
-
- _trace();
- _sqlcall(sqlite3_bind_text(statement, 1, name, -1, SQLITE_STATIC));
-
- const char *value;
- if (_sqlcall(sqlite3_step(statement)) == SQLITE_DONE) {
- _trace();
- value = NULL;}
- else {
- _trace();
- value = sqlite3_column_pooled(pool, statement, 0);
- }
+ char keyed[length + 2];
+ keyed[0] = '6';
+ keyed[length + 1] = '\0';
+ memcpy(keyed + 1, name, length);
- _sqlcall(sqlite3_finalize(statement));
+ if (CYBridgeEntry *entry = CYBridgeHash(keyed, length + 1))
+ return entry->value_;
- if (value != NULL)
- return value;
-_trace();
return NULL;
}
static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *type) {
JSObjectRef function(CYCastJSObject(context, value));
Closure_privateData *internal(CYMakeFunctor_(context, function, type, &MessageClosure_));
+ // XXX: see notes in Library.cpp about needing to leak
return reinterpret_cast<IMP>(internal->GetValue());
}
if (method != NULL)
method_setImplementation(method, imp);
- else
- class_replaceMethod(_class, sel, imp, type);
+ else {
+#ifdef GNU_RUNTIME
+ GSMethodList list(GSAllocMethodList(1));
+ GSAppendMethodToList(list, sel, type, imp, YES);
+ GSAddMethodList(_class, list, YES);
+ GSFlushMethodCacheForClass(_class);
+#else
+ class_addMethod(_class, sel, imp, type);
+#endif
+ }
return true;
}
-#if 0 && !__OBJC2__
+#if 0 && OBJC_API_VERSION < 2
static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
Class _class(internal->GetValue());
Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
Class _class(internal->GetValue());
-#ifdef __OBJC2__
+#if OBJC_API_VERSION >= 2
unsigned int size;
objc_method **data(class_copyMethodList(_class, &size));
for (size_t i(0); i != size; ++i)
#endif
}
+static bool CYHasImplicitProperties(Class _class) {
+ // XXX: this is an evil hack to deal with NSProxy; fix elsewhere
+ if (!CYImplements(_class, object_getClass(_class), @selector(cy$hasImplicitProperties), false))
+ return true;
+ return [_class cy$hasImplicitProperties];
+}
+
static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
id self(internal->GetValue());
return true;
#endif
- if (SEL sel = sel_getUid(string))
- if (CYImplements(self, _class, sel, true))
- return true;
+ if (CYHasImplicitProperties(_class))
+ if (SEL sel = sel_getUid(string))
+ if (CYImplements(self, _class, sel, true))
+ return true;
return false;
}
}
#endif
- if (SEL sel = sel_getUid(string))
- if (CYImplements(self, _class, sel, true))
- return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception);
+ if (CYHasImplicitProperties(_class))
+ if (SEL sel = sel_getUid(string))
+ if (CYImplements(self, _class, sel, true))
+ return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception);
return NULL;
} CYCatch }
NSString *name(CYCastNSString(NULL, context, property));
return [self cy$deleteProperty:name];
} CYPoolCatch(NULL)
-} CYCatch }
+} CYCatch return /*XXX*/ NULL; }
+
+static void Instance_getPropertyNames_message(JSPropertyNameAccumulatorRef names, objc_method *method) {
+ const char *name(sel_getName(method_getName(method)));
+ if (strchr(name, ':') != NULL)
+ return;
+
+ const char *type(method_getTypeEncoding(method));
+ if (type == NULL || *type == '\0' || *type == 'v')
+ return;
+
+ JSPropertyNameAccumulatorAddName(names, CYJSString(name));
+}
static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
}
#endif
+ if (CYHasImplicitProperties(_class))
+ for (Class current(_class); current != nil; current = class_getSuperclass(current)) {
+#if OBJC_API_VERSION >= 2
+ unsigned int size;
+ objc_method **data(class_copyMethodList(current, &size));
+ for (size_t i(0); i != size; ++i)
+ Instance_getPropertyNames_message(names, data[i]);
+ free(data);
+#else
+ for (objc_method_list *methods(current->methods); methods != NULL; methods = methods->method_next)
+ for (int i(0); i != methods->method_count; ++i)
+ Instance_getPropertyNames_message(names, &methods->method_list[i]);
+#endif
+ }
+
CYPoolTry {
// XXX: this is an evil hack to deal with NSProxy; fix elsewhere
- if (CYImplements(self, _class, @selector(cy$getPropertyNames:), false))
- [self cy$getPropertyNames:names];
+ if (CYImplements(self, _class, @selector(cy$getPropertyNames:inContext:), false))
+ [self cy$getPropertyNames:names inContext:context];
} CYPoolCatch()
}
return value;
} CYCatch }
+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");
+
+ struct BlockDescriptor1 {
+ unsigned long int reserved;
+ unsigned long int size;
+ };
+
+ struct BlockDescriptor2 {
+ void (*copy_helper)(void *dst, void *src);
+ void (*dispose_helper)(void *src);
+ };
+
+ struct BlockDescriptor3 {
+ const char *signature;
+ const char *layout;
+ };
+
+ struct BlockLiteral {
+ Class isa;
+ int flags;
+ int reserved;
+ void (*invoke)(void *, ...);
+ void *descriptor;
+ } *literal = reinterpret_cast<BlockLiteral *>(self);
+
+ enum {
+ BLOCK_DEALLOCATING = 0x0001,
+ BLOCK_REFCOUNT_MASK = 0xfffe,
+ BLOCK_NEEDS_FREE = 1 << 24,
+ BLOCK_HAS_COPY_DISPOSE = 1 << 25,
+ BLOCK_HAS_CTOR = 1 << 26,
+ BLOCK_IS_GC = 1 << 27,
+ BLOCK_IS_GLOBAL = 1 << 28,
+ BLOCK_HAS_STRET = 1 << 29,
+ BLOCK_HAS_SIGNATURE = 1 << 30,
+ };
+
+ if ((literal->flags & BLOCK_HAS_SIGNATURE) != 0) {
+ uint8_t *descriptor(reinterpret_cast<uint8_t *>(literal->descriptor));
+ descriptor += sizeof(BlockDescriptor1);
+ if ((literal->flags & BLOCK_HAS_COPY_DISPOSE) != 0)
+ descriptor += sizeof(BlockDescriptor2);
+ BlockDescriptor3 *descriptor3(reinterpret_cast<BlockDescriptor3 *>(descriptor));
+
+ if (const char *type = descriptor3->signature) {
+ CYPool pool;
+
+ void *setup[1];
+ setup[0] = &self;
+
+ sig::Signature signature;
+ sig::Parse(pool, &signature, type, &Structor_);
+
+ ffi_cif cif;
+ sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
+
+ void (*function)() = reinterpret_cast<void (*)()>(literal->invoke);
+ return CYCallFunction(pool, context, 1, setup, count, arguments, false, exception, &signature, &cif, function);
+ }
+ }
+
+ if (count != 0)
+ CYThrow("NSBlock without signature field passed arguments");
+
+ CYPoolTry {
+ [self invoke];
+ } CYPoolCatch(NULL);
+
+ return NULL;
+} CYCatch }
+
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());
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;
if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {
Type_privateData type(pool, ivar_getTypeEncoding(ivar));
+ // XXX: if this fails and throws an exception the person we are throwing it to gets the wrong exception
return CYFromFFI(context, type.type_, type.GetFFI(), reinterpret_cast<uint8_t *>(self) + ivar_getOffset(ivar));
}
if (Class super = class_getSuperclass(_class))
Internal_getPropertyNames_(super, names);
+#if OBJC_API_VERSION >= 2
unsigned int size;
objc_ivar **data(class_copyIvarList(_class, &size));
for (size_t i(0); i != size; ++i)
JSPropertyNameAccumulatorAddName(names, CYJSString(ivar_getName(data[i])));
free(data);
+#else
+ if (objc_ivar_list *ivars = _class->ivars)
+ for (int i(0); i != ivars->ivar_count; ++i)
+ JSPropertyNameAccumulatorAddName(names, CYJSString(ivar_getName(&ivars->ivar_list[i])));
+#endif
}
static void Internal_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
#endif
}
-#ifdef __OBJC2__
+#if OBJC_API_VERSION >= 2
static JSValueRef ObjectiveC_Image_Classes_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
const char *internal(reinterpret_cast<const char *>(JSObjectGetPrivate(object)));
} CYCatch }
static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
-#ifdef __OBJC2__
+#if OBJC_API_VERSION >= 2
unsigned int size;
Protocol **data(objc_copyProtocolList(&size));
for (size_t i(0); i != size; ++i)
#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 && (
} CYPoolCatch(NULL)
}
- objc_super super = {self, _class};
- void *arg0 = &super;
-
void *setup[2];
- setup[0] = &arg0;
+ setup[0] = &self;
setup[1] = &_cmd;
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);
- if (imp == NULL)
+ if (imp == NULL) {
#ifdef __APPLE__
if (stret(cif.rtype))
imp = class_getMethodImplementation_stret(_class, _cmd);
else
imp = class_getMethodImplementation(_class, _cmd);
#else
+ objc_super super = {self, _class};
imp = objc_msg_lookup_super(&super, _cmd);
#endif
+ }
void (*function)() = reinterpret_cast<void (*)()>(imp);
return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, exception, &signature, &cif, function);
} CYCatch }
/* Hook: objc_registerClassPair {{{ */
+#if defined(__APPLE__) && defined(__arm__) && 0
// XXX: replace this with associated objects
MSHook(void, CYDealloc, id self, SEL sel) {
$objc_registerClassPair(_class);
return CYJSUndefined(context);
} CYCatch }
+#endif
/* }}} */
static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
if (count > 1)
throw CYJSError(context, "incorrect number of arguments to Instance constructor");
id self(count == 0 ? nil : CYCastPointer<id>(context, arguments[0]));
- return Instance::Make(context, self);
+ return CYMakeInstance(context, self, false);
} CYCatch }
static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
ffi = typical->ffi_;
}
- return CYMakePointer(context, &internal->value_, type, ffi, object);
+ return CYMakePointer(context, &internal->value_, _not(size_t), type, ffi, object);
}
static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
- return Instance::Make(context, object_getClass(internal->GetValue()));
+ return Instance::Make(context, (id) object_getClass(internal->GetValue()));
}
-static JSValueRef Instance_getProperty_protocol(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+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());
if (!CYIsClass(self))
static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
id self(internal->GetValue());
- if (class_getInstanceMethod(object_getClass(self), @selector(alloc)) == NULL)
+ if (!CYIsClass(self))
return CYJSUndefined(context);
- return Messages::Make(context, self);
+ return Messages::Make(context, (Class) self);
}
static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
return NULL;
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
- return CYCastJSValue(context, CYJSString(CYCastNSCYON(internal->GetValue())));
+ return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue())));
} CYCatch }
static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
CYPoolTry {
- NSString *key(count == 0 ? nil : CYCastNSString(NULL, context, CYJSString(context, arguments[0])));
+ NSString *key;
+ if (count == 0)
+ key = nil;
+ else
+ key = CYCastNSString(NULL, context, CYJSString(context, arguments[0]));
// XXX: check for support of cy$toJSON?
- return CYCastJSValue(context, CYJSString([internal->GetValue() cy$toJSON:key]));
+ return CYCastJSValue(context, CYJSString(context, [internal->GetValue() cy$toJSON:key]));
} CYPoolCatch(NULL)
-} CYCatch }
+} CYCatch return /*XXX*/ NULL; }
+
+static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+ if (!JSValueIsObjectOfClass(context, _this, Instance_))
+ return NULL;
+
+ Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
+ id value(internal->GetValue());
+
+ if (![value respondsToSelector:@selector(cy$valueOfInContext:)])
+ return _this;
+
+ if (JSValueRef result = [value cy$valueOfInContext:context])
+ return result;
+
+ return _this;
+} CYCatch return /*XXX*/ NULL; }
+
+static JSValueRef Instance_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+ if (!JSValueIsObjectOfClass(context, _this, Instance_))
+ return NULL;
+
+ Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
+ // XXX: but... but... THIS ISN'T A POINTER! :(
+ return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->GetValue()));
+} CYCatch return /*XXX*/ NULL; }
static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (!JSValueIsObjectOfClass(context, _this, Instance_))
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([internal->GetValue() description]));
+ return CYCastJSValue(context, CYJSString(context, [value description]));
} CYPoolCatch(NULL)
-} CYCatch }
+} CYCatch return /*XXX*/ NULL; }
static JSValueRef Selector_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate(_this)));
const char *name(sel_getName(internal->GetValue()));
CYPoolTry {
- return CYCastJSValue(context, CYJSString((NSString *) [NSString stringWithFormat:@"@selector(%s)", name]));
+ NSString *string([NSString stringWithFormat:@"@selector(%s)", name]);
+ return CYCastJSValue(context, CYJSString(context, string));
} CYPoolCatch(NULL)
-} CYCatch }
+} CYCatch return /*XXX*/ NULL; }
static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (count != 1)
static JSStaticValue Instance_staticValues[5] = {
{"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"messages", &Instance_getProperty_messages, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
- {"prototype", &Instance_getProperty_protocol, 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[5] = {
+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},
+ {"toPointer", &Instance_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toString", &Instance_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, 0}
};
{NULL, NULL, 0}
};
-void CYObjectiveC(JSContextRef context, JSObjectRef global) {
+void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
apr_pool_t *pool(CYGetGlobalPool());
- hooks_ = &CYObjectiveCHooks;
-
- Object_type = new(pool) Type_privateData(pool, "@");
- Selector_type = new(pool) Type_privateData(pool, ":");
+ Object_type = new(pool) Type_privateData("@");
+ Selector_type = new(pool) Type_privateData(":");
#ifdef __APPLE__
NSCFBoolean_ = objc_getClass("NSCFBoolean");
NSCFType_ = objc_getClass("NSCFType");
+ NSGenericDeallocHandler_ = objc_getClass("__NSGenericDeallocHandler");
+ NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
+ NSZombie_ = objc_getClass("_NSZombie_");
+#else
+ NSBoolNumber_ = objc_getClass("NSBoolNumber");
#endif
NSArray_ = objc_getClass("NSArray");
- NSDictionary_ = objc_getClass("NSDictonary");
- NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
- NSZombie_ = objc_getClass("_NSZombie_");
+ NSBlock_ = objc_getClass("NSBlock");
+ NSDictionary_ = objc_getClass("NSDictionary");
+ NSString_ = objc_getClass("NSString");
Object_ = objc_getClass("Object");
JSClassDefinition definition;
definition.deleteProperty = &Instance_deleteProperty;
definition.getPropertyNames = &Instance_getPropertyNames;
definition.callAsConstructor = &Instance_callAsConstructor;
+ definition.callAsFunction = &Instance_callAsFunction;
definition.hasInstance = &Instance_hasInstance;
definition.finalize = &CYFinalize;
Instance_ = JSClassCreate(&definition);
+ definition.className = "ArrayInstance";
+ ArrayInstance_ = JSClassCreate(&definition);
+
+ definition.className = "FunctionInstance";
+ FunctionInstance_ = JSClassCreate(&definition);
+
+ definition.className = "ObjectInstance";
+ ObjectInstance_ = JSClassCreate(&definition);
+
+ definition.className = "StringInstance";
+ StringInstance_ = JSClassCreate(&definition);
+
definition = kJSClassDefinitionEmpty;
definition.className = "Internal";
definition.staticFunctions = Internal_staticFunctions;
definition.hasProperty = &Messages_hasProperty;
definition.getProperty = &Messages_getProperty;
definition.setProperty = &Messages_setProperty;
-#if 0 && !__OBJC2__
+#if 0 && OBJC_API_VERSION < 2
definition.deleteProperty = &Messages_deleteProperty;
#endif
definition.getPropertyNames = &Messages_getPropertyNames;
ObjectiveC_Classes_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
- definition.className = "ObjectiveC::Protocols";
- definition.getProperty = &ObjectiveC_Protocols_getProperty;
- definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames;
- ObjectiveC_Protocols_ = JSClassCreate(&definition);
-
- JSObjectRef ObjectiveC(JSObjectMake(context, NULL, NULL));
- CYSetProperty(context, global, CYJSString("ObjectiveC"), ObjectiveC);
+ definition.className = "ObjectiveC::Constants";
+ definition.getProperty = &ObjectiveC_Constants_getProperty;
+ definition.getPropertyNames = &ObjectiveC_Constants_getPropertyNames;
+ ObjectiveC_Constants_ = JSClassCreate(&definition);
- CYSetProperty(context, ObjectiveC, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Classes_, NULL));
- CYSetProperty(context, ObjectiveC, CYJSString("protocols"), JSObjectMake(context, ObjectiveC_Protocols_, NULL));
-
-#ifdef __OBJC2__
+#if OBJC_API_VERSION >= 2
definition = kJSClassDefinitionEmpty;
definition.className = "ObjectiveC::Images";
definition.getProperty = &ObjectiveC_Images_getProperty;
definition.getProperty = &ObjectiveC_Image_Classes_getProperty;
definition.getPropertyNames = &ObjectiveC_Image_Classes_getPropertyNames;
ObjectiveC_Image_Classes_ = JSClassCreate(&definition);
+#endif
+
+ definition = kJSClassDefinitionEmpty;
+ definition.className = "ObjectiveC::Protocols";
+ definition.getProperty = &ObjectiveC_Protocols_getProperty;
+ definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames;
+ ObjectiveC_Protocols_ = JSClassCreate(&definition);
+
+#if defined(__APPLE__) && defined(__arm__) && 0
+ MSHookFunction(&objc_registerClassPair, MSHake(objc_registerClassPair));
+#endif
+
+#ifdef __APPLE__
+ class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON), "@12@0:4@8");
+#endif
+} CYPoolCatch() }
+
+void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
+ JSObjectRef global(CYGetGlobalObject(context));
+ 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);
+
+ 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));
#endif
JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new));
JSObjectRef Super(JSObjectMakeConstructor(context, Super_, &Super_new));
- Instance_prototype_ = (JSObjectRef) CYGetProperty(context, Instance, prototype_);
- JSValueProtect(context, Instance_prototype_);
-
- CYSetProperty(context, global, CYJSString("Instance"), Instance);
- CYSetProperty(context, global, CYJSString("Selector"), Selector);
- CYSetProperty(context, global, CYJSString("Super"), Super);
+ JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s)));
+ CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);
+
+ JSObjectRef ArrayInstance(JSObjectMakeConstructor(context, ArrayInstance_, NULL));
+ JSObjectRef ArrayInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ArrayInstance, prototype_s)));
+ CYSetProperty(context, cy, CYJSString("ArrayInstance_prototype"), ArrayInstance_prototype);
+ JSObjectRef Array_prototype(CYGetCachedObject(context, CYJSString("Array_prototype")));
+ JSObjectSetPrototype(context, ArrayInstance_prototype, Array_prototype);
+
+ JSObjectRef FunctionInstance(JSObjectMakeConstructor(context, FunctionInstance_, NULL));
+ JSObjectRef FunctionInstance_prototype(CYCastJSObject(context, CYGetProperty(context, FunctionInstance, prototype_s)));
+ CYSetProperty(context, cy, CYJSString("FunctionInstance_prototype"), FunctionInstance_prototype);
+ JSObjectRef Function_prototype(CYGetCachedObject(context, CYJSString("Function_prototype")));
+ JSObjectSetPrototype(context, FunctionInstance_prototype, Function_prototype);
+
+ JSObjectRef ObjectInstance(JSObjectMakeConstructor(context, ObjectInstance_, NULL));
+ JSObjectRef ObjectInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ObjectInstance, prototype_s)));
+ CYSetProperty(context, cy, CYJSString("ObjectInstance_prototype"), ObjectInstance_prototype);
+ JSObjectRef Object_prototype(CYGetCachedObject(context, CYJSString("Object_prototype")));
+ JSObjectSetPrototype(context, ObjectInstance_prototype, Object_prototype);
+
+ JSObjectRef StringInstance(JSObjectMakeConstructor(context, 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);
+
+ CYSetProperty(context, cycript, CYJSString("Instance"), Instance);
+ 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
- CYSetProperty(context, global, CYJSString("objc_registerClassPair"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_registerClassPair"), &objc_registerClassPair_));
- CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend));
+ CYSetProperty(context, all, CYJSString("objc_msgSend"), &$objc_msgSend, kJSPropertyAttributeDontEnum);
- JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Message, prototype_), Function_prototype_);
- JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Selector, prototype_), Function_prototype_);
+ JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Message, prototype_s)), Function_prototype);
+ JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Selector, prototype_s)), Function_prototype);
+} CYPoolCatch() }
- MSHookFunction(&objc_registerClassPair, MSHake(objc_registerClassPair));
+static CYHooks CYObjectiveCHooks = {
+ &CYObjectiveC_ExecuteStart,
+ &CYObjectiveC_ExecuteEnd,
+ &CYObjectiveC_CallFunction,
+ &CYObjectiveC_Initialize,
+ &CYObjectiveC_SetupContext,
+ &CYObjectiveC_PoolFFI,
+ &CYObjectiveC_FromFFI,
+};
-#ifdef __APPLE__
- class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON), "@12@0:4@8");
-#endif
-}
+struct CYObjectiveC {
+ CYObjectiveC() {
+ hooks_ = &CYObjectiveCHooks;
+ // XXX: evil magic juju to make this actually take effect on a Mac when compiled with autoconf/libtool doom!
+ _assert(hooks_ != NULL);
+ }
+} CYObjectiveC;
projects / cycript.git / blobdiff