X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fparse.l;h=3762f3359540a994984d8df7e427e59e51a67760;hb=95b1cd01669f9867511f9a65ce01e4404e5800b3;hp=427a55cdf2b8799e0b23edb2c47c9dc41a502d7b;hpb=e974208068e0b4cede25d35fe16b861c307f0bf4;p=chaz%2Fopenbox

diff --git a/openbox/parse.l b/openbox/parse.l
index 427a55cd..3762f335 100644
--- 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; }
@@ -35,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; }
 
 %%