X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_compile.c;h=b10940ae8a3bb4c112ed4cd1fcbc726c2e88410e;hp=7d28aad6ca63ec965f796e3d9f3f2e33ad393082;hb=e0529e15e0c7f9251af5465ef03f208d279affc1;hpb=3b200f895cb7884c72d9e2409f047284027abc68 diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c index 7d28aad6..b10940ae 100644 --- a/tools/ccanlint/tests/examples_compile.c +++ b/tools/ccanlint/tests/examples_compile.c @@ -1,6 +1,10 @@ #include #include -#include +#include +#include +#include +#include +#include #include #include #include @@ -11,7 +15,7 @@ #include #include #include -#include "../compulsory_tests/build.h" +#include "build.h" static const char *can_run(struct manifest *m) { @@ -24,33 +28,33 @@ static const char *can_run(struct manifest *m) static void add_mod(struct manifest ***deps, struct manifest *m) { - unsigned int num = talloc_get_size(*deps) / sizeof(*deps); - *deps = talloc_realloc(NULL, *deps, struct manifest *, num + 1); + unsigned int num = tal_count(*deps); + tal_resize(deps, num + 1); (*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) + for (i = 0; i < tal_count(deps); i++) + 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)); - errstr = build_submodule(m); + m = get_manifest(*deps, + tal_fmt(*deps, "%s/ccan/%s", ccan_dir, modname)); + errstr = build_submodule(m, cflags, COMPILE_NORMAL); if (errstr) errx(1, "%s", errstr); @@ -61,7 +65,8 @@ static void add_dep(struct manifest ***deps, const char *basename) if (m->info_file) { char **infodeps; - infodeps = get_deps(m, m->dir, false, &m->info_file->compiled); + infodeps = get_deps(m, m->dir, "depends", false, + get_or_compile_info); for (i = 0; infodeps[i]; i++) { if (strstarts(infodeps[i], "ccan/")) @@ -70,81 +75,94 @@ static void add_dep(struct manifest ***deps, const char *basename) } } -static char *obj_list(struct manifest *m, struct ccan_file *f) +static struct manifest **get_example_deps(struct manifest *m, + struct ccan_file *f) { - struct manifest **deps = talloc_array(f, struct manifest *, 0); - char **lines, *list; - unsigned int i; + char **lines; + struct manifest **deps = tal_arr(f, struct manifest *, 0); /* 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 compiled) - list = talloc_asprintf_append(list, " %s", - deps[i]->compiled); + return deps; +} + +static char *example_obj_list(const void *ctx, struct manifest **deps) +{ + char *list = tal_strdup(ctx, ""); + unsigned int i; + + for (i = 0; i < tal_count(deps); i++) { + if (deps[i]->compiled[COMPILE_NORMAL]) + tal_append_fmt(&list, " %s", + deps[i]->compiled[COMPILE_NORMAL]); } return list; } -static char *lib_list(const struct manifest *m) +static char *example_lib_list(const void *ctx, struct manifest **deps) { - unsigned int i, num; - char **libs = get_libs(m, m->dir, &num, &m->info_file->compiled); - char *ret = talloc_strdup(m, ""); - - for (i = 0; i < num; i++) - ret = talloc_asprintf_append(ret, "-l%s ", libs[i]); - return ret; + char *list = tal_strdup(ctx, ""); + char **libs; + unsigned int i, j; + + /* FIXME: This doesn't uniquify. */ + for (i = 0; i < tal_count(deps); i++) { + libs = get_libs(ctx, deps[i]->dir, NULL, get_or_compile_info); + for (j = 0; libs[j]; j++) + tal_append_fmt(&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, - bool keep, char **output) + char **output) { - file->compiled = maybe_temp_file(ctx, "", keep, file->fullname); + 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, - obj_list(m, file), + example_obj_list(file, deps), compiler, cflags, - lib_list(m), file->compiled, output)) { - /* Don't keep failures. */ - if (keep) - unlink(file->compiled); - talloc_free(file->compiled); - file->compiled = NULL; + example_lib_list(file, deps), + file->compiled[COMPILE_NORMAL], + output)) { + /* Don't keep failures, even with --keep */ + unlink(file->compiled[COMPILE_NORMAL]); + file->compiled[COMPILE_NORMAL] = NULL; return false; } return true; } -static char *start_main(char *ret, const char *why) +static void start_main(char **ret, const char *why) { - return talloc_asprintf_append(ret, + tal_append_fmt(ret, "/* The example %s, so fake function wrapper inserted */\n" "int main(int argc, char *argv[])\n" - "{\n", why); + "{\n", why); } /* We only handle simple function definitions here. */ -static char *add_func(char *others, const char *line) +static char *add_func(const tal_t *ctx, char *others, const char *line) { const char *p, *end = strchr(line, '(') - 1; + char *use; + while (cisspace(*end)) { end--; if (end == line) @@ -156,8 +174,12 @@ static char *add_func(char *others, const char *line) return others; } - return talloc_asprintf_append(others, "printf(\"%%p\", %.*s);\n", - (unsigned)(end - p), p+1); + use = tal_fmt(ctx, "printf(\"%%p\", %.*s);\n", + (unsigned)(end - p), p+1); + if (others) + use = tal_strcat(ctx, take(others), take(use)); + + return use; } static void strip_leading_whitespace(char **lines) @@ -188,58 +210,72 @@ 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'); + /* The winners. */ if (strstarts(line, "if") && len == 2) { - *why = "starts with if"; + *why = cast_const(char *, "starts with if"); return true; } if (strstarts(line, "for") && len == 3) { - *why = "starts with for"; + *why = cast_const(char *, "starts with for"); return true; } if (strstarts(line, "while") && len == 5) { - *why = "starts with while"; + *why = cast_const(char *, "starts with while"); return true; } if (strstarts(line, "do") && len == 2) { - *why = "starts with do"; + *why = cast_const(char *, "starts with do"); return true; } /* The losers. */ if (strstarts(line, "#include")) { - *why = "starts with #include"; + *why = cast_const(char *, "starts with #include"); return false; } if (last_ended && strchr(line, '(')) { if (strstarts(line, "static")) { - *why = "starts with static and contains ("; + *why = cast_const(char *, + "starts with static" + " and contains ("); return false; } if (strends(line, ")")) { - *why = "contains ( and ends with )"; + *why = cast_const(char *, + "contains ( and ends with )"); return false; } } + /* Previously prepended. */ + if (strstr(line, "didn't seem to belong inside a function")) { + *why = cast_const(char *, "Comment said so"); + return false; + } + /* Single identifier then operator == inside function. */ if (last_ended && len && cispunct(line[len+strspn(line+len, " ")])) { - *why = "starts with identifier then punctuation"; + *why = cast_const(char *, "starts with identifier" + " then punctuation"); return true; } last_ended = (strends(line, "}") || strends(line, ";") + || strends(line, "*/") || streq(line, "...")); } /* No idea... Say yes? */ - *why = "gave no clues"; + *why = cast_const(char *, "gave no clues"); return true; } @@ -285,9 +321,9 @@ static char **combine(const void *ctx, char **lines, char **prev) for (i = 0; prev[i]; i++); prev_total = i; - ret = talloc_array(ctx, char *, 1 +lines_total + prev_total + 1); - ret[0] = talloc_asprintf(ret, "/* The example %s, thus %s */\n", - why, reasoning); + ret = tal_arr(ctx, char *, 1 + lines_total + prev_total + 1); + ret[0] = tal_fmt(ret, "/* The example %s, thus %s */", + why, reasoning); memcpy(ret+1, lines, count * sizeof(ret[0])); memcpy(ret+1 + count, prev, prev_total * sizeof(ret[0])); memcpy(ret+1 + count + prev_total, lines + count, @@ -298,7 +334,7 @@ static char **combine(const void *ctx, char **lines, char **prev) /* Only handles very simple comments. */ static char *strip_comment(const void *ctx, const char *orig_line) { - char *p, *ret = talloc_strdup(ctx, orig_line); + char *p, *ret = tal_strdup(ctx, orig_line); p = strstr(ret, "/*"); if (!p) @@ -314,26 +350,26 @@ static char *mangle(struct manifest *m, char **lines) bool in_function = false, fake_function = false, has_main = false; unsigned int i; - ret = talloc_asprintf(m, - "/* Include header from module. */\n" - "#include \n" - "/* Prepend a heap of headers. */\n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n", - m->basename, m->basename); - - ret = talloc_asprintf_append(ret, "/* Useful dummy functions. */\n" + ret = tal_fmt(m, + "/* Include header from module. */\n" + "#include \n" + "/* Prepend a heap of headers. */\n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n", + m->modname, m->basename); + + ret = tal_strcat(m, take(ret), "/* Useful dummy functions. */\n" "extern int somefunc(void);\n" "int somefunc(void) { return 0; }\n" "extern char somestring[];\n" @@ -341,14 +377,14 @@ static char *mangle(struct manifest *m, char **lines) if (looks_internal(lines, &why)) { /* Wrap it all in main(). */ - ret = start_main(ret, why); + start_main(&ret, why); fake_function = true; in_function = true; has_main = true; } else - ret = talloc_asprintf_append(ret, + tal_append_fmt(&ret, "/* The example %s, so didn't wrap in main() */\n", - why); + why); /* Primitive, very primitive. */ for (i = 0; lines[i]; i++) { @@ -369,7 +405,7 @@ static char *mangle(struct manifest *m, char **lines) if (strncmp(line, "int main", 8) == 0) has_main = true; if (strncmp(line, "static", 6) == 0) { - use_funcs = add_func(use_funcs, + use_funcs = add_func(m, use_funcs, line); } } @@ -379,61 +415,58 @@ static char *mangle(struct manifest *m, char **lines) if (!in_function && !has_main && looks_internal(lines + i + 1, &why)) { /* This implies we start a function here. */ - ret = start_main(ret, why); + start_main(&ret, why); has_main = true; fake_function = true; in_function = true; } - ret = talloc_asprintf_append(ret, - "/* ... removed */\n"); + ret = tal_strcat(m, take(ret), "/* ... removed */\n"); continue; } - ret = talloc_asprintf_append(ret, "%s\n", lines[i]); + ret = tal_strcat(m, take(ret), lines[i]); + ret = tal_strcat(m, take(ret), "\n"); } if (!has_main) { - ret = talloc_asprintf_append(ret, + ret = tal_strcat(m, take(ret), "/* Need a main to link successfully. */\n" "int main(void)\n{\n"); fake_function = true; } if (use_funcs) { - ret = talloc_asprintf_append(ret, - "/* Get rid of unused warnings" - " by printing addresses of" - " static funcs. */\n"); + ret = tal_strcat(m, take(ret), + "/* Get rid of unused warnings" + " by printing addresses of" + " static funcs. */\n"); if (!fake_function) { - ret = talloc_asprintf_append(ret, - "int use_funcs(void);\n" - "int use_funcs(void) {\n"); + ret = tal_strcat(m, take(ret), + "int use_funcs(void);\n" + "int use_funcs(void) {\n"); fake_function = true; } - ret = talloc_asprintf_append(ret, " %s\n", use_funcs); + tal_append_fmt(&ret, " %s\n", use_funcs); } if (fake_function) - ret = talloc_asprintf_append(ret, "return 0;\n" - "}\n"); + ret = tal_strcat(m, take(ret), "return 0;\n}\n"); return ret; } static struct ccan_file *mangle_example(struct manifest *m, struct ccan_file *example, - char **lines, - bool keep) + char **lines) { char *name, *contents; int fd; struct ccan_file *f; - name = maybe_temp_file(example, ".c", keep, - talloc_asprintf(m, "%s/mangled-%s", - m->dir, example->name)); + name = temp_file(example, ".c", + take(tal_fmt(NULL, "mangled-%s", example->name))); f = new_ccan_file(example, - talloc_dirname(example, name), - talloc_basename(example, name)); - talloc_steal(f, name); + take(path_dirname(example, name)), + take(path_basename(example, name))); + tal_steal(f, name); fd = open(f->fullname, O_WRONLY | O_CREAT | O_EXCL, 0600); if (fd < 0) @@ -445,7 +478,7 @@ static struct ccan_file *mangle_example(struct manifest *m, return NULL; } close(fd); - f->contents = talloc_steal(f, contents); + f->contents = tal_steal(f, contents); list_add(&m->mangled_examples, &f->list); return f; } @@ -470,7 +503,6 @@ static bool has_expected_output(char **lines) static unsigned int try_compiling(struct manifest *m, struct ccan_file *i, char **prev, - bool keep, struct ccan_file *mangled[3], bool res[3], char *err[3], @@ -480,7 +512,7 @@ static unsigned int try_compiling(struct manifest *m, /* Try standalone. */ mangled[0] = i; - res[0] = compile(i, m, mangled[0], keep, &err[0]); + res[0] = compile(i, m, mangled[0], &err[0]); lines[0] = get_ccan_file_lines(i); if (res[0] && streq(err[0], "")) return 1; @@ -488,8 +520,8 @@ static unsigned int try_compiling(struct manifest *m, if (prev) { lines[1] = combine(i, get_ccan_file_lines(i), prev); - mangled[1] = mangle_example(m, i, lines[1], keep); - res[1] = compile(i, m, mangled[1], keep, &err[1]); + mangled[1] = mangle_example(m, i, lines[1]); + res[1] = compile(i, m, mangled[1], &err[1]); if (res[1] && streq(err[1], "")) { return 2; } @@ -499,13 +531,13 @@ static unsigned int try_compiling(struct manifest *m, /* Try standalone. */ lines[num] = get_ccan_file_lines(i); - mangled[num] = mangle_example(m, i, lines[num], keep); - res[num] = compile(i, m, mangled[num], keep, &err[num]); + mangled[num] = mangle_example(m, i, lines[num]); + res[num] = compile(i, m, mangled[num], &err[num]); return num+1; } -static void build_examples(struct manifest *m, bool keep, +static void build_examples(struct manifest *m, unsigned int *timeleft, struct score *score) { struct ccan_file *i; @@ -521,14 +553,14 @@ static void build_examples(struct manifest *m, bool keep, bool res[3]; unsigned num, j; char **lines[3]; - char *error; + const char *error; score->total++; /* Simplify our dumb parsing. */ strip_leading_whitespace(get_ccan_file_lines(i)); - num = try_compiling(m, i, prev, keep, file, res, err, lines); + num = try_compiling(m, i, prev, file, res, err, lines); /* First look for a compile without any warnings. */ for (j = 0; j < num; j++) { @@ -571,7 +603,7 @@ static void build_examples(struct manifest *m, bool keep, " adding headers both failed"; } else { if (num == 3) { - error = talloc_asprintf(score, + error = tal_fmt(score, "Standalone example:\n" "%s\n" "Errors: %s\n\n" @@ -588,7 +620,7 @@ static void build_examples(struct manifest *m, bool keep, get_ccan_file_contents(file[2]), err[2]); } else { - error = talloc_asprintf(score, + error = tal_fmt(score, "Standalone example:\n" "%s\n" "Errors: %s\n\n"