From 59ca98990f814926d716a13b0201c94945133824 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Wed, 19 May 2010 07:49:47 -0700
Subject: [PATCH] Fix bug as in previous fix, but with multi-token argument.

The previous fix added FUNC_MACRO to a production one higher in teh
grammar than it should have. So it prevented a FUNC_MACRO from
appearing as part of a mutli-token argument rather than just alone as
an argument. Fix this (and add a test).
---
 glcpp-parse.y                                 | 22 +++++++++----------
 ...lf-compose-non-func-multi-token-argument.c |  2 ++
 2 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 tests/035-define-func-self-compose-non-func-multi-token-argument.c

diff --git a/glcpp-parse.y b/glcpp-parse.y
index ea27184c47c..400f138d17e 100644
--- a/glcpp-parse.y
+++ b/glcpp-parse.y
@@ -94,7 +94,7 @@ _argument_list_member_at (argument_list_t *list, int index);
 %lex-param {void *scanner}
 
 %token DEFINE FUNC_MACRO IDENTIFIER NEWLINE OBJ_MACRO REPLACEMENT TOKEN UNDEF
-%type <str> FUNC_MACRO IDENTIFIER OBJ_MACRO REPLACEMENT TOKEN word
+%type <str> argument_word FUNC_MACRO IDENTIFIER OBJ_MACRO REPLACEMENT TOKEN
 %type <string_list> argument macro parameter_list
 %type <argument_list> argument_list
 
@@ -165,18 +165,14 @@ argument_list:
 ;
 
 argument:
-	word {
+	argument_word {
 		$$ = _string_list_create (parser);
 		_string_list_append_item ($$, $1);
 	}
 |	macro {
 		$$ = _string_list_create (parser);
 	}
-|	FUNC_MACRO {
-		$$ = _string_list_create (parser);
-		_string_list_append_item ($$, $1);
-	}
-|	argument word {
+|	argument argument_word {
 		_string_list_append_item ($1, $2);
 		talloc_free ($2);
 		$$ = $1;
@@ -189,6 +185,13 @@ argument:
 	}
 ;
 
+argument_word:
+	IDENTIFIER { $$ = $1; }
+|	TOKEN { $$ = $1; }
+|	FUNC_MACRO { $$ = $1; }
+;
+
+
 directive:
 	DEFINE IDENTIFIER REPLACEMENT {
 		_define_object_macro (parser, $2, $3);
@@ -225,11 +228,6 @@ parameter_list:
 	}
 ;
 
-word:
-	IDENTIFIER { $$ = $1; }
-|	TOKEN { $$ = $1; }
-;
-
 %%
 
 string_list_t *
diff --git a/tests/035-define-func-self-compose-non-func-multi-token-argument.c b/tests/035-define-func-self-compose-non-func-multi-token-argument.c
new file mode 100644
index 00000000000..9955219470c
--- /dev/null
+++ b/tests/035-define-func-self-compose-non-func-multi-token-argument.c
@@ -0,0 +1,2 @@
+#define foo(bar) bar
+foo(1 + foo)
-- 
2.30.2