Mesa (master): AST dump: fixed printing of conditionals.

Brian Paul brianp at kemper.freedesktop.org
Fri Jun 3 17:07:23 UTC 2011


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

Author: Paul Berry <stereotype441 at gmail.com>
Date:   Fri Jun  3 10:02:32 2011 -0700

AST dump: fixed printing of conditionals.

ast_expression::print() had an incorrect index into the subexpressions
array, so (a ? b : c) was being incorrectly rendered as (a ? b : b).

Signed-off-by: Brian Paul <brianp at vmware.com>

---

 src/glsl/glsl_parser_extras.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index fce2faa..d9aa300 100644
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
@@ -436,7 +436,7 @@ ast_expression::print(void) const
       printf("? ");
       subexpressions[1]->print();
       printf(": ");
-      subexpressions[1]->print();
+      subexpressions[2]->print();
       break;
 
    case ast_array_index:




More information about the mesa-commit mailing list