projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d8b8619
)
glcpp: Don't emit SPACE tokens in conditional_tokens production.
author
Kenneth Graunke
<kenneth@whitecape.org>
Tue, 7 Dec 2010 18:47:50 +0000
(10:47 -0800)
committer
Kenneth Graunke
<kenneth@whitecape.org>
Tue, 7 Dec 2010 18:52:36 +0000
(10:52 -0800)
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>
src/glsl/glcpp/glcpp-parse.y
patch
|
blob
|
history
diff --git
a/src/glsl/glcpp/glcpp-parse.y
b/src/glsl/glcpp/glcpp-parse.y
index
8475e08
..
558ad0a
100644
(file)
--- 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);