X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foutput.cpp;h=6ba06447a3b02e6254b128884c72a206813ee22b;hb=e9a898f315b5d1396f196d785913a283c30940f2;hp=1d82cae6a9ed95f20debbcf500a6a242c929c54a;hpb=9cfccf5c4e366e033cfd5eebf8955d2b13202b46;p=libs%2Fgl.git diff --git a/source/glsl/output.cpp b/source/glsl/output.cpp index 1d82cae6..6ba06447 100644 --- a/source/glsl/output.cpp +++ b/source/glsl/output.cpp @@ -14,10 +14,11 @@ Formatter::Formatter(): source_line(1), indent(0), parameter_list(false), - omit_builtin(false) + omit_builtin(false), + r_empty_name(false) { } -const string &Formatter::apply(Stage &s) +string Formatter::apply(Stage &s) { stage = &s; omit_builtin = true; @@ -58,8 +59,8 @@ const string &Formatter::apply(Stage &s) void Formatter::append(const string &text) { formatted += text; - for(string::const_iterator i=text.begin(); i!=text.end(); ++i) - if(*i=='\n') + for(char c: text) + if(c=='\n') ++source_line; } @@ -98,16 +99,16 @@ void Formatter::visit(Block &block) SetForScope set(indent, indent+(indent>0 || use_braces)); string spaces(indent*2, ' '); bool first = true; - for(NodeList::iterator i=block.body.begin(); i!=block.body.end(); ++i) + for(const RefPtr &s: block.body) { - if(omit_builtin && (*i)->source<=BUILTIN_SOURCE) + if(omit_builtin && s->source<=BUILTIN_SOURCE) continue; if(!first) append('\n'); first = false; - set_source((*i)->source, (*i)->line); + set_source(s->source, s->line); append(spaces); - (*i)->visit(*this); + s->visit(*this); } if(use_braces) @@ -154,17 +155,23 @@ void Formatter::visit(Literal &literal) void Formatter::visit(VariableReference &var) { append(var.name); + r_empty_name = false; } void Formatter::visit(InterfaceBlockReference &iface) { - append(iface.name); + r_empty_name = iface.declaration->instance_name.empty(); + if(!r_empty_name) + append(iface.declaration->instance_name); } void Formatter::visit(MemberAccess &memacc) { visit_expression(*memacc.left, memacc.oper, false); - append(format(".%s", memacc.member)); + if(!r_empty_name) + append('.'); + append(memacc.member); + r_empty_name = false; } void Formatter::visit(Swizzle &swizzle) @@ -211,7 +218,7 @@ void Formatter::visit(TernaryExpression &ternary) void Formatter::visit(FunctionCall &call) { append(format("%s(", call.name)); - for(NodeArray::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i) + for(auto i=call.arguments.begin(); i!=call.arguments.end(); ++i) { if(i!=call.arguments.begin()) append(", "); @@ -239,7 +246,7 @@ void Formatter::visit(Precision &prec) void Formatter::visit(Layout &layout) { append("layout("); - for(vector::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i) + for(auto i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i) { if(i!=layout.qualifiers.begin()) append(", "); @@ -333,7 +340,7 @@ void Formatter::visit(InterfaceBlock &iface) void Formatter::visit(FunctionDeclaration &func) { append(format("%s %s(", func.return_type_declaration->name, func.name)); - for(NodeArray::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i) + for(auto i=func.parameters.begin(); i!=func.parameters.end(); ++i) { if(i!=func.parameters.begin()) append(", ");