From b4b2a5c3f31f0f66d3ddf1e994c099304d99ed4b Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 1 Jul 2014 17:47:29 -0700 Subject: [PATCH] glsl/glcpp: Allow single-line comments immediately after #define We were already correctly supporting single-line comments in case like: #define FOO bar // comment here... The new support added here is simply for the none-too-useful: #define // comment instead of macro name With this commit, this line will now give the expected "#define without macro name" error message instead of the lexer just going off into the weeds. 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 6e197d12a1a..2cfe203dacf 100644 --- a/src/glsl/glcpp/glcpp-lex.l +++ b/src/glsl/glcpp/glcpp-lex.l @@ -250,7 +250,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]? } /* Single-line comments */ -"//"[^\r\n]* { +"//"[^\r\n]* { } /* Multi-line comments */ -- 2.30.2