Make Type inherit Functin and build placement new.

[cycript.git] / Error.hpp

diff --git a/Error.hpp b/Error.hpp
index f608e88aff35d4e49660aeb8f3c2b171820332c4..87214982edf9f3e763d76200d259102da0a026c9 100644 (file)
--- a/Error.hpp
+++ b/Error.hpp
@@ -1,29 +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
  * 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_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 :
 
 #ifdef CY_EXECUTE
 struct CYJSError :


@@ -41,22 +41,25 @@ struct CYJSError :
     CYJSError(JSContextRef context, const char *format, ...);
 
     virtual const char *PoolCString(CYPool &pool) const;
     CYJSError(JSContextRef context, const char *format, ...);
 
     virtual const char *PoolCString(CYPool &pool) const;

-    virtual JSValueRef CastJSValue(JSContextRef context) const;
+    virtual JSValueRef CastJSValue(JSContextRef context, const char *name) const;

 };
 #endif
 
 };
 #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 *message);

     CYPoolError(const char *format, ...);
     CYPoolError(const char *format, va_list args);
 
     virtual const char *PoolCString(CYPool &pool) const;
 #ifdef CY_EXECUTE
     CYPoolError(const char *format, ...);
     CYPoolError(const char *format, va_list args);
 
     virtual const char *PoolCString(CYPool &pool) const;
 #ifdef CY_EXECUTE

-    virtual JSValueRef CastJSValue(JSContextRef context) const;
+    virtual JSValueRef CastJSValue(JSContextRef context, const char *name) const;

 #endif
 };
 
 #endif
 };