Refactor block modification operations into an intermediate base class

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

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 8681d3638a032cabd389879922fe7378c4a45a76..96fee471cc7e5351a59e7d51f9b3772862bcc195 100644 (file)
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -116,14 +116,24 @@ private:
                virtual void visit(ProgramSyntax::FunctionDeclaration &);
        };
 
-       struct InterfaceGenerator: Visitor
+       struct BlockModifier: Visitor
+       {
+               bool remove_node;
+               std::list<ProgramSyntax::Node *> insert_nodes;
+
+               BlockModifier();
+
+               void flatten_block(ProgramSyntax::Block &);
+               void apply_and_increment(ProgramSyntax::Block &, std::list<ProgramSyntax::NodePtr<ProgramSyntax::Node> >::iterator &);
+               virtual void visit(ProgramSyntax::Block &);
+       };
+
+       struct InterfaceGenerator: BlockModifier
        {
                std::string in_prefix;
                std::string out_prefix;
                unsigned scope_level;
                std::map<std::string, ProgramSyntax::VariableDeclaration *> iface_declarations;
-               bool remove_node;
-               std::list<ProgramSyntax::Node *> insert_nodes;
 
                InterfaceGenerator();
 
@@ -161,12 +171,10 @@ private:
                virtual void visit(ProgramSyntax::BinaryExpression &);
        };
 
-       struct ConstantConditionEliminator: Visitor
+       struct ConstantConditionEliminator: BlockModifier
        {
                unsigned scope_level;
                ExpressionEvaluator::ValueMap variable_values;
-               bool remove_node;
-               ProgramSyntax::Block *replacement_block;
 
                ConstantConditionEliminator();