Changeset a32b204 for translator/SynTree/TypeSubstitution.cc

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

File:

• translator/SynTree/TypeSubstitution.cc (modified) (12 diffs)

translator/SynTree/TypeSubstitution.cc

@@ -21 +21 @@
 TypeSubstitution::~TypeSubstitution()
 {
-    for( TypeEnvType::iterator i = typeEnv.begin(); i != typeEnv.end(); ++i ) {
+    for ( TypeEnvType::iterator i = typeEnv.begin(); i != typeEnv.end(); ++i ) {
         delete( i->second );
     }
-    for( VarEnvType::iterator i = varEnv.begin(); i != varEnv.end(); ++i ) {
+    for ( VarEnvType::iterator i = varEnv.begin(); i != varEnv.end(); ++i ) {
         delete( i->second );
     }
@@ -32 +32 @@
 TypeSubstitution::operator=( const TypeSubstitution &other )
 {
-    if( this == &other ) return *this;
+    if ( this == &other ) return *this;
     initialize( other, *this );
     return *this;
@@ -48 +48 @@
 TypeSubstitution::add( const TypeSubstitution &other )
 {
-    for( TypeEnvType::const_iterator i = other.typeEnv.begin(); i != other.typeEnv.end(); ++i ) {
+    for ( TypeEnvType::const_iterator i = other.typeEnv.begin(); i != other.typeEnv.end(); ++i ) {
         typeEnv[ i->first ] = i->second->clone();
     }
-    for( VarEnvType::const_iterator i = other.varEnv.begin(); i != other.varEnv.end(); ++i ) {
+    for ( VarEnvType::const_iterator i = other.varEnv.begin(); i != other.varEnv.end(); ++i ) {
         varEnv[ i->first ] = i->second->clone();
     }
@@ -60 +60 @@
 {
     TypeEnvType::iterator i = typeEnv.find( formalType );
-    if( i != typeEnv.end() ) {
+    if ( i != typeEnv.end() ) {
         delete i->second;
     }
@@ -70 +70 @@
 {
     TypeEnvType::iterator i = typeEnv.find( formalType );
-    if( i != typeEnv.end() ) {
+    if ( i != typeEnv.end() ) {
         delete i->second;
         typeEnv.erase( formalType );
@@ -80 +80 @@
 {
     TypeEnvType::const_iterator i = typeEnv.find( formalType );
-    if( i == typeEnv.end() ) {
+    if ( i == typeEnv.end() ) {
         return 0;
     } else {
@@ -99 +99 @@
         subCount = 0;
         freeOnly = true;
-        for( TypeEnvType::iterator i = typeEnv.begin(); i != typeEnv.end(); ++i ) {
+        for ( TypeEnvType::iterator i = typeEnv.begin(); i != typeEnv.end(); ++i ) {
             i->second = i->second->acceptMutator( *this );
         }
-    } while( subCount );
+    } while ( subCount );
 }
 
@@ -109 +109 @@
 {
     BoundVarsType::const_iterator bound = boundVars.find( inst->get_name() );
-    if( bound != boundVars.end() ) return inst;
+    if ( bound != boundVars.end() ) return inst;
     
     TypeEnvType::const_iterator i = typeEnv.find( inst->get_name() );
-    if( i == typeEnv.end() ) {
+    if ( i == typeEnv.end() ) {
         return inst;
     } else {
@@ -130 +130 @@
 {
     VarEnvType::const_iterator i = varEnv.find( nameExpr->get_name() );
-    if( i == varEnv.end() ) {
+    if ( i == varEnv.end() ) {
         return nameExpr;
     } else {
@@ -144 +144 @@
 {
     BoundVarsType oldBoundVars( boundVars );
-    if( freeOnly ) {
-        for( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+    if ( freeOnly ) {
+        for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
             boundVars.insert( (*tyvar)->get_name() );
         }
@@ -218 +218 @@
 {
     os << std::string( indent, ' ' ) << "Types:" << std::endl;
-    for( TypeEnvType::const_iterator i = typeEnv.begin(); i != typeEnv.end(); ++i ) {
+    for ( TypeEnvType::const_iterator i = typeEnv.begin(); i != typeEnv.end(); ++i ) {
         os << std::string( indent+2, ' ' ) << i->first << " -> ";
         i->second->print( os, indent+4 );
@@ -224 +224 @@
     }
     os << std::string( indent, ' ' ) << "Non-types:" << std::endl;
-    for( VarEnvType::const_iterator i = varEnv.begin(); i != varEnv.end(); ++i ) {
+    for ( VarEnvType::const_iterator i = varEnv.begin(); i != varEnv.end(); ++i ) {
         os << std::string( indent+2, ' ' ) << i->first << " -> ";
         i->second->print( os, indent+4 );