Mesa (master): glcpp: Test a non-function-like macro using the token paste operator

Carl Worth cworth at kemper.freedesktop.org
Fri Sep 30 18:44:34 UTC 2011


Module: Mesa
Branch: master
Commit: 7bb3403e0172a440b8100bcf1db8462f50a254cc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7bb3403e0172a440b8100bcf1db8462f50a254cc

Author: Carl Worth <cworth at cworth.org>
Date:   Thu Sep 29 17:04:09 2011 -0700

glcpp: Test a non-function-like macro using the token paste operator

Apparently we never implemented this, (but we've got a GLSL 1.30 test
in piglit that is exercising this case).

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Signed-off-by: Carl Worth <cworth at cworth.org>

---

 .../tests/097-paste-with-non-function-macro.c      |    3 +++
 .../097-paste-with-non-function-macro.c.expected   |    4 ++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c
new file mode 100644
index 0000000..0f46835
--- /dev/null
+++ b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c
@@ -0,0 +1,3 @@
+#define PASTE_MACRO one ## token
+PASTE_MACRO
+
diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected
new file mode 100644
index 0000000..af92187
--- /dev/null
+++ b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected
@@ -0,0 +1,4 @@
+
+onetoken
+
+




More information about the mesa-commit mailing list