Check the flat qualifier from the correct member

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

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index b1767d3f5748b2fcafb139e9de48098e92563a13..bcd6051a7c4a65b13604a5e75ec63eeed9c8de7b 100644 (file)
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -12,8 +12,8 @@ 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(RefPtr<Expression> &expr)
@@ -21,11 +21,6 @@ void TraversingVisitor::visit(RefPtr<Expression> &expr)
        expr->visit(*this);
 }
 
-void TraversingVisitor::visit(ParenthesizedExpression &parexpr)
-{
-       visit(parexpr.expression);
-}
-
 void TraversingVisitor::visit(MemberAccess &memacc)
 {
        visit(memacc.left);
@@ -53,10 +48,17 @@ void TraversingVisitor::visit(Assignment &assign)
        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)
-               visit(*i);
+       for(RefPtr<Expression> &a: call.arguments)
+               visit(a);
 }
 
 void TraversingVisitor::visit(ExpressionStatement &expr)
@@ -84,18 +86,12 @@ void TraversingVisitor::visit(VariableDeclaration &var)
                visit(var.array_size);
 }
 
-void TraversingVisitor::visit(InterfaceBlock &iface)
-{
-       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);
 }
 
@@ -132,12 +128,6 @@ void TraversingVisitor::visit(Return &ret)
 }
 
 
-NodeRemover::NodeRemover():
-       stage(0),
-       to_remove(0),
-       recursive_remove(false)
-{ }
-
 void NodeRemover::apply(Stage &s, const set<Node *> &tr)
 {
        stage = &s;
@@ -148,7 +138,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);
 }
@@ -156,7 +146,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()))
@@ -172,11 +162,32 @@ void NodeRemover::visit(TypeDeclaration &type)
                remove_from_map(stage->types, type.name, type);
 }
 
+void NodeRemover::visit(StructDeclaration &strct)
+{
+       if(to_remove->count(&strct))
+       {
+               remove_from_map<TypeDeclaration>(stage->types, strct.name, strct);
+               if(strct.block_declaration)
+               {
+                       string key = format("%s %s", strct.block_declaration->interface, strct.block_name);
+                       remove_from_map(stage->interface_blocks, key, *strct.block_declaration);
+                       remove_from_map(stage->interface_blocks, strct.block_declaration->name, *strct.block_declaration);
+                       strct.block_declaration->block_declaration = 0;
+               }
+       }
+}
+
 void NodeRemover::visit(VariableDeclaration &var)
 {
-       if(recursive_remove || to_remove->count(&var))
+       if(to_remove->count(&var))
        {
                remove_from_map(current_block->variables, var.name, var);
+               if(var.block_declaration)
+               {
+                       remove_from_map(stage->interface_blocks, format("%s %s", var.interface, var.block_declaration->block_name), var);
+                       remove_from_map(stage->interface_blocks, var.name, var);
+                       var.block_declaration->block_declaration = 0;
+               }
                stage->locations.erase(var.name);
                if(var.linked_declaration)
                        var.linked_declaration->linked_declaration = 0;
@@ -185,18 +196,6 @@ void NodeRemover::visit(VariableDeclaration &var)
                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))
@@ -216,11 +215,6 @@ void NodeRemover::visit(Iteration &iter)
 }
 
 
-NodeReorderer::NodeReorderer():
-       reorder_before(0),
-       to_reorder(0)
-{ }
-
 void NodeReorderer::apply(Stage &stage, Node &before, const set<Node *> &tr)
 {
        reorder_before = &before;
@@ -230,15 +224,12 @@ void NodeReorderer::apply(Stage &stage, Node &before, const set<Node *> &tr)
 
 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(); )
+       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()))
-               {
-                       NodeList<Statement>::iterator j = i++;
-                       block.body.splice(insert_point, block.body, j);
-               }
+                       block.body.splice(insert_point, block.body, i++);
                else
                {
                        if(i->get()==reorder_before)