summaryrefslogtreecommitdiffstats
path: root/src/glsl/glcpp/glcpp-lex.l
diff options
context:
space:
mode:
authorCarl Worth <[email protected]>2014-06-25 11:59:55 -0700
committerCarl Worth <[email protected]>2014-07-29 15:11:49 -0700
commitdfdf9dc082cbab332457ea2dbe012eeb0d164ce4 (patch)
tree0170d4e78244f84ece9c5dcafb01d354f041d765 /src/glsl/glcpp/glcpp-lex.l
parent0d5f5d127b2ccac29b12bc7377ccd8cd5b29c70b (diff)
glsl/glcpp: Rename HASH token to HASH_TOKEN
This is in preparation for the planned addition of a new <HASH> 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 <[email protected]>
Diffstat (limited to 'src/glsl/glcpp/glcpp-lex.l')
-rw-r--r--src/glsl/glcpp/glcpp-lex.l2
1 files changed, 1 insertions, 1 deletions
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} {