From 3a531cb253ed24c74560db8e67d3a200a593e2bb Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower III" Date: Sat, 20 Mar 2004 07:25:47 +0000 Subject: [PATCH] Use case-insensitive flex instead of manually escaping tokens, be sure to do a make Makefile before compiling to get new flex commandline. --- hw/xwin/winprefslex.l | 53 ++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/hw/xwin/winprefslex.l b/hw/xwin/winprefslex.l index 0a61c1283..4b1fef216 100644 --- a/hw/xwin/winprefslex.l +++ b/hw/xwin/winprefslex.l @@ -62,32 +62,32 @@ static char *makestr(char *str) %option yylineno %% -\#.*[\r\n] { /* comment */ return NEWLINE; } -\/\/.*[\r\n] { /* comment */ return NEWLINE; } -[\r\n] { return NEWLINE; } -[ \t]+ { /* ignore whitespace */ } -[mM][eE][nN][uU] { return MENU; } -[iI][cC][oO][nN][dD][iI][rR][eE][cC][tT][oO][rR][yY] { return ICONDIRECTORY; } -[dD][eE][fF][aA][uU][lL][tT][iI][cC][oO][nN] { return DEFAULTICON; } -[iI][cC][oO][nN][sS] { return ICONS; } -[rR][oO][oO][tT][mM][eE][nN][uU] { return ROOTMENU; } -[dD][eE][fF][aA][uU][lL][tT][sS][yY][sS][mM][eE][nN][uU] { return DEFAULTSYSMENU; } -[sS][yY][sS][mM][eE][nN][uU] { return SYSMENU; } -[sS][eE][pP][aA][rR][aA][tT][oO][rR] { return SEPARATOR; } -[aA][tT][sS][tT][aA][rR][tT] { return ATSTART; } -[aA][tT][eE][nN][dD] { return ATEND; } -[eE][xX][eE][cC] { return EXEC; } -[aA][lL][wW][aA][yY][sS][oO][nN][tT][oO][pP] { return ALWAYSONTOP; } -[dD][eE][bB][uU][gG] { return DEBUG; } -[rR][eE][lL][oO][aA][dD] { return RELOAD; } -[tT][rR][aA][yY][iI][cC][oO][nN] { return TRAYICON; } -"{" { return LB; } -"}" { return RB; } -"\""[^\"\r\n]+"\"" { yylval.sVal = makestr(yytext+1); \ - yylval.sVal[strlen(yylval.sVal)-1] = 0; \ - return STRING; } -[^ \t\r\n]+ { yylval.sVal = makestr(yytext); \ - return STRING; } +\#.*[\r\n] { /* comment */ return NEWLINE; } +\/\/.*[\r\n] { /* comment */ return NEWLINE; } +[\r\n] { return NEWLINE; } +[ \t]+ { /* ignore whitespace */ } +MENU { return MENU; } +ICONDIRECTORY { return ICONDIRECTORY; } +DEFAULTICON { return DEFAULTICON; } +ICONS { return ICONS; } +ROOTMENU { return ROOTMENU; } +DEFAULTSYSMENU { return DEFAULTSYSMENU; } +SYSMENU { return SYSMENU; } +SEPARATOR { return SEPARATOR; } +ATSTART { return ATSTART; } +ATEND { return ATEND; } +EXEC { return EXEC; } +ALWAYSONTOP { return ALWAYSONTOP; } +DEBUG { return DEBUG; } +RELOAD { return RELOAD; } +TRAYICON { return TRAYICON; } +"{" { return LB; } +"}" { return RB; } +"\""[^\"\r\n]+"\"" { yylval.sVal = makestr(yytext+1); \ + yylval.sVal[strlen(yylval.sVal)-1] = 0; \ + return STRING; } +[^ \t\r\n]+ { yylval.sVal = makestr(yytext); \ + return STRING; } %% /* @@ -112,3 +112,4 @@ parse_file (FILE *file) yyin = file; yyparse (); } +