X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.h;h=622a4834910d9d1f1a1f8e74db8c06af6c29a506;hb=3fe1aab63922eec99d8bf6fd4fd60bec10df173c;hp=30b9b484aa9a86948a9a0ae9604ace91c7ea5d1b;hpb=cd01b904990d306eadd120f306b1d0ceb4d8f5c8;p=libs%2Fgl.git

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index 30b9b484..622a4834 100644
--- a/source/glsl/visitor.h
+++ b/source/glsl/visitor.h
@@ -13,19 +13,20 @@ 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(TernaryExpression &) { }
 	virtual void visit(FunctionCall &) { }
 	virtual void visit(ExpressionStatement &) { }
 	virtual void visit(Import &) { }
@@ -49,18 +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 &);
@@ -78,13 +81,11 @@ public:
 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:
@@ -107,12 +108,10 @@ 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;
+	Node *reorder_before = 0;
+	const std::set<Node *> *to_reorder = 0;
 
 public:
-	NodeReorderer();
-
 	void apply(Stage &, Node &, const std::set<Node *> &);
 
 private: