X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b128dfee9c57068e3c1a4a852dc4dc3dcc0332d6..13c7f2fb8fc0619c8da1b5c8a697f7894479b070:/sig/copy.cpp diff --git a/sig/copy.cpp b/sig/copy.cpp index 2b0996a..9300a1d 100644 --- a/sig/copy.cpp +++ b/sig/copy.cpp @@ -1,47 +1,28 @@ -/* Cycript - Inlining/Optimizing JavaScript Compiler - * Copyright (C) 2009 Jay Freeman (saurik) +/* Cycript - Optimizing JavaScript Compiler/Runtime + * Copyright (C) 2009-2013 Jay Freeman (saurik) */ -/* Modified BSD License {{{ */ +/* GNU General Public License, Version 3 {{{ */ /* - * Redistribution and use in source and binary - * forms, with or without modification, are permitted - * provided that the following conditions are met: + * 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. * - * 1. Redistributions of source code must retain the - * above copyright notice, this list of conditions - * and the following disclaimer. - * 2. Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the - * distribution. - * 3. The name of the author may not be used to endorse - * or promote products derived from this software - * without specific prior written permission. + * 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. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ + * You should have received a copy of the GNU General Public License + * along with Cycript. If not, see <http://www.gnu.org/licenses/>. +**/ /* }}} */ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif -#include <apr_strings.h> #include "Pooling.hpp" #include "sig/parse.hpp" @@ -53,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 { @@ -64,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]; @@ -72,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; @@ -94,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;