X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ffile_analysis.c;h=a4282a96c75b06a68d7a895346c3650747a7a8aa;hp=530416e368cb1fd17a48f93fa7c9bc220b0f1a20;hb=8af0812be4b3fcb82d82b70ea1b571225a76ca19;hpb=3b200f895cb7884c72d9e2409f047284027abc68

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index 530416e3..a4282a96 100644
--- a/tools/ccanlint/file_analysis.c
+++ b/tools/ccanlint/file_analysis.c
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "ccanlint.h"
 #include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
@@ -9,6 +10,7 @@
 #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>
@@ -73,6 +75,7 @@ struct list_head *get_ccan_file_docs(struct ccan_file *f)
 struct ccan_file *new_ccan_file(const void *ctx, const char *dir, char *name)
 {
 	struct ccan_file *f;
+	unsigned int i;
 
 	assert(dir[0] == '/');
 
@@ -80,11 +83,12 @@ struct ccan_file *new_ccan_file(const void *ctx, const char *dir, char *name)
 	f->lines = NULL;
 	f->line_info = NULL;
 	f->doc_sections = NULL;
-	f->compiled = NULL;
+	for (i = 0; i < ARRAY_SIZE(f->compiled); i++)
+		f->compiled[i] = 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;
 }
 
@@ -227,7 +231,7 @@ struct manifest *get_manifest(const void *ctx, const char *dir)
 
 	m = talloc_linked(ctx, talloc(NULL, struct manifest));
 	m->info_file = NULL;
-	m->compiled = NULL;
+	m->compiled[COMPILE_NORMAL] = m->compiled[COMPILE_NOFEAT] = NULL;
 	m->dir = talloc_steal(m, canon_dir);
 	list_head_init(&m->c_files);
 	list_head_init(&m->h_files);
@@ -347,7 +351,7 @@ static char *remove_comments(const char *line, bool in_comment,
 
 static bool is_empty(const char *line)
 {
-	return strspn(line, " \t") == strlen(line);
+	return strspn(line, " \r\t") == strlen(line);
 }
 
 static bool continues(const char *line)
@@ -404,6 +408,17 @@ static bool parse_hash_if(struct pp_conditions *cond, const char **line)
 		return false;
 	if (!defined)
 		cond->type = PP_COND_IF;
+
+	/* FIXME: We just chain them, ignoring operators. */
+	if (get_token(line, "||") || get_token(line, "&&")) {
+		struct pp_conditions *sub = talloc(cond, struct pp_conditions);
+
+		sub->parent = cond->parent;
+		sub->type = PP_COND_IFDEF;
+		if (parse_hash_if(sub, line))
+			cond->parent = sub;
+	}
+
 	return true;
 }