]> git.sur5r.net Git - i3/i3/commitdiff
parser: Use right parameter, suppress warning about expected shift/reduce conflict 3.d
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 9 Nov 2009 21:36:26 +0000 (22:36 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 9 Nov 2009 21:36:26 +0000 (22:36 +0100)
src/cfgparse.y

index a33ecaf11f5c73ed996784a3841fe7318701fa46..efed14e0f19d658424e0b17db8acdf86df349f71 100644 (file)
@@ -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: