X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/9cad30fab188a57c3db8df0912a1691099468e64..def9084602162fbc6081fadd247ad50a78ad0bce:/Error.hpp diff --git a/Error.hpp b/Error.hpp index 2fc9f49..30cd052 100644 --- a/Error.hpp +++ b/Error.hpp @@ -1,40 +1,22 @@ -/* Cycript - Inlining/Optimizing JavaScript Compiler - * Copyright (C) 2009 Jay Freeman (saurik) +/* Cycript - Optimizing JavaScript Compiler/Runtime + * Copyright (C) 2009-2015 Jay Freeman (saurik) */ -/* Modified BSD License {{{ */ +/* GNU Affero General Public License, Version 3 {{{ */ /* - * Redistribution and use in source and binary - * forms, with or without modification, are permitted - * provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the - * above copyright notice, this list of conditions - * and the following disclaimer. - * 2. Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the - * distribution. - * 3. The name of the author may not be used to endorse - * or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ + * 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 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_ERROR_HPP @@ -58,7 +40,7 @@ struct CYJSError : CYJSError(JSContextRef context, const char *format, ...); - virtual const char *PoolCString(apr_pool_t *pool) const; + virtual const char *PoolCString(CYPool &pool) const; virtual JSValueRef CastJSValue(JSContextRef context) const; }; #endif @@ -69,10 +51,12 @@ struct CYPoolError : CYPool pool_; const char *message_; + CYPoolError(const CYPoolError &rhs); + CYPoolError(const char *format, ...); CYPoolError(const char *format, va_list args); - virtual const char *PoolCString(apr_pool_t *pool) const; + virtual const char *PoolCString(CYPool &pool) const; #ifdef CY_EXECUTE virtual JSValueRef CastJSValue(JSContextRef context) const; #endif