X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.h;h=a26e785c741e3b97e643d78f6353742feca04dd2;hb=b006be7a2eccaeff9647b5b403d7d0a4ff13da3b;hp=582628bbedc49ecfe695c9eacd7909d861bfa071;hpb=696a97bd7411d69953c1a9e4b5f3dfb4c1d848f1;p=libs%2Fgl.git

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index 582628bb..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,64 +69,39 @@ public:
 	virtual void visit(Return &);
 };
 
-class StageVisitor: public TraversingVisitor
-{
-public:
-	typedef void ResultType;
-
-protected:
-	Stage *stage;
-
-	StageVisitor();
-
-public:
-	virtual void apply(Stage &);
-	void get_result() const { }
-};
-
-class BlockModifier: public StageVisitor
-{
-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 StageVisitor::visit;
-	virtual void visit(Block &);
-};
-
 template<typename T>
-class NodeGatherer: public StageVisitor
+class NodeGatherer: private TraversingVisitor
 {
-public:
-	typedef std::vector<T *> ResultType;
-
 private:
 	std::vector<T *> nodes;
 
 public:
-	const ResultType &get_result() const { return nodes; }
-	using StageVisitor::visit;
+	const std::vector<T *> &apply(Stage &s) { s.content.visit(*this); return nodes; }
+
+private:
 	virtual void visit(T &n) { nodes.push_back(&n); }
 };
 
-class NodeRemover: public StageVisitor
+class NodeRemover: private TraversingVisitor
 {
 private:
-	std::set<Node *> to_remove;
+	Stage *stage;
+	const std::set<Node *> *to_remove;
+	bool recursive_remove;
 
 public:
-	NodeRemover() { }
-	NodeRemover(const std::set<Node *> &);
+	NodeRemover();
+
+	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 StageVisitor::visit;
 	virtual void visit(Block &);
+	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &);
 	virtual void visit(Iteration &);
 };