X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_compile.c;h=2ca2f34c6970a520c7b8cc3b18cbfc132bdf8c85;hp=b1798c937f36a4fb14205816183c91a1566b7d97;hb=7307b7ef3cf1d226ade30ca5d7aa524bdd396715;hpb=ab4a6fd9a3b417456ccd8f1fb976783683ccaa26

diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c
index b1798c93..2ca2f34c 100644
--- a/tools/ccanlint/tests/examples_compile.c
+++ b/tools/ccanlint/tests/examples_compile.c
@@ -1,6 +1,10 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
-#include <ccan/talloc/talloc.h>
+#include <ccan/tal/tal.h>
+#include <ccan/tal/str/str.h>
+#include <ccan/take/take.h>
+#include <ccan/cast/cast.h>
+#include <ccan/tal/path/path.h>
 #include <ccan/str/str.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -10,153 +14,184 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <assert.h>
+#include <err.h>
+#include "build.h"
 
 static const char *can_run(struct manifest *m)
 {
 	if (safe_mode)
 		return "Safe mode enabled";
+	if (list_empty(&m->examples))
+		return "No examples to compile";
 	return NULL;
 }
 
-/* FIXME: We should build if it doesn't exist... */
-static bool expect_obj_file(const char *dir)
+static void add_mod(struct manifest ***deps, struct manifest *m)
 {
-	struct manifest *dep_man;
-	bool has_c_files;
-
-	dep_man = get_manifest(dir, dir);
-
-	/* If it has C files, we expect an object file built from them. */
-	has_c_files = !list_empty(&dep_man->c_files);
-	talloc_free(dep_man);
-	return has_c_files;
+	unsigned int num = tal_count(*deps);
+	tal_resize(deps, num + 1);
+	(*deps)[num] = m;
 }
 
-static char *add_dep(const struct manifest *m, char *list, const char *mod)
+static bool have_mod(struct manifest *deps[], const char *modname)
 {
-	char **deps, *obj;
 	unsigned int i;
 
-	/* Not ourselves. */
-	if (streq(m->basename, mod))
-		return list;
+	for (i = 0; i < tal_count(deps); i++)
+		if (strcmp(deps[i]->modname, modname) == 0)
+			return true;
+	return false;
+}
 
-	/* Not if there's no object file for that module */
-	if (!expect_obj_file(talloc_asprintf(list, "%s/ccan/%s", ccan_dir,mod)))
-		return list;
+static void add_dep(struct manifest ***deps, const char *modname)
+{
+	unsigned int i;
+	struct manifest *m;
+	char *errstr;
 
-	obj = talloc_asprintf(list, "%s/ccan/%s.o", ccan_dir, mod);
+	if (have_mod(*deps, modname))
+		return;
 
-	/* Not anyone we've already included. */
-	if (strstr(list, obj))
-		return list;
+	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);
 
-	list = talloc_asprintf_append(list, " %s", obj);
+	add_mod(deps, m);
 
 	/* Get that modules depends as well... */
 	assert(!safe_mode);
-	deps = get_deps(m, talloc_asprintf(list, "%s/ccan/%s", ccan_dir, mod),
-			false, NULL);
+	if (m->info_file) {
+		char **infodeps;
 
-	for (i = 0; deps[i]; i++) {
-		if (strstarts(deps[i], "ccan/"))
-			list = add_dep(m, list, deps[i] + strlen("ccan/"));
+		infodeps = get_deps(m, m->dir, "depends", false,
+				    get_or_compile_info);
+
+		for (i = 0; infodeps[i]; i++) {
+			if (strstarts(infodeps[i], "ccan/"))
+				add_dep(deps, infodeps[i] + strlen("ccan/"));
+		}
 	}
-	return list;
 }
 
-static char *obj_list(const struct manifest *m, struct ccan_file *f)
+static struct manifest **get_example_deps(struct manifest *m,
+					  struct ccan_file *f)
 {
-	char *list = talloc_strdup(m, "");
-	struct ccan_file *i;
 	char **lines;
+	struct manifest **deps = tal_arr(f, struct manifest *, 0);
 
-	/* Object files for this module. */
-	list_for_each(&m->c_files, i, list)
-		list = talloc_asprintf_append(list, " %s", i->compiled);
-
-	/* Other ccan modules we depend on. */
-	list_for_each(&m->dep_dirs, i, list) {
-		if (i->compiled)
-			list = talloc_asprintf_append(list, " %s", i->compiled);
-	}
+	/* This one for a start. */
+	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/")) {
-			const char *mod;
-			unsigned modlen;
-
-			mod = *lines + preflen + strlen("#include <ccan/");
-			modlen = strcspn(mod, "/");
-			mod = talloc_strndup(f, mod, modlen);
-			list = add_dep(m, list, mod);
+		char *modname;
+		if (tal_strreg(f, *lines,
+			       "^[ \t]*#[ \t]*include[ \t]*[<\"]"
+			       "ccan/+(.+)/+[^/]+\\.h", &modname)) {
+			if (!have_mod(deps, modname))
+				add_dep(&deps, modname);
 		}
 	}
 
+	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, ".", &num, &m->info_file->compiled);
-	char *ret = talloc_strdup(m, "");
+	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;
+}
 
-	for (i = 0; i < num; i++)
-		ret = talloc_asprintf_append(ret, "-l%s ", libs[i]);
+static char *cflags_list(const struct manifest *m)
+{
+	unsigned int i;
+	char *ret = tal_strdup(m, cflags);
+
+	char **flags = get_cflags(m, m->dir, get_or_compile_info);
+	for (i = 0; flags[i]; i++)
+		tal_append_fmt(&ret, " %s", flags[i]);
 	return ret;
 }
 
-static char *compile(const void *ctx,
-		     struct manifest *m,
-		     struct ccan_file *file,
-		     bool keep)
+/* FIXME: Test with reduced features! */
+static bool compile(const void *ctx,
+		    struct manifest *m,
+		    struct ccan_file *file,
+		    char **output)
 {
-	char *errmsg;
-
-	file->compiled = maybe_temp_file(ctx, "", keep, file->fullname);
-	errmsg = compile_and_link(ctx, file->fullname, ccan_dir,
-				  obj_list(m, file),
-				  "", lib_list(m), file->compiled);
-	if (errmsg) {
-		talloc_free(file->compiled);
-		return errmsg;
+	struct manifest **deps = get_example_deps(m, file);
+	const char *flags = cflags_list(m);
+
+	file->compiled[COMPILE_NORMAL] = temp_file(ctx, "", file->fullname);
+	if (!compile_and_link(ctx, file->fullname, ccan_dir,
+			      example_obj_list(file, deps),
+			      compiler, flags,
+			      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 NULL;
+	return true;
 }
 
-struct score {
-	unsigned int score;
-	char *errors;
-};
-
-static char *start_main(char *ret)
+static void start_main(char **ret, const char *why)
 {
-	return talloc_asprintf_append(ret,
-				      "/* Fake function wrapper inserted */\n"
-				      "int main(int argc, char *argv[])\n"
-				      "{\n");
+	tal_append_fmt(ret,
+	      "/* The example %s, so fake function wrapper inserted */\n"
+	      "int main(int argc, char *argv[])\n"
+	       "{\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;
-	while (isblank(*end)) {
+	char *use;
+
+	while (cisspace(*end)) {
 		end--;
 		if (end == line)
 			return others;
 	}
 
-	for (p = end; isalnum(*p) || *p == '_'; p--) {
+	for (p = end; cisalnum(*p) || *p == '_'; p--) {
 		if (p == line)
 			return others;
 	}
 
-	return talloc_asprintf_append(others, "printf(\"%%p\", %.*s);\n",
-				      end - p + 1, p);
+	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)
@@ -177,7 +212,7 @@ static void strip_leading_whitespace(char **lines)
 			lines[i] += min_span;
 }
 
-static bool looks_internal(char **lines)
+static bool looks_internal(char **lines, char **why)
 {
 	unsigned int i;
 	bool last_ended = true; /* Did last line finish a statement? */
@@ -187,41 +222,72 @@ static bool looks_internal(char **lines)
 		const char *line = lines[i] + strspn(lines[i], " \t");
 		unsigned len = strspn(line, IDENT_CHARS);
 
-		if (!line[0] || isblank(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)
+		if (strstarts(line, "if") && len == 2) {
+			*why = cast_const(char *, "starts with if");
 			return true;
-		if (strstarts(line, "for") && len == 3)
+		}
+		if (strstarts(line, "for") && len == 3) {
+			*why = cast_const(char *, "starts with for");
 			return true;
-		if (strstarts(line, "while") && len == 5)
+		}
+		if (strstarts(line, "while") && len == 5) {
+			*why = cast_const(char *, "starts with while");
 			return true;
-		if (strstarts(line, "do") && len == 2)
+		}
+		if (strstarts(line, "do") && len == 2) {
+			*why = cast_const(char *, "starts with do");
 			return true;
+		}
 
 		/* The losers. */
-		if (strstarts(line, "#include"))
+		if (strstarts(line, "#include")) {
+			*why = cast_const(char *, "starts with #include");
 			return false;
+		}
 
 		if (last_ended && strchr(line, '(')) {
-			if (strstarts(line, "static"))
+			if (strstarts(line, "static")) {
+				*why = cast_const(char *,
+						  "starts with static"
+						  " and contains (");
 				return false;
-			if (strends(line, ")"))
+			}
+			if (strends(line, ")")) {
+				*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
-		    && ispunct(line[len+strspn(line+len, " ")]))
+		    && cispunct(line[len+strspn(line+len, " ")])) {
+			*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 = cast_const(char *, "gave no clues");
 	return true;
 }
 
@@ -230,24 +296,35 @@ static char **combine(const void *ctx, char **lines, char **prev)
 {
 	unsigned int i, lines_total, prev_total, count;
 	char **ret;
+	const char *reasoning;
+	char *why = NULL;
 
 	if (!prev)
 		return NULL;
 
 	/* If it looks internal, put prev at start. */
-	if (looks_internal(lines)) {
+	if (looks_internal(lines, &why)) {
 		count = 0;
+		reasoning = "seemed to belong inside a function";
 	} else {
 		/* Try inserting in first elided position */
 		for (count = 0; lines[count]; count++) {
 			if (strcmp(lines[count], "...") == 0)
 				break;
 		}
-		if (!lines[count])
+		if (!lines[count]) {
 			/* Try at start anyway? */
 			count = 0;
-		else
+			reasoning = "didn't seem to belong inside"
+				" a function, so we prepended the previous"
+				" example";
+		} else {
+			reasoning = "didn't seem to belong inside"
+				" a function, so we put the previous example"
+				" at the first ...";
+
 			count++;
+		}
 	}
 
 	for (i = 0; lines[i]; i++);
@@ -256,228 +333,345 @@ static char **combine(const void *ctx, char **lines, char **prev)
 	for (i = 0; prev[i]; i++);
 	prev_total = i;
 
-	ret = talloc_array(ctx, char *, lines_total + prev_total + 1);
-	memcpy(ret, lines, count * sizeof(ret[0]));
-	memcpy(ret + count, prev, prev_total * sizeof(ret[0]));
-	memcpy(ret + count + prev_total, lines + count,
+	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,
 	       (lines_total - count + 1) * sizeof(ret[0]));
 	return ret;
 }
 
+/* Only handles very simple comments. */
+static char *strip_comment(const void *ctx, const char *orig_line)
+{
+	char *p, *ret = tal_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;
+	char *ret, *use_funcs = NULL, *why;
 	bool in_function = false, fake_function = false, has_main = false;
 	unsigned int i;
 
-	ret = talloc_strdup(m, "/* Prepend a heap of headers. */\n"
-			    "#include <assert.h>\n"
-			    "#include <err.h>\n"
-			    "#include <errno.h>\n"
-			    "#include <fcntl.h>\n"
-			    "#include <limits.h>\n"
-			    "#include <stdbool.h>\n"
-			    "#include <stdint.h>\n"
-			    "#include <stdio.h>\n"
-			    "#include <stdlib.h>\n"
-			    "#include <string.h>\n"
-			    "#include <sys/stat.h>\n"
-			    "#include <sys/types.h>\n"
-			    "#include <unistd.h>\n");
-	ret = talloc_asprintf_append(ret, "/* Include header from module. */\n"
-				     "#include <ccan/%s/%s.h>\n",
-				     m->basename, m->basename);
-
-	ret = talloc_asprintf_append(ret, "/* Useful dummy functions. */\n"
+	ret = tal_fmt(m,
+		      "/* Include header from module. */\n"
+		      "#include <ccan/%s/%s.h>\n"
+		      "/* Prepend a heap of headers. */\n"
+		      "#include <assert.h>\n"
+		      "#include <err.h>\n"
+		      "#include <errno.h>\n"
+		      "#include <fcntl.h>\n"
+		      "#include <limits.h>\n"
+		      "#include <stdbool.h>\n"
+		      "#include <stdint.h>\n"
+		      "#include <stdio.h>\n"
+		      "#include <stdlib.h>\n"
+		      "#include <string.h>\n"
+		      "#include <sys/stat.h>\n"
+		      "#include <sys/types.h>\n"
+		      "#include <unistd.h>\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"
 				     "char somestring[] = \"hello world\";\n");
 
-	if (looks_internal(lines)) {
+	if (looks_internal(lines, &why)) {
 		/* Wrap it all in main(). */
-		ret = start_main(ret);
+		start_main(&ret, why);
 		fake_function = true;
 		in_function = true;
 		has_main = true;
-	}
+	} else
+		tal_append_fmt(&ret,
+			     "/* The example %s, so didn't wrap in main() */\n",
+			       why);
 
 	/* 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 (!isblank(lines[i][0])
-			    && strchr(lines[i], '(')
-			    && !strchr(lines[i], ';')
-			    && !strstr(lines[i], "//")) {
+			if (!cisspace(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) {
-					use_funcs = add_func(use_funcs,
-							     lines[i]);
+				if (strncmp(line, "static", 6) == 0) {
+					use_funcs = add_func(m, use_funcs,
+							     line);
 				}
 			}
 		}
 		/* ... means elided code. */
-		if (strcmp(lines[i], "...") == 0) {
+		if (strcmp(line, "...") == 0) {
 			if (!in_function && !has_main
-			    && looks_internal(lines + i + 1)) {
+			    && looks_internal(lines + i + 1, &why)) {
 				/* This implies we start a function here. */
-				ret = start_main(ret);
+				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");
 	}
 
-	/* Need a main to link successfully. */
 	if (!has_main) {
-		ret = talloc_asprintf_append(ret, "int main(void)\n{\n");
+		ret = tal_strcat(m, take(ret),
+			     "/* Need a main to link successfully. */\n"
+			     "int main(int argc, char *argv[])\n{\n");
 		fake_function = true;
 	}
 
-	/* Get rid of unused warnings by printing addresses of static funcs. */
 	if (use_funcs) {
+		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 (!has_main)
+		ret = tal_strcat(m, take(ret),
+				 "(void)argc; (void)argv;\n");
+	
 	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)
 		return NULL;
 
 	contents = mangle(m, lines);
-	if (write(fd, contents, strlen(contents)) != strlen(contents)) {
+	if (write(fd, contents, strlen(contents)) != (int)strlen(contents)) {
 		close(fd);
 		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;
 }
 
-static void *build_examples(struct manifest *m, bool keep,
-			    unsigned int *timeleft)
+/* If an example has expected output, it's complete and should not be
+ * included in future examples. */
+static bool has_expected_output(char **lines)
+{
+	unsigned int i;
+
+	for (i = 0; lines[i]; i++) {
+		char *p = lines[i] + strspn(lines[i], " \t");
+		if (!strstarts(p, "//"))
+			continue;
+		p += strspn(p, "/ ");
+		if (strncasecmp(p, "given", strlen("given")) == 0)
+			return true;
+	}
+	return false;
+}
+
+static unsigned int try_compiling(struct manifest *m,
+				  struct ccan_file *i,
+				  char **prev,
+				  struct ccan_file *mangled[3],
+				  bool res[3],
+				  char *err[3],
+				  char **lines[3])
+{
+	unsigned int num;
+
+	/* Try standalone. */
+	mangled[0] = i;
+	res[0] = compile(i, m, mangled[0], &err[0]);
+	lines[0] = get_ccan_file_lines(i);
+	if (res[0] && streq(err[0], ""))
+		return 1;
+
+	if (prev) {
+		lines[1] = combine(i, get_ccan_file_lines(i), prev);
+
+		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;
+		}
+		num = 2;
+	} else
+		num = 1;
+
+	/* Try standalone. */
+	lines[num] = get_ccan_file_lines(i);
+	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,
+			   unsigned int *timeleft UNNEEDED, struct score *score)
 {
 	struct ccan_file *i;
-	struct score *score = talloc(m, struct score);
-	struct ccan_file *mangle;
 	char **prev = NULL;
+	bool warnings = false;
 
-	score->score = 0;
-	score->errors = NULL;
+	score->total = 0;
+	score->pass = true;
 
 	list_for_each(&m->examples, i, list) {
-		char *ret;
+		char *err[3];
+		struct ccan_file *file[3] = { NULL, NULL, NULL };
+		bool res[3];
+		unsigned num, j;
+		char **lines[3];
+		const char *error;
+
+		score->total++;
 
-		examples_compile.total_score++;
 		/* Simplify our dumb parsing. */
 		strip_leading_whitespace(get_ccan_file_lines(i));
-		ret = compile(score, m, i, keep);
-		if (!ret) {
-			prev = get_ccan_file_lines(i);
-			score->score++;
-			continue;
-		}
 
-		/* Try combining with previous (successful) example... */
-		if (prev) {
-			char **new = combine(i, get_ccan_file_lines(i), prev);
-			talloc_free(ret);
+		num = try_compiling(m, i, prev, file, res, err, lines);
 
-			mangle = mangle_example(m, i, new, keep);
-			ret = compile(score, m, mangle, keep);
-			if (!ret) {
-				prev = new;
+		/* First look for a compile without any warnings. */
+		for (j = 0; j < num; j++) {
+			if (res[j] && streq(err[j], "")) {
+				if (!has_expected_output(lines[j]))
+					prev = lines[j];
 				score->score++;
-				continue;
+				goto next;
 			}
 		}
 
-		/* Try standalone. */
-		talloc_free(ret);
-		mangle = mangle_example(m, i, get_ccan_file_lines(i), keep);
-		ret = compile(score, m, mangle, keep);
-		if (!ret) {
-			prev = get_ccan_file_lines(i);
-			score->score++;
-			continue;
+		/* Now accept anything which succeeded. */
+		for (j = 0; j < num; j++) {
+			if (res[j]) {
+				if (!has_expected_output(lines[j]))
+					prev = lines[j];
+				score->score++;
+				warnings = true;
+				score_file_error(score, file[j], 0,
+						 "Compiling extracted example"
+						 " gave warnings:\n"
+						 "Example:\n"
+						 "%s\n"
+						 "Compiler:\n"
+						 "%s",
+						 get_ccan_file_contents(file[j]),
+						 err[j]);
+				goto next;
+			}
 		}
 
-		if (!score->errors)
-			score->errors = ret;
-		else {
-			score->errors = talloc_append_string(score->errors,
-							     ret);
-			talloc_free(ret);
+		score->pass = false;
+		if (!verbose) {
+			if (num == 3)
+				error = "Compiling standalone, adding headers, "
+					"and including previous "
+					"example all failed";
+			else
+				error = "Standalone compile and"
+					" adding headers both failed";
+		} else {
+			if (num == 3) {
+				error = tal_fmt(score,
+				      "Standalone example:\n"
+				      "%s\n"
+				      "Errors: %s\n\n"
+				      "Combining with previous example:\n"
+				      "%s\n"
+				      "Errors: %s\n\n"
+				      "Adding headers, wrappers:\n"
+				      "%s\n"
+				      "Errors: %s\n\n",
+				      get_ccan_file_contents(file[0]),
+				      err[0],
+				      get_ccan_file_contents(file[1]),
+				      err[1],
+				      get_ccan_file_contents(file[2]),
+				      err[2]);
+			} else {
+				error = tal_fmt(score,
+				      "Standalone example:\n"
+				      "%s\n"
+				      "Errors: %s\n\n"
+				      "Adding headers, wrappers:\n"
+				      "%s\n"
+				      "Errors: %s\n\n",
+				      get_ccan_file_contents(file[0]),
+				      err[0],
+				      get_ccan_file_contents(file[1]),
+				      err[1]);
+			}
 		}
+		score_file_error(score, i, 0, "%s", error);
 		/* This didn't work, so not a candidate for combining. */
 		prev = NULL;
-	}
-	return score;
-}
 
-static unsigned int score_examples(struct manifest *m, void *check_result)
-{
-	struct score *score = check_result;
-	return score->score;
-}
+	next:
+		;
+	}
 
-static const char *describe(struct manifest *m, void *check_result)
-{
-	struct score *score = check_result;
-	if (verbose >= 2 && score->errors)
-		return talloc_asprintf(m, "Compile errors building examples:\n"
-				       "%s", score->errors);
-	return NULL;
+	/* An extra point if they all compiled without warnings. */
+	if (!list_empty(&m->examples)) {
+		score->total++;
+		if (!warnings)
+			score->score++;
+	}
 }
 
 struct ccanlint examples_compile = {
-	.key = "examples-compile",
+	.key = "examples_compile",
 	.name = "Module examples compile",
-	.score = score_examples,
 	.check = build_examples,
-	.describe = describe,
 	.can_run = can_run,
+	.needs = "examples_exist module_builds"
 };
 
-REGISTER_TEST(examples_compile, &has_examples, NULL);
+REGISTER_TEST(examples_compile);