X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/1fdd7c7aa3b4b5775135c4c58e535caf102207c1..96d36aaa89e579a53bd5848c22a462ca8eb13f80:/sig/parse.cpp diff --git a/sig/parse.cpp b/sig/parse.cpp index 7c7c9c9..7e025f8 100644 --- a/sig/parse.cpp +++ b/sig/parse.cpp @@ -118,10 +118,9 @@ Type *Parse_(CYPool &pool, const char **encoding, char eos, bool named, Callback name = NULL; else { const char *quote = strchr(*encoding + 1, '"'); - if (quote == NULL) { - printf("unterminated specific id type {%s}\n", *encoding - 10); - _assert(false); - } else if (!named || quote[1] == eos || quote[1] == '"') { + if (quote == NULL) + CYThrow("unterminated specific id type {%s}", *encoding - 10); + else if (!named || quote[1] == eos || quote[1] == '"') { name = pool.strmemdup(*encoding + 1, quote - *encoding - 1); *encoding = quote + 1; } else { @@ -145,10 +144,8 @@ Type *Parse_(CYPool &pool, const char **encoding, char eos, bool named, Callback case '[': { size_t size(strtoul(*encoding, (char **) encoding, 10)); type = new(pool) Array(*Parse_(pool, encoding, eos, false, callback), size); - if (**encoding != ']') { - printf("']' != \"%s\"\n", *encoding); - _assert(false); - } + if (**encoding != ']') + CYThrow("']' != \"%s\"", *encoding); ++*encoding; } break; @@ -172,6 +169,7 @@ Type *Parse_(CYPool &pool, const char **encoding, char eos, bool named, Callback break; case 'c': type = new(pool) Primitive(); break; + case 'D': type = new(pool) Primitive(); break; case 'd': type = new(pool) Primitive(); break; case 'f': type = new(pool) Primitive(); break; case 'i': type = new(pool) Primitive(); break; @@ -236,8 +234,7 @@ Type *Parse_(CYPool &pool, const char **encoding, char eos, bool named, Callback break; default: - printf("invalid type character: '%c' {%s}\n", next, *encoding - 10); - _assert(false); + CYThrow("invalid type character: '%c' {%s}", next, *encoding - 10); } type->flags = flags; @@ -283,6 +280,11 @@ const char *Primitive::Encode(CYPool &pool) const { return "f"; } +template <> +const char *Primitive::Encode(CYPool &pool) const { + return "D"; +} + template <> const char *Primitive::Encode(CYPool &pool) const { return "c";