m = get_manifest(*deps, talloc_asprintf(*deps, "%s/ccan/%s",
ccan_dir, basename));
- errstr = build_submodule(m);
+ errstr = build_submodule(m, cflags, COMPILE_NORMAL);
if (errstr)
errx(1, "%s", errstr);
if (m->info_file) {
char **infodeps;
- infodeps = get_deps(m, m->dir, false, &m->info_file->compiled);
+ infodeps = get_deps(m, m->dir, false,
+ &m->info_file->compiled[COMPILE_NORMAL]);
for (i = 0; infodeps[i]; i++) {
if (strstarts(infodeps[i], "ccan/"))
}
}
-static char *obj_list(struct manifest *m, struct ccan_file *f)
+static char *example_obj_list(struct manifest *m, struct ccan_file *f)
{
struct manifest **deps = talloc_array(f, struct manifest *, 0);
char **lines, *list;
list = talloc_strdup(f, "");
for (i = 0; i < talloc_get_size(deps) / sizeof(*deps); i++) {
- if (deps[i]->compiled)
+ if (deps[i]->compiled[COMPILE_NORMAL])
list = talloc_asprintf_append(list, " %s",
- deps[i]->compiled);
+ deps[i]->compiled
+ [COMPILE_NORMAL]);
}
return list;
}
+/* FIXME: Test with reduced features! */
static char *lib_list(const struct manifest *m)
{
unsigned int i, num;
- char **libs = get_libs(m, m->dir, &num, &m->info_file->compiled);
+ char **libs;
char *ret = talloc_strdup(m, "");
+ libs = get_libs(m, m->dir, &num,
+ &m->info_file->compiled[COMPILE_NORMAL]);
for (i = 0; i < num; i++)
ret = talloc_asprintf_append(ret, "-l%s ", libs[i]);
return ret;
struct ccan_file *file,
bool keep, char **output)
{
- file->compiled = maybe_temp_file(ctx, "", keep, file->fullname);
+ file->compiled[COMPILE_NORMAL]
+ = maybe_temp_file(ctx, "", keep, file->fullname);
if (!compile_and_link(ctx, file->fullname, ccan_dir,
- obj_list(m, file),
+ example_obj_list(m, file),
compiler, cflags,
- lib_list(m), file->compiled, output)) {
+ lib_list(m), file->compiled[COMPILE_NORMAL],
+ output)) {
/* Don't keep failures. */
if (keep)
- unlink(file->compiled);
- talloc_free(file->compiled);
- file->compiled = NULL;
+ unlink(file->compiled[COMPILE_NORMAL]);
+ talloc_free(file->compiled[COMPILE_NORMAL]);
+ file->compiled[COMPILE_NORMAL] = NULL;
return false;
}
return true;
if (!line[0] || cisspace(line[0]) || strstarts(line, "//"))
continue;
+ assert(line[strlen(line)-1] != '\n');
+
/* The winners. */
if (strstarts(line, "if") && len == 2) {
*why = cast_const(char *, "starts with if");
}
}
+ /* 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, " ")])) {
last_ended = (strends(line, "}")
|| strends(line, ";")
+ || strends(line, "*/")
|| streq(line, "..."));
}
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",
+ ret[0] = talloc_asprintf(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]));