#include <errno.h>
#include <dirent.h>
#include <ctype.h>
+#include <stdarg.h>
+#include <assert.h>
-char **get_ccan_file_lines(struct ccan_file *f)
+const char *ccan_dir;
+
+const char *get_ccan_file_contents(struct ccan_file *f)
{
- if (!f->lines) {
- char *buffer = grab_file(f, f->name, NULL);
- if (!buffer)
- err(1, "Getting file %s", f->name);
- f->lines = strsplit(f, buffer, "\n", &f->num_lines);
+ if (!f->contents) {
+ f->contents = grab_file(f, f->fullname, &f->contents_size);
+ if (!f->contents)
+ err(1, "Reading file %s", f->fullname);
}
+ return f->contents;
+}
+
+char **get_ccan_file_lines(struct ccan_file *f)
+{
+ if (!f->lines)
+ f->lines = strsplit(f, get_ccan_file_contents(f),
+ "\n", &f->num_lines);
+
return f->lines;
}
return f->doc_sections;
}
+struct ccan_file *new_ccan_file(const void *ctx, const char *dir, char *name)
+{
+ struct ccan_file *f;
+
+ assert(dir[0] == '/');
+
+ f = talloc(ctx, struct ccan_file);
+ f->lines = NULL;
+ f->line_info = NULL;
+ f->doc_sections = NULL;
+ f->compiled = NULL;
+ f->name = talloc_steal(f, name);
+ f->fullname = talloc_asprintf(f, "%s/%s", dir, f->name);
+ f->contents = NULL;
+ f->cov_compiled = NULL;
+ return f;
+}
+
static void add_files(struct manifest *m, const char *dir)
{
DIR *d;
if (ent->d_name[0] == '.')
continue;
- f = talloc(m, struct ccan_file);
- f->lines = NULL;
- f->doc_sections = NULL;
- f->name = talloc_asprintf(f, "%s%s", dir, ent->d_name);
+ f = new_ccan_file(m, m->dir,
+ talloc_asprintf(m, "%s%s",
+ dir, ent->d_name));
if (lstat(f->name, &st) != 0)
err(1, "lstat %s", f->name);
continue;
}
- if (streq(f->name, "_info.c")) {
+ if (streq(f->name, "_info")) {
m->info_file = f;
continue;
}
is_c_src = strends(f->name, ".c");
- if (!is_c_src && !strends(f->name, ".h"))
+ if (!is_c_src && !strends(f->name, ".h")) {
dest = &m->other_files;
- else if (!strchr(f->name, '/')) {
+ continue;
+ }
+
+ if (!strchr(f->name, '/')) {
if (is_c_src)
dest = &m->c_files;
else
else if (strstarts(f->name, "test/compile_fail"))
dest = &m->compile_fail_tests;
else
- dest = &m->other_test_files;
+ dest = &m->other_test_c_files;
} else
dest = &m->other_test_files;
} else
return sofar;
}
-struct manifest *get_manifest(void)
+struct manifest *get_manifest(const void *ctx, const char *dir)
{
- struct manifest *m = talloc(NULL, struct manifest);
+ struct manifest *m = talloc(ctx, struct manifest);
+ char *olddir;
unsigned int len;
m->info_file = NULL;
list_head_init(&m->run_tests);
list_head_init(&m->compile_ok_tests);
list_head_init(&m->compile_fail_tests);
+ list_head_init(&m->other_test_c_files);
list_head_init(&m->other_test_files);
list_head_init(&m->other_files);
+ list_head_init(&m->examples);
+ list_head_init(&m->dep_dirs);
- /* *This* is why people hate C. */
- len = 32;
- m->basename = talloc_array(m, char, len);
- while (!getcwd(m->basename, len)) {
- if (errno != ERANGE)
- err(1, "Getting current directory");
- m->basename = talloc_realloc(m, m->basename, char, len *= 2);
- }
+ olddir = talloc_getcwd(NULL);
+ if (!olddir)
+ err(1, "Getting current directory");
- len = strlen(m->basename);
- while (len && m->basename[len-1] == '/')
- m->basename[--len] = '\0';
+ if (chdir(dir) != 0)
+ err(1, "Failed to chdir to %s", dir);
- m->basename = strrchr(m->basename, '/');
+ m->dir = talloc_getcwd(m);
+ if (!m->dir)
+ err(1, "Getting current directory");
+
+ len = strlen(m->dir);
+ while (len && m->dir[len-1] == '/')
+ m->dir[--len] = '\0';
+
+ m->basename = strrchr(m->dir, '/');
if (!m->basename)
errx(1, "I don't expect to be run from the root directory");
m->basename++;
+ /* We expect the ccan dir to be two levels above module dir. */
+ if (!ccan_dir) {
+ char *p;
+ ccan_dir = talloc_strdup(NULL, m->dir);
+ p = strrchr(ccan_dir, '/');
+ *p = '\0';
+ p = strrchr(ccan_dir, '/');
+ *p = '\0';
+ }
+
add_files(m, "");
+
+ if (chdir(olddir) != 0)
+ err(1, "Returning to original directory '%s'", olddir);
+ talloc_free(olddir);
+
return m;
}
}
/* Get token if it's equal to token. */
-static bool get_token(const char **line, const char *token)
+bool get_token(const char **line, const char *token)
{
unsigned int toklen;
return false;
}
-static char *get_symbol_token(void *ctx, const char **line)
+char *get_symbol_token(void *ctx, const char **line)
{
unsigned int toklen;
char *ret;
return f->line_info;
}
-enum line_compiled get_ccan_line_pp(struct pp_conditions *cond,
- const char *symbol,
- unsigned int value)
+struct symbol {
+ struct list_node list;
+ const char *name;
+ const unsigned int *value;
+};
+
+static struct symbol *find_symbol(struct list_head *syms, const char *sym)
{
- enum line_compiled ret;
+ struct symbol *i;
+
+ list_for_each(syms, i, list)
+ if (streq(sym, i->name))
+ return i;
+ return NULL;
+}
+
+static enum line_compiled get_pp(struct pp_conditions *cond,
+ struct list_head *syms)
+{
+ struct symbol *sym;
+ unsigned int val;
+ enum line_compiled parent, ret;
/* No conditions? Easy. */
if (!cond)
return COMPILED;
/* Check we get here at all. */
- ret = get_ccan_line_pp(cond->parent, symbol, value);
- if (ret != COMPILED)
- return ret;
+ parent = get_pp(cond->parent, syms);
+ if (parent == NOT_COMPILED)
+ return NOT_COMPILED;
+
+ if (cond->type == PP_COND_UNKNOWN)
+ return MAYBE_COMPILED;
+
+ sym = find_symbol(syms, cond->symbol);
+ if (!sym)
+ return MAYBE_COMPILED;
switch (cond->type) {
case PP_COND_IF:
- if (streq(cond->symbol, symbol)) {
- if (!value == cond->inverse)
- return COMPILED;
- else
- return NOT_COMPILED;
- }
- /* Unknown symbol, will be 0. */
- if (cond->inverse)
- return COMPILED;
- return NOT_COMPILED;
+ /* Undefined is 0. */
+ val = sym->value ? *sym->value : 0;
+ if (!val == cond->inverse)
+ ret = COMPILED;
+ else
+ ret = NOT_COMPILED;
+ break;
case PP_COND_IFDEF:
- if (streq(cond->symbol, symbol)) {
- if (cond->inverse)
- return NOT_COMPILED;
- else
- return COMPILED;
- }
- /* Unknown symbol, assume undefined. */
- if (cond->inverse)
- return COMPILED;
- return NOT_COMPILED;
-
- default: /* Unknown. */
- return MAYBE_COMPILED;
+ if (cond->inverse == !sym->value)
+ ret = COMPILED;
+ else
+ ret = NOT_COMPILED;
+ break;
+
+ default:
+ abort();
+ }
+
+ /* If parent didn't know, NO == NO, but YES == MAYBE. */
+ if (parent == MAYBE_COMPILED && ret == COMPILED)
+ ret = MAYBE_COMPILED;
+ return ret;
+}
+
+static void add_symbol(struct list_head *head,
+ const char *symbol, const unsigned int *value)
+{
+ struct symbol *sym = talloc(head, struct symbol);
+ sym->name = symbol;
+ sym->value = value;
+ list_add(head, &sym->list);
+}
+
+enum line_compiled get_ccan_line_pp(struct pp_conditions *cond,
+ const char *symbol,
+ const unsigned int *value,
+ ...)
+{
+ enum line_compiled ret;
+ struct list_head *head;
+ va_list ap;
+
+ head = talloc(NULL, struct list_head);
+ list_head_init(head);
+
+ va_start(ap, value);
+ add_symbol(head, symbol, value);
+
+ while ((symbol = va_arg(ap, const char *)) != NULL) {
+ value = va_arg(ap, const unsigned int *);
+ add_symbol(head, symbol, value);
}
+ ret = get_pp(cond, head);
+ talloc_free(head);
+ return ret;
}
+
projects / ccan / blobdiff