From 0453665034049613b3194a6f0af6deae3e1df4e1 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 14 Nov 2014 10:50:01 +1030 Subject: [PATCH] cdump: handle array sizes and comments better. We can now parse array sizes properly: comments and extra [] pairs will no longer confuse us. Signed-off-by: Rusty Russell --- ccan/cdump/cdump.c | 71 +++++++++++++++++++++++++-------- ccan/cdump/test/run-arraysize.c | 54 +++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 16 deletions(-) create mode 100644 ccan/cdump/test/run-arraysize.c diff --git a/ccan/cdump/cdump.c b/ccan/cdump/cdump.c index 2680b4d2..8ade786c 100644 --- a/ccan/cdump/cdump.c +++ b/ccan/cdump/cdump.c @@ -84,25 +84,31 @@ struct parse_state { char *complaints; }; -static bool tok_is(const struct token **toks, const char *target) +static const struct token *tok_peek(const struct token **toks) { - return (*toks)->p && (*toks)->len == strlen(target) - && memcmp((*toks)->p, target, (*toks)->len) == 0; + /* Ignore removed tokens (eg. comments) */ + while (toks[0]->len == 0) { + if (!toks[0]->p) + return NULL; + (*toks)++; + } + return toks[0]; } -static const struct token *tok_peek(const struct token **toks) +static bool tok_is(const struct token **toks, const char *target) { - if (toks[0]->p) - return toks[0]; - return NULL; + const struct token *t = tok_peek(toks); + return (t && t->len == strlen(target) + && memcmp(t->p, target, t->len) == 0); } static const struct token *tok_take(const struct token **toks) { - if (!toks[0]->p) - return NULL; + const struct token *t = tok_peek(toks); + if (t) + (*toks)++; - return (*toks)++; + return t; } static const struct token *tok_take_if(const struct token **toks, @@ -133,8 +139,27 @@ static char *string_of_toks(const tal_t *ctx, const struct token *first, const struct token *until) { - const struct token *end = until - 1; - return tal_strndup(ctx, first->p, end->p - first->p + end->len); + char *str, *p; + + /* Careful to skip erased tokens (eg. comments) */ + str = p = tal_arr(ctx, char, until->p - first->p + 1); + while (first != until) { + const struct token *next = first + 1; + + if (first->len) { + memcpy(p, first->p, first->len); + p += first->len; + /* Insert space if they weren't adjacent, unless last */ + if (next != until) { + if (first->p + first->len != next->p) + *(p++) = ' '; + } + } + first = next; + } + *p = '\0'; + + return str; } static char *tok_take_until(const tal_t *ctx, @@ -240,23 +265,37 @@ static void tok_take_unknown_statement(struct parse_state *ps) tok_take_if(&ps->toks, ";"); } +static bool tok_take_expr(struct parse_state *ps, const char *term) +{ + while (!tok_is(&ps->toks, term)) { + if (tok_take_if(&ps->toks, "(")) { + if (!tok_take_expr(ps, ")")) + return false; + } else if (tok_take_if(&ps->toks, "[")) { + if (!tok_take_expr(ps, "]")) + return false; + } else if (!tok_take(&ps->toks)) + return false; + } + return tok_take(&ps->toks); +} + /* [ ... */ static bool tok_take_array(struct parse_state *ps, struct cdump_type **type) { /* This will be some arbitrary expression! */ struct cdump_type *arr = get_type(ps->defs, CDUMP_ARRAY, NULL); + const struct token *start = tok_peek(&ps->toks); - arr->u.arr.size = tok_take_until(arr, &ps->toks, "]"); - if (!arr->u.arr.size) { + if (!tok_take_expr(ps, "]")) { complain(ps, "Could not find closing array size ]"); return false; } + arr->u.arr.size = string_of_toks(arr, start, ps->toks - 1); arr->u.arr.type = *type; *type = arr; - /* Swallow ] */ - tok_take(&ps->toks); return true; } diff --git a/ccan/cdump/test/run-arraysize.c b/ccan/cdump/test/run-arraysize.c new file mode 100644 index 00000000..e89af97b --- /dev/null +++ b/ccan/cdump/test/run-arraysize.c @@ -0,0 +1,54 @@ +#include +/* Include the C files directly. */ +#include +#include + +int main(void) +{ + struct cdump_definitions *defs; + const struct cdump_type *t; + char *ctx = tal(NULL, char), *problems; + + /* This is how many tests you plan to run */ + plan_tests(20); + + /* unions and comments. */ + defs = cdump_extract(ctx, + "struct foo {\n" + " int x[5 */* Comment */7];\n" + " int y[5// Comment\n" + " * 7];\n" + " int z[5 *\n" + "#ifdef FOO\n" + " 7\n" + "#endif\n" + "];\n" + "};\n", &problems); + + ok1(defs); + ok1(tal_parent(defs) == ctx); + ok1(!problems); + t = strmap_get(&defs->structs, "foo"); + ok1(t); + ok1(tal_count(t->u.members) == 3); + ok1(streq(t->u.members[0].name, "x")); + ok1(t->u.members[0].type->kind == CDUMP_ARRAY); + ok1(streq(t->u.members[0].type->u.arr.size, "5 * 7")); + ok1(t->u.members[0].type->u.arr.type->kind == CDUMP_UNKNOWN); + ok1(streq(t->u.members[0].type->u.arr.type->name, "int")); + + ok1(streq(t->u.members[1].name, "y")); + ok1(t->u.members[1].type->kind == CDUMP_ARRAY); + ok1(streq(t->u.members[1].type->u.arr.size, "5 * 7")); + ok1(t->u.members[1].type->u.arr.type->kind == CDUMP_UNKNOWN); + ok1(streq(t->u.members[1].type->u.arr.type->name, "int")); + + ok1(streq(t->u.members[2].name, "z")); + ok1(t->u.members[2].type->kind == CDUMP_ARRAY); + ok1(streq(t->u.members[2].type->u.arr.size, "5 * 7")); + ok1(t->u.members[2].type->u.arr.type->kind == CDUMP_UNKNOWN); + ok1(streq(t->u.members[2].type->u.arr.type->name, "int")); + + /* This exits depending on whether all tests passed */ + return exit_status(); +} -- 2.39.2