X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.h;h=622a4834910d9d1f1a1f8e74db8c06af6c29a506;hp=4e48a1a11f112205ec10feedf2017d6c7099ddd1;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=30465dd3b9f55ec42c4b19c3c2077eede7237a26

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index 4e48a1a1..622a4834 100644
--- a/source/glsl/visitor.h
+++ b/source/glsl/visitor.h
@@ -13,25 +13,28 @@ namespace SL {
 class NodeVisitor
 {
 protected:
-	NodeVisitor() { }
+	NodeVisitor() = default;
 public:
-	virtual ~NodeVisitor() { }
+	virtual ~NodeVisitor() = default;
 
 	virtual void visit(Block &) { }
 	virtual void visit(Literal &) { }
-	virtual void visit(ParenthesizedExpression &) { }
 	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(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 &) { }
@@ -47,17 +50,20 @@ public:
 class TraversingVisitor: public NodeVisitor
 {
 protected:
-	Block *current_block;
+	Block *current_block = 0;
 
-	TraversingVisitor(): current_block(0) { }
+	TraversingVisitor() = default;
 
 public:
 	virtual void enter(Block &) { }
 	virtual void visit(Block &);
-	virtual void visit(ParenthesizedExpression &);
+	virtual void visit(RefPtr<Expression> &);
 	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 &);
@@ -71,31 +77,15 @@ 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
 {
 private:
-	Stage *stage;
-	const std::set<Node *> *to_remove;
-	bool recursive_remove;
+	Stage *stage = 0;
+	const std::set<Node *> *to_remove = 0;
+	bool recursive_remove = false;
 
 public:
-	NodeRemover();
-
 	void apply(Stage &, const std::set<Node *> &);
 
 private:
@@ -103,12 +93,31 @@ 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 = 0;
+	const std::set<Node *> *to_reorder = 0;
+
+public:
+	void apply(Stage &, Node &, const std::set<Node *> &);
+
+private:
+	virtual void visit(Block &);
+};
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp