X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramsyntax.cpp;h=6dea029f2fe024d1fed301a20cf93bd2fc80f430;hp=f87488dc7a2b530a56c38841965430c0973f5738;hb=56beca9d8b4f7b4edac81411d31e24df88e84ac3;hpb=a0caabaed3aeb8947133d78986bfb4ae5ae3c893

diff --git a/source/programsyntax.cpp b/source/programsyntax.cpp
index f87488dc..6dea029f 100644
--- a/source/programsyntax.cpp
+++ b/source/programsyntax.cpp
@@ -6,6 +6,21 @@ 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();
+}
+
+
+Statement::Statement():
+	source(0),
+	line(1)
+{ }
+
+
 Block::Block():
 	use_braces(false)
 { }
@@ -72,6 +87,7 @@ void Assignment::visit(NodeVisitor &visitor)
 
 
 FunctionCall::FunctionCall():
+	declaration(0),
 	constructor(false)
 { }
 
@@ -93,12 +109,24 @@ void Import::visit(NodeVisitor &visitor)
 }
 
 
+void Precision::visit(NodeVisitor &visitor)
+{
+	visitor.visit(*this);
+}
+
+
 void Layout::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
 }
 
 
+void InterfaceLayout::visit(NodeVisitor &visitor)
+{
+	visitor.visit(*this);
+}
+
+
 StructDeclaration::StructDeclaration()
 {
 	members.use_braces = true;
@@ -177,6 +205,12 @@ void Return::visit(NodeVisitor &visitor)
 }
 
 
+void Jump::visit(NodeVisitor &visitor)
+{
+	visitor.visit(*this);
+}
+
+
 void NodeVisitor::visit(Assignment &assign)
 {
 	visit(static_cast<BinaryExpression &>(assign));
@@ -185,7 +219,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(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
 		(*i)->visit(*this);
 }
 
@@ -212,7 +246,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(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
 		(*i)->visit(*this);
 }
 
@@ -221,6 +255,11 @@ void TraversingVisitor::visit(ExpressionStatement &expr)
 	expr.expression->visit(*this);
 }
 
+void TraversingVisitor::visit(InterfaceLayout &layout)
+{
+	layout.layout.visit(*this);
+}
+
 void TraversingVisitor::visit(StructDeclaration &strct)
 {
 	strct.members.visit(*this);
@@ -228,6 +267,8 @@ void TraversingVisitor::visit(StructDeclaration &strct)
 
 void TraversingVisitor::visit(VariableDeclaration &var)
 {
+	if(var.layout)
+		var.layout->visit(*this);
 	if(var.init_expression)
 		var.init_expression->visit(*this);
 	if(var.array_size)
@@ -241,7 +282,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(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
 		(*i)->visit(*this);
 	func.body.visit(*this);
 }
@@ -255,7 +296,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)