Better naming algorithm for objects in scene export

[libs/gl.git] / source / programcompiler.cpp

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index fd9c50dbbb5c2879e55fb528035f7527aef126ff..5a17a9ed3857bf969005e57a73ebe94d01b9ec20 100644 (file)
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -543,23 +543,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 +1223,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);