Index: src/SynTree/CompoundStmt.cc
===================================================================
--- src/SynTree/CompoundStmt.cc	(revision cf0941d1a7dcb73725ea8b7f36c0940bf3f9f146)
+++ src/SynTree/CompoundStmt.cc	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 08:11:02 2015
-// Update Count     : 1
+// Last Modified On : Fri Jun  5 07:46:03 2015
+// Update Count     : 2
 //
 
@@ -34,6 +34,6 @@
 
 void CompoundStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string(indent, ' ') << "CompoundStmt" << endl ;
-	printAll( kids, os, indent+2 );
+	os << string( indent, ' ' ) << "CompoundStmt" << endl ;
+	printAll( kids, os, indent + 2 );
 }
 
Index: src/SynTree/Expression.cc
===================================================================
--- src/SynTree/Expression.cc	(revision cf0941d1a7dcb73725ea8b7f36c0940bf3f9f146)
+++ src/SynTree/Expression.cc	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  4 21:42:55 2015
-// Update Count     : 10
+// Last Modified On : Fri Jun  5 07:51:09 2015
+// Update Count     : 11
 //
 
@@ -93,5 +93,5 @@
 
 void VariableExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Variable Expression: ";
+	os << std::string( indent, ' ' ) << "Variable Expression: ";
 
 	Declaration *decl = get_var();
@@ -122,5 +122,5 @@
 
 void SizeofExpr::print( std::ostream &os, int indent) const {
-	os << std::string(indent, ' ') << "Sizeof Expression on: ";
+	os << std::string( indent, ' ' ) << "Sizeof Expression on: ";
 
 	if (isType)
@@ -152,5 +152,5 @@
 
 void AttrExpr::print( std::ostream &os, int indent) const {
-	os << std::string(indent, ' ') << "Attr ";
+	os << std::string( indent, ' ' ) << "Attr ";
 	attr->print( os, indent + 2 );
 	if ( isType || expr ) {
@@ -184,9 +184,9 @@
 
 void CastExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Cast of:" << std::endl;
+	os << std::string( indent, ' ' ) << "Cast of:" << std::endl;
 	arg->print(os, indent+2);
-	os << std::endl << std::string(indent, ' ') << "to:" << std::endl;
+	os << std::endl << std::string( indent, ' ' ) << "to:" << std::endl;
 	if ( results.empty() ) {
-		os << std::string(indent+2, ' ') << "nothing" << std::endl;
+		os << std::string( indent+2, ' ' ) << "nothing" << std::endl;
 	} else {
 		printAll(results, os, indent+2);
@@ -207,8 +207,8 @@
 
 void UntypedMemberExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Member Expression, with field: " << get_member();
+	os << std::string( indent, ' ' ) << "Member Expression, with field: " << get_member();
 
 	Expression *agg = get_aggregate();
-	os << std::string(indent, ' ') << "from aggregate: ";
+	os << std::string( indent, ' ' ) << "from aggregate: ";
 	if (agg != 0) agg->print(os, indent + 2);
 	Expression::print( os, indent );
@@ -234,13 +234,13 @@
 
 void MemberExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Member Expression, with field: " << std::endl;
+	os << std::string( indent, ' ' ) << "Member Expression, with field: " << std::endl;
 
 	assert( member );
-	os << std::string(indent + 2, ' ');
+	os << std::string( indent + 2, ' ' );
 	member->print( os, indent + 2 );
 	os << std::endl;
 
 	Expression *agg = get_aggregate();
-	os << std::string(indent, ' ') << "from aggregate: " << std::endl;
+	os << std::string( indent, ' ' ) << "from aggregate: " << std::endl;
 	if (agg != 0) agg->print(os, indent + 2);
 	Expression::print( os, indent );
@@ -261,7 +261,7 @@
 
 void UntypedExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Applying untyped: " << std::endl;
+	os << std::string( indent, ' ' ) << "Applying untyped: " << std::endl;
 	function->print(os, indent + 4);
-	os << "\r" << std::string(indent, ' ') << "...to: " << std::endl;
+	os << std::string( indent, ' ' ) << "...to: " << std::endl;
 	printArgs(os, indent + 4);
 	Expression::print( os, indent );
@@ -282,5 +282,5 @@
 
 void NameExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Name: " << get_name() << std::endl;
+	os << std::string( indent, ' ' ) << "Name: " << get_name() << std::endl;
 	Expression::print( os, indent );
 }
@@ -301,5 +301,5 @@
 
 void LogicalExpr::print( std::ostream &os, int indent )const {
-	os << std::string(indent, ' ') << "Short-circuited operation (" << (isAnd?"and":"or") << ") on: ";
+	os << std::string( indent, ' ' ) << "Short-circuited operation (" << (isAnd?"and":"or") << ") on: ";
 	arg1->print(os);
 	os << " and ";
@@ -323,9 +323,9 @@
 
 void ConditionalExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Conditional expression on: " << std::endl;
+	os << std::string( indent, ' ' ) << "Conditional expression on: " << std::endl;
 	arg1->print( os, indent+2 );
-	os << std::string(indent, ' ') << "First alternative:" << std::endl;
+	os << std::string( indent, ' ' ) << "First alternative:" << std::endl;
 	arg2->print( os, indent+2 );
-	os << std::string(indent, ' ') << "Second alternative:" << std::endl;
+	os << std::string( indent, ' ' ) << "Second alternative:" << std::endl;
 	arg3->print( os, indent+2 );
 	os << std::endl;
@@ -334,5 +334,5 @@
 
 void UntypedValofExpr::print( std::ostream &os, int indent ) const {
-	os << std::string(indent, ' ') << "Valof Expression: " << std::endl;
+	os << std::string( indent, ' ' ) << "Valof Expression: " << std::endl;
 	if ( get_body() != 0 )
 		get_body()->print( os, indent + 2 );
Index: src/SynTree/Statement.cc
===================================================================
--- src/SynTree/Statement.cc	(revision cf0941d1a7dcb73725ea8b7f36c0940bf3f9f146)
+++ src/SynTree/Statement.cc	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jun 02 13:07:09 2015
-// Update Count     : 14
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jun  5 07:51:04 2015
+// Update Count     : 15
 //
 
@@ -39,5 +39,5 @@
 
 void ExprStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string(indent, ' ') << "Expression Statement:" << endl;
+	os << string( indent, ' ' ) << "Expression Statement:" << endl;
 	expr->print( os, indent + 2 );
 } 
@@ -59,5 +59,5 @@
 
 void BranchStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Branch (" << brType[type] << ")" << endl ;
+	os << string( indent, ' ' ) << "Branch (" << brType[type] << ")" << endl ;
 }
 
@@ -69,5 +69,5 @@
 
 void ReturnStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << std::string( indent, ' ') << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
+	os << std::string( indent, ' ' ) << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
 	if ( expr != 0 ) expr->print( os );
 	os << endl;
@@ -80,8 +80,8 @@
 
 void IfStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "If on condition: " << endl ;
+	os << string( indent, ' ' ) << "If on condition: " << endl ;
 	condition->print( os, indent + 4 );
 
-	os << string( indent, ' ') << ".... and branches: " << endl;
+	os << string( indent, ' ' ) << ".... and branches: " << endl;
 
 	thenPart->print( os, indent + 4 );
@@ -104,5 +104,5 @@
 
 void SwitchStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Switch on condition: ";
+	os << string( indent, ' ' ) << "Switch on condition: ";
 	condition->print( os );
 	os << endl;
@@ -131,5 +131,5 @@
 
 void CaseStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ');
+	os << string( indent, ' ' );
 
 	if ( isDefault())
@@ -159,5 +159,5 @@
 
 void ChooseStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Choose on condition: ";
+	os << string( indent, ' ' ) << "Choose on condition: ";
 	condition->print( os );
 	os << endl;
@@ -172,5 +172,5 @@
 
 void FallthruStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Fall-through statement" << endl;
+	os << string( indent, ' ' ) << "Fall-through statement" << endl;
 }
 
@@ -184,8 +184,8 @@
 
 void WhileStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "While on condition: " << endl ;
+	os << string( indent, ' ' ) << "While on condition: " << endl ;
 	condition->print( os, indent + 4 );
 
-	os << string( indent, ' ') << ".... with body: " << endl;
+	os << string( indent, ' ' ) << ".... with body: " << endl;
 
 	if ( body != 0 ) body->print( os, indent + 4 );
@@ -204,5 +204,5 @@
 
 void ForStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Labels: {";
+	os << string( indent, ' ' ) << "Labels: {";
 	for (std::list<Label>::iterator it = get_labels().begin(); it != get_labels().end(); ++it) {
 		os << *it << ",";
@@ -210,19 +210,19 @@
 	os << "}" << endl;
 
-	os << "\r" << string( indent, ' ') << "For Statement" << endl ;
-
-	os << "\r" << string( indent + 2, ' ') << "initialization: \n"; 
+	os << string( indent, ' ' ) << "For Statement" << endl ;
+
+	os << string( indent + 2, ' ' ) << "initialization: \n"; 
 	if ( initialization != 0 )
 		initialization->print( os, indent + 4 );
 
-	os << "\n\r" << string( indent + 2, ' ') << "condition: \n"; 
+	os << "\n" << string( indent + 2, ' ' ) << "condition: \n"; 
 	if ( condition != 0 )
 		condition->print( os, indent + 4 );
 
-	os << "\n\r" << string( indent + 2, ' ') << "increment: \n"; 
+	os << "\n" << string( indent + 2, ' ' ) << "increment: \n"; 
 	if ( increment != 0 )
 		increment->print( os, indent + 4 );
 
-	os << "\n\r" << string( indent + 2, ' ') << "statement block: \n"; 
+	os << "\n" << string( indent + 2, ' ' ) << "statement block: \n"; 
 	if ( body != 0 )
 		body->print( os, indent + 4 );
@@ -246,10 +246,10 @@
 
 void TryStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Try Statement" << endl;
-	os << string( indent + 2, ' ') << "with block: " << endl;
+	os << string( indent, ' ' ) << "Try Statement" << endl;
+	os << string( indent + 2, ' ' ) << "with block: " << endl;
 	block->print( os, indent + 4 );
 
 	// handlers
-	os << string( indent + 2, ' ') << "and handlers: " << endl;
+	os << string( indent + 2, ' ' ) << "and handlers: " << endl;
 	std::list<Statement *>::iterator i;
 	for ( i = handlers.begin(); i != handlers.end(); i++)
@@ -258,5 +258,5 @@
 	// finally block
 	if ( finallyBlock != 0 ) {
-		os << string( indent + 2, ' ') << "Finally block: " << endl;
+		os << string( indent + 2, ' ' ) << "Finally block: " << endl;
 		finallyBlock->print( os, indent + 4 );
 	} // if
@@ -273,14 +273,14 @@
 
 void CatchStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Catch Statement" << endl;
-
-	os << "\r" << string( indent, ' ') << "... catching" << endl;
+	os << string( indent, ' ' ) << "Catch Statement" << endl;
+
+	os << string( indent, ' ' ) << "... catching" << endl;
 	if ( decl ) {
 		decl->printShort( os, indent + 4 );
 		os << endl;
 	} else if ( catchRest )
-		os << "\r" << string( indent + 4 , ' ') << "the rest" << endl;
+		os << string( indent + 4 , ' ' ) << "the rest" << endl;
 	else
-		os << "\r" << string( indent + 4 , ' ') << ">>> Error:  this catch clause must have a declaration <<<" << endl;
+		os << string( indent + 4 , ' ' ) << ">>> Error:  this catch clause must have a declaration <<<" << endl;
 }
 
@@ -295,6 +295,6 @@
 
 void FinallyStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Finally Statement" << endl;
-	os << string( indent + 2, ' ') << "with block: " << endl;
+	os << string( indent, ' ' ) << "Finally Statement" << endl;
+	os << string( indent + 2, ' ' ) << "with block: " << endl;
 	block->print( os, indent + 4 );
 }
@@ -305,5 +305,5 @@
 
 void NullStmt::print( std::ostream &os, int indent ) {
-	os << "\r" << string( indent, ' ') << "Null Statement" << endl ;
+	os << string( indent, ' ' ) << "Null Statement" << endl ;
 }