ccanlint: ignore comments when parsing examples.

[ccan-lca-2011.git] / tools / ccanlint / tests / examples_compile.c

diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c
index 7cee7795b7c8fef9cd532437e3d4977b6bce1fda..768e96aea911f2e5f9f3732a3d1b05eeb7911ed0 100644 (file)
--- a/tools/ccanlint/tests/examples_compile.c
+++ b/tools/ccanlint/tests/examples_compile.c
@@ -71,13 +71,12 @@ static char *add_dep(const struct manifest *m, char *list, const char *mod)
 static char *obj_list(const struct manifest *m, struct ccan_file *f)
 {
        char *list = talloc_strdup(m, "");
-       struct ccan_file *i;
        struct manifest *subm;
        char **lines;
 
-       /* Object files for this module. */
-       list_for_each(&m->c_files, i, list)
-               list = talloc_asprintf_append(list, " %s", i->compiled);
+       /* This module. */
+       if (m->compiled)
+               list = talloc_asprintf_append(list, " %s", m->compiled);
 
        /* Other ccan modules we depend on. */
        list_for_each(&m->deps, subm, list) {
@@ -154,7 +153,7 @@ static char *add_func(char *others, const char *line)
        }
 
        return talloc_asprintf_append(others, "printf(\"%%p\", %.*s);\n",
-                                     (unsigned)(end - p + 1), p);
+                                     (unsigned)(end - p), p+1);
 }
 
 static void strip_leading_whitespace(char **lines)
@@ -292,6 +291,19 @@ static char **combine(const void *ctx, char **lines, char **prev)
        return ret;
 }
 
+/* Only handles very simple comments. */
+static char *strip_comment(const void *ctx, const char *orig_line)
+{
+       char *p, *ret = talloc_strdup(ctx, orig_line);
+
+       p = strstr(ret, "/*");
+       if (!p)
+               p = strstr(ret, "//");
+       if (p)
+               *p = '\0';
+       return ret;
+}
+
 static char *mangle(struct manifest *m, char **lines)
 {
        char *ret, *use_funcs = NULL, *why;
@@ -335,28 +347,30 @@ static char *mangle(struct manifest *m, char **lines)
 
        /* Primitive, very primitive. */
        for (i = 0; lines[i]; i++) {
+               char *line = strip_comment(ret, lines[i]);
+
                /* } at start of line ends a function. */
                if (in_function) {
-                       if (lines[i][0] == '}')
+                       if (line[0] == '}')
                                in_function = false;
                } else {
                        /* Character at start of line, with ( and no ;
                         * == function start.  Ignore comments. */
-                       if (!isspace(lines[i][0])
-                           && strchr(lines[i], '(')
-                           && !strchr(lines[i], ';')
-                           && !strstr(lines[i], "//")) {
+                       if (!isspace(line[0])
+                           && strchr(line, '(')
+                           && !strchr(line, ';')
+                           && !strstr(line, "//")) {
                                in_function = true;
-                               if (strncmp(lines[i], "int main", 8) == 0)
+                               if (strncmp(line, "int main", 8) == 0)
                                        has_main = true;
-                               if (strncmp(lines[i], "static", 6) == 0) {
+                               if (strncmp(line, "static", 6) == 0) {
                                        use_funcs = add_func(use_funcs,
-                                                            lines[i]);
+                                                            line);
                                }
                        }
                }
                /* ... means elided code. */
-               if (strcmp(lines[i], "...") == 0) {
+               if (strcmp(line, "...") == 0) {
                        if (!in_function && !has_main
                            && looks_internal(lines + i + 1, &why)) {
                                /* This implies we start a function here. */
@@ -530,7 +544,14 @@ static void build_examples(struct manifest *m, bool keep,
                                warnings = true;
                                score->error = "Compiling extracted example"
                                        " gave warnings";
-                               score_file_error(score, file[j], 0, err[j]);
+                               error = talloc_asprintf(score,
+                                       "Example:\n"
+                                       "%s\n"
+                                       "Compiler:\n"
+                                       "%s",
+                                       get_ccan_file_contents(file[j]),
+                                       err[j]);
+                               score_file_error(score, file[j], 0, error);
                                goto next;
                        }
                }
@@ -600,4 +621,4 @@ struct ccanlint examples_compile = {
        .can_run = can_run,
 };
 
-REGISTER_TEST(examples_compile, &has_examples, &build_objs, NULL);
+REGISTER_TEST(examples_compile, &has_examples, &build, NULL);