The inside of a template span protects us from in.

[cycript.git] / Error.hpp

diff --git a/Error.hpp b/Error.hpp
index a87e855dbd62bcf1ac517c2ff45b03b57e5a072a..9fc6e855340d760b7212bb8f1bb224c0e2b55d33 100644 (file)
--- a/Error.hpp
+++ b/Error.hpp
@@ -1,48 +1,31 @@
-/* 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 <http://www.gnu.org/licenses/>.
+**/

 /* }}} */
 
 #ifndef CYCRIPT_ERROR_HPP
 #define CYCRIPT_ERROR_HPP
 
 /* }}} */
 
 #ifndef CYCRIPT_ERROR_HPP
 #define CYCRIPT_ERROR_HPP
 

-#include "Pooling.hpp"

 #include "Exception.hpp"
 #include "Exception.hpp"

+#include "Pooling.hpp"

 
 

+#ifdef CY_EXECUTE

 struct CYJSError :
     CYException
 {
 struct CYJSError :
     CYException
 {


@@ -57,21 +40,26 @@ struct CYJSError :
 
     CYJSError(JSContextRef context, const char *format, ...);
 
 
     CYJSError(JSContextRef context, const char *format, ...);
 

-    virtual const char *PoolCString(apr_pool_t *pool) const;
-    virtual JSValueRef CastJSValue(JSContextRef context) const;
+    virtual const char *PoolCString(CYPool &pool) const;
+    virtual JSValueRef CastJSValue(JSContextRef context, const char *name) const;

 };
 };

+#endif

 
 

-struct CYPoolError :
+struct _visible CYPoolError :

     CYException
 {
     CYPool pool_;
     const char *message_;
 
     CYException
 {
     CYPool pool_;
     const char *message_;
 

+    CYPoolError(const CYPoolError &rhs);
+

     CYPoolError(const char *format, ...);
     CYPoolError(const char *format, va_list args);
 
     CYPoolError(const char *format, ...);
     CYPoolError(const char *format, va_list args);
 

-    virtual const char *PoolCString(apr_pool_t *pool) const;
-    virtual JSValueRef CastJSValue(JSContextRef context) const;
+    virtual const char *PoolCString(CYPool &pool) const;
+#ifdef CY_EXECUTE
+    virtual JSValueRef CastJSValue(JSContextRef context, const char *name) const;
+#endif

 };
 
 #endif/*CYCRIPT_ERROR_HPP*/
 };
 
 #endif/*CYCRIPT_ERROR_HPP*/