X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.cpp;h=b0025982fc75255041187ef4d66ce58af5930997;hp=8c8056c56352c99a56ca3a7e5b21e298026e5fbe;hb=76cc18518fc8b0b4fa11fda153e7d9b3899ed112;hpb=2a9f8f3803e1b57e0e5325454266d4e701b38cc5

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index 8c8056c5..b0025982 100644
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -12,8 +12,8 @@ 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);
+	for(const RefPtr<Statement> &s: block.body)
+		s->visit(*this);
 }
 
 void TraversingVisitor::visit(RefPtr<Expression> &expr)
@@ -21,11 +21,6 @@ void TraversingVisitor::visit(RefPtr<Expression> &expr)
 	expr->visit(*this);
 }
 
-void TraversingVisitor::visit(ParenthesizedExpression &parexpr)
-{
-	visit(parexpr.expression);
-}
-
 void TraversingVisitor::visit(MemberAccess &memacc)
 {
 	visit(memacc.left);
@@ -53,10 +48,17 @@ void TraversingVisitor::visit(Assignment &assign)
 	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)
-		visit(*i);
+	for(RefPtr<Expression> &a: call.arguments)
+		visit(a);
 }
 
 void TraversingVisitor::visit(ExpressionStatement &expr)
@@ -86,6 +88,8 @@ void TraversingVisitor::visit(VariableDeclaration &var)
 
 void TraversingVisitor::visit(InterfaceBlock &iface)
 {
+	if(iface.layout)
+		iface.layout->visit(*this);
 	if(iface.members)
 		iface.members->visit(*this);
 }
@@ -94,8 +98,8 @@ 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);
+	for(const RefPtr<VariableDeclaration> &p: func.parameters)
+		p->visit(*this);
 	func.body.visit(*this);
 }
 
@@ -132,12 +136,6 @@ void TraversingVisitor::visit(Return &ret)
 }
 
 
-NodeRemover::NodeRemover():
-	stage(0),
-	to_remove(0),
-	recursive_remove(false)
-{ }
-
 void NodeRemover::apply(Stage &s, const set<Node *> &tr)
 {
 	stage = &s;
@@ -148,7 +146,7 @@ void NodeRemover::apply(Stage &s, const set<Node *> &tr)
 template<typename T>
 void NodeRemover::remove_from_map(map<string, T *> &vars, const string &key, T &node)
 {
-	typename map<string, T *>::iterator i = vars.find(key);
+	auto i = vars.find(key);
 	if(i!=vars.end() && i->second==&node)
 		vars.erase(i);
 }
@@ -156,7 +154,7 @@ void NodeRemover::remove_from_map(map<string, T *> &vars, const string &key, T &
 void NodeRemover::visit(Block &block)
 {
 	SetForScope<Block *> set_block(current_block, &block);
-	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
+	for(auto i=block.body.begin(); i!=block.body.end(); )
 	{
 		(*i)->visit(*this);
 		if(to_remove->count(i->get()))
@@ -189,9 +187,9 @@ void NodeRemover::visit(InterfaceBlock &iface)
 {
 	if(to_remove->count(&iface))
 	{
-		remove_from_map(stage->interface_blocks, iface.interface+iface.name, iface);
+		remove_from_map(stage->interface_blocks, format("%s %s", 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);
@@ -200,7 +198,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);
 }
 
@@ -212,11 +214,6 @@ void NodeRemover::visit(Iteration &iter)
 }
 
 
-NodeReorderer::NodeReorderer():
-	reorder_before(0),
-	to_reorder(0)
-{ }
-
 void NodeReorderer::apply(Stage &stage, Node &before, const set<Node *> &tr)
 {
 	reorder_before = &before;
@@ -226,15 +223,12 @@ void NodeReorderer::apply(Stage &stage, Node &before, const set<Node *> &tr)
 
 void NodeReorderer::visit(Block &block)
 {
-	NodeList<Statement>::iterator insert_point = block.body.end();
-	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
+	auto insert_point = block.body.end();
+	for(auto i=block.body.begin(); i!=block.body.end(); )
 	{
 		(*i)->visit(*this);
 		if(insert_point!=block.body.end() && to_reorder->count(i->get()))
-		{
-			NodeList<Statement>::iterator j = i++;
-			block.body.splice(insert_point, block.body, j);
-		}
+			block.body.splice(insert_point, block.body, i++);
 		else
 		{
 			if(i->get()==reorder_before)