X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.cpp;h=ebcedb71242cc883bd2ef7b7c58ac6783867a19a;hb=041ba4b1acd55337239c5ce24cc310118c621206;hp=f4b2a8d01c25294ca153e1a629d86de0260b1cc8;hpb=a55a435ae1eba21b4db5d825c4e4ec819839fea0;p=libs%2Fgl.git

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index f4b2a8d0..ebcedb71 100644
--- 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)
@@ -43,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)
@@ -76,7 +76,8 @@ 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)
@@ -103,9 +104,9 @@ void TraversingVisitor::visit(Iteration &iter)
 		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)
@@ -155,10 +156,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 +179,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.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);