X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fdebug.cpp;h=bd3404e56f0fae10addb22fb90f3aec2f234560c;hb=631872e13c2670f7dece44512ed55af50b77f399;hp=ddf1013dda2b5a70b00619c821652ae7d50f9e15;hpb=911c6c4acc8218bc40d93917207f9dc32e9f2596;p=libs%2Fgl.git

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index ddf1013d..bd3404e5 100644
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -8,24 +8,17 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-const std::string &DumpTree::apply(Stage &stage)
+std::string DumpTree::apply(Stage &stage)
 {
 	formatted = format("Stage: %s\n", Stage::get_stage_name(stage.type));
-	tree.push_back(BRANCH);
+	begin_sub();
 	append(format("Version: %d.%02d", stage.required_features.glsl_version.major, stage.required_features.glsl_version.minor));
 
 	for(std::map<string, TypeDeclaration *>::const_iterator i=stage.types.begin(); i!=stage.types.end(); ++i)
 		append(format("Type: %%%d %s", get_label(*i->second), i->first));
 
-	set<InterfaceBlock *> seen_interfaces;
 	for(std::map<string, InterfaceBlock *>::const_iterator i=stage.interface_blocks.begin(); i!=stage.interface_blocks.end(); ++i)
-		if(seen_interfaces.insert(i->second).second)
-		{
-			string text = format("Interface block: %%%d %s %s", get_label(*i->second), i->second->interface, i->second->name);
-			if(!i->second->instance_name.empty())
-				text += format(" %s", i->second->instance_name);
-			append(text);
-		}
+		append(format("Interface block: %%%d %s", get_label(*i->second), i->first));
 
 	for(std::map<string, FunctionDeclaration *>::const_iterator i=stage.functions.begin(); i!=stage.functions.end(); ++i)
 		append(format("Function: %%%d %s", get_label(*i->second), i->first));
@@ -47,6 +40,11 @@ void DumpTree::append(const string &line)
 	formatted += '\n';
 }
 
+void DumpTree::append(const Node &node, const string &line)
+{
+	append(format("<%d:%d> %s", node.source, node.line, line));
+}
+
 void DumpTree::append_subtree(const vector<Branch> &branches)
 {
 	begin_sub();
@@ -55,10 +53,14 @@ void DumpTree::append_subtree(const vector<Branch> &branches)
 		vector<Branch>::const_iterator j = increment(i, branches);
 		if(!j->text.empty())
 		{
+			append(j->text);
 			if(j->node)
-				annotated_branch(j->text, *j->node);
-			else
-				append(j->text);
+			{
+				begin_sub();
+				last_branch();
+				j->node->visit(*this);
+				end_sub();
+			}
 		}
 		else
 			j->node->visit(*this);
@@ -66,9 +68,18 @@ void DumpTree::append_subtree(const vector<Branch> &branches)
 	end_sub();
 }
 
+void DumpTree::append_subtree(Node &node)
+{
+	begin_sub();
+	last_branch();
+	node.visit(*this);
+	end_sub();
+}
+
 void DumpTree::begin_sub()
 {
-	tree.back() = (tree.back()==BRANCH_LAST ? EMPTY : STRAIGHT);
+	if(!tree.empty())
+		tree.back() = (tree.back()==BRANCH_LAST ? EMPTY : STRAIGHT);
 	tree.push_back(BRANCH);
 }
 
@@ -80,19 +91,10 @@ void DumpTree::last_branch()
 void DumpTree::end_sub()
 {
 	tree.pop_back();
-	if(tree.back()==STRAIGHT)
+	if(!tree.empty() && tree.back()==STRAIGHT)
 		tree.back() = BRANCH;
 }
 
-void DumpTree::annotated_branch(const string &annotation, Node &node)
-{
-	append(annotation);
-	begin_sub();
-	last_branch();
-	node.visit(*this);
-	end_sub();
-}
-
 unsigned DumpTree::get_label(const Node &node)
 {
 	unsigned &label = node_labels[&node];
@@ -117,38 +119,24 @@ typename T::const_iterator DumpTree::increment(typename T::const_iterator &iter,
 
 void DumpTree::visit(Block &block)
 {
-	append(format("Block %s", (block.use_braces ? "{}" : "(inline)")));
+	append(block, format("Block %s", (block.use_braces ? "{}" : "(inline)")));
 	begin_sub();
 
 	for(std::map<string, VariableDeclaration *>::const_iterator i=block.variables.begin(); i!=block.variables.end(); ++i)
 		append(format("Variable: %%%d %s %s", get_label(*i->second), i->second->type, i->first));
 
-	bool labeled_body = !block.variables.empty();
-	if(labeled_body)
-	{
-		last_branch();
-		append("Body");
-		begin_sub();
-	}
 	for(NodeList<Statement>::const_iterator i=block.body.begin(); i!=block.body.end(); )
 	{
 		NodeList<Statement>::const_iterator j = increment(i, block.body);
 		(*j)->visit(*this);
 	}
-	if(labeled_body)
-		end_sub();
 
 	end_sub();
 }
 
 void DumpTree::visit(Literal &literal)
 {
-	append(format("Literal: %s -> %s", literal.token, format_type(literal.type)));
-}
-
-void DumpTree::visit(ParenthesizedExpression &parexpr)
-{
-	annotated_branch(format("(expr) -> %s", format_type(parexpr.type)), *parexpr.expression);
+	append(literal, format("Literal: %s -> %s", literal.token, format_type(literal.type)));
 }
 
 void DumpTree::visit(VariableReference &var)
@@ -157,7 +145,7 @@ void DumpTree::visit(VariableReference &var)
 	if(var.declaration)
 		text += format("%%%d ", get_label(*var.declaration));
 	text += format("%s (var) -> %s", var.name, format_type(var.type));
-	append(text);
+	append(var, text);
 }
 
 void DumpTree::visit(InterfaceBlockReference &iface)
@@ -166,7 +154,7 @@ void DumpTree::visit(InterfaceBlockReference &iface)
 	if(iface.declaration)
 		text += format("%%%d ", get_label(*iface.declaration));
 	text += format("%s (iface) -> %s", iface.name, format_type(iface.type));
-	append(text);
+	append(iface, text);
 }
 
 void DumpTree::visit(MemberAccess &memacc)
@@ -174,8 +162,9 @@ void DumpTree::visit(MemberAccess &memacc)
 	string text = "Member access:";
 	if(memacc.declaration)
 		text += format(" %%%d", get_label(*memacc.declaration));
-	text += format(" .%s -> %s", memacc.member, format_type(memacc.type));
-	annotated_branch(text, *memacc.left);
+	text += format(" .%s (%d) -> %s", memacc.member, memacc.index, format_type(memacc.type));
+	append(memacc, text);
+	append_subtree(*memacc.left);
 }
 
 void DumpTree::visit(Swizzle &swizzle)
@@ -185,18 +174,20 @@ void DumpTree::visit(Swizzle &swizzle)
 	for(unsigned i=0; i<swizzle.count; ++i)
 		text += components[swizzle.components[i]];
 	text += format(" -> %s", format_type(swizzle.type));
-	annotated_branch(text, *swizzle.left);
+	append(swizzle, text);
+	append_subtree(*swizzle.left);
 }
 
 void DumpTree::visit(UnaryExpression &unary)
 {
 	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);
+	append(unary, text);
+	append_subtree(*unary.expression);
 }
 
 void DumpTree::visit(BinaryExpression &binary)
 {
-	append(format("Binary: %s%s -> %s", binary.oper->token, binary.oper->token2, format_type(binary.type)));
+	append(binary, format("Binary: %s%s -> %s", binary.oper->token, binary.oper->token2, format_type(binary.type)));
 	begin_sub();
 	binary.left->visit(*this);
 	last_branch();
@@ -206,7 +197,7 @@ void DumpTree::visit(BinaryExpression &binary)
 
 void DumpTree::visit(Assignment &assign)
 {
-	append(format("Assignment: %s%s -> %s", assign.oper->token, (assign.self_referencing ? " (self-referencing)" : ""), format_type(assign.type)));
+	append(assign, format("Assignment: %s%s -> %s", assign.oper->token, (assign.self_referencing ? " (self-referencing)" : ""), format_type(assign.type)));
 	begin_sub();
 	if(assign.target.declaration)
 	{
@@ -242,7 +233,7 @@ void DumpTree::visit(Assignment &assign)
 
 void DumpTree::visit(TernaryExpression &ternary)
 {
-	append(format("Ternary: %s%s -> %s", ternary.oper->token, ternary.oper->token2, format_type(ternary.type)));
+	append(ternary, format("Ternary: %s%s -> %s", ternary.oper->token, ternary.oper->token2, format_type(ternary.type)));
 	begin_sub();
 	ternary.condition->visit(*this);
 	ternary.true_expr->visit(*this);
@@ -260,7 +251,7 @@ void DumpTree::visit(FunctionCall &call)
 	if(call.constructor)
 		head += " (constructor)";
 	head += format(" -> %s", format_type(call.type));
-	append(head);
+	append(call, head);
 
 	begin_sub();
 	for(NodeArray<Expression>::const_iterator i=call.arguments.begin(); i!=call.arguments.end(); )
@@ -273,22 +264,23 @@ void DumpTree::visit(FunctionCall &call)
 
 void DumpTree::visit(ExpressionStatement &expr)
 {
-	annotated_branch("expr;", *expr.expression);
+	append(expr, "expr;");
+	append_subtree(*expr.expression);
 }
 
 void DumpTree::visit(Import &import)
 {
-	append(format("import %s", import.module));
+	append(import, format("import %s", import.module));
 }
 
 void DumpTree::visit(Precision &prec)
 {
-	append(format("precision %s %s", prec.precision, prec.type));
+	append(prec, format("precision %s %s", prec.precision, prec.type));
 }
 
 void DumpTree::visit(Layout &layout)
 {
-	append("Layout");
+	append(layout, "Layout");
 	begin_sub();
 	for(vector<Layout::Qualifier>::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); )
 	{
@@ -303,12 +295,13 @@ void DumpTree::visit(Layout &layout)
 
 void DumpTree::visit(InterfaceLayout &layout)
 {
-	annotated_branch(format("Layout: %s", layout.interface), layout.layout);
+	append(layout, format("Layout: %s", layout.interface));
+	append_subtree(layout.layout);
 }
 
 void DumpTree::visit(BasicTypeDeclaration &type)
 {
-	append(format("%%%d typedef %s", get_label(type), type.name));
+	append(type, format("%%%d typedef %s", get_label(type), type.name));
 
 	vector<Branch> branches;
 	if(type.base_type)
@@ -324,7 +317,7 @@ void DumpTree::visit(ImageTypeDeclaration &type)
 {
 	static const char *dims[] = { "1D", "2D", "3D", "Cube" };
 
-	append(format("%%%d typedef %s", get_label(type), type.name));
+	append(type, format("%%%d typedef %s", get_label(type), type.name));
 
 	vector<Branch> branches;
 	branches.push_back(format("Dimensions: %s%s", dims[type.dimensions-1], (type.array ? " array" : "")));
@@ -337,7 +330,8 @@ void DumpTree::visit(ImageTypeDeclaration &type)
 
 void DumpTree::visit(StructDeclaration &strct)
 {
-	annotated_branch(format("%%%d struct %s", get_label(strct), strct.name), strct.members);
+	append(strct, format("%%%d struct %s", get_label(strct), strct.name));
+	append_subtree(strct.members);
 }
 
 void DumpTree::visit(VariableDeclaration &var)
@@ -358,7 +352,7 @@ void DumpTree::visit(VariableDeclaration &var)
 		decl += " (builtin)";
 	else if(var.linked_declaration)
 		decl += " (linked)";
-	append(decl);
+	append(var, decl);
 
 	vector<Branch> branches;
 	if(var.type_declaration)
@@ -379,10 +373,7 @@ void DumpTree::visit(VariableDeclaration &var)
 
 void DumpTree::visit(InterfaceBlock &iface)
 {
-	string head;
-	if(!iface.instance_name.empty())
-		head += format("%%%d ", get_label(iface));
-	head += format("%s %s", iface.interface, iface.name);
+	string head = format("%%%d %s %s", get_label(iface), iface.interface, iface.block_name);
 	if(!iface.instance_name.empty())
 		head += format(" %s", iface.instance_name);
 	if(iface.array)
@@ -391,15 +382,16 @@ void DumpTree::visit(InterfaceBlock &iface)
 		head += " (builtin)";
 	else if(iface.linked_block)
 		head += " (linked)";
-	append(head);
+	append(iface, head);
 
-	begin_sub();
-	last_branch();
+	vector<Branch> branches;
 	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();
+		branches.push_back(format("Type: %%%d %s", get_label(*iface.type_declaration), iface.type_declaration->name));
+	if(iface.layout)
+		branches.push_back(iface.layout.get());
+	if(iface.members)
+		branches.push_back(iface.members.get());
+	append_subtree(branches);
 }
 
 void DumpTree::visit(FunctionDeclaration &func)
@@ -409,7 +401,7 @@ void DumpTree::visit(FunctionDeclaration &func)
 		text += " (builtin)";
 	else if(!func.definition)
 		text += " (undefined)";
-	append(text);
+	append(func, text);
 
 	begin_sub();
 	if(func.return_type_declaration)
@@ -426,51 +418,48 @@ void DumpTree::visit(FunctionDeclaration &func)
 
 void DumpTree::visit(Conditional &cond)
 {
-	append("if()");
+	append(cond, "if()");
 
 	vector<Branch> branches;
 	branches.push_back(cond.condition.get());
-	branches.push_back(&cond.body);
+	branches.push_back(Branch("then", &cond.body));
 	if(!cond.else_body.body.empty())
-		branches.push_back(&cond.else_body);
+		branches.push_back(Branch("else", &cond.else_body));
 	append_subtree(branches);
 }
 
 void DumpTree::visit(Iteration &iter)
 {
-	append("for()");
+	append(iter, "for()");
 
-	begin_sub();
+	vector<Branch> branches;
 	if(iter.init_statement)
-		annotated_branch("Initialization", *iter.init_statement);
+		branches.push_back(Branch("Initialization", iter.init_statement.get()));
 	if(iter.condition)
-		annotated_branch("Condition", *iter.condition);
+		branches.push_back(Branch("Condition", iter.condition.get()));
 	if(iter.loop_expression)
-		annotated_branch("Loop", *iter.loop_expression);
-	last_branch();
-	annotated_branch("Body", iter.body);
-	end_sub();
+		branches.push_back(Branch("Loop", iter.loop_expression.get()));
+	branches.push_back(&iter.body);
+	append_subtree(branches);
 }
 
 void DumpTree::visit(Passthrough &pass)
 {
+	append(pass, (pass.subscript ? "passthrough[]" : "passthrough"));
 	if(pass.subscript)
-		annotated_branch("passthrough[]", *pass.subscript);
-	else
-		append("passthrough;");
+		append_subtree(*pass.subscript);
 }
 
 void DumpTree::visit(Return &ret)
 {
+	append(ret, (ret.expression ? "return" : "return;"));
 	if(ret.expression)
-		annotated_branch("return", *ret.expression);
-	else
-		append("return;");
+		append_subtree(*ret.expression);
 }
 
 void DumpTree::visit(Jump &jump)
 {
-	append(format("%s;", jump.keyword));
+	append(jump, format("%s;", jump.keyword));
 }
 
 } // namespace SL