From: Jay Freeman (saurik) Date: Sat, 15 Sep 2012 06:12:30 +0000 (-0700) Subject: Support type signature flags in sig::Unparse(). X-Git-Tag: v0.9.460~15 X-Git-Url: https://git.saurik.com/cycript.git/commitdiff_plain/5171481534a3cbd5e7e4a563ee97c335ff4bf909?ds=sidebyside Support type signature flags in sig::Unparse(). --- diff --git a/sig/parse.cpp b/sig/parse.cpp index dfe7d73..77421f9 100644 --- a/sig/parse.cpp +++ b/sig/parse.cpp @@ -240,10 +240,8 @@ 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 "*"; @@ -279,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); +} + }