CYDisplay{Start,Finish} obsolete by rl_redisplay.

[cycript.git] / Exception.hpp

diff --git a/Exception.hpp b/Exception.hpp
index 3d4c5cf039809d98a4e1edd6fceae946a11799df..0410fd151398755ab8593cab38bf68e1b1b373f8 100644 (file)
--- a/Exception.hpp
+++ b/Exception.hpp
@@ -1,29 +1,67 @@
+/* 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; \

     }
 
     }
 

+// 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); \
 #define _assert(test, args...) do { \
     if (!(test)) \
         CYThrow("*** _assert(%s):%s(%u):%s [errno=%d]", #test, __FILE__, __LINE__, __FUNCTION__, errno); \


@@ -52,6 +90,12 @@ void CYThrow(JSContextRef context, JSValueRef value);
         _assert(_aprstatus == APR_SUCCESS); \
     } while (false)
 
         _assert(_aprstatus == APR_SUCCESS); \
     } while (false)
 

+#define _krncall(expr) \
+    do { \
+        kern_return_t _krnstatus((expr)); \
+        _assert(_krnstatus == KERN_SUCCESS); \
+    } while (false)
+

 #define _sqlcall(expr) ({ \
     __typeof__(expr) _value = (expr); \
     if (_value != 0 && (_value < 100 || _value >= 200)) \
 #define _sqlcall(expr) ({ \
     __typeof__(expr) _value = (expr); \
     if (_value != 0 && (_value < 100 || _value >= 200)) \


@@ -59,4 +103,28 @@ void CYThrow(JSContextRef context, JSValueRef value);
     _value; \
 })
 
     _value; \
 })
 

+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*/