From ec69e00843ecafcd817b47f22229b84561c5e624 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Wed, 2 Jul 2014 22:20:43 -0700 Subject: [PATCH] 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 --- src/glsl/glcpp/glcpp-lex.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l index 48cc62c1109..98d500ec0be 100644 --- a/src/glsl/glcpp/glcpp-lex.l +++ b/src/glsl/glcpp/glcpp-lex.l @@ -353,7 +353,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]? RETURN_TOKEN_NEVER_SKIP (ENDIF); } -error.* { +error[^\r\n]* { BEGIN INITIAL; RETURN_STRING_TOKEN (ERROR_TOKEN); } -- 2.30.2