X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/10d0e9152df283bd2a7a56db88c8d177354130dd..849b0beafc5d722cd9abf4050430600d149cc342:/Exception.hpp
diff --git a/Exception.hpp b/Exception.hpp
index 17a5bed..cd4bd08 100644
--- 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
- * 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 .
+ * 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 .
**/
/* }}} */
#ifndef CYCRIPT_EXCEPTION_HPP
#define CYCRIPT_EXCEPTION_HPP
+#include
+
#ifdef CY_EXECUTE
#include
#endif
@@ -33,13 +35,13 @@
class CYPool;
-struct CYException {
+struct _visible CYException {
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
};
@@ -51,14 +53,16 @@ void CYThrow(JSContextRef context, JSValueRef value);
#define CYTry \
try
-#define CYCatch(value) \
+#define CYCatch_(value, name) \
catch (const CYException &error) { \
- *exception = error.CastJSValue(context); \
+ *exception = error.CastJSValue(context, name); \
return value; \
} catch (...) { \
*exception = CYCastJSValue(context, "catch(...)"); \
return value; \
}
+#define CYCatch(value) \
+ CYCatch_(value, "Error")
#define _assert_(mode, test, code, format, ...) do \
if (!(test)) \
@@ -76,7 +80,7 @@ while (false)
_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) {
@@ -86,11 +90,11 @@ static _finline bool CYContains(int value, size_t many, const int *okay) {
return false;
}
-#define _syscall_(expr, many, okay) ({ \
+#define _syscall_(expr, many, ...) ({ \
__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); \
@@ -99,19 +103,14 @@ static _finline bool CYContains(int value, size_t many, const int *okay) {
})
#define _syscall(expr) \
- _syscall_(expr, 0, {})
-
-#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); \
- _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_;
@@ -122,7 +121,7 @@ struct CYJSException {
{
}
- ~CYJSException() {
+ ~CYJSException() noexcept(false) {
CYThrow(context_, value_);
}
@@ -135,5 +134,6 @@ struct CYJSException {
CYJSException _error(context); \
(code)(args, _error); \
})
+#endif
#endif/*CYCRIPT_ERROR_HPP*/