X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/3fe283c53edc2a98d0164d893a4a667245da8e78..b23692f3038296c94d25c84c55ed4c1bb49619cf:/Decode.cpp diff --git a/Decode.cpp b/Decode.cpp index e31b469..95f68ef 100644 --- a/Decode.cpp +++ b/Decode.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 . **/ /* }}} */ @@ -26,6 +26,8 @@ CYTypedIdentifier *Decode_(CYPool &pool, struct sig::Type *type) { switch (type->primitive) { + case sig::unknown_P: return $ CYTypedIdentifier($ CYTypeError()); + case sig::function_P: { _assert(type->data.signature.count != 0); CYTypedParameter *parameter(NULL); @@ -40,11 +42,14 @@ CYTypedIdentifier *Decode_(CYPool &pool, struct sig::Type *type) { case sig::selector_P: return $ CYTypedIdentifier($ CYTypeVariable("SEL")); case sig::block_P: { - _assert(type->data.signature.count != 0); - CYTypedParameter *parameter(NULL); - for (size_t i(type->data.signature.count - 1); i != 0; --i) - parameter = $ CYTypedParameter(Decode(pool, type->data.signature.elements[i].type), parameter); - return Decode(pool, type->data.signature.elements[0].type)->Modify($ CYTypeBlockWith(parameter)); + if (type->data.signature.count == 0) + return $ CYTypedIdentifier($ CYTypeVariable("NSBlock"), $ CYTypePointerTo()); + else { + CYTypedParameter *parameter(NULL); + for (size_t i(type->data.signature.count - 1); i != 0; --i) + parameter = $ CYTypedParameter(Decode(pool, type->data.signature.elements[i].type), parameter); + return Decode(pool, type->data.signature.elements[0].type)->Modify($ CYTypeBlockWith(parameter)); + } } break; case sig::object_P: {