Further reduce overhead of applying ProgramCompiler visitors

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

diff --git a/source/programcompiler.h b/source/programcompiler.h
index a2dd9401256a34c7659800765f8cf25ca56a8313..2ef4aa7d9b77c5f853968da6e4e9dbc310c9abec 100644 (file)
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -15,15 +15,20 @@ class ProgramCompiler
 private:
        struct Visitor: ProgramSyntax::TraversingVisitor
        {
+               typedef void ResultType;
+
                ProgramSyntax::Stage *stage;
 
                Visitor();
 
                virtual void apply(ProgramSyntax::Stage &);
+               void get_result() const { }
        };
 
        struct Formatter: Visitor
        {
+               typedef std::string ResultType;
+
                std::string formatted;
                unsigned indent;
                bool parameter_list;
@@ -32,6 +37,7 @@ private:
 
                Formatter();
 
+               const std::string &get_result() const { return formatted; }
                virtual void visit(ProgramSyntax::Block &);
                virtual void visit(ProgramSyntax::Literal &);
                virtual void visit(ProgramSyntax::ParenthesizedExpression &);
@@ -112,6 +118,7 @@ private:
                        bool self_referencing;
                };
 
+               typedef std::set<ProgramSyntax::Node *> ResultType;
                typedef std::map<ProgramSyntax::VariableDeclaration *, AssignmentList> BlockAssignmentMap;
 
                std::set<ProgramSyntax::Node *> unused_nodes;
@@ -124,6 +131,7 @@ private:
                UnusedVariableLocator();
 
                virtual void apply(ProgramSyntax::Stage &);
+               const ResultType &get_result() const { return unused_nodes; }
                virtual void visit(ProgramSyntax::VariableReference &);
                virtual void visit(ProgramSyntax::MemberAccess &);
                virtual void visit(ProgramSyntax::BinaryExpression &);
@@ -143,6 +151,9 @@ private:
        {
                std::set<ProgramSyntax::Node *> to_remove;
 
+               NodeRemover() { }
+               NodeRemover(const std::set<ProgramSyntax::Node *> &);
+
                virtual void visit(ProgramSyntax::Block &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);
        };
@@ -166,8 +177,9 @@ private:
        bool optimize(ProgramSyntax::Stage &);
        static void inject_block(ProgramSyntax::Block &, const ProgramSyntax::Block &);
        template<typename T>
-       static void apply(ProgramSyntax::Stage &);
-       std::string create_source(ProgramSyntax::Stage &);
+       static typename T::ResultType apply(ProgramSyntax::Stage &);
+       template<typename T, typename A>
+       static typename T::ResultType apply(ProgramSyntax::Stage &, const A &);
 };
 
 } // namespace GL