Rename InterfaceBlock::name to block_name for clarity

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

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index 9bbd4914b1a0a289caa3c48a3504fa6c79e0c11d..cc030eab7e31f33e71a8cb575f3013c7fdeab0df 100644 (file)
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -7,12 +7,6 @@ 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)
@@ -22,36 +16,54 @@ void TraversingVisitor::visit(Block &block)
                (*i)->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);
+               visit(*i);
 }
 
 void TraversingVisitor::visit(ExpressionStatement &expr)
 {
-       expr.expression->visit(*this);
+       visit(expr.expression);
 }
 
 void TraversingVisitor::visit(InterfaceLayout &layout)
@@ -69,14 +81,15 @@ 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.members)
+               iface.members->visit(*this);
 }
 
 void TraversingVisitor::visit(FunctionDeclaration &func)
@@ -90,7 +103,7 @@ void TraversingVisitor::visit(FunctionDeclaration &func)
 
 void TraversingVisitor::visit(Conditional &cond)
 {
-       cond.condition->visit(*this);
+       visit(cond.condition);
        cond.body.visit(*this);
        cond.else_body.visit(*this);
 }
@@ -102,22 +115,22 @@ 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);
 }
 
 
@@ -155,10 +168,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,9 +191,9 @@ 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, iface.interface+iface.block_name, iface);
                if(!iface.instance_name.empty())
-                       remove_from_map(stage->interface_blocks, iface.instance_name, iface);
+                       remove_from_map(stage->interface_blocks, "_"+iface.instance_name, iface);
        }
        SetFlag set_recursive(recursive_remove, recursive_remove || to_remove->count(&iface));
        TraversingVisitor::visit(iface);
@@ -189,7 +202,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);
 }