glsl/glcpp: Add test for a multi-line comment within an #if 0 block
authorCarl Worth <cworth@cworth.org>
Thu, 26 Jun 2014 17:56:41 +0000 (10:56 -0700)
committerCarl Worth <cworth@cworth.org>
Tue, 29 Jul 2014 22:11:50 +0000 (15:11 -0700)
This test is written to exercise a bug which I recently wrote, (but
fortunately caught and fixed before ever committing it).

For the curious:

  The bug happened when the NEWLINE_CATCHUP code didn't actually return the
  NEWLINE token (due to the skipping). This resulted in the lexer continuing
  on through all the subsequent rules while still in the NEWLINE_CATCHUP start
  condition, (which then triggered the internal-compiler-error catch-all
  rule).

  What is intended is for the return of the NEWLINE token to start a new
  iteration of the lexer loop, at which time the NEWLINE_CATCHUP-handling code
  will reset from the <NEWLINE_CATCHUP> to the <INITIAL> start condition.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c [new file with mode: 0644]
src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected [new file with mode: 0644]

diff --git a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c b/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c
new file mode 100644 (file)
index 0000000..38967dc
--- /dev/null
@@ -0,0 +1,7 @@
+#if 0
+/*
+ * This multi-line comment needs to be 3 lines to test what's intended.
+ */
+#else
+SUCCESS
+#endif
diff --git a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected b/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected
new file mode 100644 (file)
index 0000000..0d6ef4d
--- /dev/null
@@ -0,0 +1,7 @@
+
+
+
+
+
+SUCCESS
+