X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ffile_analysis.c;h=3152cd1e16a555e8b19ebca25c2b1836df11aed2;hp=2ede1f5b8cea7a1d59216e54266c74b2f1eb9fbc;hb=165727526f785b05f67f3d88f9518a0a840acbbf;hpb=08f8cff8f22fee31b74f8301cc5d6494e5ff7160 diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c index 2ede1f5b..3152cd1e 100644 --- a/tools/ccanlint/file_analysis.c +++ b/tools/ccanlint/file_analysis.c @@ -13,15 +13,13 @@ #include #include #include +#include char **get_ccan_file_lines(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->lines) + f->lines = strsplit(f, f->contents, "\n", &f->num_lines); + return f->lines; } @@ -34,6 +32,19 @@ struct list_head *get_ccan_file_docs(struct ccan_file *f) return f->doc_sections; } +struct ccan_file *new_ccan_file(const void *ctx, char *name) +{ + struct ccan_file *f; + + 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); + return f; +} + static void add_files(struct manifest *m, const char *dir) { DIR *d; @@ -55,10 +66,8 @@ static void add_files(struct manifest *m, const char *dir) 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, talloc_asprintf(m, "%s%s", + dir, ent->d_name)); if (lstat(f->name, &st) != 0) err(1, "lstat %s", f->name); @@ -72,15 +81,26 @@ static void add_files(struct manifest *m, const char *dir) continue; } - if (streq(f->name, "_info.c")) { + if (streq(f->name, "_info")) { m->info_file = f; + f->contents = grab_file(f, f->name, &f->contents_size); + if (!f->contents) + err(1, "Reading file %s", f->name); continue; } is_c_src = strends(f->name, ".c"); - if (!is_c_src && !strends(f->name, ".h")) + if (!is_c_src && !strends(f->name, ".h")) { + /* We don't pull in contents of non-source files */ dest = &m->other_files; - else if (!strchr(f->name, '/')) { + continue; + } + + f->contents = grab_file(f, f->name, &f->contents_size); + if (!f->contents) + err(1, "Reading file %s", f->name); + + if (!strchr(f->name, '/')) { if (is_c_src) dest = &m->c_files; else @@ -96,7 +116,7 @@ static void add_files(struct manifest *m, const char *dir) 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 @@ -131,9 +151,9 @@ char *report_on_lines(struct list_head *files, return sofar; } -struct manifest *get_manifest(void) +struct manifest *get_manifest(const void *ctx) { - struct manifest *m = talloc(NULL, struct manifest); + struct manifest *m = talloc(ctx, struct manifest); unsigned int len; m->info_file = NULL; @@ -143,18 +163,15 @@ struct manifest *get_manifest(void) 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->dep_dirs); + list_head_init(&m->dep_objs); - /* *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); - } - + m->basename = talloc_getcwd(m); + if (!m->basename) + err(1, "Getting current directory"); len = strlen(m->basename); while (len && m->basename[len-1] == '/') m->basename[--len] = '\0'; @@ -242,7 +259,7 @@ static bool continues(const char *line) } /* 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; @@ -261,7 +278,7 @@ static bool get_token(const char **line, const char *token) 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; @@ -421,47 +438,102 @@ struct line_info *get_ccan_line_info(struct ccan_file *f) 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; } +