From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 7 Dec 2010 18:47:50 +0000 (-0800)
Subject: glcpp: Don't emit SPACE tokens in conditional_tokens production.
X-Git-Tag: mesa-7.10~154
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=800eed6765d43d35a338d3135b3204fa6a318afd;p=platform%2Fupstream%2Fmesa.git

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

Fixes glslparsertest defined-01.vert.

Reported-by: José Fonseca <jfonseca@vmware.com>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Carl Worth <cworth@cworth.org>
---

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 8475e08..558ad0a 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);