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

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index 582628bb..35dce524 100644
--- a/source/glsl/visitor.h
+++ b/source/glsl/visitor.h
@@ -44,7 +44,9 @@ public:
 class TraversingVisitor: public NodeVisitor
 {
 protected:
-	TraversingVisitor() { }
+	Block *current_block;
+
+	TraversingVisitor(): current_block(0) { }
 
 public:
 	using NodeVisitor::visit;
@@ -66,64 +68,42 @@ 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) { nodes.clear(); visit(s.content); return nodes; }
+
+private:
+	using TraversingVisitor::visit;
 	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;
+	std::vector<Block *> blocks;
+	bool anonymous;
+	bool recursive_remove;
 
 public:
-	NodeRemover() { }
-	NodeRemover(const std::set<Node *> &);
+	NodeRemover();
 
-	using StageVisitor::visit;
+	void apply(Stage &, const std::set<Node *> &);
+
+private:
+	void remove_variable(std::map<std::string, VariableDeclaration *> &, VariableDeclaration &);
+
+	using TraversingVisitor::visit;
 	virtual void visit(Block &);
+	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &);
 	virtual void visit(Iteration &);
 };