(*toks)[n].len = len;
}
+static size_t to_eol(const char *p)
+{
+ size_t len = strcspn(p, "\n");
+
+ /* And any \ continuations. */
+ while (p[len] && p[len-1] == '\\')
+ len += strcspn(p+len+1, "\n") + 1;
+ return len;
+}
+
/* Simplified tokenizer: comments and preproc directives removed,
identifiers are a token, others are single char tokens. */
static struct token *tokenize(const void *ctx, const char *code)
for (i = 0; code[i]; i += len) {
if (code[i] == '#' && start_of_line) {
/* Preprocessor line. */
- len = strcspn(code+i, "\n");
+ len = to_eol(code + i);
} else if (code[i] == '/' && code[i+1] == '/') {
/* One line comment. */
- len = strcspn(code+i, "\n");
+ len = to_eol(code + i);
if (tok_start != -1U) {
add_token(&toks, code+tok_start, i - tok_start);
tok_start = -1U;
enum cdump_type_kind kind,
const char *name)
{
- struct cdump_map *m;
+ cdump_map_t *m = (void *)0x1L; /* Shouldn't be used */
struct cdump_type *t;
switch (kind) {
return tok_take(&ps->toks);
}
+static char *tok_take_expr_str(const tal_t *ctx,
+ struct parse_state *ps,
+ const char *term)
+{
+ const struct token *start = tok_peek(&ps->toks);
+
+ if (!tok_take_expr(ps, term))
+ return NULL;
+
+ return string_of_toks(ctx, start, ps->toks - 1);
+}
+
/* [ ... */
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);
- if (!tok_take_expr(ps, "]")) {
+ arr->u.arr.size = tok_take_expr_str(arr, ps, "]");
+ if (!arr->u.arr.size) {
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;
return true;
}
+/* CDUMP */
+static bool tok_maybe_take_cdump_note(const tal_t *ctx,
+ struct parse_state *ps, const char **note)
+{
+ *note = NULL;
+ if (tok_take_if(&ps->toks, "CDUMP")) {
+ if (!tok_take_if(&ps->toks, "(")) {
+ complain(ps, "Expected ( after CDUMP");
+ return false;
+ }
+ *note = tok_take_expr_str(ctx, ps, ")");
+ if (!*note) {
+ complain(ps, "Expected ) after CDUMP(");
+ return false;
+ }
+ }
+ return true;
+}
+
+/* __attribute__((...)) */
+static bool tok_ignore_attribute(struct parse_state *ps)
+{
+ if (!tok_take_if(&ps->toks, "__attribute__"))
+ return true;
+
+ if (!tok_take_if(&ps->toks, "(") || !tok_take_if(&ps->toks, "(")) {
+ complain(ps, "Expected (( after __attribute__");
+ return false;
+ }
+
+ if (!tok_take_expr(ps, ")")) {
+ complain(ps, "Expected expression after __attribute__((");
+ return false;
+ }
+ if (!tok_take_if(&ps->toks, ")")) {
+ complain(ps, "Expected )) __attribute__((");
+ return false;
+ }
+ return true;
+}
+
/* struct|union ... */
static bool tok_take_conglom(struct parse_state *ps,
enum cdump_type_kind conglom_kind)
return false;
}
+ if (!tok_maybe_take_cdump_note(e, ps, &e->note))
+ return false;
+
+ if (!tok_ignore_attribute(ps))
+ return false;
+
if (!tok_take_if(&ps->toks, "{")) {
complain(ps, "Expected { for struct/union");
return false;
const struct token *quals;
unsigned int num_quals = 0;
+ if (!tok_ignore_attribute(ps))
+ return false;
+
/* Anything can have these prepended. */
quals = ps->toks;
while (tok_take_if(&ps->toks, "const")
while (tok_take_if(&ps->toks, "*"))
m->type = ptr_of(ps, m->type);
+ if (!tok_ignore_attribute(ps))
+ return false;
+
m->name = tok_take_ident(e, &ps->toks);
if (!m->name) {
complain(ps, "Expected name for member");
if (!tok_take_array(ps, &m->type))
return false;
}
+
+ /* CDUMP() */
+ if (!tok_maybe_take_cdump_note(e->u.members,
+ ps, &m->note))
+ return false;
+
+ if (!tok_ignore_attribute(ps))
+ return false;
} while (tok_take_if(&ps->toks, ","));
if (!tok_take_if(&ps->toks, ";")) {
}
}
- if (tok_take_if(&ps->toks, "}") && tok_take_if(&ps->toks, ";"))
- return true;
- complain(ps, "Expected }; at end of struct/union");
- return false;
+ if (!tok_take_if(&ps->toks, "}")) {
+ complain(ps, "Expected } at end of struct/union");
+ return false;
+ }
+
+ if (!tok_ignore_attribute(ps))
+ return false;
+
+ if (!tok_take_if(&ps->toks, ";")) {
+ complain(ps, "Expected ; at end of struct/union");
+ return false;
+ }
+ return true;
}
/* enum ... */
return false;
}
+ /* CDUMP() */
+ if (!tok_maybe_take_cdump_note(e, ps, &e->note))
+ return false;
+
+ if (!tok_ignore_attribute(ps))
+ return false;
+
if (!tok_take_if(&ps->toks, "{")) {
complain(ps, "Expected { after enum name");
return false;
complain(ps, "Expected enum value name");
return false;
}
+
+ /* CDUMP() */
+ if (!tok_maybe_take_cdump_note(e->u.enum_vals, ps, &v->note))
+ return false;
+
if (tok_take_if(&ps->toks, "=")) {
v->value = tok_take_until(e, &ps->toks, ",}");
if (!v->value) {
v->value = NULL;
} while (tok_take_if(&ps->toks, ","));
- if (tok_take_if(&ps->toks, "}") && tok_take_if(&ps->toks, ";"))
- return true;
+ if (!tok_take_if(&ps->toks, "}")) {
+ complain(ps, "Expected } at end of enum");
+ return false;
+ }
+
+ if (!tok_ignore_attribute(ps))
+ return false;
- complain(ps, "Expected }; at end of enum");
- return false;
+ if (!tok_take_if(&ps->toks, ";")) {
+ complain(ps, "Expected ; at end of enum");
+ return false;
+ }
+ return true;
}
static bool gather_undefines(const char *name,
struct cdump_type *t,
- struct cdump_map *undefs)
+ cdump_map_t *undefs)
{
if (!type_defined(t))
strmap_add(undefs, name, t);
static bool remove_from_map(const char *name,
struct cdump_type *t,
- struct cdump_map *map)
+ cdump_map_t *map)
{
strmap_del(map, name, NULL);
return true;
}
-static void remove_undefined(struct cdump_map *map)
+static void remove_undefined(cdump_map_t *map)
{
- struct cdump_map undefs;
+ cdump_map_t undefs;
/* We can't delete inside iterator, so gather all the undefs
* then remove them. */
toks = ps.toks = tokenize(ps.defs, code);
while (tok_peek(&ps.toks)) {
+ if (!tok_ignore_attribute(&ps))
+ goto fail;
if (tok_take_if(&ps.toks, "struct")) {
if (!tok_take_conglom(&ps, CDUMP_STRUCT))
goto fail;