X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fdebug.cpp;h=700acbf9cd50a66c8db4e98c54343d8696a332ce;hb=3a1fe83;hp=dd9db2f8ff760bdd92cd8e37fa24baa8141ee865;hpb=a1ba04add302e7712d127b46d8d11386987a0aea;p=libs%2Fgl.git

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index dd9db2f8..700acbf9 100644
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -240,6 +240,17 @@ void DumpTree::visit(Assignment &assign)
 	end_sub();
 }
 
+void DumpTree::visit(TernaryExpression &ternary)
+{
+	append(format("Ternary: %s -> %s", (ternary.oper->token[0]=='?' ? "?:" : ternary.oper->token), format_type(ternary.type)));
+	begin_sub();
+	ternary.condition->visit(*this);
+	ternary.true_expr->visit(*this);
+	last_branch();
+	ternary.false_expr->visit(*this);
+	end_sub();
+}
+
 void DumpTree::visit(FunctionCall &call)
 {
 	string head = "Function call: ";
@@ -366,28 +377,28 @@ void DumpTree::visit(VariableDeclaration &var)
 	append_subtree(branches);
 }
 
-void DumpTree::visit(InterfaceBlock &block)
+void DumpTree::visit(InterfaceBlock &iface)
 {
 	string head;
-	if(!block.instance_name.empty())
-		head += format("%%%d ", get_label(block));
-	head += format("%s %s", block.interface, block.name);
-	if(!block.instance_name.empty())
-		head += format(" %s", block.instance_name);
-	if(block.array)
+	if(!iface.instance_name.empty())
+		head += format("%%%d ", get_label(iface));
+	head += format("%s %s", iface.interface, iface.name);
+	if(!iface.instance_name.empty())
+		head += format(" %s", iface.instance_name);
+	if(iface.array)
 		head += "[]";
-	if(block.source==BUILTIN_SOURCE)
+	if(iface.source==BUILTIN_SOURCE)
 		head += " (builtin)";
-	else if(block.linked_block)
+	else if(iface.linked_block)
 		head += " (linked)";
 	append(head);
 
 	begin_sub();
 	last_branch();
-	if(block.type_declaration)
-		append(format("Type: %%%d %s", get_label(*block.type_declaration), block.type_declaration->name));
-	else if(block.members)
-		block.members->visit(*this);
+	if(iface.type_declaration)
+		append(format("Type: %%%d %s", get_label(*iface.type_declaration), iface.type_declaration->name));
+	else if(iface.members)
+		iface.members->visit(*this);
 	end_sub();
 }