Make Type inherit Functin and build placement new.

[cycript.git] / Error.hpp

diff --git a/Error.hpp b/Error.hpp
index 701720d06d69c3ad9f8adc00384b39717a499fd6..87214982edf9f3e763d76200d259102da0a026c9 100644 (file)
--- a/Error.hpp
+++ b/Error.hpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)

 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -22,8 +22,8 @@
 #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,11 +41,11 @@ 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_;
     CYException
 {
     CYPool pool_;


@@ -53,12 +53,13 @@ struct CYPoolError :
 
     CYPoolError(const CYPoolError &rhs);
 
 
     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
 };