CYDisplay{Start,Finish} obsolete by rl_redisplay.

[cycript.git] / Exception.hpp

diff --git a/Exception.hpp b/Exception.hpp
index 64f90f22fa90320adc01b8edf5a5f36d3eaa8134..0410fd151398755ab8593cab38bf68e1b1b373f8 100644 (file)
--- a/Exception.hpp
+++ b/Exception.hpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2012  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)
 */
 
-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */
 /*
- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser 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 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 Lesser General Public
- * License for more details.
+ * 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
@@ -26,14 +26,18 @@
 #include <JavaScriptCore/JSBase.h>
 #endif
 
-#include <apr_pools.h>
+// XXX: does _assert really need this?
+#include <errno.h>
+
 #include "Standard.hpp"
 
+class CYPool;
+
 struct CYException {
     virtual ~CYException() {
     }
 
-    virtual const char *PoolCString(apr_pool_t *pool) const = 0;
+    virtual const char *PoolCString(CYPool &pool) const = 0;
 #ifdef CY_EXECUTE
     virtual JSValueRef CastJSValue(JSContextRef context) const = 0;
 #endif
@@ -99,4 +103,28 @@ void CYThrow(JSContextRef context, JSValueRef 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*/