From: Pavel Machek <pavel@ucw.cz>
Date: Thu, 11 Nov 1999 13:27:59 +0000 (+0000)
Subject: Shift/reduce conflict goes away _and_ if/then/else works.
X-Git-Tag: v1.2.0~1459
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ed8718a19747bba95ff86fb8d3c6ea357b50101;p=thirdparty%2Fbird.git

Shift/reduce conflict goes away _and_ if/then/else works.
---

diff --git a/filter/config.Y b/filter/config.Y
index 54aeb69d8..5c8977cfe 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -38,10 +38,8 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, CONST,
 	FILTER
 	)
 
-/* Add these to break parser and make shift/reduce conflict go away :-(
-%nonassoc ELSE
 %nonassoc THEN
-*/
+%nonassoc ELSE
 
 %type <x> term block cmds cmd function_body constant print_one print_list var_list var_listn any_dynamic enums
 %type <f> filter filter_body