glsl/glcpp: Don't include any newline characters in #error token
Some tests were failing because the message printed by #error was including a '\r' character from the source file in its output. This is easily avoided by fixing the regular expression for #error to never include any of the possible newline characters, (neither '\r' nor '\n'). With this commit 2 tests are fixed for each of the '\r' and '\r\n' cases. Current results after the commit are: \r: 137/143 tests pass \r\n 142/143 tests pass \n\r: 139/143 tests pass Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
@@ -353,7 +353,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
|
||||
RETURN_TOKEN_NEVER_SKIP (ENDIF);
|
||||
}
|
||||
|
||||
<HASH>error.* {
|
||||
<HASH>error[^\r\n]* {
|
||||
BEGIN INITIAL;
|
||||
RETURN_STRING_TOKEN (ERROR_TOKEN);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user