X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b3378a02d0a811be38e530933fb9a57a3012a823..2447e531132913a88707e5d457fb2946fa3b0478:/sig/copy.cpp?ds=sidebyside
diff --git a/sig/copy.cpp b/sig/copy.cpp
index 07ea661..948a0f0 100644
--- a/sig/copy.cpp
+++ b/sig/copy.cpp
@@ -1,21 +1,21 @@
/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2010 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 .
+ * 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 .
**/
/* }}} */
@@ -23,7 +23,6 @@
#define _GNU_SOURCE
#endif
-#include
#include "Pooling.hpp"
#include "sig/parse.hpp"
@@ -35,8 +34,8 @@
namespace sig {
-void Copy(apr_pool_t *pool, Element &lhs, Element &rhs) {
- lhs.name = apr_pstrdup(pool, rhs.name);
+void Copy(CYPool &pool, Element &lhs, const Element &rhs) {
+ lhs.name = pool.strdup(rhs.name);
if (rhs.type == NULL)
lhs.type = NULL;
else {
@@ -46,7 +45,7 @@ void Copy(apr_pool_t *pool, Element &lhs, Element &rhs) {
lhs.offset = rhs.offset;
}
-void Copy(apr_pool_t *pool, Signature &lhs, Signature &rhs) {
+void Copy(CYPool &pool, Signature &lhs, const Signature &rhs) {
size_t count(rhs.count);
lhs.count = count;
lhs.elements = new(pool) Element[count];
@@ -54,16 +53,16 @@ void Copy(apr_pool_t *pool, Signature &lhs, Signature &rhs) {
Copy(pool, lhs.elements[index], rhs.elements[index]);
}
-void Copy(apr_pool_t *pool, Type &lhs, Type &rhs) {
+void Copy(CYPool &pool, Type &lhs, const Type &rhs) {
lhs.primitive = rhs.primitive;
- lhs.name = apr_pstrdup(pool, rhs.name);
+ lhs.name = pool.strdup(rhs.name);
lhs.flags = rhs.flags;
- if (sig::IsAggregate(rhs.primitive))
+ if (sig::IsFunctional(rhs.primitive) || sig::IsAggregate(rhs.primitive))
Copy(pool, lhs.data.signature, rhs.data.signature);
else {
sig::Type *&lht(lhs.data.data.type);
- sig::Type *&rht(rhs.data.data.type);
+ sig::Type *const &rht(rhs.data.data.type);
if (rht == NULL)
lht = NULL;
@@ -76,7 +75,7 @@ void Copy(apr_pool_t *pool, Type &lhs, Type &rhs) {
}
}
-void Copy(apr_pool_t *pool, ffi_type &lhs, ffi_type &rhs) {
+void Copy(CYPool &pool, ffi_type &lhs, ffi_type &rhs) {
lhs.size = rhs.size;
lhs.alignment = rhs.alignment;
lhs.type = rhs.type;