diff options
author | Carl Worth <[email protected]> | 2012-01-21 09:24:11 -0800 |
---|---|---|
committer | Carl Worth <[email protected]> | 2012-02-02 12:05:21 -0800 |
commit | 7ab1c7f7926c75a07f33eb149d0fc17dcfaffd5e (patch) | |
tree | b443754439bfedbe61527857afd87f74a24f88f9 /src/glsl/opt_constant_variable.cpp | |
parent | e931b0e05b19259b0f5b53faf73b375013ab1cb3 (diff) |
glcpp: Fix so that trailing punctuation does not prevent macro expansion
The trick here is that flex always chooses the rule that matches the most
text. So with a input text of "two:" which we want to be lexed as an
IDENTIFIER token "two" followed by an OTHER token ":" the previous OTHER
rule would match longer as a single token of "two:" which we don't want.
We prevent this by forcing the OTHER pattern to never match any
characters that appear in other constructs, (no letters, numbers, #,
_, whitespace, nor any punctuation that appear in CPP operators).
Fixes bug #44764:
GLSL preprocessor doesn't replace defines ending with ":"
https://bugs.freedesktop.org/show_bug.cgi?id=44764
Reviewed-by: Kenneth Graunke <[email protected]>
NOTE: This is a candidate for stable release branches.
Diffstat (limited to 'src/glsl/opt_constant_variable.cpp')
0 files changed, 0 insertions, 0 deletions