#include "config.h"
#include "ccanlint.h"
-#include <ccan/talloc/talloc.h>
#include <ccan/str/str.h>
-#include <ccan/str_talloc/str_talloc.h>
-#include <ccan/talloc_link/talloc_link.h>
+#include <ccan/take/take.h>
#include <ccan/hash/hash.h>
#include <ccan/htable/htable_type.h>
-#include <ccan/grab_file/grab_file.h>
#include <ccan/noerr/noerr.h>
#include <ccan/foreach/foreach.h>
#include <ccan/asort/asort.h>
+#include <ccan/array_size/array_size.h>
#include "../tools.h"
#include <unistd.h>
#include <sys/types.h>
#include <stdarg.h>
#include <assert.h>
-const char *ccan_dir;
-
-static size_t dir_hash(const char *name)
-{
- return hash(name, strlen(name), 0);
-}
-
-static const char *manifest_name(const struct manifest *m)
-{
- return m->dir;
-}
-
-static bool dir_cmp(const struct manifest *m, const char *dir)
-{
- return strcmp(m->dir, dir) == 0;
-}
-
-HTABLE_DEFINE_TYPE(struct manifest, manifest_name, dir_hash, dir_cmp, manifest);
-static struct htable_manifest *manifests;
-
-const char *get_ccan_file_contents(struct ccan_file *f)
-{
- 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");
-
- /* FIXME: is f->num_lines necessary? */
- f->num_lines = talloc_array_length(f->lines) - 1;
- return f->lines;
-}
-
struct list_head *get_ccan_file_docs(struct ccan_file *f)
{
if (!f->doc_sections) {
get_ccan_file_lines(f);
- f->doc_sections = extract_doc_sections(f->lines);
+ f->doc_sections = extract_doc_sections(f->lines, f->name);
}
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;
- f->simplified = NULL;
- return f;
-}
-
-static void add_files(struct manifest *m, const char *dir)
-{
- DIR *d;
- struct dirent *ent;
- char **subs = NULL;
-
- if (dir[0])
- d = opendir(dir);
- else
- d = opendir(".");
- if (!d)
- err(1, "Opening directory %s", dir[0] ? dir : ".");
-
- while ((ent = readdir(d)) != NULL) {
- struct stat st;
- struct ccan_file *f;
- struct list_head *dest;
- bool is_c_src;
-
- if (ent->d_name[0] == '.')
- continue;
-
- 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);
-
- if (S_ISDIR(st.st_mode)) {
- size_t len = talloc_array_length(subs);
- subs = talloc_realloc(m, subs, char *, len+1);
- subs[len] = talloc_append_string(f->name, "/");
- continue;
- }
- if (!S_ISREG(st.st_mode)) {
- talloc_free(f);
- continue;
- }
-
- 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")) {
- dest = &m->other_files;
- } else if (!strchr(f->name, '/')) {
- if (is_c_src)
- dest = &m->c_files;
- else
- dest = &m->h_files;
- } else if (strstarts(f->name, "test/")) {
- if (is_c_src) {
- if (strstarts(f->name, "test/api"))
- dest = &m->api_tests;
- else if (strstarts(f->name, "test/run"))
- dest = &m->run_tests;
- else if (strstarts(f->name, "test/compile_ok"))
- dest = &m->compile_ok_tests;
- else if (strstarts(f->name, "test/compile_fail"))
- dest = &m->compile_fail_tests;
- else
- dest = &m->other_test_c_files;
- } else
- dest = &m->other_test_files;
- } else
- dest = &m->other_files;
-
- list_add(dest, &f->list);
- }
- closedir(d);
-
- /* Before we recurse, sanity check this is a ccan module. */
- if (!dir[0]) {
- size_t i;
-
- if (!m->info_file
- && list_empty(&m->c_files)
- && list_empty(&m->h_files))
- errx(1, "No _info, C or H files found here!");
-
- for (i = 0; i < talloc_array_length(subs); i++)
- add_files(m, subs[i]);
- }
- talloc_free(subs);
-}
-
-static int cmp_names(struct ccan_file *const *a, struct ccan_file *const *b,
- void *unused)
-{
- return strcmp((*a)->name, (*b)->name);
-}
-
-static void sort_files(struct list_head *list)
-{
- struct ccan_file **files = NULL, *f;
- unsigned int i, num;
-
- num = 0;
- while ((f = list_top(list, struct ccan_file, list)) != NULL) {
- files = talloc_realloc(NULL, files, struct ccan_file *, num+1);
- files[num++] = f;
- list_del(&f->list);
- }
- asort(files, num, cmp_names, NULL);
-
- for (i = 0; i < num; i++)
- list_add_tail(list, &files[i]->list);
- talloc_free(files);
-}
-
-struct manifest *get_manifest(const void *ctx, const char *dir)
-{
- struct manifest *m;
- char *olddir, *canon_dir;
- unsigned int len;
- struct list_head *list;
-
- if (!manifests)
- manifests = htable_manifest_new();
-
- olddir = talloc_getcwd(NULL);
- if (!olddir)
- err(1, "Getting current directory");
-
- if (chdir(dir) != 0)
- err(1, "Failed to chdir to %s", dir);
-
- canon_dir = talloc_getcwd(olddir);
- if (!canon_dir)
- err(1, "Getting current directory");
-
- m = htable_manifest_get(manifests, canon_dir);
- if (m)
- goto done;
-
- m = talloc_linked(ctx, talloc(NULL, struct manifest));
- m->info_file = NULL;
- m->compiled = NULL;
- m->dir = talloc_steal(m, canon_dir);
- list_head_init(&m->c_files);
- list_head_init(&m->h_files);
- list_head_init(&m->api_tests);
- 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->mangled_examples);
- list_head_init(&m->deps);
-
- 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, *dir;
- dir = talloc_strdup(NULL, m->dir);
- p = strrchr(dir, '/');
- if (!p)
- errx(1, "I expect the ccan root directory in ../..");
- *p = '\0';
- p = strrchr(dir, '/');
- if (!p)
- errx(1, "I expect the ccan root directory in ../..");
- *p = '\0';
- ccan_dir = dir;
- }
-
- add_files(m, "");
-
- /* Nicer to run tests in a predictable order. */
- foreach_ptr(list, &m->api_tests, &m->run_tests, &m->compile_ok_tests,
- &m->compile_fail_tests)
- sort_files(list);
-
- htable_manifest_add(manifests, m);
-
-done:
- if (chdir(olddir) != 0)
- err(1, "Returning to original directory '%s'", olddir);
- talloc_free(olddir);
-
- return m;
-}
-
/**
* remove_comments - strip comments from a line, return copy.
* @in_comment: are we already within a comment (from prev line).
* @unterminated: are we still in a comment for next line.
*/
-static char *remove_comments(const char *line, bool in_comment,
+static char *remove_comments(const tal_t *ctx,
+ const char *line, bool in_comment,
bool *unterminated)
{
- char *p, *ret = talloc_array(line, char, strlen(line) + 1);
+ char *p, *ret = tal_arr(ctx, char, strlen(line) + 1);
p = ret;
for (;;) {
return strends(line, "\\");
}
-/* Get token if it's equal to token. */
-bool get_token(const char **line, const char *token)
-{
- unsigned int toklen;
-
- *line += strspn(*line, " \t");
- if (cisalnum(token[0]) || token[0] == '_')
- toklen = strspn(*line, IDENT_CHARS);
- else {
- /* FIXME: real tokenizer handles ++ and other multi-chars. */
- toklen = strlen(token);
- }
-
- if (toklen == strlen(token) && !strncmp(*line, token, toklen)) {
- *line += toklen;
- return true;
- }
- return false;
-}
-
-char *get_symbol_token(void *ctx, const char **line)
-{
- unsigned int toklen;
- char *ret;
-
- *line += strspn(*line, " \t");
- toklen = strspn(*line, IDENT_CHARS);
- if (!toklen)
- return NULL;
- ret = talloc_strndup(ctx, *line, toklen);
- *line += toklen;
- return ret;
-}
-
static bool parse_hash_if(struct pp_conditions *cond, const char **line)
{
bool brackets, defined;
/* FIXME: We just chain them, ignoring operators. */
if (get_token(line, "||") || get_token(line, "&&")) {
- struct pp_conditions *sub = talloc(cond, struct pp_conditions);
+ struct pp_conditions *sub = tal(cond, struct pp_conditions);
sub->parent = cond->parent;
sub->type = PP_COND_IFDEF;
const char *line,
struct pp_conditions *parent)
{
- struct pp_conditions *cond = talloc(f, struct pp_conditions);
+ struct pp_conditions *cond = tal(f, struct pp_conditions);
bool unused;
- line = remove_comments(line, false, &unused);
+ line = remove_comments(f, line, false, &unused);
cond->parent = parent;
cond->type = PP_COND_IFDEF;
cond->inverse = !cond->inverse;
return cond;
} else if (get_token(&line, "endif")) {
- talloc_free(cond);
+ tal_free(cond);
/* Malformed? */
if (!parent)
return NULL;
return parent->parent;
} else {
/* Not a conditional. */
- talloc_free(cond);
+ tal_free(cond);
return parent;
}
return f->line_info;
get_ccan_file_lines(f);
- f->line_info = talloc_array(f->lines, struct line_info, f->num_lines);
+ f->line_info = tal_arr(f->lines, struct line_info, f->num_lines);
for (i = 0; i < f->num_lines; continued = continues(f->lines[i++])) {
char *p;
/* Same as last line. */
f->line_info[i].type = f->line_info[i-1].type;
/* Update in_comment. */
- remove_comments(f->lines[i], in_comment, &in_comment);
+ remove_comments(f, f->lines[i], in_comment, &in_comment);
continue;
}
still_doc_line = (in_comment
&& f->line_info[i-1].type == DOC_LINE);
- p = remove_comments(f->lines[i], in_comment, &in_comment);
+ p = remove_comments(f, f->lines[i], in_comment, &in_comment);
if (is_empty(p)) {
if (strstarts(f->lines[i], "/**") || still_doc_line)
f->line_info[i].type = DOC_LINE;
f->line_info[i].type = COMMENT_LINE;
} else
f->line_info[i].type = CODE_LINE;
- talloc_free(p);
+ tal_free(p);
}
return f->line_info;
}
static void add_symbol(struct list_head *head,
const char *symbol, const unsigned int *value)
{
- struct symbol *sym = talloc(head, struct symbol);
+ struct symbol *sym = tal(head, struct symbol);
sym->name = symbol;
sym->value = value;
list_add(head, &sym->list);
struct list_head *head;
va_list ap;
- head = talloc(NULL, struct list_head);
+ head = tal(NULL, struct list_head);
list_head_init(head);
va_start(ap, value);
add_symbol(head, symbol, value);
}
ret = get_pp(cond, head);
- talloc_free(head);
+ tal_free(head);
return ret;
}
{
va_list ap;
- struct file_error *fe = talloc(score, struct file_error);
+ struct file_error *fe = tal(score, struct file_error);
fe->file = f;
fe->line = line;
list_add_tail(&score->per_file_errors, &fe->list);
if (!score->error)
- score->error = talloc_strdup(score, "");
+ score->error = tal_strdup(score, "");
- if (verbose < 2 && strcount(score->error, "\n") > 5)
+ if (verbose < 2 && strcount(score->error, "\n") > 5) {
+ if (!strends(score->error,
+ "... more (use -vv to see them all)\n")) {
+ score->error = tal_strcat(score,
+ take(score->error),
+ "... more (use -vv to see"
+ " them all)\n");
+ }
return;
+ }
if (line)
- score->error = talloc_asprintf_append(score->error,
- "%s:%u:",
- f->fullname, line);
+ tal_append_fmt(&score->error, "%s:%u:", f->fullname, line);
else
- score->error = talloc_asprintf_append(score->error,
- "%s:", f->fullname);
+ tal_append_fmt(&score->error, "%s:", f->fullname);
va_start(ap, errorfmt);
- score->error = talloc_vasprintf_append(score->error, errorfmt, ap);
+ tal_append_vfmt(&score->error, errorfmt, ap);
va_end(ap);
- score->error = talloc_append_string(score->error, "\n");
+ score->error = tal_strcat(score, take(score->error),"\n");
+}
+
+char *get_or_compile_info(const void *ctx, const char *dir)
+{
+ struct manifest *m = get_manifest(NULL, dir);
+
+ if (!m->info_file->compiled[COMPILE_NORMAL])
+ m->info_file->compiled[COMPILE_NORMAL] = compile_info(m, dir);
- if (verbose < 2 && strcount(score->error, "\n") > 5)
- score->error = talloc_append_string(score->error,
- "... more (use -vv to see them all)\n");
+ return m->info_file->compiled[COMPILE_NORMAL];
}
projects / ccan / blobdiff