-#ifdef __APPLE__
+/* Cycript - Inlining/Optimizing JavaScript Compiler
+ * Copyright (C) 2009 Jay Freeman (saurik)
+*/
+
+/* Modified BSD License {{{ */
+/*
+ * Redistribution and use in source and binary
+ * forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the
+ * above copyright notice, this list of conditions
+ * and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the
+ * above copyright notice, this list of conditions
+ * and the following disclaimer in the documentation
+ * and/or other materials provided with the
+ * distribution.
+ * 3. The name of the author may not be used to endorse
+ * or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/* }}} */
+
+#if defined(__APPLE__) && defined(__arm__)
#include <substrate.h>
+#else
+#include <objc/objc-api.h>
#endif
-#include "ObjectiveC/Internal.hpp"
-
#ifdef __APPLE__
#include "Struct.hpp"
#endif
#include <Foundation/Foundation.h>
+#include "ObjectiveC/Internal.hpp"
+
#include <objc/Protocol.h>
#include "cycript.hpp"
#ifdef __APPLE__
#include <CoreFoundation/CoreFoundation.h>
-#include <CoreFoundation/CFLogUtilities.h>
#include <JavaScriptCore/JSStringRefCF.h>
#include <WebKit/WebScriptObject.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); \
+ 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));
}
/* }}} */
+JSValueRef CYCastJSValue(JSContextRef context, NSObject *value);
+
void CYThrow(JSContextRef context, NSException *error, JSValueRef *exception) {
if (exception == NULL)
throw error;
static JSClassRef ObjectiveC_Images_;
#endif
-static JSObjectRef Instance_prototype_;
-
#ifdef __APPLE__
static Class NSCFBoolean_;
static Class NSCFType_;
static Class NSMessageBuilder_;
static Class NSZombie_;
+#else
+static Class NSBoolNumber_;
#endif
static Class NSArray_;
static Class NSDictionary_;
+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"));
+
+ JSObjectRef global(CYGetGlobalObject(context));
+ JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));
- // XXX: I need to think through multi-context
- typedef std::map<id, JSValueRef> CacheMap;
- static CacheMap cache_;
+ char label[32];
+ sprintf(label, "i%p", self);
+ CYJSString name(label);
- JSValueRef &value(cache_[self]);
- if (value != NULL)
+ JSValueRef value(CYGetProperty(context, cy, name));
+ if (!JSValueIsUndefined(context, value))
return value;
JSClassRef _class(NULL);
JSValueRef prototype;
+ JSObjectRef object(JSObjectMake(context, _class, NULL));
+
if (self == NSArray_)
- prototype = Array_prototype_;
+ prototype = CYGetCachedObject(context, CYJSString("Array_prototype"));
else if (self == NSDictionary_)
- prototype = Object_prototype_;
- else
+ prototype = CYGetCachedObject(context, CYJSString("Object_prototype"));
+ else if (self == NSString_) {
+ prototype = CYGetCachedObject(context, CYJSString("String_prototype"));
+
+ CYSetProperty(context, object, toString_s, &Instance_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete);
+ } 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;
}
- (bool) cy$deleteProperty:(NSString *)name;
- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context;
++ (bool) cy$hasImplicitProperties;
+
@end
@protocol Cycript
/* }}} */
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;
}
}
++ (bool) cy$hasImplicitProperties {
+ return false;
+}
+
+@end
+/* }}} */
+/* 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$JSValueInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+ return CYCastJSValue(context, (bool) [self boolValue]);
+} CYObjectiveCatch }
+
@end
+#endif
/* }}} */
/* Bridge: NSDictionary {{{ */
@implementation NSDictionary (Cycript)
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:@","];
[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(context, key));
}
}
++ (bool) cy$hasImplicitProperties {
+ return false;
+}
+
@end
/* }}} */
/* Bridge: NSMutableArray {{{ */
- (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
}
++ (bool) cy$hasImplicitProperties {
+ return true;
+}
+
@end
/* }}} */
/* Bridge: NSProxy {{{ */
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;
+}
+
@end
/* }}} */
/* Bridge: WebUndefined {{{ */
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(context_, (NSString *) key)));
+ JSValueRef value(CYGetProperty(context_, object_, CYJSString(context_, (NSObject *) key)));
if (JSValueIsUndefined(context_, value))
return nil;
return CYCastNSObject(NULL, context_, value) ?: [NSNull null];
} CYObjectiveCatch }
- (void) setObject:(id)object forKey:(id)key { CYObjectiveTry {
- // XXX: are NSDictionary keys always NSString *?
- CYSetProperty(context_, object_, CYJSString(context_, (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(context_, (NSString *) key), &exception);
+ (void) JSObjectDeleteProperty(context_, object_, CYJSString(context_, (NSObject *) key), &exception);
CYThrow(context_, exception);
} CYObjectiveCatch }
- (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 CYCastDouble(context_, CYGetProperty(context_, object_, length_s));
} CYObjectiveCatch }
- (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry {
- (void) addObject:(id)object { CYObjectiveTry {
JSValueRef exception(NULL);
JSValueRef arguments[1];
- arguments[0] = CYCastJSValue(context_, object);
- JSObjectCallAsFunction(context_, Array_push_, object_, 1, arguments, &exception);
+ 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);
} CYObjectiveCatch }
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_, Array_s));
+ 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_, Array_s));
+ 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_, Array_s));
+ 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) { 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;
-} CYPoolCatch(NULL) }
+} CYPoolCatch(NULL) return /*XXX*/ NULL; }
-static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { CYPoolTry {
+static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { CYSadTry {
ffi_call(cif, function, value, values);
-} CYPoolCatch() }
+} CYSadCatch() }
-static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYPoolTry {
+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;
-} CYPoolCatch(false) }
+} CYSadCatch(false) }
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;
}
-} CYPoolCatch(NULL) }
+} 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;
-#ifdef __OBJC2__
+#if OBJC_API_VERSION >= 2
char type[16];
method_getReturnType(method, type, sizeof(type));
#else
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());
}
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:inContext:), false))
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);
-#ifdef __OBJC2__
+#if OBJC_API_VERSION >= 2
unsigned int size;
objc_ivar **data(class_copyIvarList(_class, &size));
for (size_t i(0); i != size; ++i)
#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)
} CYCatch }
/* Hook: objc_registerClassPair {{{ */
-#ifdef __OBJC2__
+#if defined(__APPLE__) && defined(__arm__)
// XXX: replace this with associated objects
MSHook(void, CYDealloc, id self, SEL sel) {
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) {
// XXX: check for support of cy$toJSON?
return CYCastJSValue(context, CYJSString(context, [internal->GetValue() cy$toJSON:key]));
} CYPoolCatch(NULL)
-} CYCatch }
+} 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()));
+} 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)));
+ // 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_))
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]));
} 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)));
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)
{NULL, NULL, NULL, 0}
};
-static JSStaticFunction Instance_staticFunctions[5] = {
+static JSStaticFunction Instance_staticFunctions[6] = {
{"$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_SetupContext(JSContextRef context) {
- JSObjectRef global(CYGetGlobalObject(context));
+void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
apr_pool_t *pool(CYGetGlobalPool());
- 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");
NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
NSZombie_ = objc_getClass("_NSZombie_");
+#else
+ NSBoolNumber_ = objc_getClass("NSBoolNumber");
#endif
NSArray_ = objc_getClass("NSArray");
NSDictionary_ = objc_getClass("NSDictionary");
+ NSString_ = objc_getClass("NSString");
Object_ = objc_getClass("Object");
JSClassDefinition definition;
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;
definition.getPropertyNames = &ObjectiveC_Classes_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);
-
- 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__)
+ 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 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));
+
+#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_);
+ JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s)));
+ CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype);
- CYSetProperty(context, global, CYJSString("Instance"), Instance);
- CYSetProperty(context, global, CYJSString("Selector"), Selector);
- CYSetProperty(context, global, CYJSString("Super"), Super);
+ CYSetProperty(context, cycript, CYJSString("Instance"), Instance);
+ CYSetProperty(context, cycript, CYJSString("Selector"), Selector);
+ CYSetProperty(context, cycript, CYJSString("Super"), Super);
-#ifdef __OBJC2__
- CYSetProperty(context, global, CYJSString("objc_registerClassPair"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_registerClassPair"), &objc_registerClassPair_));
- MSHookFunction(&objc_registerClassPair, MSHake(objc_registerClassPair));
+#if defined(__APPLE__) && defined(__arm__)
+ CYSetProperty(context, all, CYJSString("objc_registerClassPair"), &objc_registerClassPair_, kJSPropertyAttributeDontEnum);
#endif
- CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend));
-
- JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Message, prototype_), Function_prototype_);
- JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Selector, prototype_), Function_prototype_);
+ CYSetProperty(context, all, CYJSString("objc_msgSend"), &$objc_msgSend, kJSPropertyAttributeDontEnum);
-#ifdef __APPLE__
- class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON), "@12@0:4@8");
-#endif
-}
+ JSObjectRef Function_prototype(CYGetCachedObject(context, CYJSString("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() }
static CYHooks CYObjectiveCHooks = {
&CYObjectiveC_ExecuteStart,
&CYObjectiveC_ExecuteEnd,
&CYObjectiveC_RuntimeProperty,
&CYObjectiveC_CallFunction,
+ &CYObjectiveC_Initialize,
&CYObjectiveC_SetupContext,
&CYObjectiveC_PoolFFI,
&CYObjectiveC_FromFFI,
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