summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stapelberg <michael@stapelberg.de>2009-11-09 22:36:26 +0100
committerMichael Stapelberg <michael@stapelberg.de>2009-11-09 22:36:26 +0100
commitbf728be09b881f6ba20354b86b690130ec8a09da (patch)
tree82a09c8ad24c6a02a0eead3b4fee54f48d769cc5
parent08ee194d5973beed17d445f3c6bc3beabc9ecfd8 (diff)
downloadi3-3.d.tar.gz
i3-3.d.zip
parser: Use right parameter, suppress warning about expected shift/reduce conflict3.d
-rw-r--r--src/cfgparse.y4
1 files changed, 3 insertions, 1 deletions
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: