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 0c87acf0b953a40198b60299f4288b57a0c59cbe..96fee471cc7e5351a59e7d51f9b3772862bcc195 100644 (file)
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -108,14 +108,32 @@ private:
                virtual void visit(ProgramSyntax::InterfaceBlock &);
        };
 
-       struct InterfaceGenerator: Visitor
+       struct FunctionResolver: Visitor
+       {
+               std::map<std::string, std::vector<ProgramSyntax::FunctionDeclaration *> > functions;
+
+               virtual void visit(ProgramSyntax::FunctionCall &);
+               virtual void visit(ProgramSyntax::FunctionDeclaration &);
+       };
+
+       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();
 
@@ -136,6 +154,37 @@ private:
                virtual void visit(ProgramSyntax::VariableDeclaration &);
        };
 
+       struct ExpressionEvaluator: ProgramSyntax::NodeVisitor
+       {
+               typedef std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Expression *> ValueMap;
+
+               const ValueMap *variable_values;
+               float result;
+               bool result_valid;
+
+               ExpressionEvaluator();
+               ExpressionEvaluator(const ValueMap &);
+
+               virtual void visit(ProgramSyntax::Literal &);
+               virtual void visit(ProgramSyntax::VariableReference &);
+               virtual void visit(ProgramSyntax::UnaryExpression &);
+               virtual void visit(ProgramSyntax::BinaryExpression &);
+       };
+
+       struct ConstantConditionEliminator: BlockModifier
+       {
+               unsigned scope_level;
+               ExpressionEvaluator::ValueMap variable_values;
+
+               ConstantConditionEliminator();
+
+               virtual void visit(ProgramSyntax::Block &);
+               virtual void visit(ProgramSyntax::Assignment &);
+               virtual void visit(ProgramSyntax::VariableDeclaration &);
+               virtual void visit(ProgramSyntax::Conditional &);
+               virtual void visit(ProgramSyntax::Iteration &);
+       };
+
        struct UnusedVariableLocator: Visitor
        {
                struct AssignmentList
@@ -174,6 +223,18 @@ private:
                virtual void visit(ProgramSyntax::Iteration &);
        };
 
+       struct UnusedFunctionLocator: Visitor
+       {
+               typedef std::set<ProgramSyntax::Node *> ResultType;
+
+               std::set<ProgramSyntax::Node *> unused_nodes;
+               std::set<ProgramSyntax::FunctionDeclaration *> used_definitions;
+
+               const ResultType &get_result() const { return unused_nodes; }
+               virtual void visit(ProgramSyntax::FunctionCall &);
+               virtual void visit(ProgramSyntax::FunctionDeclaration &);
+       };
+
        struct NodeRemover: Visitor
        {
                std::set<ProgramSyntax::Node *> to_remove;