summaryrefslogtreecommitdiff
path: root/src/glsl/ir.h
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2010-07-20 16:44:03 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-07-20 17:01:12 -0700
commite1acbfca322c4ac720707ec8d3fda08fab65a30b (patch)
tree2ff0280eab03abc0c9c8655f050ea2ecb9567bdd /src/glsl/ir.h
parent942ccc517012e360a7e30d3322331c8450dda022 (diff)
glcpp: Avoid accidental token pasting in preprocessed result.
Consider this test case: #define EMPTY int foo = 1+EMPTY+4; The expression should compile as the sequence of tokens 1, PLUS, UNARY_POSITIVE, 4. But glcpp has been failing for this case since it results in the string "1++4" which a compiler correctly sees as a syntax error, (1, POST_INCREMENT, 4). We fix this by changing any macro with an empty definition to result in a single SPACE token rather than nothing. This then gives "1+ +4" which compiles correctly. This commit does touch up the two existing test cases which already have empty macros, (to add the space to the expected result). It also adds a new test case to exercise the above scenario.
Diffstat (limited to 'src/glsl/ir.h')
0 files changed, 0 insertions, 0 deletions