Visit iteration statement components in semantically correct order

[libs/gl.git] / source / glsl / visitor.cpp

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index f4b2a8d01c25294ca153e1a629d86de0260b1cc8..fa6e614c6394a1705e4d45b6214fc55efbc760a1 100644 (file)
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -7,12 +7,6 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-void NodeVisitor::visit(Assignment &assign)
-{
-       visit(static_cast<BinaryExpression &>(assign));
-}
-
-
 void TraversingVisitor::visit(Block &block)
 {
        if(&block!=current_block)
@@ -43,6 +37,11 @@ void TraversingVisitor::visit(BinaryExpression &binary)
        binary.right->visit(*this);
 }
 
+void TraversingVisitor::visit(Assignment &assign)
+{
+       visit(static_cast<BinaryExpression &>(assign));
+}
+
 void TraversingVisitor::visit(FunctionCall &call)
 {
        for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
@@ -103,9 +102,9 @@ void TraversingVisitor::visit(Iteration &iter)
                iter.init_statement->visit(*this);
        if(iter.condition)
                iter.condition->visit(*this);
+       iter.body.visit(*this);
        if(iter.loop_expression)
                iter.loop_expression->visit(*this);
-       iter.body.visit(*this);
 }
 
 void TraversingVisitor::visit(Passthrough &pass)