Unknown block arguments can decode to NSBlock *.

[cycript.git] / Exception.hpp

diff --git a/Exception.hpp b/Exception.hpp
index 598548fd0358d51731185eb258c8acf7669f96c5..da3546839098b101762448d84275a35fff5caa9d 100644 (file)
--- a/Exception.hpp
+++ b/Exception.hpp
@@ -26,6 +26,9 @@
 #include <JavaScriptCore/JSBase.h>
 #endif
 
 #include <JavaScriptCore/JSBase.h>
 #endif
 

+// XXX: does _assert really need this?
+#include <errno.h>
+

 #include "Standard.hpp"
 
 class CYPool;
 #include "Standard.hpp"
 
 class CYPool;


@@ -57,12 +60,15 @@ void CYThrow(JSContextRef context, JSValueRef value);
         return value; \
     }
 
         return value; \
     }
 

+#define _assert_(mode, test, code, format, ...) do \
+    if (!(test)) \
+        CYThrow("*** _%s(%s):%s(%u):%s" format, mode, code, __FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__); \
+while (false)
+

 // XXX: fix this: _ is not safe; this is /not/ Menes ;P
 #undef _assert
 // XXX: fix this: _ is not safe; this is /not/ Menes ;P
 #undef _assert

-#define _assert(test, args...) do { \
-    if (!(test)) \
-        CYThrow("*** _assert(%s):%s(%u):%s [errno=%d]", #test, __FILE__, __LINE__, __FUNCTION__, errno); \
-} while (false)
+#define _assert(test) \
+    _assert_("assert", (test), #test, "")

 
 #define _trace() do { \
     fprintf(stderr, "_trace():%u\n", __LINE__); \
 
 #define _trace() do { \
     fprintf(stderr, "_trace():%u\n", __LINE__); \


@@ -72,32 +78,51 @@ void CYThrow(JSContextRef context, JSValueRef value);
     __typeof__(expr) _value; \
     do if ((long) (_value = (expr)) != -1) \
         break; \
     __typeof__(expr) _value; \
     do if ((long) (_value = (expr)) != -1) \
         break; \

-    else switch (errno) { \
-        case EINTR: \
-            continue; \
-        default: \
-            _assert(false); \
-    } while (true); \
+    else \
+        _assert_("syscall", errno == EINTR, #expr, " [errno=%d]", errno); \
+    while (true); \

     _value; \
 })
 
 #define _aprcall(expr) \
     do { \
         apr_status_t _aprstatus((expr)); \
     _value; \
 })
 
 #define _aprcall(expr) \
     do { \
         apr_status_t _aprstatus((expr)); \

-        _assert(_aprstatus == APR_SUCCESS); \
+        _assert_("aprcall", _aprstatus == APR_SUCCESS, #expr, ""); \

     } while (false)
 
 #define _krncall(expr) \
     do { \
         kern_return_t _krnstatus((expr)); \
     } while (false)
 
 #define _krncall(expr) \
     do { \
         kern_return_t _krnstatus((expr)); \

-        _assert(_krnstatus == KERN_SUCCESS); \
+        _assert_("krncall", _krnstatus == KERN_SUCCESS, #expr, " [return=0x%x]", _krnstatus); \

     } while (false)
 
 #define _sqlcall(expr) ({ \
     __typeof__(expr) _value = (expr); \
     } while (false)
 
 #define _sqlcall(expr) ({ \
     __typeof__(expr) _value = (expr); \

-    if (_value != 0 && (_value < 100 || _value >= 200)) \
-        _assert(false, "_sqlcall(%u:%s): %s\n", _value, #expr, sqlite3_errmsg(database_)); \
-    _value; \
+    _assert_("sqlcall", _value == 0 || _value >= 100 && _value < 200, #expr, " %u:%s", _value sqlite3_errmsg(database_)); \
+})
+
+struct CYJSException {
+    JSContextRef context_;
+    JSValueRef value_;
+
+    CYJSException(JSContextRef context) :
+        context_(context),
+        value_(NULL)
+    {
+    }
+
+    ~CYJSException() {
+        CYThrow(context_, value_);
+    }
+
+    operator JSValueRef *() {
+        return &value_;
+    }
+};
+
+#define _jsccall(code, args...) ({ \
+    CYJSException _error(context); \
+    (code)(args, _error); \

 })
 
 #endif/*CYCRIPT_ERROR_HPP*/
 })
 
 #endif/*CYCRIPT_ERROR_HPP*/