Index: translator/InitTweak/Association.h =================================================================== --- translator/InitTweak/Association.h (revision 48e99f2993d23fb17ba54f104e880c4d49bd1aa2) +++ translator/InitTweak/Association.h (revision 0dd3a2faa6372da8704ff969a8bb37b5d340f350) @@ -70,5 +70,5 @@ virtual long int add_single( long int idx, Expression *newExpr) { - if( expr == 0 ) //|| *expr == *newExpr ) + if ( expr == 0 ) //|| *expr == *newExpr ) expr = newExpr; return 0; @@ -76,5 +76,5 @@ virtual long int add_single( std::string str, Expression *newExpr) { - if( expr == 0 ) //|| *expr == *newExpr ) + if ( expr == 0 ) //|| *expr == *newExpr ) expr = newExpr; return 0; @@ -114,5 +114,5 @@ long int ret; - if( idx >= (long int)ordering.size() ) throw AssocException("extra (spurious) members"); + if ( idx >= (long int)ordering.size() ) throw AssocException("extra (spurious) members"); if ( ordering[ idx ] == "") @@ -127,5 +127,5 @@ virtual long int add_single( std::string idx, Expression *expr) { - if( idx == "" ) + if ( idx == "" ) std::cerr << "Checkpoint 1" << std::endl; else { @@ -143,5 +143,5 @@ if ( table.find( str ) != table.end() ) return; ordering.push_back( str ); - if( str != "" ) { + if ( str != "" ) { std::pair p( ordering.size() - 1, 0 ); table.insert( std::pair< std::string, std::pair >(str, p) ); @@ -151,5 +151,5 @@ virtual void set_member( std::string str, Association *assoc ) { - if( str == "" ) + if ( str == "" ) anonym.push_back( assoc ); else if ( table.find( str ) == table.end() ) @@ -162,5 +162,5 @@ virtual Association *operator[]( int idx ) { - if( ordering[idx] == "" ) { + if ( ordering[idx] == "" ) { std::cerr << "Error, anonymous members not implemented yet" << std::endl; throw 0; @@ -187,5 +187,5 @@ virtual void display( std::ostream &os ) { os << "Point association: " << std::endl; - for( map_type::iterator i = table.begin(); i != table.end(); i++ ) { + for ( map_type::iterator i = table.begin(); i != table.end(); i++ ) { os << "Member [" << i->first << ", index = " << i->second.first << "]"; if ( i->second.second != 0 ) @@ -244,5 +244,5 @@ diet::diet_tree tree; /* - for( diet_tree::iterator i = tree.begin(); i != tree.end(); i++ ) + for ( diet_tree::iterator i = tree.begin(); i != tree.end(); i++ ) std::cout << "--(" << (*i).first << ", " << (*i).second << ")--" << std::endl; diet_tree tree; Index: translator/InitTweak/BasicInit.cc =================================================================== --- translator/InitTweak/BasicInit.cc (revision 48e99f2993d23fb17ba54f104e880c4d49bd1aa2) +++ translator/InitTweak/BasicInit.cc (revision 0dd3a2faa6372da8704ff969a8bb37b5d340f350) @@ -50,5 +50,5 @@ ObjectDecl *odecl = 0; - if( ( odecl = dynamic_cast(declStmt->get_decl()) ) != 0 ){ + if ( ( odecl = dynamic_cast(declStmt->get_decl()) ) != 0 ){ Initializer *init = odecl->get_init(); @@ -133,5 +133,5 @@ ReferenceToType *reftype; - if( (reftype = dynamic_cast< StructInstType * >( objdecl->get_type() )) != 0 ){ + if ( (reftype = dynamic_cast< StructInstType * >( objdecl->get_type() )) != 0 ){ StructDecl *strDecl = index->lookupStruct( reftype->get_name() ); if ( strDecl != 0 ) { @@ -169,5 +169,5 @@ if ( li != 0 ) { - for( std::list::iterator i = li->begin_initializers(); + for ( std::list::iterator i = li->begin_initializers(); i != li->end_initializers(); i++) { @@ -181,5 +181,5 @@ std::back_inserter( des ), cast_ptr ); - for( std::list::iterator j = des.begin(); j != des.end(); j++ ) { + for ( std::list::iterator j = des.begin(); j != des.end(); j++ ) { // check for existence of the element @@ -230,5 +230,5 @@ if ( col->isComposite() ) { VariousNames *vc = dynamic_cast< VariousNames * >( col ); - for( VariousNames::key_iterator it = vc->keys_begin(); it != vc->keys_end(); it++ ) { + for ( VariousNames::key_iterator it = vc->keys_begin(); it != vc->keys_end(); it++ ) { prefix.push_back( *it ); if ( (*assoc)[ *it ] != 0 ) Index: translator/InitTweak/BasicInit.h =================================================================== --- translator/InitTweak/BasicInit.h (revision 48e99f2993d23fb17ba54f104e880c4d49bd1aa2) +++ translator/InitTweak/BasicInit.h (revision 0dd3a2faa6372da8704ff969a8bb37b5d340f350) @@ -102,5 +102,5 @@ std::list temp; - if( ( sinit=dynamic_cast< SingleInit * >(_init) ) != 0 ) { + if ( ( sinit=dynamic_cast< SingleInit * >(_init) ) != 0 ) { kind = SINGLE; temp = sinit->get_designators(); @@ -179,5 +179,5 @@ blown_struct.push_front( me->get_member() ); prfx = me->get_aggregate(); - } while( prfx != 0 ); + } while ( prfx != 0 ); NameExpr *ne; Index: translator/InitTweak/DeclarationHoister.cc =================================================================== --- translator/InitTweak/DeclarationHoister.cc (revision 48e99f2993d23fb17ba54f104e880c4d49bd1aa2) +++ translator/InitTweak/DeclarationHoister.cc (revision 0dd3a2faa6372da8704ff969a8bb37b5d340f350) @@ -24,5 +24,5 @@ while ( result != kids.end() ) { - result = std::find_if(result, kids.end(), cast_ptr< Statement, DeclStmt > ); + result = std::find_if (result, kids.end(), cast_ptr< Statement, DeclStmt > ); if ( result != kids.end() ) { @@ -32,5 +32,5 @@ } - for( std::list< stmt_it >::reverse_iterator i = decls.rbegin(); i!= decls.rend(); i++ ){ + for ( std::list< stmt_it >::reverse_iterator i = decls.rbegin(); i!= decls.rend(); i++ ){ kids.push_front( **i ); kids.erase( *i ); Index: translator/InitTweak/InitExpander.cc =================================================================== --- translator/InitTweak/InitExpander.cc (revision 48e99f2993d23fb17ba54f104e880c4d49bd1aa2) +++ translator/InitTweak/InitExpander.cc (revision 0dd3a2faa6372da8704ff969a8bb37b5d340f350) @@ -18,5 +18,5 @@ index.visit( objectDecl ); - if( objectDecl->get_init() == 0 ) return objectDecl; + if ( objectDecl->get_init() == 0 ) return objectDecl; InitModelBuilder builder( objectDecl ); Index: translator/InitTweak/InitModel.cc =================================================================== --- translator/InitTweak/InitModel.cc (revision 48e99f2993d23fb17ba54f104e880c4d49bd1aa2) +++ translator/InitTweak/InitModel.cc (revision 0dd3a2faa6372da8704ff969a8bb37b5d340f350) @@ -16,9 +16,9 @@ /* this to be replaced by dynamic dispatch */ - if( dynamic_cast< BasicType * >(objectType) != 0 ) { - if( building == 0 ) building = new SingleName; - } else if( ReferenceToType *rt = dynamic_cast< ReferenceToType * >(objectType) ) { + if ( dynamic_cast< BasicType * >(objectType) != 0 ) { + if ( building == 0 ) building = new SingleName; + } else if ( ReferenceToType *rt = dynamic_cast< ReferenceToType * >(objectType) ) { rt->accept( *this ); - } else if( ArrayType *at = dynamic_cast< ArrayType * >(objectType) ) { + } else if ( ArrayType *at = dynamic_cast< ArrayType * >(objectType) ) { at->accept( *this ); } else // if (tuples) @@ -28,5 +28,5 @@ } - InitModelBuilder::~InitModelBuilder() { if( !taken ) { delete building; building = 0; } } + InitModelBuilder::~InitModelBuilder() { if ( ! taken ) { delete building; building = 0; } } void InitModelBuilder::init() { @@ -37,5 +37,5 @@ // Visitor interface void InitModelBuilder::visit( ArrayType *at ) { - if( building == 0 ) building = new RangeAssociation(interpretDimension( at->get_dimension() )); + if ( building == 0 ) building = new RangeAssociation(interpretDimension( at->get_dimension() )); decl = 0; return; @@ -43,5 +43,5 @@ void InitModelBuilder::visit( StructInstType *st ) { - if( building == 0 ) building = new PointAssociation; + if ( building == 0 ) building = new PointAssociation; decl = st->get_baseStruct(); return; @@ -59,5 +59,5 @@ std::list< Declaration * > mem = aggregateDecl->get_members(); - for( std::list::iterator i = mem.begin(); i != mem.end(); i++ ) { + for ( std::list::iterator i = mem.begin(); i != mem.end(); i++ ) { pa->add_member( (*i)->get_name() ); InitModelBuilder rec(*i); @@ -76,5 +76,5 @@ assert (c != 0); if ( BasicType *bt = dynamic_cast( c->get_type() ) ) { - if( bt->isInteger() ) { + if ( bt->isInteger() ) { // need more intelligence here, not necessarily base 10 value = std::strtol( c->get_value().c_str(), NULL, 10 ); @@ -102,5 +102,5 @@ std::list< Expression *> &des = singleInit->get_designators(); - if( topLevel ) { + if ( topLevel ) { assert ( des.empty() ); assert ( dynamic_cast< SingleName * >(model) != 0 ); @@ -113,5 +113,5 @@ } - if( des.empty() ) { + if ( des.empty() ) { assert( model != 0 ); try { @@ -160,5 +160,5 @@ for ( std::list::iterator i = des2.begin(); i != des2.end(); i++ ) { Association * newModel = 0; - if( NameExpr *n = dynamic_cast< NameExpr * >( *i ) ) + if ( NameExpr *n = dynamic_cast< NameExpr * >( *i ) ) try { newModel = (*model)[ n->get_name() ]; @@ -166,5 +166,5 @@ std::cerr << "Didn't find member: " << e.get_what() << std::endl; } - else // if( RangeExpr *r = dynamic_cast< RangeExpr * >( *i ) ) + else // if ( RangeExpr *r = dynamic_cast< RangeExpr * >( *i ) ) std::cerr << "Invalid designator specification" << std::endl; @@ -193,5 +193,5 @@ std::list< Initializer * > contents; - for( int i = 0; i < pa->size(); i++ ) + for ( int i = 0; i < pa->size(); i++ ) if ( (*pa)[i] != 0 ) { InitUnspooler rec; Index: translator/InitTweak/InitModel.h =================================================================== --- translator/InitTweak/InitModel.h (revision 48e99f2993d23fb17ba54f104e880c4d49bd1aa2) +++ translator/InitTweak/InitModel.h (revision 0dd3a2faa6372da8704ff969a8bb37b5d340f350) @@ -92,5 +92,5 @@ public: InitUnspooler() : init(0), taken( false ) {} - virtual ~InitUnspooler() { if (!taken && (init != 0)) { delete init; init = 0; } } + virtual ~InitUnspooler() { if (! taken && (init != 0)) { delete init; init = 0; } } Initializer *get_initializer() { return init; } Initializer *grab_initializer() { taken = true; return init; } Index: translator/InitTweak/RemoveInit.cc =================================================================== --- translator/InitTweak/RemoveInit.cc (revision 48e99f2993d23fb17ba54f104e880c4d49bd1aa2) +++ translator/InitTweak/RemoveInit.cc (revision 0dd3a2faa6372da8704ff969a8bb37b5d340f350) @@ -19,11 +19,11 @@ void RemoveInit::mutateStatementList( std::list< Statement* > &statements ) { - for( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) { - if( !stmtsToAddAfter.empty() ) { + for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) { + if ( ! stmtsToAddAfter.empty() ) { statements.splice( i, stmtsToAddAfter ); } *i = (*i)->acceptMutator( *this ); } - if( !stmtsToAddAfter.empty() ) { + if ( ! stmtsToAddAfter.empty() ) { statements.splice( statements.end(), stmtsToAddAfter ); } Index: translator/InitTweak/diet_map.h =================================================================== --- translator/InitTweak/diet_map.h (revision 48e99f2993d23fb17ba54f104e880c4d49bd1aa2) +++ translator/InitTweak/diet_map.h (revision 0dd3a2faa6372da8704ff969a8bb37b5d340f350) @@ -34,7 +34,7 @@ diet_tree() : root(0), left(0), right(0) {} ~diet_tree() { - if( root != 0 ) { delete root; root = 0; } - if( left != 0 ) { delete left; left = 0; } - if( right != 0 ) { delete right; right = 0; } + if ( root != 0 ) { delete root; root = 0; } + if ( left != 0 ) { delete left; left = 0; } + if ( right != 0 ) { delete right; right = 0; } } @@ -45,6 +45,6 @@ else { value_type lo = root->get_lo(), hi = root->get_hi(); - if( _lo < lo ) { - if( _hi > hi ) { + if ( _lo < lo ) { + if ( _hi > hi ) { /* can either minimize the work or minimize the number of nodes. Let's minimize the work. */ @@ -54,8 +54,8 @@ right->insert( _hi, hi ); return; - } else if( _hi < lo ) { + } else if ( _hi < lo ) { if ( left == 0 ) left = new diet_tree(); left->insert( _lo, _hi ); - } else if( _hi <= hi ) { + } else if ( _hi <= hi ) { if ( left == 0 ) left = new diet_tree(); left->insert( _lo, _hi ); @@ -65,8 +65,8 @@ root->set_range(_lo,_hi); } else if ( _hi > hi) { - if( _lo > hi ) { + if ( _lo > hi ) { if ( right == 0 ) right = new diet_tree(); right->insert( _lo, _hi ); - } else if( _lo < hi ) { + } else if ( _lo < hi ) { root->set_range(lo, _lo); if ( right == 0 ) right = new diet_tree(); @@ -152,5 +152,5 @@ assert(current != 0); if ( current->right == 0 ) - if ( !st.empty() ) + if ( ! st.empty() ) { current = st.top(); st.pop(); } else @@ -173,5 +173,5 @@ assert(current != 0); diet_tree *next = 0; - while( current->left != 0 ) { + while ( current->left != 0 ) { next = current->left; st.push( current ); current = next; }