X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.cpp;h=b1767d3f5748b2fcafb139e9de48098e92563a13;hb=a1ba04add302e7712d127b46d8d11386987a0aea;hp=dad8baddce0c5a5bd74c1b56c4abeb4a93d48fd9;hpb=b94b0c01488e676bc6c64cd7743c5ff50eb15088;p=libs%2Fgl.git

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index dad8badd..b1767d3f 100644
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -16,41 +16,52 @@ void TraversingVisitor::visit(Block &block)
 		(*i)->visit(*this);
 }
 
+void TraversingVisitor::visit(RefPtr<Expression> &expr)
+{
+	expr->visit(*this);
+}
+
 void TraversingVisitor::visit(ParenthesizedExpression &parexpr)
 {
-	parexpr.expression->visit(*this);
+	visit(parexpr.expression);
 }
 
 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(static_cast<BinaryExpression &>(assign));
+	visit(assign.left);
+	visit(assign.right);
 }
 
 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)
@@ -68,14 +79,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)
@@ -89,7 +101,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);
 }
@@ -101,22 +113,22 @@ void TraversingVisitor::visit(Iteration &iter)
 	if(iter.init_statement)
 		iter.init_statement->visit(*this);
 	if(iter.condition)
-		iter.condition->visit(*this);
+		visit(iter.condition);
 	iter.body.visit(*this);
 	if(iter.loop_expression)
-		iter.loop_expression->visit(*this);
+		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);
 }
 
 
@@ -188,7 +200,11 @@ void NodeRemover::visit(InterfaceBlock &iface)
 void NodeRemover::visit(FunctionDeclaration &func)
 {
 	if(to_remove->count(&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);
 }