We no longer need to support the restrict keyword.

[cycript.git] / Exception.hpp

diff --git a/Exception.hpp b/Exception.hpp
index e72800eca303225f81eca667022a0e37293bcea4..1efaf3f3762a848bf5b9156a4a9b8a2d0bb786e7 100644 (file)
--- a/Exception.hpp
+++ b/Exception.hpp
@@ -1,27 +1,29 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2013  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)

 */
 
 */
 

-/* GNU General Public License, Version 3 {{{ */
+/* GNU Affero 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program 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
  * 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/>.
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 **/
 /* }}} */
 
 #ifndef CYCRIPT_EXCEPTION_HPP
 #define CYCRIPT_EXCEPTION_HPP
 
 **/
 /* }}} */
 
 #ifndef CYCRIPT_EXCEPTION_HPP
 #define CYCRIPT_EXCEPTION_HPP
 

+#include <cstdlib>
+

 #ifdef CY_EXECUTE
 #include <JavaScriptCore/JSBase.h>
 #endif
 #ifdef CY_EXECUTE
 #include <JavaScriptCore/JSBase.h>
 #endif


@@ -33,13 +35,13 @@
 
 class CYPool;
 
 
 class CYPool;
 

-struct CYException {
+struct _visible CYException {

     virtual ~CYException() {
     }
 
     virtual const char *PoolCString(CYPool &pool) const = 0;
 #ifdef CY_EXECUTE
     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 char *name) const = 0;

 #endif
 };
 
 #endif
 };
 


@@ -51,14 +53,20 @@ void CYThrow(JSContextRef context, JSValueRef value);
 
 #define CYTry \
     try
 
 #define CYTry \
     try

-#define CYCatch(value) \
+#define CYCatch_(value, name) \

     catch (const CYException &error) { \
     catch (const CYException &error) { \

-        *exception = error.CastJSValue(context); \
+        *exception = error.CastJSValue(context, name); \
+        _assert(*exception != NULL); \

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

+        _assert(*exception != NULL); \

         return value; \
     }
         return value; \
     }

+#define CYCatch(value) \
+    CYCatch_(value, "Error")
+#define CYCatchObject() \
+    CYCatch(JSObjectMake(context, NULL, NULL))

 
 #define _assert_(mode, test, code, format, ...) do \
     if (!(test)) \
 
 #define _assert_(mode, test, code, format, ...) do \
     if (!(test)) \


@@ -76,7 +84,7 @@ while (false)
 _value; })
 
 #define _trace() do { \
 _value; })
 
 #define _trace() do { \

-    fprintf(stderr, "_trace():%u\n", __LINE__); \
+    fprintf(stderr, "_trace(%s:%u)\n", __FILE__, __LINE__); \

 } while (false)
 
 static _finline bool CYContains(int value, size_t many, const int *okay) {
 } while (false)
 
 static _finline bool CYContains(int value, size_t many, const int *okay) {


@@ -86,11 +94,11 @@ static _finline bool CYContains(int value, size_t many, const int *okay) {
     return false;
 }
 
     return false;
 }
 

-#define _syscall_(expr, many, okay) ({ \
+#define _syscall_(expr, many, ...) ({ \

     __typeof__(expr) _value; \
     do if ((long) (_value = (expr)) != -1) \
         break; \
     __typeof__(expr) _value; \
     do if ((long) (_value = (expr)) != -1) \
         break; \

-    else if (CYContains(errno, many, ((const int [many]) okay))) \
+    else if (CYContains(errno, many, ((const int [many + 1]) {0, ##__VA_ARGS__} + 1))) \

         break; \
     else \
         _assert_("syscall", errno == EINTR, #expr, " [errno=%d]", errno); \
         break; \
     else \
         _assert_("syscall", errno == EINTR, #expr, " [errno=%d]", errno); \


@@ -99,25 +107,14 @@ static _finline bool CYContains(int value, size_t many, const int *okay) {
 })
 
 #define _syscall(expr) \
 })
 
 #define _syscall(expr) \

-    _syscall_(expr, 0, {})
-
-#define _aprcall(expr) \
-    do { \
-        apr_status_t _aprstatus((expr)); \
-        _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)
+    _syscall_(expr, 0)

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

-    _assert_("sqlcall", _value == 0 || _value >= 100 && _value < 200, #expr, " %u:%s", _value sqlite3_errmsg(database_)); \
-})
+    _assert_("sqlcall", _value == 0 || _value >= 100 && _value < 200, #expr, " %u:%s", _value, sqlite3_errmsg(database_)); \
+_value; })

 
 

+#ifdef CY_EXECUTE

 struct CYJSException {
     JSContextRef context_;
     JSValueRef value_;
 struct CYJSException {
     JSContextRef context_;
     JSValueRef value_;


@@ -128,7 +125,7 @@ struct CYJSException {
     {
     }
 
     {
     }
 

-    ~CYJSException() {
+    ~CYJSException() noexcept(false) {

         CYThrow(context_, value_);
     }
 
         CYThrow(context_, value_);
     }
 


@@ -141,5 +138,6 @@ struct CYJSException {
     CYJSException _error(context); \
     (code)(args, _error); \
 })
     CYJSException _error(context); \
     (code)(args, _error); \
 })

+#endif

 
 #endif/*CYCRIPT_ERROR_HPP*/
 
 #endif/*CYCRIPT_ERROR_HPP*/