X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/9185d5ef70289d99e212f2dd04457b05716e222e..5b75838211f16d9c88fb1bae3193e3693a1bee39:/sig/parse.cpp?ds=sidebyside diff --git a/sig/parse.cpp b/sig/parse.cpp index a359e54..77421f9 100644 --- a/sig/parse.cpp +++ b/sig/parse.cpp @@ -1,53 +1,31 @@ -/* Cycript - Remove Execution Server and Disassembler - * Copyright (C) 2009 Jay Freeman (saurik) +/* Cycript - Optimizing JavaScript Compiler/Runtime + * Copyright (C) 2009-2012 Jay Freeman (saurik) */ -/* Modified BSD License {{{ */ +/* GNU Lesser 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 Lesser 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 Lesser 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 Lesser General Public License + * along with Cycript. If not, see . +**/ /* }}} */ -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif - -#include "minimal/stdlib.h" - #include - -#include - #include "sig/parse.hpp" +#include "Error.hpp" + +#include +#include +#include namespace sig { @@ -85,7 +63,7 @@ void Parse_(apr_pool_t *pool, struct Signature *signature, const char **name, ch if (**name != '"') element->name = NULL; else { - char *quote = strchr(++*name, '"'); + const char *quote = strchr(++*name, '"'); element->name = apr_pstrmemdup(pool, *name, quote - *name); *name = quote + 1; } @@ -128,17 +106,28 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, C case '*': type->primitive = string_P; break; case ':': type->primitive = selector_P; break; - case '@': - if (**name == '"') { - char *quote = strchr(*name + 1, '"'); - if (!named || quote[1] == eos || quote[1] == '"') { - type->name = apr_pstrmemdup(pool, *name + 1, quote - *name - 1); - *name = quote + 1; + case '@': { + char next(**name); + + if (next == '?') { + type->primitive = block_P; + ++*name; + } else { + type->primitive = object_P; + + if (next == '"') { + const char *quote = strchr(*name + 1, '"'); + if (quote == NULL) { + printf("unterminated specific id type {%s}\n", *name - 10); + _assert(false); + } else if (!named || quote[1] == eos || quote[1] == '"') { + type->name = apr_pstrmemdup(pool, *name + 1, quote - *name - 1); + *name = quote + 1; + } } } - type->primitive = object_P; - break; + } break; case 'B': type->primitive = boolean_P; break; case 'C': type->primitive = uchar_P; break; @@ -205,17 +194,8 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, C // XXX: this types thing is a throwback to JocStrap - char *types; - if (next != '=') { - types = NULL; - } else { - const char *temp(*name); + if (next == '=') Parse_(pool, &type->data.signature, name, end, callback); - types = (char *) apr_pstrmemdup(pool, temp, *name - temp - 1); - } - - if (callback != NULL) - (*callback)(pool, type->name, types, type); } break; case 'N': type->flags |= JOC_TYPE_INOUT; goto next; @@ -236,6 +216,9 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, C _assert(false); } + if (callback != NULL) + (*callback)(pool, type); + return type; } @@ -257,14 +240,13 @@ const char *Unparse(apr_pool_t *pool, struct Signature *signature) { return value; } -const char *Unparse(apr_pool_t *pool, struct Type *type) { - if (type == NULL) - return "?"; - else switch (type->primitive) { +const char *Unparse_(apr_pool_t *pool, struct Type *type) { + switch (type->primitive) { case typename_P: return "#"; case union_P: return apr_psprintf(pool, "(%s)", Unparse(pool, &type->data.signature)); case string_P: return "*"; case selector_P: return ":"; + case block_P: return "@?"; case object_P: return type->name == NULL ? "@" : apr_psprintf(pool, "@\"%s\"", type->name); case boolean_P: return "B"; case uchar_P: return "C"; @@ -275,11 +257,11 @@ const char *Unparse(apr_pool_t *pool, struct Type *type) { case array_P: { const char *value = Unparse(pool, type->data.data.type); - return apr_psprintf(pool, "[%lu%s]", type->data.data.size, value); + return apr_psprintf(pool, "[%"APR_SIZE_T_FMT"%s]", type->data.data.size, value); } break; - case pointer_P: return apr_psprintf(pool, "^%s", type->data.data.type == NULL ? "" : Unparse(pool, type->data.data.type)); - case bit_P: return apr_psprintf(pool, "b%zu", type->data.data.size); + case pointer_P: return apr_psprintf(pool, "^%s", type->data.data.type == NULL ? "v" : Unparse(pool, type->data.data.type)); + case bit_P: return apr_psprintf(pool, "b%"APR_SIZE_T_FMT"", type->data.data.size); case char_P: return "c"; case double_P: return "d"; case float_P: return "f"; @@ -295,4 +277,37 @@ const char *Unparse(apr_pool_t *pool, struct Type *type) { return NULL; } +const char *Unparse(apr_pool_t *pool, struct Type *type) { + if (type == NULL) + return "?"; + + const char *base(Unparse_(pool, type)); + if (type->flags == 0) + return base; + + #define iovec_(base, size) \ + (struct iovec) {const_cast(base), size} + + struct iovec parts[8]; + memset(parts, 0, sizeof(parts)); + + if ((type->flags & JOC_TYPE_INOUT) != 0) + parts[0] = iovec_("N", 1); + if ((type->flags & JOC_TYPE_IN) != 0) + parts[1] = iovec_("n", 1); + if ((type->flags & JOC_TYPE_BYCOPY) != 0) + parts[2] = iovec_("O", 1); + if ((type->flags & JOC_TYPE_OUT) != 0) + parts[3] = iovec_("o", 1); + if ((type->flags & JOC_TYPE_BYREF) != 0) + parts[4] = iovec_("R", 1); + if ((type->flags & JOC_TYPE_CONST) != 0) + parts[5] = iovec_("r", 1); + if ((type->flags & JOC_TYPE_ONEWAY) != 0) + parts[6] = iovec_("V", 1); + + parts[7] = iovec_(base, strlen(base)); + return apr_pstrcatv(pool, parts, 8, NULL); +} + }