X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fdebug.cpp;h=77b9025a8776cd8cce3ae83ba26dba54d3c8c0ad;hb=f639d088c478fe5d266f9f5779928735b5176976;hp=d49b9a5f142e8a09b29bcc304e7c29056b87f412;hpb=4c805f55d89919d6971d600102ab4d6d65d56dc3;p=libs%2Fgl.git

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index d49b9a5f..77b9025a 100644
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -82,6 +82,11 @@ unsigned DumpTree::get_label(const Node &node)
 	return label;
 }
 
+string DumpTree::format_type(TypeDeclaration *type)
+{
+	return (type ? type->name : "?");
+}
+
 template<typename T>
 typename T::const_iterator DumpTree::increment(typename T::const_iterator &iter, const T &container)
 {
@@ -119,12 +124,12 @@ void DumpTree::visit(Block &block)
 
 void DumpTree::visit(Literal &literal)
 {
-	append(format("Literal: %s", literal.token));
+	append(format("Literal: %s -> %s", literal.token, format_type(literal.type)));
 }
 
 void DumpTree::visit(ParenthesizedExpression &parexpr)
 {
-	annotated_branch("(expr)", *parexpr.expression);
+	annotated_branch(format("(expr) -> %s", format_type(parexpr.type)), *parexpr.expression);
 }
 
 void DumpTree::visit(VariableReference &var)
@@ -132,7 +137,7 @@ void DumpTree::visit(VariableReference &var)
 	string text;
 	if(var.declaration)
 		text += format("%%%d ", get_label(*var.declaration));
-	text += format("%s (var)", var.name);
+	text += format("%s (var) -> %s", var.name, format_type(var.type));
 	append(text);
 }
 
@@ -150,19 +155,19 @@ void DumpTree::visit(MemberAccess &memacc)
 	string text = "Member access:";
 	if(memacc.declaration)
 		text += format(" %%%d", get_label(*memacc.declaration));
-	text += format(" .%s", memacc.member);
+	text += format(" .%s -> %s", memacc.member, format_type(memacc.type));
 	annotated_branch(text, *memacc.left);
 }
 
 void DumpTree::visit(UnaryExpression &unary)
 {
-	string text = format("Unary: %s, %sfix", unary.oper->token, (unary.oper->type==Operator::PREFIX ? "pre" : "post"));
+	string text = format("Unary: %s, %sfix -> %s", unary.oper->token, (unary.oper->type==Operator::PREFIX ? "pre" : "post"), format_type(unary.type));
 	annotated_branch(text, *unary.expression);
 }
 
 void DumpTree::visit(BinaryExpression &binary)
 {
-	append(format("Binary: %s", (binary.oper->token[0]=='[' ? "[]" : binary.oper->token)));
+	append(format("Binary: %s -> %s", (binary.oper->token[0]=='[' ? "[]" : binary.oper->token), format_type(binary.type)));
 	begin_sub();
 	binary.left->visit(*this);
 	last_branch();
@@ -172,7 +177,7 @@ void DumpTree::visit(BinaryExpression &binary)
 
 void DumpTree::visit(Assignment &assign)
 {
-	append(format("Assignment: %s%s", assign.oper->token, (assign.self_referencing ? " (self-referencing)" : "")));
+	append(format("Assignment: %s%s -> %s", assign.oper->token, (assign.self_referencing ? " (self-referencing)" : ""), format_type(assign.type)));
 	begin_sub();
 	if(assign.target_declaration)
 		append(format("Target: %%%d %s %s", get_label(*assign.target_declaration), assign.target_declaration->type, assign.target_declaration->name));
@@ -190,6 +195,7 @@ void DumpTree::visit(FunctionCall &call)
 	head += call.name;
 	if(call.constructor)
 		head += " (constructor)";
+	head += format(" -> %s", format_type(call.type));
 	append(head);
 
 	begin_sub();