Refactor and improve unused variable detection in ProgramCompiler

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

diff --git a/source/programcompiler.h b/source/programcompiler.h
index db63eb3645d62d39fbb6a8717b28d9735d9b5234..0ff4f667d3feb830013d30c908a4eb97847b4ec4 100644 (file)
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -246,24 +246,26 @@ private:
 
        struct UnusedVariableLocator: Visitor
        {
-               struct AssignmentList
+               struct VariableInfo
                {
-                       std::vector<ProgramSyntax::Node *> nodes;
-                       bool conditional;
-                       bool self_referencing;
+                       bool local;
+                       std::vector<ProgramSyntax::Node *> assignments;
+                       bool conditionally_assigned;
+                       bool referenced;
+
+                       VariableInfo();
                };
 
                typedef std::set<ProgramSyntax::Node *> ResultType;
-               typedef std::map<ProgramSyntax::VariableDeclaration *, AssignmentList> BlockAssignmentMap;
+               typedef std::map<ProgramSyntax::VariableDeclaration *, VariableInfo> BlockVariableMap;
 
                std::set<ProgramSyntax::Node *> unused_nodes;
                std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Node *> aggregates;
                ProgramSyntax::Node *aggregate;
-               std::vector<BlockAssignmentMap> assignments;
+               std::vector<BlockVariableMap> variables;
                ProgramSyntax::Assignment *assignment;
                bool assignment_target;
-               bool iteration;
-               std::set<ProgramSyntax::Node *> used_in_iteration;
+               bool global_scope;
 
                UnusedVariableLocator();
 
@@ -279,7 +281,7 @@ private:
                virtual void visit(ProgramSyntax::VariableDeclaration &);
                virtual void visit(ProgramSyntax::InterfaceBlock &);
                virtual void visit(ProgramSyntax::FunctionDeclaration &);
-               void merge_down_assignments();
+               void merge_down_variables();
                virtual void visit(ProgramSyntax::Conditional &);
                virtual void visit(ProgramSyntax::Iteration &);
        };