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

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index cd9dafb0..3b558bd1 100644
--- a/source/glsl/visitor.h
+++ b/source/glsl/visitor.h
@@ -23,15 +23,19 @@ 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 &) { }
 	virtual void visit(Precision &) { }
 	virtual void visit(Layout &) { }
 	virtual void visit(InterfaceLayout &) { }
+	virtual void visit(BasicTypeDeclaration &) { }
+	virtual void visit(ImageTypeDeclaration &) { }
 	virtual void visit(StructDeclaration &) { }
 	virtual void visit(VariableDeclaration &) { }
 	virtual void visit(InterfaceBlock &) { }
@@ -54,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 &);
@@ -72,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
 {
@@ -104,7 +97,10 @@ private:
 	void remove_from_map(std::map<std::string, T *> &, const std::string &, T &);
 
 	virtual void visit(Block &);
-	virtual void visit(StructDeclaration &);
+	void visit(TypeDeclaration &);
+	virtual void visit(BasicTypeDeclaration &t) { visit(static_cast<TypeDeclaration &>(t)); }
+	virtual void visit(ImageTypeDeclaration &t) { visit(static_cast<TypeDeclaration &>(t)); }
+	virtual void visit(StructDeclaration &t) { visit(static_cast<TypeDeclaration &>(t)); }
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);