Make the modifier more flexible.

2 files changed, 10 insertions, 6 deletions

diff --git a/libjulia/optimiser/ASTWalker.cpp b/libjulia/optimiser/ASTWalker.cpp
index 786afbe0..0caef04e 100644
--- a/libjulia/optimiser/ASTWalker.cpp
+++ b/libjulia/optimiser/ASTWalker.cpp
@@ -104,24 +104,24 @@ void ASTModifier::operator()(Assignment& _assignment)
 {
 	for (auto& name: _assignment.variableNames)
 		(*this)(name);
-	boost::apply_visitor(*this, *_assignment.value);
+	visit(*_assignment.value);
 }
 
 void ASTModifier::operator()(VariableDeclaration& _varDecl)
 {
 	if (_varDecl.value)
-		boost::apply_visitor(*this, *_varDecl.value);
+		visit(*_varDecl.value);
 }
 
 void ASTModifier::operator()(If& _if)
 {
-	boost::apply_visitor(*this, *_if.condition);
+	visit(*_if.condition);
 	(*this)(_if.body);
 }
 
 void ASTModifier::operator()(Switch& _switch)
 {
-	boost::apply_visitor(*this, *_switch.expression);
+	visit(*_switch.expression);
 	for (auto& _case: _switch.cases)
 	{
 		if (_case.value)
@@ -138,7 +138,7 @@ void ASTModifier::operator()(FunctionDefinition& _fun)
 void ASTModifier::operator()(ForLoop& _for)
 {
 	(*this)(_for.pre);
-	boost::apply_visitor(*this, *_for.condition);
+	visit(*_for.condition);
 	(*this)(_for.post);
 	(*this)(_for.body);
 }
diff --git a/libjulia/optimiser/ASTWalker.h b/libjulia/optimiser/ASTWalker.h
index 01499a50..8bd867d5 100644
--- a/libjulia/optimiser/ASTWalker.h
+++ b/libjulia/optimiser/ASTWalker.h
@@ -92,7 +92,11 @@ protected:
 	void walkVector(T&& _statements)
 	{
 		for (auto& st: _statements)
-			boost::apply_visitor(*this, st);
+			visit(st);
+	}
+	virtual void visit(Statement& _st)
+	{
+		boost::apply_visitor(*this, _st);
 	}
 };