Temporarily remove MobileSubstrate extension.

[cycript.git] / Tweak.mm

diff --git a/Tweak.mm b/Tweak.mm
index 590d2a4fbd2d3b69ab01c81bc1f5a5d1c6a1513a..2a8bf97b6b51cd5fb7510780e0e6d105139f643d 100644 (file)
--- a/Tweak.mm
+++ b/Tweak.mm
@@ -38,6 +38,7 @@
 /* }}} */
 
 #include <substrate.h>
 /* }}} */
 
 #include <substrate.h>

+#include "Struct.hpp"

 
 #include "sig/parse.hpp"
 #include "sig/ffi_type.hpp"
 
 #include "sig/parse.hpp"
 #include "sig/ffi_type.hpp"


@@ -69,11 +70,9 @@
 #undef _assert
 #undef _trace
 
 #undef _assert
 #undef _trace
 

-/* XXX: bad _assert */

 #define _assert(test) do { \
 #define _assert(test) do { \

-    if ((test)) break; \
-    CFLog(kCFLogLevelNotice, CFSTR("_assert(%s):%u"), #test, __LINE__); \
-    throw; \
+    if (!(test)) \
+        @throw [NSException exceptionWithName:NSInternalInconsistencyException reason:[NSString stringWithFormat:@"_assert(%s):%s(%u):%s", #test, __FILE__, __LINE__, __FUNCTION__] userInfo:nil]; \

 } while (false)
 
 #define _trace() do { \
 } while (false)
 
 #define _trace() do { \


@@ -130,15 +129,42 @@ class _H {
     }
 };
 /* }}} */
     }
 };
 /* }}} */

+/* APR Pool Helpers {{{ */
+void *operator new(size_t size, apr_pool_t *pool) {
+    return apr_palloc(pool, size);
+}
+
+void *operator new [](size_t size, apr_pool_t *pool) {
+    return apr_palloc(pool, size);
+}
+
+class CYPool {
+  private:
+    apr_pool_t *pool_;
+
+  public:
+    CYPool() {
+        apr_pool_create(&pool_, NULL);
+    }
+
+    ~CYPool() {
+        apr_pool_destroy(pool_);
+    }
+
+    operator apr_pool_t *() const {
+        return pool_;
+    }
+};
+/* }}} */

 
 #define _pooled _H<NSAutoreleasePool> _pool([[NSAutoreleasePool alloc] init], true);
 
 static JSContextRef Context_;
 
 
 #define _pooled _H<NSAutoreleasePool> _pool([[NSAutoreleasePool alloc] init], true);
 
 static JSContextRef Context_;
 

-static JSClassRef ffi_;
-static JSClassRef joc_;
-static JSClassRef ptr_;
-static JSClassRef sel_;
+static JSClassRef Functor_;
+static JSClassRef Instance_;
+static JSClassRef Pointer_;
+static JSClassRef Selector_;

 
 static JSObjectRef Array_;
 
 
 static JSObjectRef Array_;
 


@@ -148,33 +174,47 @@ static JSStringRef length_;
 
 static Class NSCFBoolean_;
 
 
 static Class NSCFBoolean_;
 

+static NSMutableDictionary *Bridge_;
+

 struct Client {
     CFHTTPMessageRef message_;
     CFSocketRef socket_;
 };
 
 struct Client {
     CFHTTPMessageRef message_;
     CFSocketRef socket_;
 };
 

-@interface NSMethodSignature (Cyrver)
+JSObjectRef CYMakeObject(JSContextRef context, id object) {
+    return JSObjectMake(context, Instance_, [object retain]);
+}
+
+@interface NSMethodSignature (Cycript)

 - (NSString *) _typeString;
 @end
 
 - (NSString *) _typeString;
 @end
 

-@interface NSObject (Cyrver)
+@interface NSObject (Cycript)

 - (NSString *) cy$toJSON;
 - (JSValueRef) cy$JSValueInContext:(JSContextRef)context;
 @end
 
 - (NSString *) cy$toJSON;
 - (JSValueRef) cy$JSValueInContext:(JSContextRef)context;
 @end
 

-@implementation NSObject (Cyrver)
+@interface NSString (Cycript)
+- (void *) cy$symbol;
+@end
+
+@interface NSNumber (Cycript)
+- (void *) cy$symbol;
+@end
+
+@implementation NSObject (Cycript)

 
 - (NSString *) cy$toJSON {
     return [self description];
 }
 
 - (JSValueRef) cy$JSValueInContext:(JSContextRef)context {
 
 - (NSString *) cy$toJSON {
     return [self description];
 }
 
 - (JSValueRef) cy$JSValueInContext:(JSContextRef)context {

-    return JSObjectMake(context, joc_, [self retain]);
+    return CYMakeObject(context, self);

 }
 
 @end
 
 }
 
 @end
 

-@implementation WebUndefined (Cyrver)
+@implementation WebUndefined (Cycript)

 
 - (NSString *) cy$toJSON {
     return @"undefined";
 
 - (NSString *) cy$toJSON {
     return @"undefined";


@@ -186,7 +226,7 @@ struct Client {
 
 @end
 
 
 @end
 

-@implementation NSArray (Cyrver)
+@implementation NSArray (Cycript)

 
 - (NSString *) cy$toJSON {
     NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
 
 - (NSString *) cy$toJSON {
     NSMutableString *json([[[NSMutableString alloc] init] autorelease]);


@@ -207,7 +247,7 @@ struct Client {
 
 @end
 
 
 @end
 

-@implementation NSDictionary (Cyrver)
+@implementation NSDictionary (Cycript)

 
 - (NSString *) cy$toJSON {
     NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
 
 - (NSString *) cy$toJSON {
     NSMutableString *json([[[NSMutableString alloc] init] autorelease]);


@@ -232,7 +272,7 @@ struct Client {
 
 @end
 
 
 @end
 

-@implementation NSNumber (Cyrver)
+@implementation NSNumber (Cycript)

 
 - (NSString *) cy$toJSON {
     return [self class] != NSCFBoolean_ ? [self stringValue] : [self boolValue] ? @"true" : @"false";
 
 - (NSString *) cy$toJSON {
     return [self class] != NSCFBoolean_ ? [self stringValue] : [self boolValue] ? @"true" : @"false";


@@ -242,9 +282,13 @@ struct Client {
     return [self class] != NSCFBoolean_ ? JSValueMakeNumber(context, [self doubleValue]) : JSValueMakeBoolean(context, [self boolValue]);
 }
 
     return [self class] != NSCFBoolean_ ? JSValueMakeNumber(context, [self doubleValue]) : JSValueMakeBoolean(context, [self boolValue]);
 }
 

+- (void *) cy$symbol {
+    return [self pointerValue];
+}
+

 @end
 
 @end
 

-@implementation NSString (Cyrver)
+@implementation NSString (Cycript)

 
 - (NSString *) cy$toJSON {
     CFMutableStringRef json(CFStringCreateMutableCopy(kCFAllocatorDefault, 0, (CFStringRef) self));
 
 - (NSString *) cy$toJSON {
     CFMutableStringRef json(CFStringCreateMutableCopy(kCFAllocatorDefault, 0, (CFStringRef) self));


@@ -261,9 +305,13 @@ struct Client {
     return [reinterpret_cast<const NSString *>(json) autorelease];
 }
 
     return [reinterpret_cast<const NSString *>(json) autorelease];
 }
 

+- (void *) cy$symbol {
+    return dlsym(RTLD_DEFAULT, [self UTF8String]);
+}
+

 @end
 
 @end
 

-@interface CY$JSObject : NSDictionary {
+@interface CYJSObject : NSDictionary {

     JSObjectRef object_;
     JSContextRef context_;
 }
     JSObjectRef object_;
     JSContextRef context_;
 }


@@ -278,7 +326,7 @@ struct Client {
 
 @end
 
 
 @end
 

-@interface CY$JSArray : NSArray {
+@interface CYJSArray : NSArray {

     JSObjectRef object_;
     JSContextRef context_;
 }
     JSObjectRef object_;
     JSContextRef context_;
 }


@@ -294,30 +342,87 @@ JSContextRef JSGetContext() {
     return Context_;
 }
 
     return Context_;
 }
 

+#define CYCatch \
+    @catch (id error) { \
+        CYThrow(context, error, exception); \
+        return NULL; \
+    }
+

 void CYThrow(JSContextRef context, JSValueRef value);
 
 void CYThrow(JSContextRef context, JSValueRef value);
 

-id JSObjectToNSObject(JSContextRef context, JSObjectRef object) {
-    if (JSValueIsObjectOfClass(context, object, joc_))
+id CYCastNSObject(JSContextRef context, JSObjectRef object) {
+    if (JSValueIsObjectOfClass(context, object, Instance_))

         return reinterpret_cast<id>(JSObjectGetPrivate(object));
     JSValueRef exception(NULL);
     bool array(JSValueIsInstanceOfConstructor(context, object, Array_, &exception));
     CYThrow(context, exception);
     if (array)
         return reinterpret_cast<id>(JSObjectGetPrivate(object));
     JSValueRef exception(NULL);
     bool array(JSValueIsInstanceOfConstructor(context, object, Array_, &exception));
     CYThrow(context, exception);
     if (array)

-        return [[[CY$JSArray alloc] initWithJSObject:object inContext:context] autorelease];
-    return [[[CY$JSObject alloc] initWithJSObject:object inContext:context] autorelease];
+        return [[[CYJSArray alloc] initWithJSObject:object inContext:context] autorelease];
+    return [[[CYJSObject alloc] initWithJSObject:object inContext:context] autorelease];

 }
 
 }
 

+JSStringRef CYCopyJSString(id value) {
+    return JSStringCreateWithCFString(reinterpret_cast<CFStringRef>([value description]));
+}
+
+JSStringRef CYCopyJSString(const char *value) {
+    return JSStringCreateWithUTF8CString(value);
+}
+
+JSStringRef CYCopyJSString(JSStringRef value) {
+    return JSStringRetain(value);
+}
+
+JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value) {
+    JSValueRef exception(NULL);
+    JSStringRef string(JSValueToStringCopy(context, value, &exception));
+    CYThrow(context, exception);
+    return string;
+}
+
+// XXX: this is not a safe handle
+class CYString {
+  private:
+    JSStringRef string_;
+
+  public:
+    template <typename Arg0_>
+    CYString(Arg0_ arg0) {
+        string_ = CYCopyJSString(arg0);
+    }
+
+    template <typename Arg0_, typename Arg1_>
+    CYString(Arg0_ arg0, Arg1_ arg1) {
+        string_ = CYCopyJSString(arg0, arg1);
+    }
+
+    ~CYString() {
+        JSStringRelease(string_);
+    }
+
+    operator JSStringRef() const {
+        return string_;
+    }
+};
+

 CFStringRef CYCopyCFString(JSStringRef value) {
     return JSStringCopyCFString(kCFAllocatorDefault, value);
 }
 
 CFStringRef CYCopyCFString(JSContextRef context, JSValueRef value) {
 CFStringRef CYCopyCFString(JSStringRef value) {
     return JSStringCopyCFString(kCFAllocatorDefault, value);
 }
 
 CFStringRef CYCopyCFString(JSContextRef context, JSValueRef value) {

+    return CYCopyCFString(CYString(context, value));
+}
+
+double CYCastDouble(JSContextRef context, JSValueRef value) {

     JSValueRef exception(NULL);
     JSValueRef exception(NULL);

-    JSStringRef string(JSValueToStringCopy(context, value, &exception));
+    double number(JSValueToNumber(context, value, &exception));

     CYThrow(context, exception);
     CYThrow(context, exception);

-    CFStringRef object(CYCopyCFString(string));
-    JSStringRelease(string);
-    return object;
+    return number;
+}
+
+CFNumberRef CYCopyCFNumber(JSContextRef context, JSValueRef value) {
+    double number(CYCastDouble(context, value));
+    return CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType, &number);

 }
 
 NSString *CYCastNSString(JSStringRef value) {
 }
 
 NSString *CYCastNSString(JSStringRef value) {


@@ -325,39 +430,21 @@ NSString *CYCastNSString(JSStringRef value) {
 }
 
 CFTypeRef CYCopyCFType(JSContextRef context, JSValueRef value) {
 }
 
 CFTypeRef CYCopyCFType(JSContextRef context, JSValueRef value) {

-    JSType type(JSValueGetType(context, value));
-
-    switch (type) {
+    switch (JSType type = JSValueGetType(context, value)) {

         case kJSTypeUndefined:
             return CFRetain([WebUndefined undefined]);
         case kJSTypeUndefined:
             return CFRetain([WebUndefined undefined]);

-        break;
-

         case kJSTypeNull:
             return nil;
         case kJSTypeNull:
             return nil;

-        break;
-

         case kJSTypeBoolean:
             return CFRetain(JSValueToBoolean(context, value) ? kCFBooleanTrue : kCFBooleanFalse);
         case kJSTypeBoolean:
             return CFRetain(JSValueToBoolean(context, value) ? kCFBooleanTrue : kCFBooleanFalse);

-        break;
-
-        case kJSTypeNumber: {
-            JSValueRef exception(NULL);
-            double number(JSValueToNumber(context, value, &exception));
-            CYThrow(context, exception);
-            return CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType, &number);
-        } break;
-
+        case kJSTypeNumber:
+            return CYCopyCFNumber(context, value);

         case kJSTypeString:
             return CYCopyCFString(context, value);
         case kJSTypeString:
             return CYCopyCFString(context, value);

-        break;
-

         case kJSTypeObject:
         case kJSTypeObject:

-            return CFRetain((CFTypeRef) JSObjectToNSObject(context, (JSObjectRef) value));
-        break;
-
+            return CFRetain((CFTypeRef) CYCastNSObject(context, (JSObjectRef) value));

         default:
         default:

-            _assert(false);
-        break;
+            @throw [NSException exceptionWithName:NSInternalInconsistencyException reason:[NSString stringWithFormat:@"JSValueGetType() == 0x%x", type] userInfo:nil];

     }
 }
 
     }
 }
 


@@ -384,43 +471,11 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) {
     return value == nil ? JSValueMakeNull(context) : [value cy$JSValueInContext:context];
 }
 
     return value == nil ? JSValueMakeNull(context) : [value cy$JSValueInContext:context];
 }
 

-JSStringRef CYCopyJSString(id value) {
-    return JSStringCreateWithCFString(reinterpret_cast<CFStringRef>([value description]));
-}
-
-JSStringRef CYCopyJSString(const char *value) {
-    return JSStringCreateWithUTF8CString(value);
-}
-
-JSStringRef CYCopyJSString(JSStringRef value) {
-    return JSStringRetain(value);
-}
-
-// XXX: this is not a safe handle
-class CYString {
-  private:
-    JSStringRef string_;
-
-  public:
-    template <typename Type_>
-    CYString(Type_ value) {
-        string_ = CYCopyJSString(value);
-    }
-
-    ~CYString() {
-        JSStringRelease(string_);
-    }
-
-    operator JSStringRef() const {
-        return string_;
-    }
-};
-

 void CYThrow(JSContextRef context, id error, JSValueRef *exception) {
     *exception = CYCastJSValue(context, error);
 }
 
 void CYThrow(JSContextRef context, id error, JSValueRef *exception) {
     *exception = CYCastJSValue(context, error);
 }
 

-@implementation CY$JSObject
+@implementation CYJSObject

 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context {
     if ((self = [super init]) != nil) {
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context {
     if ((self = [super init]) != nil) {


@@ -458,14 +513,14 @@ void CYThrow(JSContextRef context, id error, JSValueRef *exception) {
 
 - (void) removeObjectForKey:(id)key {
     JSValueRef exception(NULL);
 
 - (void) removeObjectForKey:(id)key {
     JSValueRef exception(NULL);

-    // XXX: this returns a bool
+    // XXX: this returns a bool... throw exception, or ignore?

     JSObjectDeleteProperty(context_, object_, CYString(key), &exception);
     CYThrow(context_, exception);
 }
 
 @end
 
     JSObjectDeleteProperty(context_, object_, CYString(key), &exception);
     CYThrow(context_, exception);
 }
 
 @end
 

-@implementation CY$JSArray
+@implementation CYJSArray

 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context {
     if ((self = [super init]) != nil) {
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context {
     if ((self = [super init]) != nil) {


@@ -478,9 +533,7 @@ void CYThrow(JSContextRef context, id error, JSValueRef *exception) {
     JSValueRef exception(NULL);
     JSValueRef value(JSObjectGetProperty(context_, object_, length_, &exception));
     CYThrow(context_, exception);
     JSValueRef exception(NULL);
     JSValueRef value(JSObjectGetProperty(context_, object_, length_, &exception));
     CYThrow(context_, exception);

-    double number(JSValueToNumber(context_, value, &exception));
-    CYThrow(context_, exception);
-    return number;
+    return CYCastDouble(context_, value);

 }
 
 - (id) objectAtIndex:(NSUInteger)index {
 }
 
 - (id) objectAtIndex:(NSUInteger)index {


@@ -571,22 +624,79 @@ static void OnAccept(CFSocketRef socket, CFSocketCallBackType type, CFDataRef ad
     }
 }
 
     }
 }
 

-static JSValueRef joc_getProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef *exception) {
-    return NULL;
+static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { _pooled
+    @try {
+        NSString *name(CYCastNSString(property));
+        NSLog(@"%@", name);
+        return NULL;
+    } CYCatch

 }
 
 typedef id jocData;
 
 }
 
 typedef id jocData;
 

-static void joc_finalize(JSObjectRef object) {
+static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { _pooled
+    @try {
+        id data(reinterpret_cast<jocData>(JSObjectGetPrivate(object)));
+        return CYMakeObject(context, [[data alloc] autorelease]);
+    } CYCatch
+}
+
+struct ptrData {
+    apr_pool_t *pool_;
+    void *value_;
+    sig::Type type_;
+
+    void *operator new(size_t size) {
+        apr_pool_t *pool;
+        apr_pool_create(&pool, NULL);
+        void *data(apr_palloc(pool, size));
+        reinterpret_cast<ptrData *>(data)->pool_ = pool;
+        return data;;
+    }
+
+    ptrData(void *value) :
+        value_(value)
+    {
+    }
+};
+
+struct ffiData : ptrData {
+    sig::Signature signature_;
+    ffi_cif cif_;
+
+    ffiData(void (*value)(), const char *type) :
+        ptrData(reinterpret_cast<void *>(value))
+    {
+        sig::Parse(pool_, &signature_, type);
+        sig::sig_ffi_cif(pool_, &sig::ObjectiveC, &signature_, &cif_);
+    }
+};
+
+struct selData : ptrData {
+    selData(SEL value) :
+        ptrData(value)
+    {
+    }
+};
+
+static void Pointer_finalize(JSObjectRef object) {
+    ptrData *data(reinterpret_cast<ptrData *>(JSObjectGetPrivate(object)));
+    apr_pool_destroy(data->pool_);
+}
+
+static void Instance_finalize(JSObjectRef object) {

     id data(reinterpret_cast<jocData>(JSObjectGetPrivate(object)));
     [data release];
 }
 
     id data(reinterpret_cast<jocData>(JSObjectGetPrivate(object)));
     [data release];
 }
 

-static JSValueRef obc_getProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef *exception) {
-    NSString *name([(NSString *) JSStringCopyCFString(kCFAllocatorDefault, propertyName) autorelease]);
-    if (Class _class = NSClassFromString(name))
-        return JSObjectMake(context, joc_, [_class retain]);
-    return NULL;
+JSObjectRef CYMakeFunction(JSContextRef context, void (*function)(), const char *type) {
+    ffiData *data(new ffiData(function, type));
+    return JSObjectMake(context, Functor_, data);
+}
+
+
+JSObjectRef CYMakeFunction(JSContextRef context, void *function, const char *type) {
+    return CYMakeFunction(context, reinterpret_cast<void (*)()>(function), type);

 }
 
 void CYSetProperty(JSContextRef context, JSObjectRef object, const char *name, JSValueRef value) {
 }
 
 void CYSetProperty(JSContextRef context, JSObjectRef object, const char *name, JSValueRef value) {


@@ -595,65 +705,79 @@ void CYSetProperty(JSContextRef context, JSObjectRef object, const char *name, J
     CYThrow(context, exception);
 }
 
     CYThrow(context, exception);
 }
 

-struct ffiData {
-    apr_pool_t *pool_;
-    void (*function_)();
-    const char *type_;
-    sig::Signature signature_;
-    ffi_cif cif_;
-};
-

 char *CYPoolCString(apr_pool_t *pool, JSStringRef value) {
     size_t size(JSStringGetMaximumUTF8CStringSize(value));
 char *CYPoolCString(apr_pool_t *pool, JSStringRef value) {
     size_t size(JSStringGetMaximumUTF8CStringSize(value));

-    char *string(reinterpret_cast<char *>(apr_palloc(pool, size)));
+    char *string(new(pool) char[size]);

     JSStringGetUTF8CString(value, string, size);
     JSStringRelease(value);
     return string;
 }
 
     JSStringGetUTF8CString(value, string, size);
     JSStringRelease(value);
     return string;
 }
 

+char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
+    return CYPoolCString(pool, CYString(context, value));
+}
+
+// XXX: this macro is unhygenic
+#define CYCastCString(context, value) ({ \
+    JSValueRef exception(NULL); \
+    JSStringRef string(JSValueToStringCopy(context, value, &exception)); \
+    CYThrow(context, exception); \
+    size_t size(JSStringGetMaximumUTF8CStringSize(string)); \
+    char *utf8(reinterpret_cast<char *>(alloca(size))); \
+    JSStringGetUTF8CString(string, utf8, size); \
+    JSStringRelease(string); \
+    utf8; \
+})
+

 SEL CYCastSEL(JSContextRef context, JSValueRef value) {
     if (JSValueIsNull(context, value))
         return NULL;
 SEL CYCastSEL(JSContextRef context, JSValueRef value) {
     if (JSValueIsNull(context, value))
         return NULL;

-    else if (JSValueIsObjectOfClass(context, value, sel_))
-        return reinterpret_cast<SEL>(JSObjectGetPrivate((JSObjectRef) value));
-    else {
-        JSValueRef exception(NULL);
-        JSStringRef string(JSValueToStringCopy(context, value, &exception));
-        CYThrow(context, exception);
-        size_t size(JSStringGetMaximumUTF8CStringSize(string));
-        char utf8[size];
-        JSStringGetUTF8CString(string, utf8, size);
-        JSStringRelease(string);
-        return sel_registerName(utf8);
+    else if (JSValueIsObjectOfClass(context, value, Selector_)) {
+        selData *data(reinterpret_cast<selData *>(JSObjectGetPrivate((JSObjectRef) value)));
+        return reinterpret_cast<SEL>(data->value_);
+    } else
+        return sel_registerName(CYCastCString(context, value));
+}
+
+void *CYCastPointer(JSContextRef context, JSValueRef value) {
+    switch (JSValueGetType(context, value)) {
+        case kJSTypeNull:
+            return NULL;
+        case kJSTypeString:
+            return dlsym(RTLD_DEFAULT, CYCastCString(context, value));
+        case kJSTypeObject:
+            if (JSValueIsObjectOfClass(context, value, Pointer_)) {
+                ptrData *data(reinterpret_cast<ptrData *>(JSObjectGetPrivate((JSObjectRef) value)));
+                return data->value_;
+            }
+        default:
+            return reinterpret_cast<void *>(static_cast<uintptr_t>(CYCastDouble(context, value)));

     }
 }
 
     }
 }
 

-void CYToFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, void *data, JSValueRef value) {
+void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, void *data, JSValueRef value) {

     switch (type->primitive) {
         case sig::boolean_P:
             *reinterpret_cast<bool *>(data) = JSValueToBoolean(context, value);
         break;
 
     switch (type->primitive) {
         case sig::boolean_P:
             *reinterpret_cast<bool *>(data) = JSValueToBoolean(context, value);
         break;
 

-#define CYToFFI_(primitive, native) \
-        case sig::primitive ## _P: { \
-            JSValueRef exception(NULL); \
-            double number(JSValueToNumber(context, value, &exception)); \
-            CYThrow(context, exception); \
-            *reinterpret_cast<native *>(data) = number; \
-        } break;
+#define CYPoolFFI_(primitive, native) \
+        case sig::primitive ## _P: \
+            *reinterpret_cast<native *>(data) = CYCastDouble(context, value); \
+        break;

 
 

-        CYToFFI_(uchar, unsigned char)
-        CYToFFI_(char, char)
-        CYToFFI_(ushort, unsigned short)
-        CYToFFI_(short, short)
-        CYToFFI_(ulong, unsigned long)
-        CYToFFI_(long, long)
-        CYToFFI_(uint, unsigned int)
-        CYToFFI_(int, int)
-        CYToFFI_(ulonglong, unsigned long long)
-        CYToFFI_(longlong, long long)
-        CYToFFI_(float, float)
-        CYToFFI_(double, double)
+        CYPoolFFI_(uchar, unsigned char)
+        CYPoolFFI_(char, char)
+        CYPoolFFI_(ushort, unsigned short)
+        CYPoolFFI_(short, short)
+        CYPoolFFI_(ulong, unsigned long)
+        CYPoolFFI_(long, long)
+        CYPoolFFI_(uint, unsigned int)
+        CYPoolFFI_(int, int)
+        CYPoolFFI_(ulonglong, unsigned long long)
+        CYPoolFFI_(longlong, long long)
+        CYPoolFFI_(float, float)
+        CYPoolFFI_(double, double)

 
         case sig::object_P:
         case sig::typename_P:
 
         case sig::object_P:
         case sig::typename_P:


@@ -664,30 +788,13 @@ void CYToFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, void *data
             *reinterpret_cast<SEL *>(data) = CYCastSEL(context, value);
         break;
 
             *reinterpret_cast<SEL *>(data) = CYCastSEL(context, value);
         break;
 

-        case sig::pointer_P: {
-            void *&pointer(*reinterpret_cast<void **>(data));
-            if (JSValueIsNull(context, value))
-                pointer = NULL;
-            else if (JSValueIsObjectOfClass(context, value, ptr_))
-                pointer = JSObjectGetPrivate((JSObjectRef) value);
-            else {
-                JSValueRef exception(NULL);
-                double number(JSValueToNumber(context, value, &exception));
-                CYThrow(context, exception);
-                pointer = reinterpret_cast<void *>(static_cast<uintptr_t>(number));
-            }
-        } break;
+        case sig::pointer_P:
+            *reinterpret_cast<void **>(data) = CYCastPointer(context, value);
+        break;

 
 

-        case sig::string_P: {
-            JSValueRef exception(NULL);
-            JSStringRef string(JSValueToStringCopy(context, value, &exception));
-            CYThrow(context, exception);
-            size_t size(JSStringGetMaximumUTF8CStringSize(string));
-            char *utf8(reinterpret_cast<char *>(apr_palloc(pool, size)));
-            JSStringGetUTF8CString(string, utf8, size);
-            JSStringRelease(string);
-            *reinterpret_cast<char **>(data) = utf8;
-        } break;
+        case sig::string_P:
+            *reinterpret_cast<char **>(data) = CYPoolCString(pool, context, value);
+        break;

 
         case sig::struct_P:
             goto fail;
 
         case sig::struct_P:
             goto fail;


@@ -696,12 +803,12 @@ void CYToFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, void *data
         break;
 
         default: fail:
         break;
 
         default: fail:

-            NSLog(@"CYToFFI(%c)\n", type->primitive);
+            NSLog(@"CYPoolFFI(%c)\n", type->primitive);

             _assert(false);
     }
 }
 
             _assert(false);
     }
 }
 

-JSValueRef CYFromFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, void *data) {
+JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, void *data) {

     JSValueRef value;
 
     switch (type->primitive) {
     JSValueRef value;
 
     switch (type->primitive) {


@@ -733,25 +840,34 @@ JSValueRef CYFromFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, vo
         } break;
 
         case sig::selector_P: {
         } break;
 
         case sig::selector_P: {

-            SEL sel(*reinterpret_cast<SEL *>(data));
-            value = sel == NULL ? JSValueMakeNull(context) : JSObjectMake(context, sel_, sel);
+            if (SEL sel = *reinterpret_cast<SEL *>(data)) {
+                selData *data(new selData(sel));
+                value = JSObjectMake(context, Selector_, data);
+            } else goto null;

         } break;
 
         case sig::pointer_P: {
         } break;
 
         case sig::pointer_P: {

-            void *pointer(*reinterpret_cast<void **>(data));
-            value = pointer == NULL ? JSValueMakeNull(context) : JSObjectMake(context, ptr_, pointer);
+            if (void *pointer = *reinterpret_cast<void **>(data)) {
+                ptrData *data(new ptrData(pointer));
+                value = JSObjectMake(context, Pointer_, data);
+            } else goto null;

         } break;
 
         case sig::string_P: {
         } break;
 
         case sig::string_P: {

-            char *utf8(*reinterpret_cast<char **>(data));
-            value = utf8 == NULL ? JSValueMakeNull(context) : JSValueMakeString(context, CYString(utf8));
+            if (char *utf8 = *reinterpret_cast<char **>(data))
+                value = JSValueMakeString(context, CYString(utf8));
+            else goto null;

         } break;
 
         case sig::struct_P:
             goto fail;
 
         case sig::void_P:
         } break;
 
         case sig::struct_P:
             goto fail;
 
         case sig::void_P:

-            value = NULL;
+            value = JSValueMakeUndefined(context);
+        break;
+
+        null:
+            value = JSValueMakeNull(context);

         break;
 
         default: fail:
         break;
 
         default: fail:


@@ -762,46 +878,54 @@ JSValueRef CYFromFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, vo
     return value;
 }
 
     return value;
 }
 

-class CYPool {
-  private:
-    apr_pool_t *pool_;
-
-  public:
-    CYPool() {
-        apr_pool_create(&pool_, NULL);
-    }
-
-    ~CYPool() {
-        apr_pool_destroy(pool_);
-    }
-
-    operator apr_pool_t *() const {
-        return pool_;
-    }
-};
-
-static JSValueRef CYCallFunction(JSContextRef context, size_t count, const JSValueRef *arguments, JSValueRef *exception, sig::Signature *signature, ffi_cif *cif, void (*function)()) {
+static JSValueRef CYCallFunction(JSContextRef context, size_t count, const JSValueRef *arguments, JSValueRef *exception, sig::Signature *signature, ffi_cif *cif, void (*function)()) { _pooled

     @try {
         if (count != signature->count - 1)
     @try {
         if (count != signature->count - 1)

-            [NSException raise:NSInvalidArgumentException format:@"incorrect number of arguments to ffi function"];
+            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to ffi function" userInfo:nil];

 
         CYPool pool;
         void *values[count];
 
         for (unsigned index(0); index != count; ++index) {
             sig::Element *element(&signature->elements[index + 1]);
 
         CYPool pool;
         void *values[count];
 
         for (unsigned index(0); index != count; ++index) {
             sig::Element *element(&signature->elements[index + 1]);

-            values[index] = apr_palloc(pool, cif->arg_types[index]->size);
-            CYToFFI(pool, context, element->type, values[index], arguments[index]);
+            // XXX: alignment?
+            values[index] = new(pool) uint8_t[cif->arg_types[index]->size];
+            CYPoolFFI(pool, context, element->type, values[index], arguments[index]);

         }
 
         uint8_t value[cif->rtype->size];
         ffi_call(cif, function, value, values);
 
         }
 
         uint8_t value[cif->rtype->size];
         ffi_call(cif, function, value, values);
 

-        return CYFromFFI(pool, context, signature->elements[0].type, value);
-    } @catch (id error) {
-        CYThrow(context, error, exception);
+        return CYFromFFI(context, signature->elements[0].type, value);
+    } CYCatch
+}
+
+static JSValueRef Global_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { _pooled
+    @try {
+        NSString *name(CYCastNSString(property));
+        if (Class _class = NSClassFromString(name))
+            return CYMakeObject(context, _class);
+        if (NSMutableArray *entry = [Bridge_ objectForKey:name])
+            switch ([[entry objectAtIndex:0] intValue]) {
+                case 0:
+                    return JSEvaluateScript(JSGetContext(), CYString([entry objectAtIndex:1]), NULL, NULL, 0, NULL);
+                case 1:
+                    return CYMakeFunction(context, [name cy$symbol], [[entry objectAtIndex:1] UTF8String]);
+                case 2:
+                    CYPool pool;
+                    sig::Signature signature;
+                    sig::Parse(pool, &signature, [[entry objectAtIndex:1] UTF8String]);
+                    return CYFromFFI(context, signature.elements[0].type, [name cy$symbol]);
+            }

         return NULL;
         return NULL;

-    }
+    } CYCatch
+}
+
+bool stret(ffi_type *ffi_type) {
+    return ffi_type->type == FFI_TYPE_STRUCT && (
+        ffi_type->size > OBJC_MAX_STRUCT_BY_VALUE ||
+        struct_forward_array[ffi_type->size] != 0
+    );

 }
 
 static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { _pooled
 }
 
 static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { _pooled


@@ -809,7 +933,7 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
 
     @try {
         if (count < 2)
 
     @try {
         if (count < 2)

-            [NSException raise:NSInvalidArgumentException format:@"too few arguments to objc_msgSend"];
+            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"too few arguments to objc_msgSend" userInfo:nil];

 
         id self(CYCastNSObject(context, arguments[0]));
         if (self == nil)
 
         id self(CYCastNSObject(context, arguments[0]));
         if (self == nil)


@@ -818,54 +942,48 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
         SEL _cmd(CYCastSEL(context, arguments[1]));
         NSMethodSignature *method([self methodSignatureForSelector:_cmd]);
         if (method == nil)
         SEL _cmd(CYCastSEL(context, arguments[1]));
         NSMethodSignature *method([self methodSignatureForSelector:_cmd]);
         if (method == nil)

-            [NSException raise:NSInvalidArgumentException format:@"unrecognized selector %s sent to object %p", sel_getName(_cmd), self];
+            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"unrecognized selector %s sent to object %p", sel_getName(_cmd), self] userInfo:nil];

 
         type = [[method _typeString] UTF8String];
 
         type = [[method _typeString] UTF8String];

-    } @catch (id error) {
-        CYThrow(context, error, exception);
-        return NULL;
-    }
+    } CYCatch

 
     CYPool pool;
 
     sig::Signature signature;
     sig::Parse(pool, &signature, type);
 
 
     CYPool pool;
 
     sig::Signature signature;
     sig::Parse(pool, &signature, type);
 

-    void (*function)() = reinterpret_cast<void (*)()>(&objc_msgSend);
-

     ffi_cif cif;
     ffi_cif cif;

-    sig::sig_ffi_cif(pool, &sig::sig_objc_ffi_type, &signature, &cif);
+    sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);

 
 

+    void (*function)() = stret(cif.rtype) ? reinterpret_cast<void (*)()>(&objc_msgSend_stret) : reinterpret_cast<void (*)()>(&objc_msgSend);

     return CYCallFunction(context, count, arguments, exception, &signature, &cif, function);
 }
 
 static JSValueRef ffi_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     ffiData *data(reinterpret_cast<ffiData *>(JSObjectGetPrivate(object)));
     return CYCallFunction(context, count, arguments, exception, &signature, &cif, function);
 }
 
 static JSValueRef ffi_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     ffiData *data(reinterpret_cast<ffiData *>(JSObjectGetPrivate(object)));

-    return CYCallFunction(context, count, arguments, exception, &data->signature_, &data->cif_, data->function_);
+    return CYCallFunction(context, count, arguments, exception, &data->signature_, &data->cif_, reinterpret_cast<void (*)()>(data->value_));

 }
 
 }
 

-static void ffi_finalize(JSObjectRef object) {
-    ffiData *data(reinterpret_cast<ffiData *>(JSObjectGetPrivate(object)));
-    apr_pool_destroy(data->pool_);
+JSObjectRef ffi(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+    @try {
+        if (count != 2)
+            @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"incorrect number of arguments to ffi constructor" userInfo:nil];
+        void *function(CYCastPointer(context, arguments[0]));
+        const char *type(CYCastCString(context, arguments[1]));
+        return CYMakeFunction(context, function, type);
+    } CYCatch

 }
 
 }
 

-void CYSetFunction(JSContextRef context, JSObjectRef object, const char *name, void (*function)(), const char *type) {
-    apr_pool_t *pool;
-    apr_pool_create(&pool, NULL);
-
-    ffiData *data(reinterpret_cast<ffiData *>(apr_palloc(pool, sizeof(ffiData))));
-
-    data->pool_ = pool;
-    data->function_ = function;
-    data->type_ = apr_pstrdup(pool, type);
-
-    sig::Parse(pool, &data->signature_, type);
-    sig::sig_ffi_cif(pool, &sig::sig_objc_ffi_type, &data->signature_, &data->cif_);
-
-    JSObjectRef value(JSObjectMake(context, ffi_, data));
-    CYSetProperty(context, object, name, value);
+JSValueRef Pointer_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+    ptrData *data(reinterpret_cast<ptrData *>(JSObjectGetPrivate(object)));
+    return JSValueMakeNumber(context, reinterpret_cast<uintptr_t>(data->value_));

 }
 
 }
 

+static JSStaticValue Pointer_staticValues[2] = {
+    {"value", &Pointer_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete},
+    {NULL, NULL, NULL, 0}
+};
+

 MSInitialize { _pooled
     apr_initialize();
 
 MSInitialize { _pooled
     apr_initialize();
 


@@ -893,70 +1011,43 @@ MSInitialize { _pooled
     JSClassDefinition definition;
 
     definition = kJSClassDefinitionEmpty;
     JSClassDefinition definition;
 
     definition = kJSClassDefinitionEmpty;

-    definition.getProperty = &obc_getProperty;
-    JSClassRef obc(JSClassCreate(&definition));
+    definition.className = "Pointer";
+    definition.staticValues = Pointer_staticValues;
+    definition.finalize = &Pointer_finalize;
+    Pointer_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
 
     definition = kJSClassDefinitionEmpty;

-    definition.className = "ffi";
+    definition.className = "Functor";
+    definition.parentClass = Pointer_;

     definition.callAsFunction = &ffi_callAsFunction;
     definition.callAsFunction = &ffi_callAsFunction;

-    definition.finalize = &ffi_finalize;
-    ffi_ = JSClassCreate(&definition);
+    Functor_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
 
     definition = kJSClassDefinitionEmpty;

-    definition.className = "ptr";
-    ptr_ = JSClassCreate(&definition);
+    definition.className = "Selector";
+    definition.parentClass = Pointer_;
+    Selector_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
 
     definition = kJSClassDefinitionEmpty;

-    definition.className = "sel";
-    sel_ = JSClassCreate(&definition);
+    definition.className = "Instance_";
+    definition.getProperty = &Instance_getProperty;
+    definition.callAsConstructor = &Instance_callAsConstructor;
+    definition.finalize = &Instance_finalize;
+    Instance_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
 
     definition = kJSClassDefinitionEmpty;

-    definition.className = "joc";
-    definition.getProperty = &joc_getProperty;
-    definition.finalize = &joc_finalize;
-    joc_ = JSClassCreate(&definition);
+    definition.getProperty = &Global_getProperty;
+    JSClassRef Global(JSClassCreate(&definition));

 
 

-    JSContextRef context(JSGlobalContextCreate(obc));
+    JSContextRef context(JSGlobalContextCreate(Global));

     Context_ = context;
 
     JSObjectRef global(JSContextGetGlobalObject(context));
 
     Context_ = context;
 
     JSObjectRef global(JSContextGetGlobalObject(context));
 

-#define CYSetFunction_(name, type) \
-    CYSetFunction(context, global, #name, reinterpret_cast<void (*)()>(&name), type)
-
-    CYSetFunction_(class_createInstance, "@#L");
-    CYSetFunction_(class_getInstanceSize, "L#");
-    CYSetFunction_(class_getIvarLayout, "*#");
-    CYSetFunction_(class_getName, "*#");
-    CYSetFunction_(class_getSuperclass, "##");
-    CYSetFunction_(class_getVersion, "i#");
-    CYSetFunction_(class_isMetaClass, "B#");
-    CYSetFunction_(class_respondsToSelector, "B#:");
-    CYSetFunction_(class_setSuperclass, "###");
-    CYSetFunction_(class_setVersion, "v#i");
-    CYSetFunction_(objc_allocateClassPair, "##*L");
-    CYSetFunction_(objc_getClass, "#*");
-    CYSetFunction_(objc_getFutureClass, "#*");
-    CYSetFunction_(objc_getMetaClass, "@*");
-    CYSetFunction_(objc_getRequiredClass, "@*");
-    CYSetFunction_(objc_lookUpClass, "@*");
-    CYSetFunction_(objc_registerClassPair, "v#");
-    CYSetFunction_(objc_setFutureClass, "v#*");
-    CYSetFunction_(object_copy, "@@L");
-    CYSetFunction_(object_dispose, "@@");
-    CYSetFunction_(object_getClass, "#@");
-    CYSetFunction_(object_getClassName, "*@");
-    CYSetFunction_(object_setClass, "#@#");
-    CYSetFunction_(sel_getName, "*:");
-    CYSetFunction_(sel_getUid, ":*");
-    CYSetFunction_(sel_isEqual, "B::");
-    CYSetFunction_(sel_registerName, ":*");
+    CYSetProperty(context, global, "ffi", JSObjectMakeConstructor(context, Functor_, &ffi));

 
     CYSetProperty(context, global, "objc_msgSend", JSObjectMakeFunctionWithCallback(context, CYString("objc_msgSend"), &$objc_msgSend));
 
 
     CYSetProperty(context, global, "objc_msgSend", JSObjectMakeFunctionWithCallback(context, CYString("objc_msgSend"), &$objc_msgSend));
 

-    CYSetProperty(context, global, "YES", JSValueMakeBoolean(context, true));
-    CYSetProperty(context, global, "NO", JSValueMakeBoolean(context, false));
-    CYSetProperty(context, global, "nil", JSValueMakeNull(context));
+    Bridge_ = [[NSMutableDictionary dictionaryWithContentsOfFile:@"/usr/lib/libcycript.plist"] retain];

 
     name_ = JSStringCreateWithUTF8CString("name");
     message_ = JSStringCreateWithUTF8CString("message");
 
     name_ = JSStringCreateWithUTF8CString("name");
     message_ = JSStringCreateWithUTF8CString("message");