X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.h;h=a26e785c741e3b97e643d78f6353742feca04dd2;hb=bd8816692056230c36504dcccd76c6946dff47b1;hp=e1c45b5c89de152976cfd94549c018f8e7607116;hpb=1fa69bb8eec3070f5da296d6dd0bd67aea62d3bf;p=libs%2Fgl.git diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h index e1c45b5c..a26e785c 100644 --- 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 > insert_nodes; - - BlockModifier(); - - void flatten_block(Block &); - void apply_and_increment(Block &, NodeList::iterator &); - -public: - using TraversingVisitor::visit; - virtual void visit(Block &); -}; - template -class NodeGatherer: public TraversingVisitor +class NodeGatherer: private TraversingVisitor { private: std::vector nodes; public: - const std::vector &apply(Stage &s) { visit(s.content); return nodes; } + const std::vector &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 to_remove; + const std::set *to_remove; + bool recursive_remove; public: - NodeRemover(const std::set &); + NodeRemover(); - void apply(Stage &); + void apply(Stage &, const std::set &); + +private: + template + void remove_from_map(std::map &, 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 &); };