glsl/glcpp: Drop the HASH_ prefix from token names like HASH_IF
authorCarl Worth <cworth@cworth.org>
Wed, 25 Jun 2014 20:55:18 +0000 (13:55 -0700)
committerCarl Worth <cworth@cworth.org>
Tue, 29 Jul 2014 22:11:50 +0000 (15:11 -0700)
commit18c589d20ea684f6415b28d563fd2edaae0d7b2c
treeda021eee461c54e956763c1b2596da6f7e2d8b27
parentde0b4b6607c755257a63a72d0079ef9f2aaccbc2
glsl/glcpp: Drop the HASH_ prefix from token names like HASH_IF

Previously, we had a single token for "#if" but now that we have two separate
tokens, it looks much better to see:

HASH_TOKEN IF

than:

HASH_TOKEN HASH_IF

(Note, that for the same reason we use HASH_TOKEN instead of HASH, we also use
DEFINE_TOKEN instead of DEFINE to avoid a conflict with the <DEFINE> start
condition in the lexer.)

There should be no behavioral change from this commit.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
src/glsl/glcpp/glcpp-lex.l
src/glsl/glcpp/glcpp-parse.y