X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramcompiler.cpp;h=3dc07d80fa4dd2566c069d0cae5bdb4451f7ac5d;hp=a3691b112fd4fc22d8121f04c4d37024037f8470;hb=6a832fe1771f8c7bca0faa0d383fbbab062a1c56;hpb=20af6dd2f04caa224d8cae00befc97d010a1ed08

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index a3691b11..3dc07d80 100644
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -8,6 +8,8 @@
 #include "resources.h"
 #include "shader.h"
 
+#undef interface
+
 using namespace std;
 
 namespace {
@@ -543,14 +545,40 @@ void ProgramCompiler::Formatter::visit(Conditional &cond)
 
 void ProgramCompiler::Formatter::visit(Iteration &iter)
 {
-	formatted += "for(";
-	iter.init_statement->visit(*this);
-	formatted += ' ';
-	iter.condition->visit(*this);
-	formatted += "; ";
-	iter.loop_expression->visit(*this);
-	formatted += ")\n";
-	iter.body.visit(*this);
+	if(!iter.init_statement && iter.condition && !iter.loop_expression)
+	{
+		formatted += "while(";
+		iter.condition->visit(*this);
+		formatted += ')';
+	}
+	else
+	{
+		formatted += "for(";
+		if(iter.init_statement)
+			iter.init_statement->visit(*this);
+		else
+			formatted += ';';
+		if(iter.condition)
+		{
+			formatted += ' ';
+			iter.condition->visit(*this);
+		}
+		formatted += ';';
+		if(iter.loop_expression)
+		{
+			formatted += ' ';
+			iter.loop_expression->visit(*this);
+		}
+		formatted += ')';
+	}
+
+	if(iter.body.body.empty())
+		formatted += " { }";
+	else
+	{
+		formatted += '\n';
+		iter.body.visit(*this);
+	}
 }
 
 void ProgramCompiler::Formatter::visit(Return &ret)
@@ -1197,6 +1225,13 @@ void ProgramCompiler::FunctionInliner::visit(FunctionCall &call)
 		inline_result = 0;
 }
 
+void ProgramCompiler::FunctionInliner::visit(VariableDeclaration &var)
+{
+	if(var.init_expression)
+		visit_and_inline(var.init_expression);
+	inline_result = 0;
+}
+
 void ProgramCompiler::FunctionInliner::visit(Return &ret)
 {
 	TraversingVisitor::visit(ret);
@@ -1380,6 +1415,7 @@ ProgramCompiler::UnusedVariableLocator::UnusedVariableLocator():
 	aggregate(0),
 	assignment(0),
 	assignment_target(false),
+	assign_to_subscript(false),
 	global_scope(true)
 { }
 
@@ -1425,6 +1461,8 @@ void ProgramCompiler::UnusedVariableLocator::visit(BinaryExpression &binary)
 {
 	if(binary.oper=="[")
 	{
+		if(assignment_target)
+			assign_to_subscript = true;
 		binary.left->visit(*this);
 		SetForScope<bool> set(assignment_target, false);
 		binary.right->visit(*this);
@@ -1436,6 +1474,7 @@ void ProgramCompiler::UnusedVariableLocator::visit(BinaryExpression &binary)
 void ProgramCompiler::UnusedVariableLocator::visit(Assignment &assign)
 {
 	{
+		assign_to_subscript = false;
 		SetForScope<bool> set(assignment_target, !assign.self_referencing);
 		assign.left->visit(*this);
 	}
@@ -1443,10 +1482,10 @@ void ProgramCompiler::UnusedVariableLocator::visit(Assignment &assign)
 	assignment = &assign;
 }
 
-void ProgramCompiler::UnusedVariableLocator::record_assignment(VariableDeclaration &var, Node &node, bool self_ref)
+void ProgramCompiler::UnusedVariableLocator::record_assignment(VariableDeclaration &var, Node &node, bool chained)
 {
 	VariableInfo &var_info = variables.back()[&var];
-	if(!self_ref)
+	if(!chained)
 		clear_assignments(var_info, true);
 	var_info.assignments.push_back(&node);
 	var_info.conditionally_assigned = false;
@@ -1467,7 +1506,7 @@ void ProgramCompiler::UnusedVariableLocator::visit(ExpressionStatement &expr)
 	assignment = 0;
 	TraversingVisitor::visit(expr);
 	if(assignment && assignment->target_declaration)
-		record_assignment(*assignment->target_declaration, expr, assignment->self_referencing);
+		record_assignment(*assignment->target_declaration, expr, (assignment->self_referencing || assign_to_subscript));
 }
 
 void ProgramCompiler::UnusedVariableLocator::visit(StructDeclaration &strct)
@@ -1648,6 +1687,13 @@ void ProgramCompiler::NodeRemover::visit(VariableDeclaration &var)
 		var.init_expression = 0;
 }
 
+void ProgramCompiler::NodeRemover::visit(Iteration &iter)
+{
+	if(to_remove.count(iter.init_statement.get()))
+		iter.init_statement = 0;
+	TraversingVisitor::visit(iter);
+}
+
 
 void ProgramCompiler::PrecisionRemover::visit(Precision &)
 {