X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/03db6a67c728f631b6c6f6fd140eb86a8050cf12..57f0643431ab99e0eba70d447e72a5d42e726fcc:/sig/parse.cpp?ds=inline diff --git a/sig/parse.cpp b/sig/parse.cpp index 3a8a7af..67a28bf 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 . **/ /* }}} */ @@ -160,7 +160,7 @@ Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callback cal type->data.data.size = strtoul(*name, (char **) name, 10); break; - case 'c': type->primitive = char_P; break; + case 'c': type->primitive = schar_P; break; case 'd': type->primitive = double_P; break; case 'f': type->primitive = float_P; break; case 'i': type->primitive = int_P; break; @@ -286,7 +286,7 @@ const char *Unparse_(CYPool &pool, struct Type *type) { } break; case bit_P: return pool.strcat("b", pool.itoa(type->data.data.size), NULL); - case char_P: return "c"; + case schar_P: return "c"; case double_P: return "d"; case float_P: return "f"; case int_P: return "i"; @@ -294,6 +294,7 @@ const char *Unparse_(CYPool &pool, struct Type *type) { case longlong_P: return "q"; case short_P: return "s"; case void_P: return "v"; + case char_P: return "c"; case struct_P: return pool.strcat("{", type->name == NULL ? "?" : type->name, "=", Unparse(pool, &type->data.signature), "}", NULL); }