Mark constant data as const

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

diff --git a/source/glsl/debug.cpp b/source/glsl/debug.cpp
index 2f243dc73dc0d25518ce341597749f4255f45d8a..5b142019150441f3fd7291f03db30473e401631b 100644 (file)
--- a/source/glsl/debug.cpp
+++ b/source/glsl/debug.cpp
@@ -8,20 +8,20 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-std::string DumpTree::apply(Stage &stage)
+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));
+       for(const auto &kvp: stage.types)
+               append(format("Type: %%%d %s", get_label(*kvp.second), kvp.first));
 
-       for(std::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(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));
+       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 @@ std::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);
@@ -78,7 +78,8 @@ void DumpTree::append_subtree(Node &node)
 
 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);
 }
 
@@ -90,7 +91,7 @@ void DumpTree::last_branch()
 void DumpTree::end_sub()
 {
        tree.pop_back();
-       if(tree.back()==STRAIGHT)
+       if(!tree.empty() && tree.back()==STRAIGHT)
                tree.back() = BRANCH;
 }
 
@@ -110,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;
@@ -121,12 +122,12 @@ void DumpTree::visit(Block &block)
        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));
+       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);
        }
 
@@ -161,7 +162,7 @@ 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));
+       text += format(" .%s (%d) -> %s", memacc.member, memacc.index, format_type(memacc.type));
        append(memacc, text);
        append_subtree(*memacc.left);
 }
@@ -253,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();
@@ -281,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);
@@ -314,7 +315,7 @@ void DumpTree::visit(BasicTypeDeclaration &type)
 
 void DumpTree::visit(ImageTypeDeclaration &type)
 {
-       static const char *dims[] = { "1D", "2D", "3D", "Cube" };
+       static const char *const dims[] = { "1D", "2D", "3D", "Cube" };
 
        append(type, format("%%%d typedef %s", get_label(type), type.name));
 
@@ -372,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.block_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)
@@ -408,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);