fallback to transients' parents when possible.

[chaz/openbox] / openbox / parse.l

diff --git a/openbox/parse.l b/openbox/parse.l
index c888b9f1a9fc2752db6404008963ad89dcf35101..4dcdc2ca8c440d432b0e9560d10b1c208b322b71 100644 (file)
--- a/openbox/parse.l
+++ b/openbox/parse.l
@@ -1,19 +1,16 @@
 %{
-#include <glib.h>
-#include "y.tab.h"
+#include "parse.h"
 #ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 #endif
 
-extern void yyerror(char *err);
-
 int yylineno = 1;
 %}
 
 real [-0-9][0-9]*\.[0-9]+
 integer [-0-9][0-9]*
 string \"[^"\n]*\"
-identifier [a-zA-Z][.a-zA-Z0-9]*
+identifier [a-zA-Z][-.a-zA-Z0-9]*
 bool ([tT][rR][uU][eE]|[fF][aA][lL][sS][eE]|[yY][eE][sS]|[nN][oO]|[oO][nN]|[oO][fF][fF])
 
 %%
@@ -38,7 +35,7 @@ bool ([tT][rR][uU][eE]|[fF][aA][lL][sS][eE]|[yY][eE][sS]|[nN][oO]|[oO][nN]|[oO][
              }
 {identifier} { yylval.identifier = g_strdup(yytext); return IDENTIFIER; }
 [{}()\[\]=,] { yylval.character = *yytext; return *yytext; }
-\n           { yylval.character = *yytext; ++yylineno; return *yytext; }
+\n           { yylval.character = *yytext; return *yytext; }
 .            { return INVALID; }
 
 %%