X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.h;h=9a4817092acecc6c08e67bffac7c43158bd3c1da;hp=f5f7b51d8bbb89078d83fa82aa356c305856da70;hb=8af0812be4b3fcb82d82b70ea1b571225a76ca19;hpb=a791eb1e4c369104f90c543fe9ebafcae113ead8

diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h
index f5f7b51d..9a481709 100644
--- a/tools/ccanlint/ccanlint.h
+++ b/tools/ccanlint/ccanlint.h
@@ -1,15 +1,12 @@
 #ifndef CCAN_LINT_H
 #define CCAN_LINT_H
+#include "config.h"
 #include <ccan/list/list.h>
 #include <stdbool.h>
 #include "../doc_extract.h"
+#include "licenses.h"
 
 #define REGISTER_TEST(name, ...) extern struct ccanlint name
-#include "generated-compulsory-tests"
-#include "generated-normal-tests"
-#undef REGISTER_TEST
-
-#define REGISTER_TEST(name, ...) 
 
 /* 0 == Describe failed tests.
    1 == Describe results for partial failures.
@@ -20,12 +17,24 @@
    4 == Describe every action. */
 extern int verbose;
 
+enum compile_type {
+	COMPILE_NORMAL,
+	COMPILE_NOFEAT,
+	COMPILE_COVERAGE,
+	COMPILE_TYPES
+};
+
 struct manifest {
 	char *dir;
 	/* The module name, ie. final element of dir name */
 	char *basename;
 	struct ccan_file *info_file;
 
+	/* Linked off deps. */
+	struct list_node list;
+	/* Where our final compiled output is */
+	char *compiled[COMPILE_TYPES];
+
 	struct list_head c_files;
 	struct list_head h_files;
 
@@ -41,22 +50,32 @@ struct manifest {
 	struct list_head mangled_examples;
 
 	/* From tests/check_depends_exist.c */
-	struct list_head dep_dirs;
+	struct list_head deps;
+
+	/* From tests/license_exists.c */
+	enum license license;
 };
 
+/* Get the manifest for a given directory. */
 struct manifest *get_manifest(const void *ctx, const char *dir);
 
+/* Error in a particular file: stored off score->per_file_errors. */
 struct file_error {
 	struct list_node list;
 	struct ccan_file *file;
-	unsigned int line; /* 0 not to print */
-	const char *error;
+	unsigned int line;
 };
 
+/* The score for an individual test. */
 struct score {
+	/* Starts as false: if not set to true, ccanlint exits non-zero.
+	 * Thus it is usually set for compilation or other serious failures. */
 	bool pass;
+	/* Starts at 0 and 1 respectively. */
 	unsigned int score, total;
-	const char *error;
+	/* The error message to print. */
+	char *error;
+	/* Per file errors, set by score_file_error() */
 	struct list_head per_file_errors;
 };
 
@@ -83,10 +102,13 @@ struct ccanlint {
 	void (*handle)(struct manifest *m, struct score *score);
 
 	/* Options from _info. */
-	char *options;
+	char **options;
 	/* If not set, we'll give an error if they try to set options. */
 	bool takes_options;
 
+	/* Space-separated list of dependency keys. */
+	const char *needs;
+
 	/* Internal use fields: */
 	/* Who depends on us? */
 	struct list_head dependencies;
@@ -159,10 +181,16 @@ struct ccan_file {
 	struct list_head *doc_sections;
 
 	/* If this file gets compiled (eg. .C file to .o file), result here. */
-	char *compiled;
+	char *compiled[COMPILE_TYPES];
 
-	/* Compiled with coverage information. */
-	char *cov_compiled;
+	/* Filename containing output from valgrind. */
+	char *valgrind_log;
+
+	/* Leak output from valgrind. */
+	char *leak_info;
+
+	/* Simplified stream (lowercase letters and single spaces) */
+	char *simplified;
 };
 
 /* A new ccan_file, with the given name (talloc_steal onto returned value). */
@@ -177,6 +205,9 @@ char **get_ccan_file_lines(struct ccan_file *f);
 /* Use this rather than accessing f->lines directly: loads on demand. */
 struct line_info *get_ccan_line_info(struct ccan_file *f);
 
+/* Use this rather than accessing f->simplified directly: loads on demand. */
+const char *get_ccan_simplified(struct ccan_file *f);
+
 enum line_compiled {
 	NOT_COMPILED,
 	COMPILED,
@@ -197,9 +228,12 @@ char *get_symbol_token(void *ctx, const char **line);
 /* Similarly for ->doc_sections */
 struct list_head *get_ccan_file_docs(struct ccan_file *f);
 
-/* Add an error about this file (and line, if non-zero) to the score struct */
+/* Get NULL-terminated array options for this file for this test */
+char **per_file_options(const struct ccanlint *test, struct ccan_file *f);
+
+/* Append message about this file (and line, if non-zero) to the score->error */
 void score_file_error(struct score *, struct ccan_file *f, unsigned line,
-		      const char *error);
+		      const char *errorfmt, ...);
 
 /* Normal tests. */
 extern struct ccanlint trailing_whitespace;
@@ -210,10 +244,19 @@ struct dependent {
 	struct ccanlint *dependent;
 };
 
+/* Is this test excluded (cmdline or _info). */
+bool is_excluded(const char *name);
+
 /* Are we happy to compile stuff, or just non-intrusive tests? */
 extern bool safe_mode;
 
 /* Where is the ccan dir?  Available after first manifest. */
 extern const char *ccan_dir;
 
+/* Compiler and CFLAGS, from config.h if available. */
+extern const char *compiler, *cflags;
+
+/* Contents of config.h (or NULL if not found) */
+extern const char *config_header;
+
 #endif /* CCAN_LINT_H */