make epist compile with the new code base

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

diff --git a/util/epist/epist.l b/util/epist/epist.l
index 6e3914cbcc7e46dea498e404ec97608f3af3b742..6c7e08a5acdb567bba9b7bd03d43b0f2de297517 100644 (file)
--- a/util/epist/epist.l
+++ b/util/epist/epist.l
@@ -1,62 +1,51 @@
 %{
+#ifdef    HAVE_CONFIG_H
+#  include "../../config.h"
+#endif // HAVE_CONFIG_H
+
 #include <stdio.h>
+#include <string.h>
 #include "yacc_parser.hh"
+
+extern YYSTYPE yylval;
+
 %}
 
+%option yylineno
+
 %%
 
 \{                  return OBRACE;
 \}                  return EBRACE;
 ;                   return SEMICOLON;
 -                   return DASH;
-noaction |
-execute |
-iconify |
-raise |
-lower |
-close |
-toggleshade |
-toggleomnipresent |
-moveWindowUp |
-moveWindowDown |
-moveWindowLeft |
-moveWindowRight |
-resizeWindowWidth |
-resizeWindowHeight |
-toggleMaximizeFull |
-toggleMaximizeVertical |
-toggleMaximizeHorizontal |
-sendToWorkspace |
-nextWindow |
-prevWindow |
-nextWindowOnAllWorkspaces |
-prevWindowOnAllWorkspaces |
-nextWindowOnAllScreens |
-prevWindowOnAllScreens |
-nextWindowOfClass |
-prevWindowOfClass |
-nextWindowOfClassOnAllWorkspaces |
-prevWindowOfClassOnAllWorkspaces |
-changeWorkspace |
-nextWorkspace |
-prevWorkspace |
-nextScreen |
-prevScreen |
-showRootMenu |
-showWorkspaceMenu |
-stringChain |
-keyChain |
-numberChain |
-cancel              yylval = strdup(yytext); return ACTION;
+Options |
+options             return OPTIONS;
 Mod1 |
+mod1 |
 Mod2 |
+mod2 |
 Mod3 |
+mod3 |
 Mod4 |
+mod4 |
+Mod5 |
+mod5 |
 Control |
-Shift               yylval = strdup(yytext); return BINDING;
-[0-9]+              yylval = strdup(yytext); return NUMBER;
-\".+\"              yylval = strdup(yytext); return QUOTES;
-[a-zA-Z_0-9]+       yylval = strdup(yytext); return WORD;
+control |
+shift |
+Shift               yylval = (int) strdup(yytext); return BINDING;
+on |
+On |
+true |
+True                yylval = (int) strdup(yytext); return TRUE;
+Off |
+off |
+false |
+False               yylval = (int) strdup(yytext); return FALSE;
+[0-9]+              yylval = (int) strdup(yytext); return NUMBER;
+\".+\"              yylval = (int) strdup(yytext); return QUOTES;
+[a-zA-Z_0-9]+       yylval = (int) strdup(yytext); return WORD;
 #.+\n               /* ignore */
 \n                  /* ignore */
 [ \t]+              /* */