Sort of improve the error messages from _assert.

[cycript.git] / Exception.hpp

diff --git a/Exception.hpp b/Exception.hpp
index 3d4c5cf039809d98a4e1edd6fceae946a11799df..da3546839098b101762448d84275a35fff5caa9d 100644 (file)
--- a/Exception.hpp
+++ b/Exception.hpp
@@ -1,33 +1,74 @@
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)
+*/
+
+/* GNU General Public License, Version 3 {{{ */
+/*
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * Cycript is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/
+/* }}} */
+

 #ifndef CYCRIPT_EXCEPTION_HPP
 #define CYCRIPT_EXCEPTION_HPP
 
 #ifndef CYCRIPT_EXCEPTION_HPP
 #define CYCRIPT_EXCEPTION_HPP
 

+#ifdef CY_EXECUTE

 #include <JavaScriptCore/JSBase.h>
 #include <JavaScriptCore/JSBase.h>

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

 
 #include "Standard.hpp"
 
 
 #include "Standard.hpp"
 

+class CYPool;
+

 struct CYException {
 struct CYException {

-    virtual const char *PoolCString(apr_pool_t *pool) const = 0;
+    virtual ~CYException() {
+    }
+
+    virtual const char *PoolCString(CYPool &pool) const = 0;
+#ifdef CY_EXECUTE

     virtual JSValueRef CastJSValue(JSContextRef context) const = 0;
     virtual JSValueRef CastJSValue(JSContextRef context) const = 0;

+#endif

 };
 
 void CYThrow(const char *format, ...) _noreturn;
 };
 
 void CYThrow(const char *format, ...) _noreturn;

+
+#ifdef CY_EXECUTE

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

+#endif

 
 #define CYTry \
     try
 
 #define CYTry \
     try

-#define CYCatch \
+#define CYCatch(value) \

     catch (const CYException &error) { \
         *exception = error.CastJSValue(context); \
     catch (const CYException &error) { \
         *exception = error.CastJSValue(context); \

-        return NULL; \
+        return value; \

     } catch (...) { \
         *exception = CYCastJSValue(context, "catch(...)"); \
     } catch (...) { \
         *exception = CYCastJSValue(context, "catch(...)"); \

-        return NULL; \
+        return value; \

     }
 
     }
 

-#define _assert(test, args...) do { \
+#define _assert_(mode, test, code, format, ...) do \

     if (!(test)) \
     if (!(test)) \

-        CYThrow("*** _assert(%s):%s(%u):%s [errno=%d]", #test, __FILE__, __LINE__, __FUNCTION__, errno); \
-} while (false)
+        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
+#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__); \


@@ -37,26 +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)); \
+        _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*/