Refactor scope management

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

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index cf0cca9612e92132e9a89f16471f788c8f7d00a1..fe0175c2214f51946fb7805fa866606964e335fc 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)
@@ -125,7 +132,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)