ccanlint: handle nested modules when mentioned in examples.

[ccan] / tools / ccanlint / tests / examples_compile.c

diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c
index 760711f1c5354f8fc39fa228c213f20ed728db8b..7d8803c6973db2cc4213915a30caa1e3aa67d5f3 100644 (file)
--- a/tools/ccanlint/tests/examples_compile.c
+++ b/tools/ccanlint/tests/examples_compile.c
@@ -1,6 +1,7 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
 #include <ccan/talloc/talloc.h>
+#include <ccan/str_talloc/str_talloc.h>
 #include <ccan/cast/cast.h>
 #include <ccan/str/str.h>
 #include <sys/types.h>
@@ -30,27 +31,27 @@ static void add_mod(struct manifest ***deps, struct manifest *m)
        (*deps)[num] = m;
 }
 
-static bool have_mod(struct manifest *deps[], const char *basename)
+static bool have_mod(struct manifest *deps[], const char *modname)
 {
        unsigned int i;
 
        for (i = 0; i < talloc_get_size(deps) / sizeof(*deps); i++)
-               if (strcmp(deps[i]->basename, basename) == 0)
+               if (strcmp(deps[i]->modname, modname) == 0)
                        return true;
        return false;
 }
 
-static void add_dep(struct manifest ***deps, const char *basename)
+static void add_dep(struct manifest ***deps, const char *modname)
 {
        unsigned int i;
        struct manifest *m;
        char *errstr;
 
-       if (have_mod(*deps, basename))
+       if (have_mod(*deps, modname))
                return;
 
        m = get_manifest(*deps, talloc_asprintf(*deps, "%s/ccan/%s",
-                                               ccan_dir, basename));
+                                               ccan_dir, modname));
        errstr = build_submodule(m, cflags, COMPILE_NORMAL);
        if (errstr)
                errx(1, "%s", errstr);
@@ -62,7 +63,8 @@ static void add_dep(struct manifest ***deps, const char *basename)
        if (m->info_file) {
                char **infodeps;
 
-               infodeps = get_deps(m, m->dir, false, get_or_compile_info);
+               infodeps = get_deps(m, m->dir, "depends", false,
+                                   get_or_compile_info);
 
                for (i = 0; infodeps[i]; i++) {
                        if (strstarts(infodeps[i], "ccan/"))
@@ -71,31 +73,35 @@ static void add_dep(struct manifest ***deps, const char *basename)
        }
 }
 
-static char *example_obj_list(struct manifest *m, struct ccan_file *f)
+static struct manifest **get_example_deps(struct manifest *m,
+                                         struct ccan_file *f)
 {
+       char **lines;
        struct manifest **deps = talloc_array(f, struct manifest *, 0);
-       char **lines, *list;
-       unsigned int i;
 
        /* This one for a start. */
-       add_dep(&deps, m->basename);
+       add_dep(&deps, m->modname);
 
        /* Other modules implied by includes. */
        for (lines = get_ccan_file_lines(f); *lines; lines++) {
-               unsigned preflen = strspn(*lines, " \t");
-               if (strstarts(*lines + preflen, "#include <ccan/")) {
-                       char *modname;
-
-                       modname = talloc_strdup(f, *lines + preflen
-                                               + strlen("#include <ccan/"));
-                       modname[strcspn(modname, "/")] = '\0';
+               char *modname;
+               if (strreg(f, *lines,
+                           "^[ \t]*#[ \t]*include[ \t]*[<\"]"
+                          "ccan/+(.+)/+[^/]+\\.h", &modname)) {
                        if (!have_mod(deps, modname))
                                add_dep(&deps, modname);
                }
        }
 
-       list = talloc_strdup(f, "");
-       for (i = 0; i < talloc_get_size(deps) / sizeof(*deps); i++) {
+       return deps;
+}
+
+static char *example_obj_list(const void *ctx, struct manifest **deps)
+{
+       char *list = talloc_strdup(ctx, "");
+       unsigned int i;
+
+       for (i = 0; i < talloc_array_length(deps); i++) {
                if (deps[i]->compiled[COMPILE_NORMAL])
                        list = talloc_asprintf_append(list, " %s",
                                                      deps[i]->compiled
@@ -104,29 +110,35 @@ static char *example_obj_list(struct manifest *m, struct ccan_file *f)
        return list;
 }
 
-/* FIXME: Test with reduced features! */
-static char *lib_list(const struct manifest *m)
+static char *example_lib_list(const void *ctx, struct manifest **deps)
 {
-       unsigned int i;
+       char *list = talloc_strdup(ctx, "");
        char **libs;
-       char *ret = talloc_strdup(m, "");
+       unsigned int i, j;
 
-       libs = get_libs(m, m->dir, true, get_or_compile_info);
-       for (i = 0; libs[i]; i++)
-               ret = talloc_asprintf_append(ret, "-l%s ", libs[i]);
-       return ret;
+       /* FIXME: This doesn't uniquify. */
+       for (i = 0; i < talloc_array_length(deps); i++) {
+               libs = get_libs(ctx, deps[i]->dir, NULL, get_or_compile_info);
+               for (j = 0; libs[j]; j++)
+                       list = talloc_asprintf_append(list, "-l%s ", libs[j]);
+       }
+       return list;
 }
 
+/* FIXME: Test with reduced features! */
 static bool compile(const void *ctx,
                    struct manifest *m,
                    struct ccan_file *file,
                    char **output)
 {
+       struct manifest **deps = get_example_deps(m, file);
+
        file->compiled[COMPILE_NORMAL] = temp_file(ctx, "", file->fullname);
        if (!compile_and_link(ctx, file->fullname, ccan_dir,
-                             example_obj_list(m, file),
+                             example_obj_list(file, deps),
                              compiler, cflags,
-                             lib_list(m), file->compiled[COMPILE_NORMAL],
+                             example_lib_list(file, deps),
+                             file->compiled[COMPILE_NORMAL],
                              output)) {
                /* Don't keep failures, even with --keep */
                unlink(file->compiled[COMPILE_NORMAL]);
@@ -191,7 +203,8 @@ static bool looks_internal(char **lines, char **why)
                const char *line = lines[i] + strspn(lines[i], " \t");
                unsigned len = strspn(line, IDENT_CHARS);
 
-               if (!line[0] || cisspace(line[0]) || strstarts(line, "//"))
+               if (!line[0] || cisspace(line[0]) || strstarts(line, "//")
+                   || strstarts(line, "#line"))
                        continue;
 
                assert(line[strlen(line)-1] != '\n');
@@ -347,7 +360,7 @@ static char *mangle(struct manifest *m, char **lines)
                              "#include <sys/stat.h>\n"
                              "#include <sys/types.h>\n"
                              "#include <unistd.h>\n",
-                             m->basename, m->basename);
+                             m->modname, m->basename);
 
        ret = talloc_asprintf_append(ret, "/* Useful dummy functions. */\n"
                                     "extern int somefunc(void);\n"