From 9d512587dc4e4ff598d4663ca1e43996a8cfd9e9 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Wed, 8 Jan 2014 19:53:46 -0800 Subject: [PATCH] I really really want some kind of Error monad :(. --- Execute.cpp | 6 +++--- JavaScript.hpp | 2 +- ObjectiveC/Library.mm | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Execute.cpp b/Execute.cpp index ca678ae..ca0b617 100644 --- a/Execute.cpp +++ b/Execute.cpp @@ -955,7 +955,7 @@ static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JS } } -JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception, sig::Signature *signature, ffi_cif *cif, void (*function)()) { CYTry { +JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, sig::Signature *signature, ffi_cif *cif, void (*function)()) { if (setups + count != signature->count - 1) throw CYJSError(context, "incorrect number of arguments to ffi function"); @@ -979,12 +979,12 @@ JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, voi ffi_call(cif, function, value, values); return CYFromFFI(context, signature->elements[0].type, cif->rtype, value, initialize); -} CYCatch(NULL) } +} static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { CYPool pool; cy::Functor *internal(reinterpret_cast(JSObjectGetPrivate(object))); - return CYCallFunction(pool, context, 0, NULL, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue()); + return CYCallFunction(pool, context, 0, NULL, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue()); } CYCatch(NULL) } JSObjectRef CYMakeType(JSContextRef context, const char *type) { diff --git a/JavaScript.hpp b/JavaScript.hpp index 8f99cee..944c89e 100644 --- a/JavaScript.hpp +++ b/JavaScript.hpp @@ -101,7 +101,7 @@ _finline Type_ CYCastPointer(JSContextRef context, JSValueRef value) { void CYPoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value); JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize = false, JSObjectRef owner = NULL); -JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception, sig::Signature *signature, ffi_cif *cif, void (*function)()); +JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, sig::Signature *signature, ffi_cif *cif, void (*function)()); bool CYIsCallable(JSContextRef context, JSValueRef value); JSValueRef CYCallAsFunction(JSContextRef context, JSObjectRef function, JSObjectRef _this, size_t count, const JSValueRef arguments[]); diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm index 2428fd5..e54e02a 100644 --- a/ObjectiveC/Library.mm +++ b/ObjectiveC/Library.mm @@ -159,7 +159,7 @@ enum { BLOCK_HAS_SIGNATURE = 1 << 30, }; -JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception); +JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize); /* Objective-C Pool Release {{{ */ void CYPoolRelease_(void *data) { @@ -1739,14 +1739,14 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object, if (objc_property_t property = class_getProperty(_class, string)) { PropertyAttributes attributes(property); SEL sel(sel_registerName(attributes.Getter())); - return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception); + return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false); } #endif 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 CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false); return NULL; } CYCatch(NULL) } @@ -1774,7 +1774,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr if (const char *setter = attributes.Setter()) { SEL sel(sel_registerName(setter)); JSValueRef arguments[1] = {value}; - CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception); + CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false); return true; } } @@ -1799,7 +1799,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr if (SEL sel = sel_getUid(set)) if (CYImplements(self, _class, sel)) { JSValueRef arguments[1] = {value}; - CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception); + CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false); return true; } @@ -1912,7 +1912,7 @@ static JSValueRef Instance_callAsFunction(JSContextRef context, JSObjectRef obje sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif); void (*function)() = reinterpret_cast(literal->invoke); - return CYCallFunction(pool, context, 1, setup, count, arguments, false, exception, &signature, &cif, function); + return CYCallFunction(pool, context, 1, setup, count, arguments, false, &signature, &cif, function); } } @@ -2228,7 +2228,7 @@ static bool stret(ffi_type *ffi_type) { #endif #endif -JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _class, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception) { CYTry { +JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _class, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize) { const char *type; if (_class == NULL) @@ -2295,8 +2295,8 @@ JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _cla } void (*function)() = reinterpret_cast(imp); - return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, exception, &signature, &cif, function); -} CYCatch(NULL) } + return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, &signature, &cif, function); +} static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count < 2) @@ -2333,7 +2333,7 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje _cmd = CYCastSEL(context, arguments[1]); - return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized, exception); + return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized); } CYCatch(NULL) } static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -2355,7 +2355,7 @@ static JSValueRef Message_callAsFunction(JSContextRef context, JSObjectRef objec setup[0] = &self; setup[1] = &internal->sel_; - return CYCallFunction(pool, context, 2, setup, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue()); + return CYCallFunction(pool, context, 2, setup, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue()); } CYCatch(NULL) } static JSObjectRef Super_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { -- 2.45.2