From bf728be09b881f6ba20354b86b690130ec8a09da Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 9 Nov 2009 22:36:26 +0100
Subject: [PATCH] parser: Use right parameter, suppress warning about expected
 shift/reduce conflict

---
 src/cfgparse.y | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/cfgparse.y b/src/cfgparse.y
index a33ecaf1..efed14e0 100644
--- a/src/cfgparse.y
+++ b/src/cfgparse.y
@@ -160,6 +160,8 @@ void parse_file(const char *f) {
 
 %}
 
+%expect 1
+
 %union {
         int number;
         char *string;
@@ -404,7 +406,7 @@ workspace:
 
 optional_workspace_name:
         /* empty */                     { $<string>$ = NULL; }
-        | WHITESPACE workspace_name     { $<string>$ = $<string>1; }
+        | WHITESPACE workspace_name     { $<string>$ = $<string>2; }
         ;
 
 workspace_name: