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));
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);
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);
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);
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;
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);
}
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);
}
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();
{
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);
vector<Branch> branches;
if(type.base_type)
- branches.push_back(format("%s: %%%d %s", (type.kind==BasicTypeDeclaration::ALIAS ? "Alias of" : "Base"), get_label(*type.base_type), type.base_type->name));
+ branches.emplace_back(format("%s: %%%d %s", (type.kind==BasicTypeDeclaration::ALIAS ? "Alias of" : "Base"), get_label(*type.base_type), type.base_type->name));
if(type.kind==BasicTypeDeclaration::VECTOR)
- branches.push_back(format("Vector: %d", type.size));
+ branches.emplace_back(format("Vector: %d", type.size));
else if(type.kind==BasicTypeDeclaration::MATRIX)
- branches.push_back(format("Matrix: %dx%d", type.size&0xFFFF, type.size>>16));
+ branches.emplace_back(format("Matrix: %dx%d", type.size&0xFFFF, type.size>>16));
append_subtree(branches);
}
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));
vector<Branch> branches;
- branches.push_back(format("Dimensions: %s%s", dims[type.dimensions-1], (type.array ? " array" : "")));
+ branches.emplace_back(format("Dimensions: %s%s", dims[type.dimensions-1], (type.array ? " array" : "")));
if(type.base_type)
- branches.push_back(format("Element type: %%%d %s", get_label(*type.base_type), type.base_type->name));
+ branches.emplace_back(format("Element type: %%%d %s", get_label(*type.base_type), type.base_type->name));
if(type.shadow)
- branches.push_back("Shadow");
+ branches.emplace_back("Shadow");
append_subtree(branches);
}
if(var.array)
{
if(var.array_size)
- branches.push_back(Branch("Array []", var.array_size.get()));
+ branches.emplace_back("Array []", var.array_size.get());
else
branches.push_back("Array []");
}
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)
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);
append(cond, "if()");
vector<Branch> branches;
- branches.push_back(cond.condition.get());
- branches.push_back(Branch("then", &cond.body));
+ branches.emplace_back(cond.condition.get());
+ branches.emplace_back("then", &cond.body);
if(!cond.else_body.body.empty())
- branches.push_back(Branch("else", &cond.else_body));
+ branches.emplace_back("else", &cond.else_body);
append_subtree(branches);
}
vector<Branch> branches;
if(iter.init_statement)
- branches.push_back(Branch("Initialization", iter.init_statement.get()));
+ branches.emplace_back("Initialization", iter.init_statement.get());
if(iter.condition)
- branches.push_back(Branch("Condition", iter.condition.get()));
+ branches.emplace_back("Condition", iter.condition.get());
if(iter.loop_expression)
- branches.push_back(Branch("Loop", iter.loop_expression.get()));
- branches.push_back(&iter.body);
+ branches.emplace_back("Loop", iter.loop_expression.get());
+ branches.emplace_back(&iter.body);
append_subtree(branches);
}