Refactor block management in NodeRemover

[libs/gl.git] / source / glsl / visitor.h

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index 8bfcac0fd490b85bb2db1c32dfca371a4e786363..685bb4eef7a8ee09745f0e026e57687b78491d36 100644 (file)
--- a/source/glsl/visitor.h
+++ b/source/glsl/visitor.h
@@ -44,10 +44,12 @@ public:
 class TraversingVisitor: public NodeVisitor
 {
 protected:
-       TraversingVisitor() { }
+       Block *current_block;
+
+       TraversingVisitor(): current_block(0) { }
 
 public:
-       using NodeVisitor::visit;
+       virtual void enter(Block &) { }
        virtual void visit(Block &);
        virtual void visit(ParenthesizedExpression &);
        virtual void visit(MemberAccess &);
@@ -66,22 +68,6 @@ public:
        virtual void visit(Return &);
 };
 
-class BlockModifier: public TraversingVisitor
-{
-protected:
-       bool remove_node;
-       std::vector<RefPtr<Statement> > insert_nodes;
-
-       BlockModifier();
-
-       void flatten_block(Block &);
-       void apply_and_increment(Block &, NodeList<Statement>::iterator &);
-
-public:
-       using TraversingVisitor::visit;
-       virtual void visit(Block &);
-};
-
 template<typename T>
 class NodeGatherer: private TraversingVisitor
 {
@@ -89,10 +75,9 @@ private:
        std::vector<T *> nodes;
 
 public:
-       const std::vector<T *> &apply(Stage &s) { nodes.clear(); visit(s.content); return nodes; }
+       const std::vector<T *> &apply(Stage &s) { s.content.visit(*this); return nodes; }
 
 private:
-       using TraversingVisitor::visit;
        virtual void visit(T &n) { nodes.push_back(&n); }
 };
 
@@ -101,6 +86,8 @@ class NodeRemover: private TraversingVisitor
 private:
        Stage *stage;
        const std::set<Node *> *to_remove;
+       bool anonymous;
+       bool recursive_remove;
 
 public:
        NodeRemover();
@@ -108,9 +95,12 @@ public:
        void apply(Stage &, const std::set<Node *> &);
 
 private:
-       using TraversingVisitor::visit;
+       void remove_variable(std::map<std::string, VariableDeclaration *> &, VariableDeclaration &);
+
        virtual void visit(Block &);
+       virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
+       virtual void visit(InterfaceBlock &);
        virtual void visit(Iteration &);
 };