Mesa (master): glsl: glcpp: Extend testing of #line directives

[Carl Worth]

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

Author: Carl Worth <cworth at cworth.org>
Date:   Sat Jun  9 16:37:08 2012 -0700

glsl: glcpp: Extend testing of #line directives

The most recent commit adds support for comments and macro expansion
on #line directives. Add testing to verify the new features.

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

---

 src/glsl/glcpp/tests/091-hash-line.c          |    6 ++++++
 src/glsl/glcpp/tests/091-hash-line.c.expected |    6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/glsl/glcpp/tests/091-hash-line.c b/src/glsl/glcpp/tests/091-hash-line.c
index fea35d3..26d7038 100644
--- a/src/glsl/glcpp/tests/091-hash-line.c
+++ b/src/glsl/glcpp/tests/091-hash-line.c
@@ -6,3 +6,9 @@
 #error source 1, line 0 error
 #line 30 2
 #error source 2, line 30 error
+#line 45 2 /* A line with a comment */
+#define NINETY 90
+#define TWO 2
+#line NINETY TWO /* A #line line with macro expansion */
+#define FUNCTION_LIKE_MACRO(source, line) source line
+#line FUNCTION_LIKE_MACRO(180,2)
diff --git a/src/glsl/glcpp/tests/091-hash-line.c.expected b/src/glsl/glcpp/tests/091-hash-line.c.expected
index ea29149..976d178 100644
--- a/src/glsl/glcpp/tests/091-hash-line.c.expected
+++ b/src/glsl/glcpp/tests/091-hash-line.c.expected
@@ -11,3 +11,9 @@
 
 #line 30 2
 
+#line 45 2
+
+
+#line 90 2
+
+#line 180 2