diff options
| author | Carl Worth <cworth@cworth.org> | 2014-07-02 22:20:43 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-08-07 16:08:29 -0700 |
| commit | ec69e00843ecafcd817b47f22229b84561c5e624 (patch) | |
| tree | e954d93f614024060f1a523a127be2c195b2b1b7 /src/glsl/glcpp | |
| parent | 04e40fd337a244ee77ef9553985e9398ff0344af (diff) | |
| download | external_mesa3d-ec69e00843ecafcd817b47f22229b84561c5e624.zip external_mesa3d-ec69e00843ecafcd817b47f22229b84561c5e624.tar.gz external_mesa3d-ec69e00843ecafcd817b47f22229b84561c5e624.tar.bz2 | |
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>
Diffstat (limited to 'src/glsl/glcpp')
| -rw-r--r-- | src/glsl/glcpp/glcpp-lex.l | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l index 48cc62c..98d500e 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); } -<HASH>error.* { +<HASH>error[^\r\n]* { BEGIN INITIAL; RETURN_STRING_TOKEN (ERROR_TOKEN); } |