Improve support for interface blocks

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

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index e1c45b5c89de152976cfd94549c018f8e7607116..a26e785c741e3b97e643d78f6353742feca04dd2 100644 (file)
--- a/source/glsl/visitor.h
+++ b/source/glsl/visitor.h
@@ -20,6 +20,7 @@ public:
        virtual void visit(Literal &) { }
        virtual void visit(ParenthesizedExpression &) { }
        virtual void visit(VariableReference &) { }
+       virtual void visit(InterfaceBlockReference &) { }
        virtual void visit(MemberAccess &) { }
        virtual void visit(UnaryExpression &) { }
        virtual void visit(BinaryExpression &) { }
@@ -44,10 +45,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,49 +69,39 @@ 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: public TraversingVisitor
+class NodeGatherer: private TraversingVisitor
 {
 private:
        std::vector<T *> nodes;
 
 public:
-       const std::vector<T *> &apply(Stage &s) { visit(s.content); return nodes; }
+       const std::vector<T *> &apply(Stage &s) { s.content.visit(*this); return nodes; }
 
-       using TraversingVisitor::visit;
+private:
        virtual void visit(T &n) { nodes.push_back(&n); }
 };
 
-class NodeRemover: public TraversingVisitor
+class NodeRemover: private TraversingVisitor
 {
 private:
        Stage *stage;
-       std::set<Node *> to_remove;
+       const std::set<Node *> *to_remove;
+       bool recursive_remove;
 
 public:
-       NodeRemover(const std::set<Node *> &);
+       NodeRemover();
 
-       void apply(Stage &);
+       void apply(Stage &, const std::set<Node *> &);
+
+private:
+       template<typename T>
+       void remove_from_map(std::map<std::string, T *> &, const std::string &, T &);
 
-       using TraversingVisitor::visit;
        virtual void visit(Block &);
+       virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
+       virtual void visit(InterfaceBlock &);
        virtual void visit(Iteration &);
 };