X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramsyntax.cpp;h=47b59f6c8900868c21f91c633cf2c4b512da55e4;hp=c6e0f6d40e9bc9ca97583adf07454af208bcadf9;hb=13cf58be0e455227e8e5ae418b276a11c7873869;hpb=8812fe9fc71b997246ddfdedb8a91932b679d2d3

diff --git a/source/programsyntax.cpp b/source/programsyntax.cpp
index c6e0f6d4..47b59f6c 100644
--- a/source/programsyntax.cpp
+++ b/source/programsyntax.cpp
@@ -6,6 +6,15 @@ namespace Msp {
 namespace GL {
 namespace ProgramSyntax {
 
+template<typename C>
+NodeContainer<C>::NodeContainer(const NodeContainer &c):
+	C(c)
+{
+	for(typename C::iterator i=this->begin(); i!=this->end(); ++i)
+		*i = (*i)->clone();
+}
+
+
 Block::Block():
 	use_braces(false)
 { }
@@ -94,6 +103,12 @@ void Import::visit(NodeVisitor &visitor)
 }
 
 
+void Precision::visit(NodeVisitor &visitor)
+{
+	visitor.visit(*this);
+}
+
+
 void Layout::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
@@ -184,6 +199,12 @@ void Return::visit(NodeVisitor &visitor)
 }
 
 
+void Jump::visit(NodeVisitor &visitor)
+{
+	visitor.visit(*this);
+}
+
+
 void NodeVisitor::visit(Assignment &assign)
 {
 	visit(static_cast<BinaryExpression &>(assign));
@@ -192,7 +213,7 @@ void NodeVisitor::visit(Assignment &assign)
 
 void TraversingVisitor::visit(Block &block)
 {
-	for(list<NodePtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+	for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); ++i)
 		(*i)->visit(*this);
 }
 
@@ -219,7 +240,7 @@ void TraversingVisitor::visit(BinaryExpression &binary)
 
 void TraversingVisitor::visit(FunctionCall &call)
 {
-	for(vector<NodePtr<Expression> >::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
+	for(vector<RefPtr<Expression> >::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
 		(*i)->visit(*this);
 }
 
@@ -255,7 +276,7 @@ void TraversingVisitor::visit(InterfaceBlock &iface)
 
 void TraversingVisitor::visit(FunctionDeclaration &func)
 {
-	for(vector<NodePtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+	for(vector<RefPtr<VariableDeclaration> >::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
 		(*i)->visit(*this);
 	func.body.visit(*this);
 }
@@ -269,7 +290,8 @@ void TraversingVisitor::visit(Conditional &cond)
 
 void TraversingVisitor::visit(Iteration &iter)
 {
-	iter.init_statement->visit(*this);
+	if(iter.init_statement)
+		iter.init_statement->visit(*this);
 	if(iter.condition)
 		iter.condition->visit(*this);
 	if(iter.loop_expression)