From dfdf9dc082cbab332457ea2dbe012eeb0d164ce4 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Wed, 25 Jun 2014 11:59:55 -0700 Subject: glsl/glcpp: Rename HASH token to HASH_TOKEN This is in preparation for the planned addition of a new start condition to the lexer. Both start conditions and token types are, of course, in the same default C namespace, so a start condition and a token type with the same name will collide. (And unfortunately, they are both apparently implemented as equivalent numeric types so the collision is undetected at compile time and simply leads to unpredictable behavior at run time.) Reviewed-by: Jordan Justen --- src/glsl/glcpp/glcpp-lex.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/glsl/glcpp/glcpp-lex.l') diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l index f13b3dacb16..5a5bbe1886a 100644 --- a/src/glsl/glcpp/glcpp-lex.l +++ b/src/glsl/glcpp/glcpp-lex.l @@ -344,7 +344,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]? {HASH} { yyextra->space_tokens = 0; - RETURN_TOKEN (HASH); + RETURN_TOKEN (HASH_TOKEN); } {DECIMAL_INTEGER} { -- cgit v1.2.3