Temporarily remove MobileSubstrate extension.

[cycript.git] / Tweak.mm

diff --git a/Tweak.mm b/Tweak.mm
index 21c91a135ba7d06f896f48ee9a3f30d9830293f4..2a8bf97b6b51cd5fb7510780e0e6d105139f643d 100644 (file)
--- a/Tweak.mm
+++ b/Tweak.mm
@@ -70,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 { \


@@ -131,9 +129,7 @@ class _H {
     }
 };
 /* }}} */
     }
 };
 /* }}} */

-
-#define _pooled _H<NSAutoreleasePool> _pool([[NSAutoreleasePool alloc] init], true);
-
+/* 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);
 }


@@ -142,12 +138,33 @@ void *operator new [](size_t size, apr_pool_t *pool) {
     return apr_palloc(pool, size);
 }
 
     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_;
 
 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_;
 


@@ -157,25 +174,35 @@ static JSStringRef length_;
 
 static Class NSCFBoolean_;
 
 
 static Class NSCFBoolean_;
 

+static NSMutableDictionary *Bridge_;
+

 struct Client {
     CFHTTPMessageRef message_;
     CFSocketRef socket_;
 };
 
 JSObjectRef CYMakeObject(JSContextRef context, id object) {
 struct Client {
     CFHTTPMessageRef message_;
     CFSocketRef socket_;
 };
 
 JSObjectRef CYMakeObject(JSContextRef context, id object) {

-    return JSObjectMake(context, joc_, [object retain]);
+    return JSObjectMake(context, Instance_, [object retain]);

 }
 
 }
 

-@interface NSMethodSignature (Cyrver)
+@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];
 
 - (NSString *) cy$toJSON {
     return [self description];


@@ -187,7 +214,7 @@ JSObjectRef CYMakeObject(JSContextRef context, id object) {
 
 @end
 
 
 @end
 

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

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


@@ -199,7 +226,7 @@ JSObjectRef CYMakeObject(JSContextRef context, id object) {
 
 @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]);


@@ -220,7 +247,7 @@ JSObjectRef CYMakeObject(JSContextRef context, id object) {
 
 @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]);


@@ -245,7 +272,7 @@ JSObjectRef CYMakeObject(JSContextRef context, id object) {
 
 @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";


@@ -255,9 +282,13 @@ JSObjectRef CYMakeObject(JSContextRef context, id object) {
     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));


@@ -274,6 +305,10 @@ JSObjectRef CYMakeObject(JSContextRef context, id object) {
     return [reinterpret_cast<const NSString *>(json) autorelease];
 }
 
     return [reinterpret_cast<const NSString *>(json) autorelease];
 }
 

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

 @end
 
 @interface CYJSObject : NSDictionary {
 @end
 
 @interface CYJSObject : NSDictionary {


@@ -316,7 +351,7 @@ JSContextRef JSGetContext() {
 void CYThrow(JSContextRef context, JSValueRef value);
 
 id CYCastNSObject(JSContextRef context, JSObjectRef object) {
 void CYThrow(JSContextRef context, JSValueRef value);
 
 id CYCastNSObject(JSContextRef context, JSObjectRef object) {

-    if (JSValueIsObjectOfClass(context, object, joc_))
+    if (JSValueIsObjectOfClass(context, object, Instance_))

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


@@ -378,10 +413,15 @@ CFStringRef CYCopyCFString(JSContextRef context, JSValueRef value) {
     return CYCopyCFString(CYString(context, value));
 }
 
     return CYCopyCFString(CYString(context, value));
 }
 

-CFNumberRef CYCopyCFNumber(JSContextRef context, JSValueRef value) {
+double CYCastDouble(JSContextRef context, JSValueRef value) {

     JSValueRef exception(NULL);
     double number(JSValueToNumber(context, value, &exception));
     CYThrow(context, exception);
     JSValueRef exception(NULL);
     double number(JSValueToNumber(context, value, &exception));
     CYThrow(context, exception);

+    return number;
+}
+
+CFNumberRef CYCopyCFNumber(JSContextRef context, JSValueRef value) {
+    double number(CYCastDouble(context, value));

     return CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType, &number);
 }
 
     return CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType, &number);
 }
 


@@ -390,7 +430,7 @@ NSString *CYCastNSString(JSStringRef value) {
 }
 
 CFTypeRef CYCopyCFType(JSContextRef context, JSValueRef value) {
 }
 
 CFTypeRef CYCopyCFType(JSContextRef context, JSValueRef value) {

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

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


@@ -404,7 +444,7 @@ CFTypeRef CYCopyCFType(JSContextRef context, JSValueRef value) {
         case kJSTypeObject:
             return CFRetain((CFTypeRef) CYCastNSObject(context, (JSObjectRef) value));
         default:
         case kJSTypeObject:
             return CFRetain((CFTypeRef) CYCastNSObject(context, (JSObjectRef) value));
         default:

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

     }
 }
 
     }
 }
 


@@ -473,7 +513,7 @@ 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);
 }
     JSObjectDeleteProperty(context_, object_, CYString(key), &exception);
     CYThrow(context_, exception);
 }


@@ -493,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 {


@@ -586,13 +624,17 @@ 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 JSObjectRef joc_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { _pooled
+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]);
     @try {
         id data(reinterpret_cast<jocData>(JSObjectGetPrivate(object)));
         return CYMakeObject(context, [[data alloc] autorelease]);


@@ -637,21 +679,24 @@ struct selData : ptrData {
     }
 };
 
     }
 };
 

-static void ptr_finalize(JSObjectRef object) {
+static void Pointer_finalize(JSObjectRef object) {

     ptrData *data(reinterpret_cast<ptrData *>(JSObjectGetPrivate(object)));
     apr_pool_destroy(data->pool_);
 }
 
     ptrData *data(reinterpret_cast<ptrData *>(JSObjectGetPrivate(object)));
     apr_pool_destroy(data->pool_);
 }
 

-static void joc_finalize(JSObjectRef object) {
+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) { _pooled
-    NSString *name([(NSString *) JSStringCopyCFString(kCFAllocatorDefault, propertyName) autorelease]);
-    if (Class _class = NSClassFromString(name))
-        return CYMakeObject(context, _class);
-    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) {


@@ -672,7 +717,7 @@ char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
     return CYPoolCString(pool, CYString(context, value));
 }
 
     return CYPoolCString(pool, CYString(context, value));
 }
 

-// XXX: this macro is dangerous
+// XXX: this macro is unhygenic

 #define CYCastCString(context, value) ({ \
     JSValueRef exception(NULL); \
     JSStringRef string(JSValueToStringCopy(context, value, &exception)); \
 #define CYCastCString(context, value) ({ \
     JSValueRef exception(NULL); \
     JSStringRef string(JSValueToStringCopy(context, value, &exception)); \


@@ -687,7 +732,7 @@ char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
 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_)) {
+    else if (JSValueIsObjectOfClass(context, value, Selector_)) {

         selData *data(reinterpret_cast<selData *>(JSObjectGetPrivate((JSObjectRef) value)));
         return reinterpret_cast<SEL>(data->value_);
     } else
         selData *data(reinterpret_cast<selData *>(JSObjectGetPrivate((JSObjectRef) value)));
         return reinterpret_cast<SEL>(data->value_);
     } else


@@ -701,16 +746,12 @@ void *CYCastPointer(JSContextRef context, JSValueRef value) {
         case kJSTypeString:
             return dlsym(RTLD_DEFAULT, CYCastCString(context, value));
         case kJSTypeObject:
         case kJSTypeString:
             return dlsym(RTLD_DEFAULT, CYCastCString(context, value));
         case kJSTypeObject:

-            // XXX: maybe support more than just pointers, like ffis and sels
-            if (JSValueIsObjectOfClass(context, value, ptr_)) {
+            if (JSValueIsObjectOfClass(context, value, Pointer_)) {

                 ptrData *data(reinterpret_cast<ptrData *>(JSObjectGetPrivate((JSObjectRef) value)));
                 return data->value_;
             }
         default:
                 ptrData *data(reinterpret_cast<ptrData *>(JSObjectGetPrivate((JSObjectRef) value)));
                 return data->value_;
             }
         default:

-            JSValueRef exception(NULL);
-            double number(JSValueToNumber(context, value, &exception));
-            CYThrow(context, exception);
-            return reinterpret_cast<void *>(static_cast<uintptr_t>(number));
+            return reinterpret_cast<void *>(static_cast<uintptr_t>(CYCastDouble(context, value)));

     }
 }
 
     }
 }
 


@@ -721,12 +762,9 @@ void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, void *da
         break;
 
 #define CYPoolFFI_(primitive, native) \
         break;
 
 #define CYPoolFFI_(primitive, native) \

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

 
         CYPoolFFI_(uchar, unsigned char)
         CYPoolFFI_(char, char)
 
         CYPoolFFI_(uchar, unsigned char)
         CYPoolFFI_(char, char)


@@ -804,27 +842,32 @@ JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, void *data) {
         case sig::selector_P: {
             if (SEL sel = *reinterpret_cast<SEL *>(data)) {
                 selData *data(new selData(sel));
         case sig::selector_P: {
             if (SEL sel = *reinterpret_cast<SEL *>(data)) {
                 selData *data(new selData(sel));

-                value = JSObjectMake(context, sel_, data);
-            } else value = JSValueMakeNull(context);
+                value = JSObjectMake(context, Selector_, data);
+            } else goto null;

         } break;
 
         case sig::pointer_P: {
             if (void *pointer = *reinterpret_cast<void **>(data)) {
                 ptrData *data(new ptrData(pointer));
         } break;
 
         case sig::pointer_P: {
             if (void *pointer = *reinterpret_cast<void **>(data)) {
                 ptrData *data(new ptrData(pointer));

-                value = JSObjectMake(context, ptr_, data);
-            } else value = JSValueMakeNull(context);
+                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:


@@ -835,28 +878,10 @@ JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, void *data) {
     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)()) { _pooled
     @try {
         if (count != signature->count - 1)
 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)

-            [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];
 
         CYPool pool;
         void *values[count];


@@ -875,6 +900,27 @@ static JSValueRef CYCallFunction(JSContextRef context, size_t count, const JSVal
     } CYCatch
 }
 
     } 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;
+    } CYCatch
+}
+

 bool stret(ffi_type *ffi_type) {
     return ffi_type->type == FFI_TYPE_STRUCT && (
         ffi_type->size > OBJC_MAX_STRUCT_BY_VALUE ||
 bool stret(ffi_type *ffi_type) {
     return ffi_type->type == FFI_TYPE_STRUCT && (
         ffi_type->size > OBJC_MAX_STRUCT_BY_VALUE ||


@@ -887,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)


@@ -896,7 +942,7 @@ 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];
     } CYCatch
 
         type = [[method _typeString] UTF8String];
     } CYCatch


@@ -918,28 +964,23 @@ static JSValueRef ffi_callAsFunction(JSContextRef context, JSObjectRef object, J
     return CYCallFunction(context, count, arguments, exception, &data->signature_, &data->cif_, reinterpret_cast<void (*)()>(data->value_));
 }
 
     return CYCallFunction(context, count, arguments, exception, &data->signature_, &data->cif_, reinterpret_cast<void (*)()>(data->value_));
 }
 

-JSObjectRef CYMakeFunction(JSContextRef context, void (*function)(), const char *type) {
-    ffiData *data(new ffiData(function, type));
-    return JSObjectMake(context, ffi_, data);
-}
-

 JSObjectRef ffi(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     @try {
         if (count != 2)
 JSObjectRef ffi(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     @try {
         if (count != 2)

-            [NSException raise:NSInvalidArgumentException format:@"incorrect number of arguments to ffi constructor"];
-        void (*function)() = reinterpret_cast<void (*)()>(CYCastPointer(context, arguments[0]));
+            @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
 }
 
         const char *type(CYCastCString(context, arguments[1]));
         return CYMakeFunction(context, function, type);
     } CYCatch
 }
 

-JSValueRef ptr_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef *exception) {
+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_));
 }
 
     ptrData *data(reinterpret_cast<ptrData *>(JSObjectGetPrivate(object)));
     return JSValueMakeNumber(context, reinterpret_cast<uintptr_t>(data->value_));
 }
 

-static JSStaticValue ptr_staticValues[2] = {
-    {"value", &ptr_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete},
+static JSStaticValue Pointer_staticValues[2] = {
+    {"value", &Pointer_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete},

     {NULL, NULL, NULL, 0}
 };
 
     {NULL, NULL, NULL, 0}
 };
 


@@ -970,128 +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 = "ptr";
-    definition.staticValues = ptr_staticValues;
-    definition.finalize = &ptr_finalize;
-    ptr_ = JSClassCreate(&definition);
+    definition.className = "Functor";
+    definition.parentClass = Pointer_;
+    definition.callAsFunction = &ffi_callAsFunction;
+    Functor_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
 
     definition = kJSClassDefinitionEmpty;

-    definition.className = "ffi";
-    definition.parentClass = ptr_;
-    definition.callAsFunction = &ffi_callAsFunction;
-    ffi_ = JSClassCreate(&definition);
+    definition.className = "Selector";
+    definition.parentClass = Pointer_;
+    Selector_ = JSClassCreate(&definition);

 
     definition = kJSClassDefinitionEmpty;
 
     definition = kJSClassDefinitionEmpty;

-    definition.className = "sel";
-    definition.parentClass = ptr_;
-    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.callAsConstructor = &joc_callAsConstructor;
-    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));
 

-    CYSetProperty(context, global, "ffi", JSObjectMakeConstructor(context, ffi_, &ffi));
-    CYSetProperty(context, global, "obc", JSObjectMake(context, obc, NULL));
-
-#define CYSetFunction_(name, type) \
-    CYSetProperty(context, global, #name, CYMakeFunction(context, reinterpret_cast<void (*)()>(&name), type))
-
-    CYSetFunction_(class_addIvar, "B#*LC*");
-    CYSetFunction_(class_addMethod, "B#:^?*");
-    CYSetFunction_(class_addProtocol, "B#@");
-    CYSetFunction_(class_conformsToProtocol, "B#@");
-    CYSetFunction_(class_copyIvarList, "^^{objc_ivar=}#^I");
-    CYSetFunction_(class_copyMethodList, "^^{objc_method=}#^I");
-    CYSetFunction_(class_copyPropertyList, "^^{objc_property=}#^I");
-    CYSetFunction_(class_copyProtocolList, "^@#^I");
-    CYSetFunction_(class_createInstance, "@#L");
-    CYSetFunction_(class_getClassMethod, "^{objc_method=}#:");
-    CYSetFunction_(class_getClassVariable, "^{objc_ivar=}#*");
-    CYSetFunction_(class_getInstanceMethod, "^{objc_method=}#:");
-    CYSetFunction_(class_getInstanceSize, "L#");
-    CYSetFunction_(class_getInstanceVariable, "^{objc_ivar=}#*");
-    CYSetFunction_(class_getIvarLayout, "*#");
-    CYSetFunction_(class_getMethodImplementation, "^?#:");
-    CYSetFunction_(class_getMethodImplementation_stret, "^?#:");
-    CYSetFunction_(class_getName, "*#");
-    CYSetFunction_(class_getProperty, "^{objc_property=}#*");
-    CYSetFunction_(class_getSuperclass, "##");
-    CYSetFunction_(class_getVersion, "i#");
-    CYSetFunction_(class_getWeakIvarLayout, "*#");
-    CYSetFunction_(class_isMetaClass, "B#");
-    CYSetFunction_(class_replaceMethod, "^?#:^?*");
-    CYSetFunction_(class_respondsToSelector, "B#:");
-    CYSetFunction_(class_setIvarLayout, "v#*");
-    CYSetFunction_(class_setSuperclass, "###");
-    CYSetFunction_(class_setVersion, "v#i");
-    CYSetFunction_(class_setWeakIvarLayout, "v#*");
-    CYSetFunction_(ivar_getName, "*^{objc_ivar=}");
-    CYSetFunction_(ivar_getOffset, "i^{objc_ivar=}");
-    CYSetFunction_(ivar_getTypeEncoding, "*^{objc_ivar=}");
-    CYSetFunction_(method_copyArgumentType, "^c^{objc_method=}I");
-    CYSetFunction_(method_copyReturnType, "^c^{objc_method=}");
-    CYSetFunction_(method_exchangeImplementations, "v^{objc_method=}^{objc_method=}");
-    CYSetFunction_(method_getArgumentType, "v^{objc_method=}I^cL");
-    CYSetFunction_(method_getImplementation, "^?^{objc_method=}");
-    CYSetFunction_(method_getName, ":^{objc_method=}");
-    CYSetFunction_(method_getNumberOfArguments, "I^{objc_method=}");
-    CYSetFunction_(method_getReturnType, "v^{objc_method=}^cL");
-    CYSetFunction_(method_getTypeEncoding, "*^{objc_method=}");
-    CYSetFunction_(method_setImplementation, "^?^{objc_method=}^?");
-    CYSetFunction_(objc_allocateClassPair, "##*L");
-    CYSetFunction_(objc_copyProtocolList, "^@^I");
-    CYSetFunction_(objc_duplicateClass, "##*L");
-    CYSetFunction_(objc_getClass, "#*");
-    CYSetFunction_(objc_getClassList, "i^#i");
-    CYSetFunction_(objc_getFutureClass, "#*");
-    CYSetFunction_(objc_getMetaClass, "@*");
-    CYSetFunction_(objc_getProtocol, "@*");
-    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_getIndexedIvars, "^v@");
-    CYSetFunction_(object_getInstanceVariable, "^{objc_ivar=}@*^^v");
-    CYSetFunction_(object_getIvar, "@@^{objc_ivar=}");
-    CYSetFunction_(object_setClass, "#@#");
-    CYSetFunction_(object_setInstanceVariable, "^{objc_ivar=}@*^v");
-    CYSetFunction_(object_setIvar, "v@^{objc_ivar=}@");
-    CYSetFunction_(property_getAttributes, "*^{objc_property=}");
-    CYSetFunction_(property_getName, "*^{objc_property=}");
-    CYSetFunction_(protocol_conformsToProtocol, "B@@");
-    CYSetFunction_(protocol_copyMethodDescriptionList, "^{objc_method_description=:*}@BB^I");
-    CYSetFunction_(protocol_copyPropertyList, "^{objc_property=}@^I");
-    CYSetFunction_(protocol_copyProtocolList, "^@@^I");
-    CYSetFunction_(protocol_getMethodDescription, "{objc_method_description=:*}@:BB");
-    CYSetFunction_(protocol_getName, "*@");
-    CYSetFunction_(protocol_getProperty, "^{objc_property=}@*BB");
-    CYSetFunction_(protocol_isEqual, "B@@");
-    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");