Assign a result type to all expressions

[libs/gl.git] / source / glsl / debug.cpp

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index d49b9a5f142e8a09b29bcc304e7c29056b87f412..8a76744a1a90bbeeeac5366489ab978c017c93ee 100644 (file)
--- 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();
@@ -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();