Port to the now modern version of GNUstep (Linux).

[cycript.git] / Exception.hpp

diff --git a/Exception.hpp b/Exception.hpp
index da3546839098b101762448d84275a35fff5caa9d..c23267dee69fc935c863727f7911d729243a9e47 100644 (file)
--- a/Exception.hpp
+++ b/Exception.hpp
@@ -1,27 +1,29 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2013  Jay Freeman (saurik)
+ * Copyright (C) 2009-2014  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


@@ -70,31 +72,36 @@ while (false)
 #define _assert(test) \
     _assert_("assert", (test), #test, "")
 
 #define _assert(test) \
     _assert_("assert", (test), #test, "")
 

+#define _require(expr) ({ \
+    __typeof__(expr) _value = (expr); \
+    _assert_("require", _value != NULL, #expr, ""); \
+_value; })
+

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

-#define _syscall(expr) ({ \
+static _finline bool CYContains(int value, size_t many, const int *okay) {
+    for (size_t i(0); i != many; ++i)
+        if (value == okay[i])
+            return true;
+    return false;
+}
+
+#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 + 1]) {0, ##__VA_ARGS__} + 1))) \
+        break; \

     else \
         _assert_("syscall", errno == EINTR, #expr, " [errno=%d]", errno); \
     while (true); \
     _value; \
 })
 
     else \
         _assert_("syscall", errno == EINTR, #expr, " [errno=%d]", errno); \
     while (true); \
     _value; \
 })
 

-#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)
+#define _syscall(expr) \
+    _syscall_(expr, 0)

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


@@ -111,7 +118,7 @@ struct CYJSException {
     {
     }
 
     {
     }
 

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

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