From: Carl Worth <cworth@cworth.org>
Date: Fri, 14 May 2010 15:47:32 +0000 (-0700)
Subject: Eliminate a reduce/reduce conflict in the function-like macro production.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=db35d557a40b9fb56483f77da2fb98f541808dd0;p=mesa.git

Eliminate a reduce/reduce conflict in the function-like macro production.

Previously, an empty argument could be parsed as either an "argument_list"
directly or first as an "argument" and then an "argument_list".

We fix this by removing the possibility of an empty "argument_list"
directly.
---

diff --git a/glcpp-parse.y b/glcpp-parse.y
index 2e40db525b8..66725db69ed 100644
--- a/glcpp-parse.y
+++ b/glcpp-parse.y
@@ -121,10 +121,7 @@ macro:
 ;
 
 argument_list:
-	/* empty */ {
-		$$ = _list_create (parser);
-	}
-|	argument {
+	argument {
 		$$ = _list_create (parser);
 		_list_append_list ($$, $1);
 	}