Overhaul assignment tracking to work properly with conditionals

[libs/gl.git] / source / programcompiler.h

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 695c2e260a7c65ec4ced67b5c9b15c7c537c5d16..1c76d63f8ccb4201da8b6429abfad5f37e636b4b 100644 (file)
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -39,6 +39,7 @@ private:
                virtual void visit(ProgramSyntax::MemberAccess &);
                virtual void visit(ProgramSyntax::UnaryExpression &);
                virtual void visit(ProgramSyntax::BinaryExpression &);
+               virtual void visit(ProgramSyntax::Assignment &);
                virtual void visit(ProgramSyntax::FunctionCall &);
                virtual void visit(ProgramSyntax::ExpressionStatement &);
                virtual void visit(ProgramSyntax::Layout &);
@@ -57,6 +58,9 @@ private:
                ProgramSyntax::StructDeclaration *type;
                bool anonymous;
                std::string block_interface;
+               bool record_target;
+               ProgramSyntax::VariableDeclaration *assignment_target;
+               bool self_referencing;
 
                VariableResolver();
 
@@ -65,6 +69,7 @@ private:
                virtual void visit(ProgramSyntax::VariableReference &);
                virtual void visit(ProgramSyntax::MemberAccess &);
                virtual void visit(ProgramSyntax::BinaryExpression &);
+               virtual void visit(ProgramSyntax::Assignment &);
                virtual void visit(ProgramSyntax::StructDeclaration &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);
                virtual void visit(ProgramSyntax::InterfaceBlock &);
@@ -100,25 +105,38 @@ private:
 
        struct UnusedVariableLocator: Visitor
        {
+               struct AssignmentList
+               {
+                       std::vector<ProgramSyntax::Node *> nodes;
+                       bool conditional;
+                       bool self_referencing;
+               };
+
+               typedef std::map<ProgramSyntax::VariableDeclaration *, AssignmentList> BlockAssignmentMap;
+
                std::set<ProgramSyntax::Node *> unused_nodes;
                std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Node *> aggregates;
                ProgramSyntax::Node *aggregate;
-               std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Node *> assignments;
-               bool assignment;
-               bool record_target;
-               ProgramSyntax::VariableDeclaration *assignment_target;
-               bool indeterminate_target;
-               bool self_referencing;
+               std::vector<BlockAssignmentMap> assignments;
+               ProgramSyntax::Assignment *assignment;
+               bool assignment_target;
 
                UnusedVariableLocator();
 
+               virtual void apply(ProgramSyntax::Stage &);
                virtual void visit(ProgramSyntax::VariableReference &);
                virtual void visit(ProgramSyntax::MemberAccess &);
                virtual void visit(ProgramSyntax::BinaryExpression &);
+               virtual void visit(ProgramSyntax::Assignment &);
+               void record_assignment(ProgramSyntax::VariableDeclaration &, ProgramSyntax::Node &, bool);
                virtual void visit(ProgramSyntax::ExpressionStatement &);
                virtual void visit(ProgramSyntax::StructDeclaration &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);
                virtual void visit(ProgramSyntax::InterfaceBlock &);
+               virtual void visit(ProgramSyntax::FunctionDeclaration &);
+               void merge_down_assignments();
+               virtual void visit(ProgramSyntax::Conditional &);
+               virtual void visit(ProgramSyntax::Iteration &);
        };
 
        struct NodeRemover: Visitor