From: Carl Worth <cworth@cworth.org>
Date: Wed, 2 Jul 2014 00:47:29 +0000 (-0700)
Subject: glsl/glcpp: Allow single-line comments immediately after #define
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b4b2a5c3f31f0f66d3ddf1e994c099304d99ed4b;p=mesa.git

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 <ian.d.romanick@intel.com>
---

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]* {
+<INITIAL,DEFINE>"//"[^\r\n]* {
 }
 
 	/* Multi-line comments */