Fix some clang compile warnings

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

diff --git a/source/programcompiler.h b/source/programcompiler.h
index e43b3a2d45c0e1c272976de51abd6c643cff0054..5bb7147496b3190f730db4a878395f81fe2fb519 100644 (file)
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -40,6 +40,7 @@ private:
 
                virtual void apply(ProgramSyntax::Stage &);
                const std::string &get_result() const { return formatted; }
+               using Visitor::visit;
                virtual void visit(ProgramSyntax::Block &);
                virtual void visit(ProgramSyntax::Literal &);
                virtual void visit(ProgramSyntax::ParenthesizedExpression &);
@@ -71,6 +72,7 @@ private:
                std::list<T *> nodes;
 
                const ResultType &get_result() const { return nodes; }
+               using Visitor::visit;
                virtual void visit(T &n) { nodes.push_back(&n); }
        };
 
@@ -83,6 +85,7 @@ private:
 
                DeclarationCombiner();
 
+               using Visitor::visit;
                virtual void visit(ProgramSyntax::Block &);
                virtual void visit(ProgramSyntax::FunctionDeclaration &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);
@@ -101,6 +104,7 @@ private:
                VariableResolver();
 
                virtual void apply(ProgramSyntax::Stage &);
+               using Visitor::visit;
                virtual void visit(ProgramSyntax::Block &);
                virtual void visit(ProgramSyntax::VariableReference &);
                virtual void visit(ProgramSyntax::MemberAccess &);
@@ -115,6 +119,7 @@ private:
        {
                std::map<std::string, std::vector<ProgramSyntax::FunctionDeclaration *> > functions;
 
+               using Visitor::visit;
                virtual void visit(ProgramSyntax::FunctionCall &);
                virtual void visit(ProgramSyntax::FunctionDeclaration &);
        };
@@ -128,6 +133,7 @@ private:
 
                void flatten_block(ProgramSyntax::Block &);
                void apply_and_increment(ProgramSyntax::Block &, std::list<RefPtr<ProgramSyntax::Node> >::iterator &);
+               using Visitor::visit;
                virtual void visit(ProgramSyntax::Block &);
        };
 
@@ -142,6 +148,7 @@ private:
 
                static std::string get_out_prefix(ProgramSyntax::StageType);
                virtual void apply(ProgramSyntax::Stage &);
+               using Visitor::visit;
                virtual void visit(ProgramSyntax::Block &);
                std::string change_prefix(const std::string &, const std::string &) const;
                bool generate_interface(ProgramSyntax::VariableDeclaration &, const std::string &, const std::string &);
@@ -153,6 +160,7 @@ private:
 
        struct VariableRenamer: Visitor
        {
+               using Visitor::visit;
                virtual void visit(ProgramSyntax::VariableReference &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);
        };
@@ -172,6 +180,7 @@ private:
 
                DeclarationReorderer();
 
+               using Visitor::visit;
                virtual void visit(ProgramSyntax::Block &);
                virtual void visit(ProgramSyntax::InterfaceLayout &) { kind = LAYOUT; }
                virtual void visit(ProgramSyntax::StructDeclaration &) { kind = STRUCT; }
@@ -191,6 +200,7 @@ private:
                InlineableFunctionLocator();
 
                const ResultType &get_result() const { return inlineable; }
+               using Visitor::visit;
                virtual void visit(ProgramSyntax::FunctionCall &);
                virtual void visit(ProgramSyntax::FunctionDeclaration &);
        };
@@ -205,6 +215,7 @@ private:
                FunctionInliner(const std::set<ProgramSyntax::FunctionDeclaration *> &);
 
                void visit_and_inline(RefPtr<ProgramSyntax::Expression> &);
+               using Visitor::visit;
                virtual void visit(ProgramSyntax::Block &);
                virtual void visit(ProgramSyntax::UnaryExpression &);
                virtual void visit(ProgramSyntax::BinaryExpression &);
@@ -223,6 +234,7 @@ private:
                ExpressionEvaluator();
                ExpressionEvaluator(const ValueMap &);
 
+               using ProgramSyntax::NodeVisitor::visit;
                virtual void visit(ProgramSyntax::Literal &);
                virtual void visit(ProgramSyntax::ParenthesizedExpression &);
                virtual void visit(ProgramSyntax::VariableReference &);
@@ -237,6 +249,7 @@ private:
 
                ConstantConditionEliminator();
 
+               using Visitor::visit;
                virtual void visit(ProgramSyntax::Block &);
                virtual void visit(ProgramSyntax::Assignment &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);
@@ -246,38 +259,44 @@ 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 global_scope;
 
                UnusedVariableLocator();
 
                virtual void apply(ProgramSyntax::Stage &);
                const ResultType &get_result() const { return unused_nodes; }
+               using Visitor::visit;
                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);
+               void clear_assignments(VariableInfo &, 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();
+               void merge_down_variables();
                virtual void visit(ProgramSyntax::Conditional &);
                virtual void visit(ProgramSyntax::Iteration &);
        };
@@ -290,6 +309,7 @@ private:
                std::set<ProgramSyntax::FunctionDeclaration *> used_definitions;
 
                const ResultType &get_result() const { return unused_nodes; }
+               using Visitor::visit;
                virtual void visit(ProgramSyntax::FunctionCall &);
                virtual void visit(ProgramSyntax::FunctionDeclaration &);
        };
@@ -301,6 +321,7 @@ private:
                NodeRemover() { }
                NodeRemover(const std::set<ProgramSyntax::Node *> &);
 
+               using Visitor::visit;
                virtual void visit(ProgramSyntax::Block &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);
        };
@@ -315,6 +336,7 @@ private:
                LegacyConverter(const Version &);
 
                bool check_version(const Version &);
+               using Visitor::visit;
                virtual void visit(ProgramSyntax::VariableReference &);
                virtual void visit(ProgramSyntax::FunctionCall &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);