**/
/* }}} */
-#include <apr_strings.h>
#include "sig/parse.hpp"
#include "Error.hpp"
#include <cstdio>
#include <cstdlib>
#include <cstring>
+#include <sstream>
namespace sig {
-void Parse_(apr_pool_t *pool, struct Signature *signature, const char **name, char eos, Callback callback);
-struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, Callback callback);
+void Parse_(CYPool &pool, struct Signature *signature, const char **name, char eos, Callback callback);
+struct Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callback callback);
/* XXX: I really screwed up this time */
-void *prealloc_(apr_pool_t *pool, void *odata, size_t osize, size_t nsize) {
- void *ndata = apr_palloc(pool, nsize);
+void *prealloc_(CYPool &pool, void *odata, size_t osize, size_t nsize) {
+ void *ndata(pool.malloc<void>(nsize));
memcpy(ndata, odata, osize);
return ndata;
}
-void Parse_(apr_pool_t *pool, struct Signature *signature, const char **name, char eos, Callback callback) {
+void Parse_(CYPool &pool, struct Signature *signature, const char **name, char eos, Callback callback) {
_assert(*name != NULL);
// XXX: this is just a stupid check :(
element->name = NULL;
else {
const char *quote = strchr(++*name, '"');
- element->name = apr_pstrmemdup(pool, *name, quote - *name);
+ element->name = pool.strmemdup(*name, quote - *name);
*name = quote + 1;
}
}
}
-struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, Callback callback) {
+Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callback callback) {
char next = *(*name)++;
if (next == '?')
return NULL;
- struct Type *type = (struct Type *) apr_palloc(pool, sizeof(struct Type));
+ Type *type(new(pool) Type());
_assert(type != NULL);
- memset(type, 0, sizeof(struct Type));
+ memset(type, 0, sizeof(Type));
parse:
switch (next) {
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);
+ type->name = pool.strmemdup(*name + 1, quote - *name - 1);
*name = quote + 1;
}
}
case '^':
type->primitive = pointer_P;
- if (**name == '"') {
+ if (**name == '"')
+ // XXX: why is this here?
type->data.data.type = NULL;
- } else {
+ else
type->data.data.type = Parse_(pool, name, eos, named, callback);
- sig::Type *&target(type->data.data.type);
- if (target != NULL && target->primitive == void_P)
- target = NULL;
- }
break;
case 'b':
case 's': type->primitive = short_P; break;
case 'v': type->primitive = void_P; break;
+#ifdef __LP64__
+ case 'F': type->primitive = double_P; break;
+#else
+ case 'F': type->primitive = float_P; break;
+#endif
+
case '{':
type->primitive = struct_P;
next = '}';
);
size_t length = *name - begin - 1;
if (strncmp(begin, "?", length) != 0)
- type->name = (char *) apr_pstrmemdup(pool, begin, length);
+ type->name = (char *) pool.strmemdup(begin, length);
else
type->name = NULL;
return type;
}
-void Parse(apr_pool_t *pool, struct Signature *signature, const char *name, Callback callback) {
+void Parse(CYPool &pool, struct Signature *signature, const char *name, Callback callback) {
const char *temp = name;
Parse_(pool, signature, &temp, '\0', callback);
_assert(temp[-1] == '\0');
}
-const char *Unparse(apr_pool_t *pool, struct Signature *signature) {
+const char *Unparse(CYPool &pool, struct Signature *signature) {
const char *value = "";
size_t offset;
for (offset = 0; offset != signature->count; ++offset) {
const char *type = Unparse(pool, signature->elements[offset].type);
- value = apr_pstrcat(pool, value, type, NULL);
+ value = pool.strcat(value, type, NULL);
}
return value;
}
-const char *Unparse_(apr_pool_t *pool, struct Type *type) {
+const char *Unparse_(CYPool &pool, struct Type *type) {
switch (type->primitive) {
+ case function_P: {
+ if (type->data.signature.count == 0)
+ return "?";
+ std::ostringstream out;
+ for (size_t i(0); i != type->data.signature.count; ++i) {
+ Element &element(type->data.signature.elements[i]);
+ out << Unparse(pool, element.type);
+ if (element.offset != _not(size_t))
+ out << pool.itoa(element.offset);
+ }
+ return pool.strdup(out.str().c_str());
+ } break;
+
case typename_P: return "#";
- case union_P: return apr_psprintf(pool, "(%s)", Unparse(pool, &type->data.signature));
+ case union_P: return pool.strcat("(", Unparse(pool, &type->data.signature), ")", NULL);
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 object_P: return type->name == NULL ? "@" : pool.strcat("@\"", type->name, "\"", NULL);
case boolean_P: return "B";
case uchar_P: return "C";
case uint_P: return "I";
case array_P: {
const char *value = Unparse(pool, type->data.data.type);
- return apr_psprintf(pool, "[%"APR_SIZE_T_FMT"%s]", type->data.data.size, value);
+ return pool.strcat("[", pool.itoa(type->data.data.size), value, "]", NULL);
+ } break;
+
+ case pointer_P: {
+ // XXX: protect against the weird '"' check in Parse_
+ _assert(type->data.data.type != NULL);
+ if (type->data.data.type->primitive == function_P)
+ return "^?";
+ else
+ return pool.strcat("^", Unparse(pool, type->data.data.type), NULL);
} break;
- 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 bit_P: return pool.strcat("b", pool.itoa(type->data.data.size), NULL);
case char_P: return "c";
case double_P: return "d";
case float_P: return "f";
case longlong_P: return "q";
case short_P: return "s";
case void_P: return "v";
- case struct_P: return apr_psprintf(pool, "{%s=%s}", type->name == NULL ? "?" : type->name, Unparse(pool, &type->data.signature));
+ case struct_P: return pool.strcat("{", type->name == NULL ? "?" : type->name, "=", Unparse(pool, &type->data.signature), "}", NULL);
}
_assert(false);
return NULL;
}
-const char *Unparse(apr_pool_t *pool, struct Type *type) {
+const char *Unparse(CYPool &pool, struct Type *type) {
if (type == NULL)
return "?";
#define iovec_(base, size) \
(struct iovec) {const_cast<char *>(base), size}
- struct iovec parts[8];
- memset(parts, 0, sizeof(parts));
+ size_t size(strlen(base));
+ char buffer[7 + size];
+ size_t offset(0);
if ((type->flags & JOC_TYPE_INOUT) != 0)
- parts[0] = iovec_("N", 1);
+ buffer[offset++] = 'N';
if ((type->flags & JOC_TYPE_IN) != 0)
- parts[1] = iovec_("n", 1);
+ buffer[offset++] = 'n';
if ((type->flags & JOC_TYPE_BYCOPY) != 0)
- parts[2] = iovec_("O", 1);
+ buffer[offset++] = 'O';
if ((type->flags & JOC_TYPE_OUT) != 0)
- parts[3] = iovec_("o", 1);
+ buffer[offset++] = 'o';
if ((type->flags & JOC_TYPE_BYREF) != 0)
- parts[4] = iovec_("R", 1);
+ buffer[offset++] = 'R';
if ((type->flags & JOC_TYPE_CONST) != 0)
- parts[5] = iovec_("r", 1);
+ buffer[offset++] = 'r';
if ((type->flags & JOC_TYPE_ONEWAY) != 0)
- parts[6] = iovec_("V", 1);
+ buffer[offset++] = 'V';
- parts[7] = iovec_(base, strlen(base));
- return apr_pstrcatv(pool, parts, 8, NULL);
+ memcpy(buffer + offset, base, size);
+ return pool.strmemdup(buffer, offset + size);
}
}
projects / cycript.git / blobdiff