From: Carl Worth <cworth@cworth.org>
Date: Thu, 20 May 2010 19:06:33 +0000 (-0700)
Subject: Add test (and fix) for a function argument of a macro that expands with a comma.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=805ea6afe66f52476094256914b7319b29972a16;p=mesa.git

Add test (and fix) for a function argument of a macro that expands with a comma.

The fix here is quite simple (and actually only deletes code). When
expanding a macro, we don't return a ',' as a unique token type, but
simply let it fall through to the generic case.
---

diff --git a/glcpp-parse.y b/glcpp-parse.y
index c9edc5c3040..773db93e54a 100644
--- a/glcpp-parse.y
+++ b/glcpp-parse.y
@@ -779,8 +779,6 @@ glcpp_parser_lex (glcpp_parser_t *parser)
 		return '(';
 	else if (strcmp (replacements->value, ")") == 0)
 		return ')';
-	else if (strcmp (replacements->value, ",") == 0)
-		return ',';
 
 	yylval.str = xtalloc_strdup (parser, replacements->value);
 
diff --git a/tests/039-func-arg-obj-macro-with-comma.c b/tests/039-func-arg-obj-macro-with-comma.c
new file mode 100644
index 00000000000..0f7fe632b56
--- /dev/null
+++ b/tests/039-func-arg-obj-macro-with-comma.c
@@ -0,0 +1,3 @@
+#define foo(a) (a)
+#define bar two,words
+foo(bar)