From 8e1945a9902e4a9b9bfccc84549a2cbc217a9fa7 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Fri, 6 Nov 2009 17:19:01 +0100 Subject: [PATCH] parser: solve shift/reduce conflict by moving WHITESPACE token to the right place --- src/cfgparse.y | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/cfgparse.y b/src/cfgparse.y index 548d7482..f212826e 100644 --- a/src/cfgparse.y +++ b/src/cfgparse.y @@ -276,7 +276,7 @@ word_or_number: ; mode: - TOKMODE WHITESPACE QUOTEDSTRING WHITESPACE '{' optional_whitespace modelines optional_whitespace '}' + TOKMODE WHITESPACE QUOTEDSTRING WHITESPACE '{' modelines '}' { if (strcasecmp($3, "default") == 0) { printf("You cannot use the name \"default\" for your mode\n"); @@ -298,19 +298,15 @@ mode: } ; -optional_whitespace: - /* empty */ - | WHITESPACE - ; modelines: /* empty */ - | modelines WHITESPACE modeline | modelines modeline ; modeline: - comment + WHITESPACE + | comment | binding { if (current_bindings == NULL) { -- 2.39.5