X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fparse.l;h=4dcdc2ca8c440d432b0e9560d10b1c208b322b71;hb=cb444e37d21009b0e32705901836f77b08f4c5aa;hp=bab976c4129c1c8457353adf82281e72169a4edd;hpb=87fbee961fcf302ed92cbc2681375a3bea9ce713;p=chaz%2Fopenbox diff --git a/openbox/parse.l b/openbox/parse.l index bab976c4..4dcdc2ca 100644 --- a/openbox/parse.l +++ b/openbox/parse.l @@ -10,7 +10,7 @@ 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]) %% @@ -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; } %%