X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Foutput.cpp;h=c2c54f9ff33834d11d681a0e80e976aa75747b39;hp=38adb5bd6b799f54f165299657b90f09830293de;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=dfcf8ebc329b79c369b88bdbeb982480aa5fc12a

diff --git a/source/glsl/output.cpp b/source/glsl/output.cpp
index 38adb5bd..c2c54f9f 100644
--- a/source/glsl/output.cpp
+++ b/source/glsl/output.cpp
@@ -8,17 +8,7 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Formatter::Formatter():
-	stage(0),
-	source_index(0),
-	source_line(1),
-	indent(0),
-	parameter_list(false),
-	omit_builtin(false),
-	r_empty_name(false)
-{ }
-
-const string &Formatter::apply(Stage &s)
+string Formatter::apply(Stage &s)
 {
 	stage = &s;
 	omit_builtin = true;
@@ -28,7 +18,7 @@ const string &Formatter::apply(Stage &s)
 	if(ver)
 	{
 		append(format("#version %d%02d", ver.major, ver.minor));
-		if(s.required_features.gl_api==OPENGL_ES2 && ver>=Version(3, 0))
+		if(s.required_features.target_api==OPENGL_ES && ver>=Version(3, 0))
 			append(" es");
 		formatted += '\n';
 	}
@@ -59,8 +49,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;
 }
 
@@ -99,16 +89,16 @@ void Formatter::visit(Block &block)
 	SetForScope<unsigned> set(indent, indent+(indent>0 || use_braces));
 	string spaces(indent*2, ' ');
 	bool first = true;
-	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+	for(const RefPtr<Statement> &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)
@@ -171,6 +161,7 @@ void Formatter::visit(MemberAccess &memacc)
 	if(!r_empty_name)
 		append('.');
 	append(memacc.member);
+	r_empty_name = false;
 }
 
 void Formatter::visit(Swizzle &swizzle)
@@ -217,7 +208,7 @@ void Formatter::visit(TernaryExpression &ternary)
 void Formatter::visit(FunctionCall &call)
 {
 	append(format("%s(", call.name));
-	for(NodeArray<Expression>::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(", ");
@@ -245,7 +236,7 @@ void Formatter::visit(Precision &prec)
 void Formatter::visit(Layout &layout)
 {
 	append("layout(");
-	for(vector<Layout::Qualifier>::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(", ");
@@ -339,7 +330,7 @@ void Formatter::visit(InterfaceBlock &iface)
 void Formatter::visit(FunctionDeclaration &func)
 {
 	append(format("%s %s(", func.return_type_declaration->name, func.name));
-	for(NodeArray<VariableDeclaration>::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(", ");