X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fdebug.cpp;h=2543450212c4d4442005770cf7eb8ca5f8e34da3;hp=beafaddf47605454f177e4f529235aa01c4fefaf;hb=e9a898f315b5d1396f196d785913a283c30940f2;hpb=bdef3de6559629f25121de2e014383d7f773266b

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index beafaddf..25434502 100644
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -14,14 +14,14 @@ string DumpTree::apply(Stage &stage)
 	begin_sub();
 	append(format("Version: %d.%02d", stage.required_features.glsl_version.major, stage.required_features.glsl_version.minor));
 
-	for(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));
+	for(const auto &kvp: stage.types)
+		append(format("Type: %%%d %s", get_label(*kvp.second), kvp.first));
 
-	for(map<string, InterfaceBlock *>::const_iterator i=stage.interface_blocks.begin(); i!=stage.interface_blocks.end(); ++i)
-		append(format("Interface block: %%%d %s", get_label(*i->second), i->first));
+	for(const auto &kvp: stage.interface_blocks)
+		append(format("Interface block: %%%d %s", get_label(*kvp.second), kvp.first));
 
-	for(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));
+	for(const auto &kvp: stage.functions)
+		append(format("Function: %%%d %s", get_label(*kvp.second), kvp.first));
 
 	last_branch();
 	stage.content.visit(*this);
@@ -31,7 +31,7 @@ string DumpTree::apply(Stage &stage)
 void DumpTree::append(const string &line)
 {
 	StringCodec::Utf8::Encoder enc;
-	for(vector<TreeChars>::const_iterator i=tree.begin(); i!=tree.end(); )
+	for(auto i=tree.begin(); i!=tree.end(); )
 	{
 		enc.encode_char(*i++, formatted);
 		enc.encode_char((i==tree.end() ? REACH : EMPTY), formatted);
@@ -48,9 +48,9 @@ void DumpTree::append(const Node &node, const string &line)
 void DumpTree::append_subtree(const vector<Branch> &branches)
 {
 	begin_sub();
-	for(vector<Branch>::const_iterator i=branches.begin(); i!=branches.end(); )
+	for(auto i=branches.begin(); i!=branches.end(); )
 	{
-		vector<Branch>::const_iterator j = increment(i, branches);
+		auto j = increment(i, branches);
 		if(!j->text.empty())
 		{
 			append(j->text);
@@ -111,7 +111,7 @@ string DumpTree::format_type(TypeDeclaration *type)
 template<typename T>
 typename T::const_iterator DumpTree::increment(typename T::const_iterator &iter, const T &container)
 {
-	typename T::const_iterator ret = iter++;
+	auto ret = iter++;
 	if(iter==container.end())
 		last_branch();
 	return ret;
@@ -122,12 +122,12 @@ void DumpTree::visit(Block &block)
 	append(block, format("Block %s", (block.use_braces ? "{}" : "(inline)")));
 	begin_sub();
 
-	for(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));
+	for(const auto &kvp: block.variables)
+		append(format("Variable: %%%d %s %s", get_label(*kvp.second), kvp.second->type, kvp.first));
 
-	for(NodeList<Statement>::const_iterator i=block.body.begin(); i!=block.body.end(); )
+	for(auto i=block.body.cbegin(); i!=block.body.cend(); )
 	{
-		NodeList<Statement>::const_iterator j = increment(i, block.body);
+		auto j = increment(i, block.body);
 		(*j)->visit(*this);
 	}
 
@@ -254,9 +254,9 @@ void DumpTree::visit(FunctionCall &call)
 	append(call, head);
 
 	begin_sub();
-	for(NodeArray<Expression>::const_iterator i=call.arguments.begin(); i!=call.arguments.end(); )
+	for(auto i=call.arguments.cbegin(); i!=call.arguments.cend(); )
 	{
-		NodeArray<Expression>::const_iterator j = increment(i, call.arguments);
+		auto j = increment(i, call.arguments);
 		(*j)->visit(*this);
 	}
 	end_sub();
@@ -282,9 +282,9 @@ void DumpTree::visit(Layout &layout)
 {
 	append(layout, "Layout");
 	begin_sub();
-	for(vector<Layout::Qualifier>::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); )
+	for(auto i=layout.qualifiers.cbegin(); i!=layout.qualifiers.cend(); )
 	{
-		vector<Layout::Qualifier>::const_iterator j = increment(i, layout.qualifiers);
+		auto j = increment(i, layout.qualifiers);
 		string qualifier = j->name;
 		if(j->has_value)
 			qualifier += format("=%d", j->value);
@@ -406,8 +406,8 @@ void DumpTree::visit(FunctionDeclaration &func)
 	begin_sub();
 	if(func.return_type_declaration)
 		append(format("Return type: %%%d %s", get_label(*func.return_type_declaration), func.return_type_declaration->name));
-	for(NodeArray<VariableDeclaration>::const_iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
-		(*i)->visit(*this);
+	for(const RefPtr<VariableDeclaration> &p: func.parameters)
+		p->visit(*this);
 	last_branch();
 	if(func.definition==&func)
 		func.body.visit(*this);