summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2010-05-14 08:47:32 -0700
committerCarl Worth <cworth@cworth.org>2010-05-14 08:47:32 -0700
commitdb35d557a40b9fb56483f77da2fb98f541808dd0 (patch)
tree3b1c1530249bd7ad864224a2b1e9b9fecf8b3d74
parentfcbbb4688641e46270ba0cd531639df9b964f697 (diff)
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.
-rw-r--r--glcpp-parse.y5
1 files changed, 1 insertions, 4 deletions
diff --git a/glcpp-parse.y b/glcpp-parse.y
index 2e40db525b..66725db69e 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);
}