summaryrefslogtreecommitdiffstats
path: root/filter/config.Y
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>1999-11-11 14:27:59 +0100
committerPavel Machek <pavel@ucw.cz>1999-11-11 14:27:59 +0100
commit4ed8718a19747bba95ff86fb8d3c6ea357b50101 (patch)
tree5f59d659da1dd53e519415dbc15ed59beed64824 /filter/config.Y
parent986e34131dbd2bca668c2b0a6ebb25de6848fc0a (diff)
downloadbird-4ed8718a19747bba95ff86fb8d3c6ea357b50101.tar
bird-4ed8718a19747bba95ff86fb8d3c6ea357b50101.zip
Shift/reduce conflict goes away _and_ if/then/else works.
Diffstat (limited to 'filter/config.Y')
-rw-r--r--filter/config.Y4
1 files changed, 1 insertions, 3 deletions
diff --git a/filter/config.Y b/filter/config.Y
index 54aeb69..5c8977c 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