Index: src/SynTree/Statement.cc
===================================================================
--- src/SynTree/Statement.cc	(revision 4737d8eaf9f9804db83080519e528549133d6a34)
+++ src/SynTree/Statement.cc	(revision 0608e007303c4e31c9edfc18e6aead6e4c2a409d)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep  3 20:46:44 2017
-// Update Count     : 68
+// Last Modified On : Fri Jan 10 14:20:47 2020
+// Update Count     : 70
 //
 
@@ -46,7 +46,7 @@
 Statement::~Statement() {}
 
-ExprStmt::ExprStmt( Expression *expr ) : Statement(), expr( expr ) {}
-
-ExprStmt::ExprStmt( const ExprStmt &other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
+ExprStmt::ExprStmt( Expression * expr ) : Statement(), expr( expr ) {}
+
+ExprStmt::ExprStmt( const ExprStmt & other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
 
 ExprStmt::~ExprStmt() {
@@ -54,5 +54,5 @@
 }
 
-void ExprStmt::print( std::ostream &os, Indenter indent ) const {
+void ExprStmt::print( std::ostream & os, Indenter indent ) const {
 	os << "Expression Statement:" << endl << indent+1;
 	expr->print( os, indent+1 );
@@ -60,5 +60,5 @@
 
 
-AsmStmt::AsmStmt( bool voltile, Expression *instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels ) : Statement(), voltile( voltile ), instruction( instruction ), output( output ), input( input ), clobber( clobber ), gotolabels( gotolabels ) {}
+AsmStmt::AsmStmt( bool voltile, Expression * instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels ) : Statement(), voltile( voltile ), instruction( instruction ), output( output ), input( input ), clobber( clobber ), gotolabels( gotolabels ) {}
 
 AsmStmt::AsmStmt( const AsmStmt & other ) : Statement( other ), voltile( other.voltile ), instruction( maybeClone( other.instruction ) ), gotolabels( other.gotolabels ) {
@@ -75,5 +75,5 @@
 }
 
-void AsmStmt::print( std::ostream &os, Indenter indent ) const {
+void AsmStmt::print( std::ostream & os, Indenter indent ) const {
 	os << "Assembler Statement:" << endl;
 	os << indent+1 << "instruction: " << endl << indent;
@@ -96,10 +96,10 @@
 DirectiveStmt::DirectiveStmt( const std::string & directive ) : Statement(), directive( directive ) {}
 
-void DirectiveStmt::print( std::ostream &os, Indenter ) const {
+void DirectiveStmt::print( std::ostream & os, Indenter ) const {
 	os << "GCC Directive:" << directive << endl;
 }
 
 
-const char *BranchStmt::brType[] = { "Goto", "Break", "Continue" };
+const char * BranchStmt::brType[] = { "Goto", "Break", "Continue" };
 
 BranchStmt::BranchStmt( Label target, Type type ) throw ( SemanticErrorException ) :
@@ -111,5 +111,5 @@
 }
 
-BranchStmt::BranchStmt( Expression *computedTarget, Type type ) throw ( SemanticErrorException ) :
+BranchStmt::BranchStmt( Expression * computedTarget, Type type ) throw ( SemanticErrorException ) :
 	Statement(), computedTarget( computedTarget ), type( type ) {
 	if ( type != BranchStmt::Goto || computedTarget == nullptr ) {
@@ -118,5 +118,5 @@
 }
 
-void BranchStmt::print( std::ostream &os, Indenter indent ) const {
+void BranchStmt::print( std::ostream & os, Indenter indent ) const {
 	os << "Branch (" << brType[type] << ")" << endl ;
 	if ( target != "" ) os << indent+1 << "with target: " << target << endl;
@@ -125,5 +125,5 @@
 }
 
-ReturnStmt::ReturnStmt( Expression *expr ) : Statement(), expr( expr ) {}
+ReturnStmt::ReturnStmt( Expression * expr ) : Statement(), expr( expr ) {}
 
 ReturnStmt::ReturnStmt( const ReturnStmt & other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
@@ -133,5 +133,5 @@
 }
 
-void ReturnStmt::print( std::ostream &os, Indenter indent ) const {
+void ReturnStmt::print( std::ostream & os, Indenter indent ) const {
 	os << "Return Statement, returning: ";
 	if ( expr != nullptr ) {
@@ -142,5 +142,5 @@
 }
 
-IfStmt::IfStmt( Expression *condition, Statement *thenPart, Statement *elsePart, std::list<Statement *> initialization ):
+IfStmt::IfStmt( Expression * condition, Statement * thenPart, Statement * elsePart, std::list<Statement *> initialization ):
 	Statement(), condition( condition ), thenPart( thenPart ), elsePart( elsePart ), initialization( initialization ) {}
 
@@ -157,5 +157,5 @@
 }
 
-void IfStmt::print( std::ostream &os, Indenter indent ) const {
+void IfStmt::print( std::ostream & os, Indenter indent ) const {
 	os << "If on condition: " << endl;
 	os << indent+1;
@@ -176,5 +176,5 @@
 	thenPart->print( os, indent+1 );
 
-	if ( elsePart != 0 ) {
+	if ( elsePart != nullptr ) {
 		os << indent << "... else: " << endl;
 		os << indent+1;
@@ -183,5 +183,5 @@
 }
 
-SwitchStmt::SwitchStmt( Expression * condition, const std::list<Statement *> &statements ):
+SwitchStmt::SwitchStmt( Expression * condition, const std::list<Statement *> & statements ):
 	Statement(), condition( condition ), statements( statements ) {
 }
@@ -198,5 +198,5 @@
 }
 
-void SwitchStmt::print( std::ostream &os, Indenter indent ) const {
+void SwitchStmt::print( std::ostream & os, Indenter indent ) const {
 	os << "Switch on condition: ";
 	condition->print( os );
@@ -208,7 +208,7 @@
 }
 
-CaseStmt::CaseStmt( Expression *condition, const std::list<Statement *> &statements, bool deflt ) throw ( SemanticErrorException ) :
+CaseStmt::CaseStmt( Expression * condition, const std::list<Statement *> & statements, bool deflt ) throw ( SemanticErrorException ) :
 	Statement(), condition( condition ), stmts( statements ), _isDefault( deflt ) {
-	if ( isDefault() && condition != 0 ) SemanticError( condition, "default case with condition: " );
+	if ( isDefault() && condition != nullptr ) SemanticError( condition, "default case with condition: " );
 }
 
@@ -229,5 +229,5 @@
 }
 
-void CaseStmt::print( std::ostream &os, Indenter indent ) const {
+void CaseStmt::print( std::ostream & os, Indenter indent ) const {
 	if ( isDefault() ) os << indent << "Default ";
 	else {
@@ -243,5 +243,5 @@
 }
 
-WhileStmt::WhileStmt( Expression *condition, Statement *body, std::list< Statement * > & initialization, bool isDoWhile ):
+WhileStmt::WhileStmt( Expression * condition, Statement * body, std::list< Statement * > & initialization, bool isDoWhile ):
 	Statement(), condition( condition), body( body), initialization( initialization ), isDoWhile( isDoWhile) {
 }
@@ -256,5 +256,5 @@
 }
 
-void WhileStmt::print( std::ostream &os, Indenter indent ) const {
+void WhileStmt::print( std::ostream & os, Indenter indent ) const {
 	os << "While on condition: " << endl ;
 	condition->print( os, indent+1 );
@@ -262,8 +262,8 @@
 	os << indent << "... with body: " << endl;
 
-	if ( body != 0 ) body->print( os, indent+1 );
-}
-
-ForStmt::ForStmt( std::list<Statement *> initialization, Expression *condition, Expression *increment, Statement *body ):
+	if ( body != nullptr ) body->print( os, indent+1 );
+}
+
+ForStmt::ForStmt( std::list<Statement *> initialization, Expression * condition, Expression * increment, Statement * body ):
 	Statement(), initialization( initialization ), condition( condition ), increment( increment ), body( body ) {
 }
@@ -282,5 +282,5 @@
 }
 
-void ForStmt::print( std::ostream &os, Indenter indent ) const {
+void ForStmt::print( std::ostream & os, Indenter indent ) const {
 	Statement::print( os, indent ); // print labels
 
@@ -305,5 +305,5 @@
 	}
 
-	if ( body != 0 ) {
+	if ( body != nullptr ) {
 		os << "\n" << indent << "... with body: \n" << indent+1;
 		body->print( os, indent+1 );
@@ -317,5 +317,5 @@
 }
 
-ThrowStmt::ThrowStmt( const ThrowStmt &other ) :
+ThrowStmt::ThrowStmt( const ThrowStmt & other ) :
 	Statement ( other ), kind( other.kind ), expr( maybeClone( other.expr ) ), target( maybeClone( other.target ) ) {
 }
@@ -326,5 +326,5 @@
 }
 
-void ThrowStmt::print( std::ostream &os, Indenter indent) const {
+void ThrowStmt::print( std::ostream & os, Indenter indent) const {
 	if ( target ) os << "Non-Local ";
 	os << "Throw Statement, raising: ";
@@ -336,9 +336,9 @@
 }
 
-TryStmt::TryStmt( CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock ) :
+TryStmt::TryStmt( CompoundStmt * tryBlock, std::list<CatchStmt *> & handlers, FinallyStmt * finallyBlock ) :
 	Statement(), block( tryBlock ),  handlers( handlers ), finallyBlock( finallyBlock ) {
 }
 
-TryStmt::TryStmt( const TryStmt &other ) : Statement( other ), block( maybeClone( other.block ) ), finallyBlock( maybeClone( other.finallyBlock ) ) {
+TryStmt::TryStmt( const TryStmt & other ) : Statement( other ), block( maybeClone( other.block ) ), finallyBlock( maybeClone( other.finallyBlock ) ) {
 	cloneAll( other.handlers, handlers );
 }
@@ -350,5 +350,5 @@
 }
 
-void TryStmt::print( std::ostream &os, Indenter indent ) const {
+void TryStmt::print( std::ostream & os, Indenter indent ) const {
 	os << "Try Statement" << endl;
 	os << indent << "... with block:" << endl << indent+1;
@@ -363,5 +363,5 @@
 
 	// finally block
-	if ( finallyBlock != 0 ) {
+	if ( finallyBlock != nullptr ) {
 		os << indent << "... and finally:" << endl << indent+1;
 		finallyBlock->print( os, indent+1 );
@@ -369,5 +369,5 @@
 }
 
-CatchStmt::CatchStmt( Kind kind, Declaration *decl, Expression *cond, Statement *body ) :
+CatchStmt::CatchStmt( Kind kind, Declaration * decl, Expression * cond, Statement * body ) :
 	Statement(), kind ( kind ), decl ( decl ), cond ( cond ), body( body ) {
 		assertf( decl, "Catch clause must have a declaration." );
@@ -383,5 +383,5 @@
 }
 
-void CatchStmt::print( std::ostream &os, Indenter indent ) const {
+void CatchStmt::print( std::ostream & os, Indenter indent ) const {
 	os << "Catch " << ((Terminate == kind) ? "Terminate" : "Resume") << " Statement" << endl;
 
@@ -401,5 +401,5 @@
 
 
-FinallyStmt::FinallyStmt( CompoundStmt *block ) : Statement(), block( block ) {
+FinallyStmt::FinallyStmt( CompoundStmt * block ) : Statement(), block( block ) {
 }
 
@@ -411,5 +411,5 @@
 }
 
-void FinallyStmt::print( std::ostream &os, Indenter indent ) const {
+void FinallyStmt::print( std::ostream & os, Indenter indent ) const {
 	os << "Finally Statement" << endl;
 	os << indent << "... with block:" << endl << indent+1;
@@ -458,5 +458,5 @@
 }
 
-void WaitForStmt::print( std::ostream &os, Indenter indent ) const {
+void WaitForStmt::print( std::ostream & os, Indenter indent ) const {
 	os << "Waitfor Statement" << endl;
 	indent += 1;
@@ -514,5 +514,5 @@
 }
 
-void NullStmt::print( std::ostream &os, Indenter indent ) const {
+void NullStmt::print( std::ostream & os, Indenter indent ) const {
 	os << "Null Statement" << endl;
 	Statement::print( os, indent );
@@ -530,5 +530,5 @@
 }
 
-void ImplicitCtorDtorStmt::print( std::ostream &os, Indenter indent ) const {
+void ImplicitCtorDtorStmt::print( std::ostream & os, Indenter indent ) const {
 	os << "Implicit Ctor Dtor Statement" << endl;
 	os << indent << "... with Ctor/Dtor: ";
Index: src/SynTree/Statement.h
===================================================================
--- src/SynTree/Statement.h	(revision 4737d8eaf9f9804db83080519e528549133d6a34)
+++ src/SynTree/Statement.h	(revision 0608e007303c4e31c9edfc18e6aead6e4c2a409d)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 12 09:01:53 2019
-// Update Count     : 83
+// Last Modified On : Fri Jan 10 14:13:24 2020
+// Update Count     : 85
 //
 
@@ -257,5 +257,5 @@
 	Statement * body;
 
-	ForStmt( std::list<Statement *> initialization, Expression * condition = 0, Expression * increment = 0, Statement * body = 0 );
+	ForStmt( std::list<Statement *> initialization, Expression * condition = nullptr, Expression * increment = nullptr, Statement * body = nullptr );
 	ForStmt( const ForStmt & other );
 	virtual ~ForStmt();
@@ -357,5 +357,5 @@
 	FinallyStmt * finallyBlock;
 
-	TryStmt( CompoundStmt * tryBlock, std::list<CatchStmt *> & handlers, FinallyStmt * finallyBlock = 0 );
+	TryStmt( CompoundStmt * tryBlock, std::list<CatchStmt *> & handlers, FinallyStmt * finallyBlock = nullptr );
 	TryStmt( const TryStmt & other );
 	virtual ~TryStmt();