Use default member initializers for simple types

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

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index d8b1813959f17e4535ea1ea8c60001c22a36d76f..b0025982fc75255041187ef4d66ce58af5930997 100644 (file)
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -7,51 +7,63 @@ 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);
+       for(const RefPtr<Statement> &s: block.body)
+               s->visit(*this);
 }
 
-void TraversingVisitor::visit(ParenthesizedExpression &parexpr)
+void TraversingVisitor::visit(RefPtr<Expression> &expr)
 {
-       parexpr.expression->visit(*this);
+       expr->visit(*this);
 }
 
 void TraversingVisitor::visit(MemberAccess &memacc)
 {
-       memacc.left->visit(*this);
+       visit(memacc.left);
+}
+
+void TraversingVisitor::visit(Swizzle &swizzle)
+{
+       visit(swizzle.left);
 }
 
 void TraversingVisitor::visit(UnaryExpression &unary)
 {
-       unary.expression->visit(*this);
+       visit(unary.expression);
 }
 
 void TraversingVisitor::visit(BinaryExpression &binary)
 {
-       binary.left->visit(*this);
-       binary.right->visit(*this);
+       visit(binary.left);
+       visit(binary.right);
+}
+
+void TraversingVisitor::visit(Assignment &assign)
+{
+       visit(assign.left);
+       visit(assign.right);
+}
+
+void TraversingVisitor::visit(TernaryExpression &ternary)
+{
+       visit(ternary.condition);
+       visit(ternary.true_expr);
+       visit(ternary.false_expr);
 }
 
 void TraversingVisitor::visit(FunctionCall &call)
 {
-       for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
-               (*i)->visit(*this);
+       for(RefPtr<Expression> &a: call.arguments)
+               visit(a);
 }
 
 void TraversingVisitor::visit(ExpressionStatement &expr)
 {
-       expr.expression->visit(*this);
+       visit(expr.expression);
 }
 
 void TraversingVisitor::visit(InterfaceLayout &layout)
@@ -69,28 +81,31 @@ void TraversingVisitor::visit(VariableDeclaration &var)
        if(var.layout)
                var.layout->visit(*this);
        if(var.init_expression)
-               var.init_expression->visit(*this);
+               visit(var.init_expression);
        if(var.array_size)
-               var.array_size->visit(*this);
+               visit(var.array_size);
 }
 
 void TraversingVisitor::visit(InterfaceBlock &iface)
 {
-       iface.members.visit(*this);
+       if(iface.layout)
+               iface.layout->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);
+       for(const RefPtr<VariableDeclaration> &p: func.parameters)
+               p->visit(*this);
        func.body.visit(*this);
 }
 
 void TraversingVisitor::visit(Conditional &cond)
 {
-       cond.condition->visit(*this);
+       visit(cond.condition);
        cond.body.visit(*this);
        cond.else_body.visit(*this);
 }
@@ -102,31 +117,25 @@ void TraversingVisitor::visit(Iteration &iter)
        if(iter.init_statement)
                iter.init_statement->visit(*this);
        if(iter.condition)
-               iter.condition->visit(*this);
-       if(iter.loop_expression)
-               iter.loop_expression->visit(*this);
+               visit(iter.condition);
        iter.body.visit(*this);
+       if(iter.loop_expression)
+               visit(iter.loop_expression);
 }
 
 void TraversingVisitor::visit(Passthrough &pass)
 {
        if(pass.subscript)
-               pass.subscript->visit(*this);
+               visit(pass.subscript);
 }
 
 void TraversingVisitor::visit(Return &ret)
 {
        if(ret.expression)
-               ret.expression->visit(*this);
+               visit(ret.expression);
 }
 
 
-NodeRemover::NodeRemover():
-       stage(0),
-       to_remove(0),
-       recursive_remove(false)
-{ }
-
 void NodeRemover::apply(Stage &s, const set<Node *> &tr)
 {
        stage = &s;
@@ -137,7 +146,7 @@ void NodeRemover::apply(Stage &s, const set<Node *> &tr)
 template<typename T>
 void NodeRemover::remove_from_map(map<string, T *> &vars, const string &key, T &node)
 {
-       typename map<string, T *>::iterator i = vars.find(key);
+       auto i = vars.find(key);
        if(i!=vars.end() && i->second==&node)
                vars.erase(i);
 }
@@ -145,7 +154,7 @@ void NodeRemover::remove_from_map(map<string, T *> &vars, const string &key, T &
 void NodeRemover::visit(Block &block)
 {
        SetForScope<Block *> set_block(current_block, &block);
-       for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
+       for(auto i=block.body.begin(); i!=block.body.end(); )
        {
                (*i)->visit(*this);
                if(to_remove->count(i->get()))
@@ -155,10 +164,10 @@ void NodeRemover::visit(Block &block)
        }
 }
 
-void NodeRemover::visit(StructDeclaration &strct)
+void NodeRemover::visit(TypeDeclaration &type)
 {
-       if(to_remove->count(&strct))
-               remove_from_map(stage->types, strct.name, strct);
+       if(to_remove->count(&type))
+               remove_from_map(stage->types, type.name, type);
 }
 
 void NodeRemover::visit(VariableDeclaration &var)
@@ -178,7 +187,7 @@ void NodeRemover::visit(InterfaceBlock &iface)
 {
        if(to_remove->count(&iface))
        {
-               remove_from_map(stage->interface_blocks, iface.name, iface);
+               remove_from_map(stage->interface_blocks, format("%s %s", iface.interface, iface.block_name), iface);
                if(!iface.instance_name.empty())
                        remove_from_map(stage->interface_blocks, iface.instance_name, iface);
        }
@@ -189,7 +198,11 @@ void NodeRemover::visit(InterfaceBlock &iface)
 void NodeRemover::visit(FunctionDeclaration &func)
 {
        if(to_remove->count(&func))
-               remove_from_map(stage->functions, func.name+func.signature, func);
+       {
+               remove_from_map(stage->functions, func.name, func);
+               if(!func.signature.empty())
+                       remove_from_map(stage->functions, func.name+func.signature, func);
+       }
        TraversingVisitor::visit(func);
 }
 
@@ -200,6 +213,31 @@ void NodeRemover::visit(Iteration &iter)
        TraversingVisitor::visit(iter);
 }
 
+
+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)
+{
+       auto insert_point = block.body.end();
+       for(auto i=block.body.begin(); i!=block.body.end(); )
+       {
+               (*i)->visit(*this);
+               if(insert_point!=block.body.end() && to_reorder->count(i->get()))
+                       block.body.splice(insert_point, block.body, i++);
+               else
+               {
+                       if(i->get()==reorder_before)
+                               insert_point = i;
+                       ++i;
+               }
+       }
+}
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp