Commit e355ee2d authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

Filenames may contain '/' and '\'.

Small typo fixes.
parent fca20f65
...@@ -110,7 +110,7 @@ __FILE__ | "..." | Current filename as string ...@@ -110,7 +110,7 @@ __FILE__ | "..." | Current filename as string
__LINE__ | nnn | Current linenumber as integer __LINE__ | nnn | Current linenumber as integer
__TIME__ | "23:59:59" | Timestring of compilation __TIME__ | "23:59:59" | Timestring of compilation
__DATE__ | "May 1 2000" | Datestring of compilation __DATE__ | "May 1 2000" | Datestring of compilation
__WRC__  1 | Wrc's major version __WRC__ | 1 | Wrc's major version
__WRC_MINOR__ | 1 | Wrc's minor version __WRC_MINOR__ | 1 | Wrc's minor version
__WRC_MICRO__ | 7 | Wrc's minor version __WRC_MICRO__ | 7 | Wrc's minor version
__WRC_PATCH__ | 8 | Alias of __WRC_MICRO__ __WRC_PATCH__ | 8 | Alias of __WRC_MICRO__
......
...@@ -369,7 +369,7 @@ static struct keyword *iskeyword(char *kw) ...@@ -369,7 +369,7 @@ static struct keyword *iskeyword(char *kw)
0[oO][0-7]+[lL]? { yylval.num = strtoul(yytext+2, 0, 8); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } 0[oO][0-7]+[lL]? { yylval.num = strtoul(yytext+2, 0, 8); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; }
/* /*
* The next to rules scan identifiers and filenames. * The next two rules scan identifiers and filenames.
* This is achieved by using the priority ruling * This is achieved by using the priority ruling
* of the scanner where a '.' is valid in a filename * of the scanner where a '.' is valid in a filename
* and *only* in a filename. In this case, the second * and *only* in a filename. In this case, the second
...@@ -396,7 +396,7 @@ static struct keyword *iskeyword(char *kw) ...@@ -396,7 +396,7 @@ static struct keyword *iskeyword(char *kw)
return tIDENT; return tIDENT;
} }
} }
[A-Za-z_0-9.]+ yylval.str = make_string(yytext); return tFILENAME; [A-Za-z_0-9./\\]+ yylval.str = make_string(yytext); return tFILENAME;
/* /*
* Wide string scanning * Wide string scanning
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment