cdump: ignore __attribute__ (gcc extension).

[ccan] / ccan / cdump / cdump.c

diff --git a/ccan/cdump/cdump.c b/ccan/cdump/cdump.c
index 8ade786c676c00eafe66868b9f194f52241974b7..f080b968b5732593dbed861d241614878c5191bf 100644 (file)
--- a/ccan/cdump/cdump.c
+++ b/ccan/cdump/cdump.c
@@ -16,6 +16,16 @@ static void add_token(struct token **toks, const char *p, size_t len)
        (*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)
@@ -27,10 +37,10 @@ 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;
@@ -280,19 +290,30 @@ static bool tok_take_expr(struct parse_state *ps, const char *term)
        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;
 
@@ -350,6 +371,47 @@ static bool tok_take_type(struct parse_state *ps, struct cdump_type **type)
        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)
@@ -372,6 +434,12 @@ static bool tok_take_conglom(struct parse_state *ps,
                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;
@@ -383,6 +451,9 @@ static bool tok_take_conglom(struct parse_state *ps,
                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")
@@ -412,6 +483,9 @@ static bool tok_take_conglom(struct parse_state *ps,
                        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");
@@ -423,6 +497,14 @@ static bool tok_take_conglom(struct parse_state *ps,
                                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, ";")) {
@@ -431,10 +513,19 @@ static bool tok_take_conglom(struct parse_state *ps,
                }
        }
 
-       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 ... */
@@ -458,6 +549,13 @@ static bool tok_take_enum(struct parse_state *ps)
                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;
@@ -479,6 +577,11 @@ static bool tok_take_enum(struct parse_state *ps)
                        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) {
@@ -489,11 +592,19 @@ static bool tok_take_enum(struct parse_state *ps)
                        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,
@@ -551,6 +662,8 @@ struct cdump_definitions *cdump_extract(const tal_t *ctx, const char *code,
 
        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;