Index: src/SynTree/AddStmtVisitor.cc
===================================================================
--- src/SynTree/AddStmtVisitor.cc	(revision 51fcaf8df28d845472ddec8c08cdb4b238f2aa9c)
+++ src/SynTree/AddStmtVisitor.cc	(revision 51fcaf8df28d845472ddec8c08cdb4b238f2aa9c)
@@ -0,0 +1,96 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// AddStmtVisitor.cc --
+//
+// Author           : Rob Schluntz
+// Created On       : Wed Jun 22 12:11:17 2016
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jun 22 12:16:29 2016
+// Update Count     : 11
+//
+
+#include "AddStmtVisitor.h"
+#include "Statement.h"
+#include "Declaration.h"
+#include "Expression.h"
+#include "Common/utility.h"
+
+void AddStmtVisitor::visitStatementList( std::list< Statement* > &statements ) {
+	for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
+		if ( ! stmtsToAddAfter.empty() ) {
+			statements.splice( i, stmtsToAddAfter );
+		} // if
+		(*i)->accept( *this );
+		if ( ! stmtsToAdd.empty() ) {
+			statements.splice( i, stmtsToAdd );
+		} // if
+	} // for
+	if ( ! stmtsToAddAfter.empty() ) {
+		statements.splice( statements.end(), stmtsToAddAfter );
+	} // if
+}
+
+Statement * AddStmtVisitor::visitStatement( Statement *stmt ) {
+	maybeAccept( stmt, *this );
+	if ( ! stmtsToAdd.empty() || ! stmtsToAddAfter.empty() ) {
+		CompoundStmt *compound = new CompoundStmt( noLabels );
+		compound->get_kids().splice( compound->get_kids().end(), stmtsToAdd );
+		compound->get_kids().push_back( stmt );
+		compound->get_kids().splice( compound->get_kids().end(), stmtsToAddAfter );
+		return compound;
+	} else {
+		return stmt;
+	}
+}
+
+void AddStmtVisitor::visit(CompoundStmt *compoundStmt) {
+	visitStatementList( compoundStmt->get_kids() );
+}
+
+void AddStmtVisitor::visit(IfStmt *ifStmt) {
+	ifStmt->set_thenPart( visitStatement( ifStmt->get_thenPart() ) );
+	ifStmt->set_elsePart( visitStatement( ifStmt->get_elsePart() ) );
+	maybeAccept( ifStmt->get_condition(), *this );
+}
+
+void AddStmtVisitor::visit(WhileStmt *whileStmt) {
+	whileStmt->set_body( visitStatement( whileStmt->get_body() ) );
+	maybeAccept( whileStmt->get_condition(), *this );
+}
+
+void AddStmtVisitor::visit(ForStmt *forStmt) {
+	forStmt->set_body( visitStatement( forStmt->get_body() ) );
+	acceptAll( forStmt->get_initialization(), *this );
+	maybeAccept( forStmt->get_condition(), *this );
+	maybeAccept( forStmt->get_increment(), *this );
+}
+
+void AddStmtVisitor::visit(SwitchStmt *switchStmt) {
+	visitStatementList( switchStmt->get_branches() );
+	maybeAccept( switchStmt->get_condition(), *this );
+}
+
+void AddStmtVisitor::visit(ChooseStmt *switchStmt) {
+	visitStatementList( switchStmt->get_branches() );
+	maybeAccept( switchStmt->get_condition(), *this );
+}
+
+void AddStmtVisitor::visit(CaseStmt *caseStmt) {
+	visitStatementList( caseStmt->get_statements() );
+	maybeAccept( caseStmt->get_condition(), *this );
+}
+
+void AddStmtVisitor::visit(CatchStmt *catchStmt) {
+	catchStmt->set_body( visitStatement( catchStmt->get_body() ) );
+	maybeAccept( catchStmt->get_decl(), *this );
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/SynTree/AddStmtVisitor.h
===================================================================
--- src/SynTree/AddStmtVisitor.h	(revision 51fcaf8df28d845472ddec8c08cdb4b238f2aa9c)
+++ src/SynTree/AddStmtVisitor.h	(revision 51fcaf8df28d845472ddec8c08cdb4b238f2aa9c)
@@ -0,0 +1,45 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// AddStmtVisitor.h --
+//
+// Author           : Rob Schluntz
+// Created On       : Wed Jun 22 12:05:48 2016
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jun 22 12:12:05 2016
+// Update Count     : 7
+//
+
+#ifndef ADD_STATEMENT_VISITOR_H
+#define ADD_STATEMENT_VISITOR_H
+
+#include <list>
+
+#include "SynTree/SynTree.h"
+#include "SynTree/Visitor.h"
+
+class AddStmtVisitor : public Visitor {
+  public:
+	typedef Visitor Parent;
+
+	using Parent::visit;
+	virtual void visit(CompoundStmt *compoundStmt);
+	virtual void visit(IfStmt *ifStmt);
+	virtual void visit(WhileStmt *whileStmt);
+	virtual void visit(ForStmt *forStmt);
+	virtual void visit(SwitchStmt *switchStmt);
+	virtual void visit(ChooseStmt *chooseStmt);
+	virtual void visit(CaseStmt *caseStmt);
+	virtual void visit(CatchStmt *catchStmt);
+
+  protected:
+	void visitStatementList( std::list< Statement * > & );
+	Statement * visitStatement( Statement * );
+	std::list< Statement* > stmtsToAdd;
+	std::list< Statement* > stmtsToAddAfter;
+};
+
+#endif // ADD_STATEMENT_VISITOR_H
Index: src/SynTree/module.mk
===================================================================
--- src/SynTree/module.mk	(revision 0f8e4ac628ebde73ac11e8dfa6bd2e532f3627f6)
+++ src/SynTree/module.mk	(revision 51fcaf8df28d845472ddec8c08cdb4b238f2aa9c)
@@ -46,4 +46,5 @@
        SynTree/Visitor.cc \
        SynTree/Mutator.cc \
+       SynTree/AddStmtVisitor.cc \
        SynTree/TypeSubstitution.cc \
        SynTree/Attribute.cc