Move non-RegEx lexer hacks from Scanner to Parser.

[cycript.git] / Error.hpp

diff --git a/Error.hpp b/Error.hpp
index 6cda0689e9754766238b18b520c284b748d7d29d..9fc6e855340d760b7212bb8f1bb224c0e2b55d33 100644 (file)
--- a/Error.hpp
+++ b/Error.hpp
@@ -1,29 +1,29 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2012  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
-/* GNU Lesser 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 Lesser 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 MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * 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
 
-#include "Pooling.hpp"
 #include "Exception.hpp"
+#include "Pooling.hpp"
 
 #ifdef CY_EXECUTE
 struct CYJSError :
@@ -40,23 +40,25 @@ struct CYJSError :
 
     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_;
 
+    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;
+    virtual JSValueRef CastJSValue(JSContextRef context, const char *name) const;
 #endif
 };