summaryrefslogtreecommitdiffstats
path: root/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected
diff options
context:
space:
mode:
authorCarl Worth <[email protected]>2014-06-25 14:17:37 -0700
committerCarl Worth <[email protected]>2014-07-29 15:11:50 -0700
commit285c9392ad9c4ca862bc6f0cd4138bfc38cc3cee (patch)
treef23fdf95d9601a6e0e8bc5784eae7f0ebc790df2 /src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected
parent34cd293c8ac6df6284f94fd456eee7ddc847c5df (diff)
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 <[email protected]>
Diffstat (limited to 'src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected')
-rw-r--r--src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected b/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected
new file mode 100644
index 00000000000..137921b1695
--- /dev/null
+++ b/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected
@@ -0,0 +1,8 @@
+0:7(12): preprocessor error: syntax error, unexpected PLUS_PLUS
+
+a = x++;
+b = ++x;
+c = x--;
+d = --x;
+
+