Minor, largely cosmetic tweaks

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

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 4230a402a0dc413b23e331a5248f3671dc412ff4..90128a18e1a7bbdfcaa023579c9665cac27c9a78 100644 (file)
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -118,8 +118,8 @@ VariableResolver::VariableResolver():
        stage(0),
        r_members(0),
        record_target(false),
-       r_assignment_target(0),
-       r_self_referencing(false)
+       r_self_referencing(false),
+       r_assignment_target(0)
 { }
 
 void VariableResolver::apply(Stage &s)
@@ -240,7 +240,7 @@ void VariableResolver::visit(BinaryExpression &binary)
        if(binary.oper->token[0]=='[')
        {
                {
-                       SetForScope<bool> set(record_target, false);
+                       SetFlag set(record_target, false);
                        binary.right->visit(*this);
                }
                r_members = 0;
@@ -264,13 +264,13 @@ void VariableResolver::visit(Assignment &assign)
                SetFlag set(record_target);
                r_assignment_target = 0;
                assign.left->visit(*this);
+               assign.target_declaration = r_assignment_target;
        }
 
        r_self_referencing = false;
        assign.right->visit(*this);
-
        assign.self_referencing = (r_self_referencing || assign.oper->token[0]!='=');
-       assign.target_declaration = r_assignment_target;
+
        r_members = 0;
        r_iface_ref = 0;
 }