Add functions for setting arrays of 2x2 and 3x3 matrix uniforms

[libs/gl.git] / source / programsyntax.cpp

diff --git a/source/programsyntax.cpp b/source/programsyntax.cpp
index e67784fe8626a24522b43db5e203cb78354108bc..6dea029f2fe024d1fed301a20cf93bd2fc80f430 100644 (file)
--- 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)
 { }
@@ -94,6 +109,12 @@ void Import::visit(NodeVisitor &visitor)
 }
 
 
+void Precision::visit(NodeVisitor &visitor)
+{
+       visitor.visit(*this);
+}
+
+
 void Layout::visit(NodeVisitor &visitor)
 {
        visitor.visit(*this);
@@ -184,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));
@@ -192,7 +219,7 @@ void NodeVisitor::visit(Assignment &assign)
 
 void TraversingVisitor::visit(Block &block)
 {
-       for(list<RefPtr<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);
 }
 
@@ -219,7 +246,7 @@ void TraversingVisitor::visit(BinaryExpression &binary)
 
 void TraversingVisitor::visit(FunctionCall &call)
 {
-       for(vector<RefPtr<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);
 }
 
@@ -255,7 +282,7 @@ void TraversingVisitor::visit(InterfaceBlock &iface)
 
 void TraversingVisitor::visit(FunctionDeclaration &func)
 {
-       for(vector<RefPtr<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);
 }
@@ -269,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)