X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.cpp;h=fd25bf342a7ea588525be88079166453474c4e8e;hb=30465dd3b9f55ec42c4b19c3c2077eede7237a26;hp=265b11d41215da3bae6cebdbfcaa1b92e0919f24;hpb=99719790df8a1215465a68c7b1d87a495bff87eb;p=libs%2Fgl.git

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index 265b11d4..fd25bf34 100644
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -15,6 +15,8 @@ void NodeVisitor::visit(Assignment &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);
@@ -79,6 +81,8 @@ void TraversingVisitor::visit(InterfaceBlock &iface)
 
 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);
 	func.body.visit(*this);
@@ -93,6 +97,8 @@ void TraversingVisitor::visit(Conditional &cond)
 
 void TraversingVisitor::visit(Iteration &iter)
 {
+	enter(iter.body);
+	SetForScope<Block *> set_block(current_block, &iter.body);
 	if(iter.init_statement)
 		iter.init_statement->visit(*this);
 	if(iter.condition)
@@ -118,7 +124,6 @@ void TraversingVisitor::visit(Return &ret)
 NodeRemover::NodeRemover():
 	stage(0),
 	to_remove(0),
-	anonymous(false),
 	recursive_remove(false)
 { }
 
@@ -126,19 +131,20 @@ void NodeRemover::apply(Stage &s, const set<Node *> &tr)
 {
 	stage = &s;
 	to_remove = &tr;
-	visit(s.content);
+	s.content.visit(*this);
 }
 
-void NodeRemover::remove_variable(map<string, VariableDeclaration *> &vars, VariableDeclaration &decl)
+template<typename T>
+void NodeRemover::remove_from_map(map<string, T *> &vars, const string &key, T &node)
 {
-	map<string, VariableDeclaration *>::iterator i = vars.find(decl.name);
-	if(i!=vars.end() && i->second==&decl)
+	typename map<string, T *>::iterator i = vars.find(key);
+	if(i!=vars.end() && i->second==&node)
 		vars.erase(i);
 }
 
 void NodeRemover::visit(Block &block)
 {
-	blocks.push_back(&block);
+	SetForScope<Block *> set_block(current_block, &block);
 	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
 	{
 		(*i)->visit(*this);
@@ -147,24 +153,19 @@ void NodeRemover::visit(Block &block)
 		else
 			++i;
 	}
-	blocks.pop_back();
 }
 
 void NodeRemover::visit(StructDeclaration &strct)
 {
 	if(to_remove->count(&strct))
-		blocks.back()->types.erase(strct.name);
+		remove_from_map(stage->types, strct.name, strct);
 }
 
 void NodeRemover::visit(VariableDeclaration &var)
 {
 	if(recursive_remove || to_remove->count(&var))
 	{
-		remove_variable(blocks.back()->variables, var);
-		if(anonymous && blocks.size()>1)
-			remove_variable(blocks[blocks.size()-2]->variables, var);
-		remove_variable(stage->in_variables, var);
-		remove_variable(stage->out_variables, var);
+		remove_from_map(current_block->variables, var.name, var);
 		stage->locations.erase(var.name);
 		if(var.linked_declaration)
 			var.linked_declaration->linked_declaration = 0;
@@ -175,7 +176,12 @@ void NodeRemover::visit(VariableDeclaration &var)
 
 void NodeRemover::visit(InterfaceBlock &iface)
 {
-	SetFlag set_anon(anonymous);
+	if(to_remove->count(&iface))
+	{
+		remove_from_map(stage->interface_blocks, 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);
 }