X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b3378a02d0a811be38e530933fb9a57a3012a823..8c0927fb9c0806a72f787373bad815716a0c8b4c:/Exception.hpp diff --git a/Exception.hpp b/Exception.hpp index ef6ab99..9f6a81a 100644 --- a/Exception.hpp +++ b/Exception.hpp @@ -1,20 +1,20 @@ /* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2010 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 . **/ /* }}} */ @@ -26,14 +26,18 @@ #include #endif -#include +// XXX: does _assert really need this? +#include + #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 @@ -47,13 +51,13 @@ void CYThrow(JSContextRef context, JSValueRef value); #define CYTry \ try -#define CYCatch \ +#define CYCatch(value) \ catch (const CYException &error) { \ *exception = error.CastJSValue(context); \ - return NULL; \ + return value; \ } catch (...) { \ *exception = CYCastJSValue(context, "catch(...)"); \ - return NULL; \ + return value; \ } // XXX: fix this: _ is not safe; this is /not/ Menes ;P