From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 9 Nov 2009 21:36:26 +0000 (+0100)
Subject: parser: Use right parameter, suppress warning about expected shift/reduce conflict
X-Git-Tag: 3.d
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bf728be09b881f6ba20354b86b690130ec8a09da;p=i3%2Fi3

parser: Use right parameter, suppress warning about expected shift/reduce conflict
---

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: