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

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index fd9c50db..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,23 +545,32 @@ void ProgramCompiler::Formatter::visit(Conditional &cond)
 
 void ProgramCompiler::Formatter::visit(Iteration &iter)
 {
-	formatted += "for(";
-	if(iter.init_statement)
-		iter.init_statement->visit(*this);
-	else
-		formatted += ';';
-	if(iter.condition)
+	if(!iter.init_statement && iter.condition && !iter.loop_expression)
 	{
-		formatted += ' ';
+		formatted += "while(";
 		iter.condition->visit(*this);
+		formatted += ')';
 	}
-	formatted += ';';
-	if(iter.loop_expression)
+	else
 	{
-		formatted += ' ';
-		iter.loop_expression->visit(*this);
+		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 += ')';
 	}
-	formatted += ')';
 
 	if(iter.body.body.empty())
 		formatted += " { }";
@@ -1214,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);
@@ -1397,6 +1415,7 @@ ProgramCompiler::UnusedVariableLocator::UnusedVariableLocator():
 	aggregate(0),
 	assignment(0),
 	assignment_target(false),
+	assign_to_subscript(false),
 	global_scope(true)
 { }
 
@@ -1442,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);
@@ -1453,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);
 	}
@@ -1460,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;
@@ -1484,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)
@@ -1669,6 +1691,7 @@ void ProgramCompiler::NodeRemover::visit(Iteration &iter)
 {
 	if(to_remove.count(iter.init_statement.get()))
 		iter.init_statement = 0;
+	TraversingVisitor::visit(iter);
 }