Derive ProgramCompiler::DeclarationCombiner from BlockModifier

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

diff --git a/source/programcompiler.h b/source/programcompiler.h
index daf2a5db7904988f9e782e300b25e88ebcc47835..6b1e1cdafe79f9be2ad0df6858cd89b95942e859 100644 (file)
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -26,6 +26,19 @@ private:
                void get_result() const { }
        };
 
+       struct BlockModifier: Visitor
+       {
+               bool remove_node;
+               std::list<RefPtr<ProgramSyntax::Node> > insert_nodes;
+
+               BlockModifier();
+
+               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 &);
+       };
+
        struct Formatter: Visitor
        {
                typedef std::string ResultType;
@@ -77,12 +90,11 @@ private:
                virtual void visit(T &n) { nodes.push_back(&n); }
        };
 
-       struct DeclarationCombiner: Visitor
+       struct DeclarationCombiner: BlockModifier
        {
                bool toplevel;
                std::map<std::string, std::vector<ProgramSyntax::FunctionDeclaration *> > functions;
                std::map<std::string, ProgramSyntax::VariableDeclaration *> variables;
-               bool remove_node;
 
                DeclarationCombiner();
 
@@ -125,19 +137,6 @@ private:
                virtual void visit(ProgramSyntax::FunctionDeclaration &);
        };
 
-       struct BlockModifier: Visitor
-       {
-               bool remove_node;
-               std::list<RefPtr<ProgramSyntax::Node> > insert_nodes;
-
-               BlockModifier();
-
-               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 &);
-       };
-
        struct InterfaceGenerator: BlockModifier
        {
                std::string in_prefix;