Mesa (7.9): glcpp: Don't emit SPACE tokens in conditional_tokens production .

[Ian Romanick]

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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Tue Dec  7 10:47:50 2010 -0800

glcpp: Don't emit SPACE tokens in conditional_tokens production.

Fixes glslparsertest defined-01.vert.

Reported-by: José Fonseca <jfonseca at vmware.com>
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Carl Worth <cworth at cworth.org>
(cherry picked from commit 800eed6765d43d35a338d3135b3204fa6a318afd)

---

 src/glsl/glcpp/glcpp-parse.y |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 3ea66d2..a81a3ac 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -472,7 +472,6 @@ conditional_token:
 conditional_tokens:
 	/* Exactly the same as pp_tokens, but using conditional_token */
 	conditional_token {
-		parser->space_tokens = 1;
 		$$ = _token_list_create (parser);
 		_token_list_append ($$, $1);
 		talloc_unlink (parser, $1);