all my changes while i was offline.

[chaz/openbox] / openbox / parse.l

diff --git a/openbox/parse.l b/openbox/parse.l
index 64896e07249d6806cb7f2d6678a5b3a417991b3e..a7cd6c636b2d71b08cc901d798aab63541554278 100644 (file)
--- a/openbox/parse.l
+++ b/openbox/parse.l
@@ -10,7 +10,7 @@ extern int lineno;
 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])
 
 %%
@@ -31,7 +31,7 @@ bool ([tT][rR][uU][eE]|[fF][aA][lL][sS][eE]|[yY][eE][sS]|[nN][oO]|[oO][nN]|[oO][
 {bool}       { yylval.bool = (!g_ascii_strcasecmp("true", yytext) ||
                               !g_ascii_strcasecmp("yes", yytext) ||
                               !g_ascii_strcasecmp("on", yytext));
-               return BOOL;
+               return BOOLEAN;
              }
 {identifier} { yylval.identifier = g_strdup(yytext); return IDENTIFIER; }
 [{}()\[\]=,] { yylval.character = *yytext; return *yytext; }