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

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index 9ca910be..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 &);
@@ -73,10 +76,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); }
 };
 
@@ -85,8 +87,6 @@ class NodeRemover: private TraversingVisitor
 private:
 	Stage *stage;
 	const std::set<Node *> *to_remove;
-	std::vector<Block *> blocks;
-	bool anonymous;
 	bool recursive_remove;
 
 public:
@@ -95,9 +95,9 @@ public:
 	void apply(Stage &, const std::set<Node *> &);
 
 private:
-	void remove_variable(std::map<std::string, VariableDeclaration *> &, VariableDeclaration &);
+	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 &);