Move return lexer hack to grammar semantic action.

[cycript.git] / Error.hpp

diff --git a/Error.hpp b/Error.hpp
index 30cd052ff8457b516da7a21c863537b034ee5a02..9fc6e855340d760b7212bb8f1bb224c0e2b55d33 100644 (file)
--- a/Error.hpp
+++ b/Error.hpp
@@ -22,8 +22,8 @@
 #ifndef CYCRIPT_ERROR_HPP
 #define CYCRIPT_ERROR_HPP
 
-#include "Pooling.hpp"
 #include "Exception.hpp"
+#include "Pooling.hpp"
 
 #ifdef CY_EXECUTE
 struct CYJSError :
@@ -41,11 +41,11 @@ struct CYJSError :
     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
 
-struct CYPoolError :
+struct _visible CYPoolError :
     CYException
 {
     CYPool pool_;
@@ -58,7 +58,7 @@ struct CYPoolError :
 
     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
 };