Changeset a32b204 for translator/InitTweak

Timestamp:

May 17, 2015, 1:19:35 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

0dd3a2f

Parents:

b87a5ed

Message:

licencing: second groups of files

Location:

translator/InitTweak

Files:

• Association.h (modified) (9 diffs)
• BasicInit.cc (modified) (5 diffs)
• BasicInit.h (modified) (2 diffs)
• DeclarationHoister.cc (modified) (2 diffs)
• InitExpander.cc (modified) (1 diff)
• InitModel.cc (modified) (11 diffs)
• InitModel.h (modified) (1 diff)
• RemoveInit.cc (modified) (1 diff)
• diet_map.h (modified) (6 diffs)

translator/InitTweak/Association.h

@@ -70 +70 @@
 
   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 +76 @@
 
   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 +114 @@
     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 +127 @@
 
   virtual long int add_single( std::string idx, Expression *expr) {
-    if( idx == "" )
+    if ( idx == "" )
       std::cerr << "Checkpoint 1" << std::endl;
     else {
@@ -143 +143 @@
     if ( table.find( str ) != table.end() ) return;
     ordering.push_back( str );
-    if( str != "" ) {
+    if ( str != "" ) {
       std::pair<long int, Association *> p( ordering.size() - 1, 0 );
       table.insert( std::pair< std::string, std::pair<long int, Association *> >(str, p) );
@@ -151 +151 @@
 
   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 +162 @@
 
   virtual Association *operator[]( int idx ) {
-    if( ordering[idx] == "" ) {
+    if ( ordering[idx] == "" ) {
       std::cerr << "Error, anonymous members not implemented yet" << std::endl;
       throw 0;
@@ -187 +187 @@
   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 +244 @@
   diet::diet_tree<int> tree;
   /*
-  for( diet_tree<int>::iterator i = tree.begin(); i != tree.end(); i++ )
+  for ( diet_tree<int>::iterator i = tree.begin(); i != tree.end(); i++ )
     std::cout << "--(" << (*i).first << ", " << (*i).second << ")--" << std::endl;
   diet_tree<int> tree;

translator/InitTweak/BasicInit.cc

@@ -50 +50 @@
     ObjectDecl *odecl = 0;
 
-    if( ( odecl = dynamic_cast<ObjectDecl *>(declStmt->get_decl()) ) != 0 ){
+    if ( ( odecl = dynamic_cast<ObjectDecl *>(declStmt->get_decl()) ) != 0 ){
 
       Initializer *init = odecl->get_init();
@@ -133 +133 @@
 
     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 +169 @@
 
       if ( li != 0 ) {
-        for( std::list<Initializer *>::iterator i = li->begin_initializers();
+        for ( std::list<Initializer *>::iterator i = li->begin_initializers();
                                                          i != li->end_initializers();
               i++) {
@@ -181 +181 @@
                             std::back_inserter( des ), cast_ptr<Expression, NameExpr > );
 
-            for( std::list<NameExpr *>::iterator j = des.begin(); j != des.end(); j++ ) {
+            for ( std::list<NameExpr *>::iterator j = des.begin(); j != des.end(); j++ ) {
               // check for existence of the element
 
@@ -230 +230 @@
     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 )

translator/InitTweak/BasicInit.h

@@ -102 +102 @@
       std::list<Expression *> temp;
 
-      if( ( sinit=dynamic_cast< SingleInit * >(_init) ) != 0 ) {
+      if ( ( sinit=dynamic_cast< SingleInit * >(_init) ) != 0 ) {
         kind = SINGLE;
         temp = sinit->get_designators();
@@ -179 +179 @@
           blown_struct.push_front( me->get_member() );
           prfx = me->get_aggregate();
-        } while( prfx != 0 );
+        } while ( prfx != 0 );
 
         NameExpr *ne;

translator/InitTweak/DeclarationHoister.cc

@@ -24 +24 @@
 
     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 +32 @@
     } 
 
-    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 );

translator/InitTweak/InitExpander.cc

@@ -18 +18 @@
     index.visit( objectDecl );
 
-    if( objectDecl->get_init() == 0 ) return objectDecl;
+    if ( objectDecl->get_init() == 0 ) return objectDecl;
 
     InitModelBuilder builder( objectDecl );

translator/InitTweak/InitModel.cc

@@ -16 +16 @@
 
     /* 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 +28 @@
   }
 
-  InitModelBuilder::~InitModelBuilder() { if( !taken ) { delete building; building = 0; } }
+  InitModelBuilder::~InitModelBuilder() { if ( ! taken ) { delete building; building = 0; } }
 
   void InitModelBuilder::init() {
@@ -37 +37 @@
   // 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 +43 @@
 
   void InitModelBuilder::visit( StructInstType *st ) {
-    if( building == 0 ) building = new PointAssociation;
+    if ( building == 0 ) building = new PointAssociation;
     decl = st->get_baseStruct();
     return;
@@ -59 +59 @@
     std::list< Declaration * > mem = aggregateDecl->get_members();
 
-    for( std::list<Declaration *>::iterator i = mem.begin(); i != mem.end(); i++ ) {
+    for ( std::list<Declaration *>::iterator i = mem.begin(); i != mem.end(); i++ ) {
       pa->add_member( (*i)->get_name() );
       InitModelBuilder rec(*i);
@@ -76 +76 @@
     assert (c != 0);
     if ( BasicType *bt = dynamic_cast<BasicType *>( 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 +102 @@
     std::list< Expression *> &des = singleInit->get_designators();
 
-    if( topLevel ) {
+    if ( topLevel ) {
       assert ( des.empty() );
       assert ( dynamic_cast< SingleName * >(model) != 0 );
@@ -113 +113 @@
     }
 
-    if( des.empty() ) {
+    if ( des.empty() ) {
       assert( model != 0 );
       try {
@@ -160 +160 @@
       for ( std::list<Expression *>::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 +166 @@
             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 +193 @@
 
     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;

translator/InitTweak/InitModel.h

@@ -92 +92 @@
       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; }

translator/InitTweak/RemoveInit.cc

@@ -19 +19 @@
 
 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 );
   }

translator/InitTweak/diet_map.h

@@ -34 +34 @@
     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 +45 @@
       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 +54 @@
             right->insert( _hi, hi );
             return;
-          } else if( _hi < lo ) {
+          } else if ( _hi < lo ) {
             if ( left == 0 ) left = new diet_tree<T>();
             left->insert( _lo, _hi );
-          } else if( _hi <= hi ) {
+          } else if ( _hi <= hi ) {
             if ( left == 0 ) left = new diet_tree<T>();
             left->insert( _lo, _hi );
@@ -65 +65 @@
           root->set_range(_lo,_hi);
         } else if ( _hi > hi) {
-          if( _lo > hi ) {
+          if ( _lo > hi ) {
             if ( right == 0 ) right = new diet_tree<T>();
             right->insert( _lo, _hi );
-          } else if( _lo < hi ) {
+          } else if ( _lo < hi ) {
             root->set_range(lo, _lo);
             if ( right == 0 ) right = new diet_tree<T>();
@@ -152 +152 @@
       assert(current != 0);
       if ( current->right == 0 )
-        if ( !st.empty() )
+        if ( ! st.empty() )
           { current = st.top(); st.pop(); }
         else
@@ -173 +173 @@
       assert(current != 0);
       diet_tree<T> *next = 0;
-      while( current->left != 0 ) {
+      while ( current->left != 0 ) {
         next = current->left; st.push( current ); current = next;
       }