Make Animation::Iterator assignable

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

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index e102349a6482f0dc4a679ee325561210948dd52b..cafedc8f03180d9be4285d7e189d7a9a1e4de975 100644 (file)
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -35,6 +35,8 @@ namespace GL {
 
 using namespace ProgramSyntax;
 
+// XXX For some reason global declarations are emitted for otherwise undeclared local variables
+
 ProgramCompiler::ProgramCompiler():
        resources(0),
        module(0)
@@ -205,7 +207,6 @@ void ProgramCompiler::generate(Stage &stage)
        apply<VariableResolver>(stage);
        apply<InterfaceGenerator>(stage);
        apply<VariableResolver>(stage);
-       apply<VariableRenamer>(stage);
        apply<DeclarationReorderer>(stage);
        apply<LegacyConverter>(stage);
 }
@@ -861,6 +862,7 @@ void ProgramCompiler::InterfaceGenerator::insert_assignment(const string &left,
 
        ExpressionStatement *stmt = new ExpressionStatement;
        stmt->expression = assign;
+       stmt->visit(*this);
        insert_nodes.push_back(stmt);
 }
 
@@ -876,7 +878,10 @@ void ProgramCompiler::InterfaceGenerator::visit(VariableReference &var)
        if(i==prev_out.end())
                i = prev_out.find(in_prefix+var.name);
        if(i!=prev_out.end())
-               generate_interface(*i->second, "in", var.name);
+       {
+               generate_interface(*i->second, "in", i->second->name);
+               var.name = i->second->name;
+       }
 }
 
 void ProgramCompiler::InterfaceGenerator::visit(VariableDeclaration &var)
@@ -889,7 +894,10 @@ void ProgramCompiler::InterfaceGenerator::visit(VariableDeclaration &var)
                {
                        remove_node = true;
                        if(var.init_expression)
+                       {
                                insert_assignment(var.name, var.init_expression->clone());
+                               return;
+                       }
                }
        }
        else if(var.interface=="in")
@@ -978,20 +986,6 @@ void ProgramCompiler::InterfaceGenerator::visit(Passthrough &pass)
 }
 
 
-void ProgramCompiler::VariableRenamer::visit(VariableReference &var)
-{
-       if(var.declaration)
-               var.name = var.declaration->name;
-}
-
-void ProgramCompiler::VariableRenamer::visit(VariableDeclaration &var)
-{
-       if(var.linked_declaration)
-               var.name = var.linked_declaration->name;
-       TraversingVisitor::visit(var);
-}
-
-
 ProgramCompiler::DeclarationReorderer::DeclarationReorderer():
        kind(NO_DECLARATION)
 { }