Refactor block management in NodeRemover

[libs/gl.git] / source / glsl / visitor.cpp

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index cf0cca9612e92132e9a89f16471f788c8f7d00a1..0577b5ab213f5e67296f87e0285323cc0e361433 100644 (file)
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -15,6 +15,9 @@ void NodeVisitor::visit(Assignment &assign)
 
 void TraversingVisitor::visit(Block &block)
 {
+       if(&block!=current_block)
+               enter(block);
+       SetForScope<Block *> set_block(current_block, &block);
        for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
                (*i)->visit(*this);
 }
@@ -78,6 +81,8 @@ void TraversingVisitor::visit(InterfaceBlock &iface)
 
 void TraversingVisitor::visit(FunctionDeclaration &func)
 {
+       enter(func.body);
+       SetForScope<Block *> set_block(current_block, &func.body);
        for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
                (*i)->visit(*this);
        func.body.visit(*this);
@@ -92,6 +97,8 @@ void TraversingVisitor::visit(Conditional &cond)
 
 void TraversingVisitor::visit(Iteration &iter)
 {
+       enter(iter.body);
+       SetForScope<Block *> set_block(current_block, &iter.body);
        if(iter.init_statement)
                iter.init_statement->visit(*this);
        if(iter.condition)
@@ -117,7 +124,6 @@ void TraversingVisitor::visit(Return &ret)
 NodeRemover::NodeRemover():
        stage(0),
        to_remove(0),
-       anonymous(false),
        recursive_remove(false)
 { }
 
@@ -125,7 +131,7 @@ void NodeRemover::apply(Stage &s, const set<Node *> &tr)
 {
        stage = &s;
        to_remove = &tr;
-       visit(s.content);
+       s.content.visit(*this);
 }
 
 void NodeRemover::remove_variable(map<string, VariableDeclaration *> &vars, VariableDeclaration &decl)
@@ -137,7 +143,7 @@ void NodeRemover::remove_variable(map<string, VariableDeclaration *> &vars, Vari
 
 void NodeRemover::visit(Block &block)
 {
-       blocks.push_back(&block);
+       SetForScope<Block *> set_block(current_block, &block);
        for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
        {
                (*i)->visit(*this);
@@ -146,22 +152,21 @@ void NodeRemover::visit(Block &block)
                else
                        ++i;
        }
-       blocks.pop_back();
 }
 
 void NodeRemover::visit(StructDeclaration &strct)
 {
        if(to_remove->count(&strct))
-               blocks.back()->types.erase(strct.name);
+               current_block->types.erase(strct.name);
 }
 
 void NodeRemover::visit(VariableDeclaration &var)
 {
        if(recursive_remove || to_remove->count(&var))
        {
-               remove_variable(blocks.back()->variables, var);
-               if(anonymous && blocks.size()>1)
-                       remove_variable(blocks[blocks.size()-2]->variables, var);
+               remove_variable(current_block->variables, var);
+               if(current_block->anonymous && current_block->parent)
+                       remove_variable(current_block->parent->variables, var);
                remove_variable(stage->in_variables, var);
                remove_variable(stage->out_variables, var);
                stage->locations.erase(var.name);
@@ -174,7 +179,6 @@ void NodeRemover::visit(VariableDeclaration &var)
 
 void NodeRemover::visit(InterfaceBlock &iface)
 {
-       SetFlag set_anon(anonymous);
        SetFlag set_recursive(recursive_remove, recursive_remove || to_remove->count(&iface));
        TraversingVisitor::visit(iface);
 }