CRLF from non-last line wrote result over command.

[cycript.git] / sig / parse.hpp

diff --git a/sig/parse.hpp b/sig/parse.hpp
index b315807d1b2456dc85b0a7aa26bceed513f0e5bc..fb6db63beea186a3440423b4e81451b7ca1e8871 100644 (file)
--- a/sig/parse.hpp
+++ b/sig/parse.hpp
@@ -1,21 +1,41 @@
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)
+*/
+
+/* GNU 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
+ * 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/>.
+**/
+/* }}} */
+
 #ifndef SIG_PARSE_H
 #define SIG_PARSE_H
 
+#include "Pooling.hpp"
 #include "sig/types.hpp"
 
-#include <apr-1/apr_pools.h>
-
 namespace sig {
 
-extern void (*sig_aggregate)(apr_pool_t *pool, enum Primitive primitive, const char *name, struct Signature *signature, const char *types);
-
-void sig_parse_signature(apr_pool_t *pool, struct Signature *signature, const char **name, char eos);
-struct Type *sig_parse_type(apr_pool_t *pool, const char **name, char eos, bool named);
+typedef void (*Callback)(CYPool &pool, Type *&type);
+void Parse(CYPool &pool, struct Signature *signature, const char *name, Callback callback);
 
-void Parse(apr_pool_t *pool, struct Signature *signature, const char *name);
+const char *Unparse(CYPool &pool, struct Signature *signature);
+const char *Unparse(CYPool &pool, struct Type *type);
 
-const char *sig_unparse_signature(apr_pool_t *pool, struct Signature *signature);
-const char *sig_unparse_type(apr_pool_t *pool, struct Type *type);
+void Copy(CYPool &pool, Type &lhs, Type &rhs);
+void Copy(CYPool &pool, Signature &lhs, Signature &rhs);
+void Copy(CYPool &pool, Type &lhs, Type &rhs);
 
 }