Fix VariableResolver doing bogus things on certain invalid constructs

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 48fc742342bdf042aa32bdbd5686e61e1e43bbe0..f76c2c2d8fba55d7231f95dfd487d20e897b3061 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -61,12 +61,12 @@ class VariableResolver: private TraversingVisitor
 {
 private:
        Stage *stage;
-       std::map<std::string, VariableDeclaration *> *members;
-       RefPtr<InterfaceBlockReference> iface_ref;
+       std::map<std::string, VariableDeclaration *> *r_members;
+       RefPtr<InterfaceBlockReference> r_iface_ref;
        std::string block_interface;
        bool record_target;
-       VariableDeclaration *assignment_target;
-       bool self_referencing;
+       VariableDeclaration *r_assignment_target;
+       bool r_self_referencing;
 
 public:
        VariableResolver();
@@ -78,8 +78,10 @@ private:
        virtual void visit(VariableReference &);
        virtual void visit(InterfaceBlockReference &);
        virtual void visit(MemberAccess &);
+       virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
+       virtual void visit(FunctionCall &);
        virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);