fixed getStringValue failure case and compiler warnings

[chaz/openbox] / util / epist / epist.y

diff --git a/util/epist/epist.y b/util/epist/epist.y
index c1bf196dcdb748de4156a65d96fc70fd297f515f..d956a4cabc02ce835d6b6f2b67610a18f22fa66a 100644 (file)
--- a/util/epist/epist.y
+++ b/util/epist/epist.y
@@ -20,12 +20,13 @@ void yyerror(const char *c) {
 
 %}
 
-%token OBRACE EBRACE SEMICOLON DASH NUMBER QUOTES WORD BINDING 
+%token OBRACE EBRACE SEMICOLON DASH NUMBER QUOTES WORD BINDING OPTIONS
 
 %%
 
 commands:
     | commands command
+    | commands options_block
     ;
 
 command:
@@ -48,6 +49,10 @@ chain_command:
     }
     ;
 
+options_block:
+    options_keyword OBRACE options EBRACE
+    ;
+
 binding:
     binding_w_modifier bind_key
     ;
@@ -79,5 +84,18 @@ parameter:
     | QUOTES      { ((parser*)parser_obj)->setArgumentStr($1); }
     ;
 
+options_keyword:
+    OPTIONS
+    ;
+
+options:
+    | options option
+    ;
+
+option:
+    WORD parameter SEMICOLON
+    { ((parser*)parser_obj)->setOption($1); }
+    ;
+
 %%