X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b799113bd4ec270504dd9f552142c1adfd6e583a..032131d5afeca86ad9d94d9bd7e4f299d06906b1:/sig/copy.cpp diff --git a/sig/copy.cpp b/sig/copy.cpp index b38405e..948a0f0 100644 --- a/sig/copy.cpp +++ b/sig/copy.cpp @@ -1,21 +1,21 @@ /* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2013 Jay Freeman (saurik) + * Copyright (C) 2009-2015 Jay Freeman (saurik) */ -/* GNU 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 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 + * 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Cycript. If not, see . + * 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 . **/ /* }}} */ @@ -34,7 +34,7 @@ namespace sig { -void Copy(CYPool &pool, Element &lhs, Element &rhs) { +void Copy(CYPool &pool, Element &lhs, const Element &rhs) { lhs.name = pool.strdup(rhs.name); if (rhs.type == NULL) lhs.type = NULL; @@ -45,7 +45,7 @@ void Copy(CYPool &pool, Element &lhs, Element &rhs) { lhs.offset = rhs.offset; } -void Copy(CYPool &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]; @@ -53,16 +53,16 @@ void Copy(CYPool &pool, Signature &lhs, Signature &rhs) { Copy(pool, lhs.elements[index], rhs.elements[index]); } -void Copy(CYPool &pool, Type &lhs, Type &rhs) { +void Copy(CYPool &pool, Type &lhs, const Type &rhs) { lhs.primitive = rhs.primitive; 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;