X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.h;h=3b558bd195c5cf6a9f0e68d57127d1d8159aa9b0;hb=3a1fe833ea04df75449706f1d773f6e65521a392;hp=6fe1868ca8221a4619fc30cb889524b68f7b9f9e;hpb=4c805f55d89919d6971d600102ab4d6d65d56dc3;p=libs%2Fgl.git

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index 6fe1868c..3b558bd1 100644
--- a/source/glsl/visitor.h
+++ b/source/glsl/visitor.h
@@ -23,9 +23,11 @@ public:
 	virtual void visit(VariableReference &) { }
 	virtual void visit(InterfaceBlockReference &) { }
 	virtual void visit(MemberAccess &) { }
+	virtual void visit(Swizzle &) { }
 	virtual void visit(UnaryExpression &) { }
 	virtual void visit(BinaryExpression &) { }
 	virtual void visit(Assignment &) { }
+	virtual void visit(TernaryExpression &) { }
 	virtual void visit(FunctionCall &) { }
 	virtual void visit(ExpressionStatement &) { }
 	virtual void visit(Import &) { }
@@ -56,11 +58,14 @@ protected:
 public:
 	virtual void enter(Block &) { }
 	virtual void visit(Block &);
+	virtual void visit(RefPtr<Expression> &);
 	virtual void visit(ParenthesizedExpression &);
 	virtual void visit(MemberAccess &);
+	virtual void visit(Swizzle &);
 	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
+	virtual void visit(TernaryExpression &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(ExpressionStatement &);
 	virtual void visit(InterfaceLayout &);
@@ -74,20 +79,6 @@ public:
 	virtual void visit(Return &);
 };
 
-/** Gathers nodes of a particular type from the syntax tree. */
-template<typename T>
-class NodeGatherer: private TraversingVisitor
-{
-private:
-	std::vector<T *> nodes;
-
-public:
-	const std::vector<T *> &apply(Stage &s) { s.content.visit(*this); return nodes; }
-
-private:
-	virtual void visit(T &n) { nodes.push_back(&n); }
-};
-
 /** Removes a set of nodes from the syntax tree. */
 class NodeRemover: private TraversingVisitor
 {