Index: src/SynTree/AddressExpr.cc =================================================================== --- src/SynTree/AddressExpr.cc (revision dc5376a15ff2e64a5f2ea5042812b95f826a9656) +++ src/SynTree/AddressExpr.cc (revision 89231bca718ca9495bdc5dfa547e4f79ee18cff8) @@ -5,10 +5,10 @@ // file "LICENCE" distributed with Cforall. // -// AddressExpr.cc -- +// AddressExpr.cc -- // // Author : Richard C. Bilson // Created On : Sun May 17 23:54:44 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Tue May 19 16:52:51 2015 +// Last Modified By : Rob Schluntz +// Last Modified On : Tue Apr 26 12:35:13 2016 // Update Count : 6 // @@ -32,7 +32,8 @@ void AddressExpr::print( std::ostream &os, int indent ) const { - os << std::string( indent, ' ' ) << "Address of:" << std::endl; + os << "Address of:" << std::endl; if ( arg ) { - arg->print( os, indent+2 ); + os << std::string( indent+2, ' ' ); + arg->print( os, indent+2 ); } // if } Index: src/SynTree/ApplicationExpr.cc =================================================================== --- src/SynTree/ApplicationExpr.cc (revision dc5376a15ff2e64a5f2ea5042812b95f826a9656) +++ src/SynTree/ApplicationExpr.cc (revision 89231bca718ca9495bdc5dfa547e4f79ee18cff8) @@ -5,10 +5,10 @@ // file "LICENCE" distributed with Cforall. // -// ApplicationExpr.cc.cc -- +// ApplicationExpr.cc.cc -- // // Author : Richard C. Bilson // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon May 18 07:54:17 2015 +// Last Modified By : Rob Schluntz +// Last Modified On : Tue Apr 26 12:41:06 2016 // Update Count : 4 // @@ -47,5 +47,5 @@ FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() ); assert( function ); - + for ( std::list< DeclarationWithType* >::const_iterator i = function->get_returnVals().begin(); i != function->get_returnVals().end(); ++i ) { get_results().push_back( (*i)->get_type()->clone() ); @@ -64,5 +64,5 @@ void ApplicationExpr::print( std::ostream &os, int indent ) const { - os << std::string( indent, ' ' ) << "Application of" << std::endl; + os << "Application of" << std::endl << std::string(indent, ' '); function->print( os, indent+2 ); if ( ! args.empty() ) { Index: src/SynTree/Expression.cc =================================================================== --- src/SynTree/Expression.cc (revision dc5376a15ff2e64a5f2ea5042812b95f826a9656) +++ src/SynTree/Expression.cc (revision 89231bca718ca9495bdc5dfa547e4f79ee18cff8) @@ -9,6 +9,6 @@ // Author : Richard C. Bilson // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Fri Apr 8 17:16:23 2016 +// Last Modified By : Rob Schluntz +// Last Modified On : Tue Apr 26 12:52:40 2016 // Update Count : 40 // @@ -93,5 +93,5 @@ void VariableExpr::print( std::ostream &os, int indent ) const { - os << std::string( indent, ' ' ) << "Variable Expression: "; + os << "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 << "Sizeof Expression on: "; if (isType) @@ -295,5 +295,5 @@ void CastExpr::print( std::ostream &os, int indent ) const { - os << std::string( indent, ' ' ) << "Cast of:" << std::endl; + os << "Cast of:" << std::endl << std::string( indent+2, ' ' ); arg->print(os, indent+2); os << std::endl << std::string( indent, ' ' ) << "to:" << std::endl; @@ -318,9 +318,13 @@ void UntypedMemberExpr::print( std::ostream &os, int indent ) const { - os << std::string( indent, ' ' ) << "Member Expression, with field: " << get_member(); + os << "Untyped Member Expression, with field: " << get_member(); Expression *agg = get_aggregate(); os << std::string( indent, ' ' ) << "from aggregate: "; - if (agg != 0) agg->print(os, indent + 2); + if (agg != 0) { + os << std::string( indent+2, ' ' ); + agg->print(os, indent + 2); + } + os << std::string( indent+2, ' ' ); Expression::print( os, indent ); } @@ -345,5 +349,5 @@ void MemberExpr::print( std::ostream &os, int indent ) const { - os << std::string( indent, ' ' ) << "Member Expression, with field: " << std::endl; + os << "Member Expression, with field: " << std::endl; assert( member ); @@ -354,5 +358,9 @@ Expression *agg = get_aggregate(); os << std::string( indent, ' ' ) << "from aggregate: " << std::endl; - if (agg != 0) agg->print(os, indent + 2); + if (agg != 0) { + os << std::string( indent+2, ' ' ); + agg->print(os, indent + 2); + } + os << std::string( indent+2, ' ' ); Expression::print( os, indent ); } @@ -372,7 +380,9 @@ void UntypedExpr::print( std::ostream &os, int indent ) const { - os << std::string( indent, ' ' ) << "Applying untyped: " << std::endl; + os << "Applying untyped: " << std::endl; + os << std::string( indent, ' ' ); function->print(os, indent + 4); os << std::string( indent, ' ' ) << "...to: " << std::endl; + os << std::string( indent, ' ' ); printArgs(os, indent + 4); Expression::print( os, indent ); @@ -393,5 +403,5 @@ void NameExpr::print( std::ostream &os, int indent ) const { - os << std::string( indent, ' ' ) << "Name: " << get_name() << std::endl; + os << "Name: " << get_name() << std::endl; Expression::print( os, indent ); } Index: src/SynTree/Initializer.cc =================================================================== --- src/SynTree/Initializer.cc (revision dc5376a15ff2e64a5f2ea5042812b95f826a9656) +++ src/SynTree/Initializer.cc (revision 89231bca718ca9495bdc5dfa547e4f79ee18cff8) @@ -5,11 +5,11 @@ // file "LICENCE" distributed with Cforall. // -// Initializer.cc -- +// Initializer.cc -- // // Author : Richard C. Bilson // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Rob Schluntz -// Last Modified On : Wed Aug 12 14:05:25 2015 -// Update Count : 14 +// Last Modified On : Tue Apr 26 12:50:47 2016 +// Update Count : 28 // @@ -31,5 +31,5 @@ void Initializer::print( std::ostream &os, int indent ) {} -SingleInit::SingleInit( Expression *v, std::list< Expression *> &_designators ) : value ( v ), designators( _designators ) { +SingleInit::SingleInit( Expression *v, std::list< Expression *> &_designators ) : value ( v ), designators( _designators ) { } @@ -65,16 +65,16 @@ void ListInit::print( std::ostream &os, int indent ) { - os << std::endl << std::string(indent, ' ') << "Compound initializer: "; + os << std::endl << std::string(indent, ' ') << "Compound initializer: "; if ( ! designators.empty() ) { os << std::string(indent + 2, ' ' ) << "designated by: ["; for ( std::list < Expression * >::iterator i = designators.begin(); i != designators.end(); i++ ) { - ( *i )->print(os, indent + 4 ); + ( *i )->print(os, indent + 4 ); } // for - + os << std::string(indent + 2, ' ' ) << "]"; } // if - for ( std::list::iterator i = initializers.begin(); i != initializers.end(); i++ ) + for ( std::list::iterator i = initializers.begin(); i != initializers.end(); i++ ) (*i)->print( os, indent + 2 ); } Index: src/SynTree/ObjectDecl.cc =================================================================== --- src/SynTree/ObjectDecl.cc (revision dc5376a15ff2e64a5f2ea5042812b95f826a9656) +++ src/SynTree/ObjectDecl.cc (revision 89231bca718ca9495bdc5dfa547e4f79ee18cff8) @@ -5,11 +5,11 @@ // file "LICENCE" distributed with Cforall. // -// ObjectDecl.cc -- +// ObjectDecl.cc -- // // Author : Richard C. Bilson // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Rob Schluntz -// Last Modified On : Tue Sep 29 14:13:01 2015 -// Update Count : 18 +// Last Modified On : Tue Apr 26 12:53:13 2016 +// Update Count : 30 // @@ -69,6 +69,6 @@ #if 0 if ( get_mangleName() != "") { - os << get_mangleName() << ": "; - } else + os << get_mangleName() << ": "; + } else #endif if ( get_name() != "" ) { Index: src/SynTree/Statement.cc =================================================================== --- src/SynTree/Statement.cc (revision dc5376a15ff2e64a5f2ea5042812b95f826a9656) +++ src/SynTree/Statement.cc (revision 89231bca718ca9495bdc5dfa547e4f79ee18cff8) @@ -10,5 +10,5 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Rob Schluntz -// Last Modified On : Wed Dec 09 14:09:34 2015 +// Last Modified On : Tue Apr 26 12:33:33 2016 // Update Count : 54 // @@ -43,5 +43,5 @@ void ExprStmt::print( std::ostream &os, int indent ) const { - os << string( indent, ' ' ) << "Expression Statement:" << endl; + os << "Expression Statement:" << endl << std::string( indent, ' ' ); expr->print( os, indent + 2 ); } @@ -110,6 +110,9 @@ void ReturnStmt::print( std::ostream &os, int indent ) const { - os << std::string( indent, ' ' ) << string ( isThrow? "Throw":"Return" ) << " Statement, returning: "; - if ( expr != 0 ) expr->print( os ); + os << string ( isThrow? "Throw":"Return" ) << " Statement, returning: "; + if ( expr != 0 ) { + os << endl << string( indent+2, ' ' ); + expr->print( os, indent + 2 ); + } os << endl; } @@ -124,5 +127,5 @@ void IfStmt::print( std::ostream &os, int indent ) const { - os << string( indent, ' ' ) << "If on condition: " << endl ; + os << "If on condition: " << endl ; condition->print( os, indent + 4 ); @@ -153,5 +156,5 @@ void SwitchStmt::print( std::ostream &os, int indent ) const { - os << string( indent, ' ' ) << "Switch on condition: "; + os << "Switch on condition: "; condition->print( os ); os << endl; @@ -218,5 +221,5 @@ void ChooseStmt::print( std::ostream &os, int indent ) const { - os << string( indent, ' ' ) << "Choose on condition: "; + os << "Choose on condition: "; condition->print( os ); os << endl; @@ -247,5 +250,5 @@ void WhileStmt::print( std::ostream &os, int indent ) const { - os << string( indent, ' ' ) << "While on condition: " << endl ; + os << "While on condition: " << endl ; condition->print( os, indent + 4 ); @@ -273,5 +276,5 @@ void ForStmt::print( std::ostream &os, int indent ) const { - os << string( indent, ' ' ) << "Labels: {"; + os << "Labels: {"; for ( std::list