X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/a2f3ecabdf36b8b6e35dff67380ab7482993c60b..7752205a17e5ea74ed609e029169a633c25d7621:/sig/parse.cpp diff --git a/sig/parse.cpp b/sig/parse.cpp index d95af2f..62d99cf 100644 --- a/sig/parse.cpp +++ b/sig/parse.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 . **/ /* }}} */ @@ -84,8 +84,6 @@ void Parse_(CYPool &pool, struct Signature *signature, const char **name, char e Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callback callback) { char next = *(*name)++; - if (next == '?') - return NULL; Type *type(new(pool) Type()); _assert(type != NULL); @@ -93,6 +91,7 @@ Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callback cal parse: switch (next) { + case '?': type->primitive = unknown_P; break; case '#': type->primitive = typename_P; break; case '(': @@ -258,6 +257,7 @@ const char *Unparse_(CYPool &pool, struct Type *type) { return pool.strdup(out.str().c_str()); } break; + case unknown_P: return "?"; case typename_P: return "#"; case union_P: return pool.strcat("(", Unparse(pool, &type->data.signature), ")", NULL); case string_P: return "*";