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

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index 35dce524..622a4834 100644
--- a/source/glsl/visitor.h
+++ b/source/glsl/visitor.h
@@ -9,27 +9,32 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
+/** Base class for all node visitors. */
 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 &) { }
@@ -41,20 +46,24 @@ public:
 	virtual void visit(Jump &) { }
 };
 
+/** An intermediate base visitor class which traverses the syntax tree. */
 class TraversingVisitor: public NodeVisitor
 {
 protected:
-	Block *current_block;
+	Block *current_block = 0;
 
-	TraversingVisitor(): current_block(0) { }
+	TraversingVisitor() = default;
 
 public:
-	using NodeVisitor::visit;
+	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 &);
@@ -68,43 +77,45 @@ public:
 	virtual void visit(Return &);
 };
 
-template<typename T>
-class NodeGatherer: private TraversingVisitor
+/** Removes a set of nodes from the syntax tree. */
+class NodeRemover: private TraversingVisitor
 {
 private:
-	std::vector<T *> nodes;
+	Stage *stage = 0;
+	const std::set<Node *> *to_remove = 0;
+	bool recursive_remove = false;
 
 public:
-	const std::vector<T *> &apply(Stage &s) { nodes.clear(); visit(s.content); return nodes; }
+	void apply(Stage &, const std::set<Node *> &);
 
 private:
-	using TraversingVisitor::visit;
-	virtual void visit(T &n) { nodes.push_back(&n); }
+	template<typename T>
+	void remove_from_map(std::map<std::string, T *> &, const std::string &, T &);
+
+	virtual void visit(Block &);
+	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 &);
 };
 
-class NodeRemover: private TraversingVisitor
+/** 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:
-	Stage *stage;
-	const std::set<Node *> *to_remove;
-	std::vector<Block *> blocks;
-	bool anonymous;
-	bool recursive_remove;
+	Node *reorder_before = 0;
+	const std::set<Node *> *to_reorder = 0;
 
 public:
-	NodeRemover();
-
-	void apply(Stage &, const std::set<Node *> &);
+	void apply(Stage &, Node &, const std::set<Node *> &);
 
 private:
-	void remove_variable(std::map<std::string, VariableDeclaration *> &, VariableDeclaration &);
-
-	using TraversingVisitor::visit;
 	virtual void visit(Block &);
-	virtual void visit(StructDeclaration &);
-	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
-	virtual void visit(Iteration &);
 };
 
 } // namespace SL