Refactor scope management

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

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index 58d323ab540fc3be3a02c70a7c0a81dd333977b8..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)
@@ -114,82 +121,74 @@ void TraversingVisitor::visit(Return &ret)
 }
 
 
-StageVisitor::StageVisitor():
-       stage(0)
+NodeRemover::NodeRemover():
+       stage(0),
+       to_remove(0),
+       anonymous(false),
+       recursive_remove(false)
 { }
 
-void StageVisitor::apply(Stage &s)
+void NodeRemover::apply(Stage &s, const set<Node *> &tr)
 {
-       SetForScope<Stage *> set(stage, &s);
-       stage->content.visit(*this);
+       stage = &s;
+       to_remove = &tr;
+       s.content.visit(*this);
 }
 
-
-BlockModifier::BlockModifier():
-       remove_node(false)
-{ }
-
-void BlockModifier::flatten_block(Block &block)
-{
-       insert_nodes.insert(insert_nodes.end(), block.body.begin(), block.body.end());
-       remove_node = true;
-}
-
-void BlockModifier::apply_and_increment(Block &block, NodeList<Statement>::iterator &i)
+void NodeRemover::remove_variable(map<string, VariableDeclaration *> &vars, VariableDeclaration &decl)
 {
-       block.body.insert(i, insert_nodes.begin(), insert_nodes.end());
-       insert_nodes.clear();
-
-       if(remove_node)
-               block.body.erase(i++);
-       else
-               ++i;
-       remove_node = false;
+       map<string, VariableDeclaration *>::iterator i = vars.find(decl.name);
+       if(i!=vars.end() && i->second==&decl)
+               vars.erase(i);
 }
 
-void BlockModifier::visit(Block &block)
-{
-       for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
-       {
-               (*i)->visit(*this);
-               apply_and_increment(block, i);
-       }
-}
-
-
-NodeRemover::NodeRemover(const set<Node *> &r):
-       to_remove(r)
-{ }
-
 void NodeRemover::visit(Block &block)
 {
+       blocks.push_back(&block);
        for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
        {
                (*i)->visit(*this);
-               if(to_remove.count(i->get()))
+               if(to_remove->count(i->get()))
                        block.body.erase(i++);
                else
                        ++i;
        }
+       blocks.pop_back();
+}
+
+void NodeRemover::visit(StructDeclaration &strct)
+{
+       if(to_remove->count(&strct))
+               blocks.back()->types.erase(strct.name);
 }
 
 void NodeRemover::visit(VariableDeclaration &var)
 {
-       if(to_remove.count(&var))
+       if(recursive_remove || to_remove->count(&var))
        {
-               stage->in_variables.erase(var.name);
-               stage->out_variables.erase(var.name);
+               remove_variable(blocks.back()->variables, var);
+               if(anonymous && blocks.size()>1)
+                       remove_variable(blocks[blocks.size()-2]->variables, var);
+               remove_variable(stage->in_variables, var);
+               remove_variable(stage->out_variables, var);
                stage->locations.erase(var.name);
                if(var.linked_declaration)
                        var.linked_declaration->linked_declaration = 0;
        }
-       else if(var.init_expression && to_remove.count(var.init_expression.get()))
+       else if(var.init_expression && to_remove->count(var.init_expression.get()))
                var.init_expression = 0;
 }
 
+void NodeRemover::visit(InterfaceBlock &iface)
+{
+       SetFlag set_anon(anonymous);
+       SetFlag set_recursive(recursive_remove, recursive_remove || to_remove->count(&iface));
+       TraversingVisitor::visit(iface);
+}
+
 void NodeRemover::visit(Iteration &iter)
 {
-       if(to_remove.count(iter.init_statement.get()))
+       if(to_remove->count(iter.init_statement.get()))
                iter.init_statement = 0;
        TraversingVisitor::visit(iter);
 }