X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.h;h=6fe1868ca8221a4619fc30cb889524b68f7b9f9e;hb=02c43c5aebb2214af8144eaf19f25b9a04aa2414;hp=83b310f62ebadbcef621a9b8d1aa65eb571e59c1;hpb=39141d961e55f56d540b3678f9f8fe94868f2652;p=libs%2Fgl.git

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index 83b310f6..6fe1868c 100644
--- a/source/glsl/visitor.h
+++ b/source/glsl/visitor.h
@@ -25,13 +25,15 @@ public:
 	virtual void visit(MemberAccess &) { }
 	virtual void visit(UnaryExpression &) { }
 	virtual void visit(BinaryExpression &) { }
-	virtual void visit(Assignment &);
+	virtual void visit(Assignment &) { }
 	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 &) { }
@@ -58,6 +60,7 @@ public:
 	virtual void visit(MemberAccess &);
 	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
+	virtual void visit(Assignment &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(ExpressionStatement &);
 	virtual void visit(InterfaceLayout &);
@@ -103,13 +106,33 @@ 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 &);
 	virtual void visit(Iteration &);
 };
 
+/** Reorders a set of nodes so they appear before another node.  Only nodes
+on the same hierarchly level as the target node are reordered. */
+class NodeReorderer: private TraversingVisitor
+{
+private:
+	Node *reorder_before;
+	const std::set<Node *> *to_reorder;
+
+public:
+	NodeReorderer();
+
+	void apply(Stage &, Node &, const std::set<Node *> &);
+
+private:
+	virtual void visit(Block &);
+};
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp