From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 22 Mar 2011 01:13:00 +0000 (+1030)
Subject: ccanlint: roughly handle multiple conditions on #if line.
X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=061e359bfc50f006a08410d43527342025d498ad;ds=sidebyside

ccanlint: roughly handle multiple conditions on #if line.

Just grab the tokens for the simple case: this allows the ccanlint
reduce_features test to work on eg. ccan/cast.
---

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index 530416e3..d8d2d3e9 100644
--- a/tools/ccanlint/file_analysis.c
+++ b/tools/ccanlint/file_analysis.c
@@ -404,6 +404,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;
 }