Transform interface block contents into structs

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

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index 91e75b7006b40cf0d621e0a3498c5cf2e5431fe1..ebcedb71242cc883bd2ef7b7c58ac6783867a19a 100644 (file)
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -7,14 +7,11 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-void NodeVisitor::visit(Assignment &assign)
-{
-       visit(static_cast<BinaryExpression &>(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);
 }
@@ -40,6 +37,12 @@ void TraversingVisitor::visit(BinaryExpression &binary)
        binary.right->visit(*this);
 }
 
+void TraversingVisitor::visit(Assignment &assign)
+{
+       assign.left->visit(*this);
+       assign.right->visit(*this);
+}
+
 void TraversingVisitor::visit(FunctionCall &call)
 {
        for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
@@ -73,11 +76,14 @@ void TraversingVisitor::visit(VariableDeclaration &var)
 
 void TraversingVisitor::visit(InterfaceBlock &iface)
 {
-       iface.members.visit(*this);
+       if(iface.members)
+               iface.members->visit(*this);
 }
 
 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,13 +98,15 @@ 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)
                iter.condition->visit(*this);
+       iter.body.visit(*this);
        if(iter.loop_expression)
                iter.loop_expression->visit(*this);
-       iter.body.visit(*this);
 }
 
 void TraversingVisitor::visit(Passthrough &pass)
@@ -114,82 +122,118 @@ void TraversingVisitor::visit(Return &ret)
 }
 
 
-BlockModifier::BlockModifier():
-       remove_node(false)
+NodeRemover::NodeRemover():
+       stage(0),
+       to_remove(0),
+       recursive_remove(false)
 { }
 
-void BlockModifier::flatten_block(Block &block)
+void NodeRemover::apply(Stage &s, const set<Node *> &tr)
 {
-       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)
-{
-       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;
-}
-
-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);
-       }
+       stage = &s;
+       to_remove = &tr;
+       s.content.visit(*this);
 }
 
-
-NodeRemover::NodeRemover(const set<Node *> &r):
-       stage(0),
-       to_remove(r)
-{ }
-
-void NodeRemover::apply(Stage &s)
+template<typename T>
+void NodeRemover::remove_from_map(map<string, T *> &vars, const string &key, T &node)
 {
-       stage = &s;
-       visit(s.content);
+       typename map<string, T *>::iterator i = vars.find(key);
+       if(i!=vars.end() && i->second==&node)
+               vars.erase(i);
 }
 
 void NodeRemover::visit(Block &block)
 {
+       SetForScope<Block *> set_block(current_block, &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;
        }
 }
 
+void NodeRemover::visit(TypeDeclaration &type)
+{
+       if(to_remove->count(&type))
+               remove_from_map(stage->types, type.name, type);
+}
+
 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_from_map(current_block->variables, var.name, 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)
+{
+       if(to_remove->count(&iface))
+       {
+               remove_from_map(stage->interface_blocks, iface.interface+iface.name, iface);
+               if(!iface.instance_name.empty())
+                       remove_from_map(stage->interface_blocks, "_"+iface.instance_name, iface);
+       }
+       SetFlag set_recursive(recursive_remove, recursive_remove || to_remove->count(&iface));
+       TraversingVisitor::visit(iface);
+}
+
+void NodeRemover::visit(FunctionDeclaration &func)
+{
+       if(to_remove->count(&func))
+               remove_from_map(stage->functions, func.name, func);
+       TraversingVisitor::visit(func);
+}
+
 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);
 }
 
+
+NodeReorderer::NodeReorderer():
+       reorder_before(0),
+       to_reorder(0)
+{ }
+
+void NodeReorderer::apply(Stage &stage, Node &before, const set<Node *> &tr)
+{
+       reorder_before = &before;
+       to_reorder = &tr;
+       stage.content.visit(*this);
+}
+
+void NodeReorderer::visit(Block &block)
+{
+       NodeList<Statement>::iterator insert_point = block.body.end();
+       for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
+       {
+               (*i)->visit(*this);
+               if(insert_point!=block.body.end() && to_reorder->count(i->get()))
+               {
+                       NodeList<Statement>::iterator j = i++;
+                       block.body.splice(insert_point, block.body, j);
+               }
+               else
+               {
+                       if(i->get()==reorder_before)
+                               insert_point = i;
+                       ++i;
+               }
+       }
+}
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp