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

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index 30b9b484..2503a15e 100644
--- a/source/glsl/visitor.h
+++ b/source/glsl/visitor.h
@@ -13,19 +13,19 @@ 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 &) { }
@@ -36,7 +36,6 @@ public:
 	virtual void visit(ImageTypeDeclaration &) { }
 	virtual void visit(StructDeclaration &) { }
 	virtual void visit(VariableDeclaration &) { }
-	virtual void visit(InterfaceBlock &) { }
 	virtual void visit(FunctionDeclaration &) { }
 	virtual void visit(Conditional &) { }
 	virtual void visit(Iteration &) { }
@@ -49,24 +48,25 @@ 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 &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
 	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
@@ -78,13 +78,10 @@ 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;
 
 public:
-	NodeRemover();
-
 	void apply(Stage &, const std::set<Node *> &);
 
 private:
@@ -95,9 +92,8 @@ private:
 	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(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
 	virtual void visit(Iteration &);
 };
@@ -107,12 +103,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: