all my changes while i was offline.

[chaz/openbox] / openbox / parse.l

diff --git a/openbox/parse.l b/openbox/parse.l
index 4dcdc2ca8c440d432b0e9560d10b1c208b322b71..a7cd6c636b2d71b08cc901d798aab63541554278 100644 (file)
--- a/openbox/parse.l
+++ b/openbox/parse.l
@@ -4,20 +4,20 @@
 #  include <stdlib.h>
 #endif
 
-int yylineno = 1;
+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])
 
 %%
 
-^[ \t]*#.*\n /* comment */ { ++yylineno; }
+^[ \t]*#.*\n /* comment */ { ++lineno; }
 ^[ \t]*#.*   /* comment */
-^[ \t]*\n    /* empty lines */ { ++yylineno; }
+^[ \t]*\n    /* empty lines */ { ++lineno; }
 [ \t]        /* whitespace */
 {real}       { yylval.real = atof(yytext); return REAL; }
 {integer}    { yylval.integer = atoi(yytext); return INTEGER; }
@@ -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; }