glsl/glcpp: Add (non)-support for ++ and -- operators
authorCarl Worth <cworth@cworth.org>
Wed, 25 Jun 2014 21:17:37 +0000 (14:17 -0700)
committerCarl Worth <cworth@cworth.org>
Tue, 29 Jul 2014 22:11:50 +0000 (15:11 -0700)
commit285c9392ad9c4ca862bc6f0cd4138bfc38cc3cee
treef23fdf95d9601a6e0e8bc5784eae7f0ebc790df2
parent34cd293c8ac6df6284f94fd456eee7ddc847c5df
glsl/glcpp: Add (non)-support for ++ and -- operators

These operators aren't defined for preprocessor expressions, so we never
implemented them. This led them to be misinterpreted as strings of unary
'+' or '-' operators.

In fact, what is actually desired is to generate an error if these operators
appear in any preprocessor condition.

So this commit looks like it is strictly adding support for these
operators. And it is supporting them as far as passing them through to the
subsequent compiler, (which was already happening anyway).

What's less apparent in the commit is that with these tokens now being lexed,
but with no change to the grammar for preprocessor expressions, these
operators will now trigger errors there.

A new "make check" test is added to verify the desired behavior.

This commit fixes the following Khronos GLES3 CTS test:

invalid_op_1_vertex
invalid_op_1_fragment
invalid_op_2_vertex
invalid_op_2_fragment

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
src/glsl/glcpp/glcpp-lex.l
src/glsl/glcpp/glcpp-parse.y
src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c [new file with mode: 0644]
src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected [new file with mode: 0644]