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

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index 58d323ab..fd25bf34 100644
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -15,6 +15,9 @@ 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);
 }
@@ -78,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);
@@ -92,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)
@@ -114,82 +121,74 @@ void TraversingVisitor::visit(Return &ret)
 }
 
 
-StageVisitor::StageVisitor():
-	stage(0)
+NodeRemover::NodeRemover():
+	stage(0),
+	to_remove(0),
+	recursive_remove(false)
 { }
 
-void StageVisitor::apply(Stage &s)
+void NodeRemover::apply(Stage &s, const set<Node *> &tr)
 {
-	SetForScope<Stage *> set(stage, &s);
-	stage->content.visit(*this);
+	stage = &s;
+	to_remove = &tr;
+	s.content.visit(*this);
 }
 
-
-BlockModifier::BlockModifier():
-	remove_node(false)
-{ }
-
-void BlockModifier::flatten_block(Block &block)
+template<typename T>
+void NodeRemover::remove_from_map(map<string, T *> &vars, const string &key, T &node)
 {
-	insert_nodes.insert(insert_nodes.end(), block.body.begin(), block.body.end());
-	remove_node = true;
-}
-
-void BlockModifier::apply_and_increment(Block &block, NodeList<Statement>::iterator &i)
-{
-	block.body.insert(i, insert_nodes.begin(), insert_nodes.end());
-	insert_nodes.clear();
-
-	if(remove_node)
-		block.body.erase(i++);
-	else
-		++i;
-	remove_node = false;
+	typename map<string, T *>::iterator i = vars.find(key);
+	if(i!=vars.end() && i->second==&node)
+		vars.erase(i);
 }
 
-void BlockModifier::visit(Block &block)
-{
-	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
-	{
-		(*i)->visit(*this);
-		apply_and_increment(block, i);
-	}
-}
-
-
-NodeRemover::NodeRemover(const set<Node *> &r):
-	to_remove(r)
-{ }
-
 void NodeRemover::visit(Block &block)
 {
+	SetForScope<Block *> set_block(current_block, &block);
 	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
 	{
 		(*i)->visit(*this);
-		if(to_remove.count(i->get()))
+		if(to_remove->count(i->get()))
 			block.body.erase(i++);
 		else
 			++i;
 	}
 }
 
+void NodeRemover::visit(StructDeclaration &strct)
+{
+	if(to_remove->count(&strct))
+		remove_from_map(stage->types, strct.name, strct);
+}
+
 void NodeRemover::visit(VariableDeclaration &var)
 {
-	if(to_remove.count(&var))
+	if(recursive_remove || to_remove->count(&var))
 	{
-		stage->in_variables.erase(var.name);
-		stage->out_variables.erase(var.name);
+		remove_from_map(current_block->variables, var.name, var);
 		stage->locations.erase(var.name);
 		if(var.linked_declaration)
 			var.linked_declaration->linked_declaration = 0;
 	}
-	else if(var.init_expression && to_remove.count(var.init_expression.get()))
+	else if(var.init_expression && to_remove->count(var.init_expression.get()))
 		var.init_expression = 0;
 }
 
+void NodeRemover::visit(InterfaceBlock &iface)
+{
+	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);
+}
+
 void NodeRemover::visit(Iteration &iter)
 {
-	if(to_remove.count(iter.init_statement.get()))
+	if(to_remove->count(iter.init_statement.get()))
 		iter.init_statement = 0;
 	TraversingVisitor::visit(iter);
 }