Changeset 6840e7c for src/SynTree/TypeSubstitution.cc

Timestamp:

Oct 19, 2017, 12:01:04 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

837ce06

Parents:

b96ec83 (diff), a15b72c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

• src/SynTree/TypeSubstitution.cc (modified) (5 diffs)

src/SynTree/TypeSubstitution.cc

@@ -148 +148 @@
 template< typename TypeClass >
 Type *TypeSubstitution::handleType( TypeClass *type ) {
-        BoundVarsType oldBoundVars( boundVars );
+        ValueGuard<BoundVarsType> oldBoundVars( boundVars );
         // bind type variables from forall-qualifiers
         if ( freeOnly ) {
@@ -156 +156 @@
         } // if
         Type *ret = Mutator::mutate( type );
-        boundVars = oldBoundVars;
         return ret;
 }
@@ -162 +161 @@
 template< typename TypeClass >
 Type *TypeSubstitution::handleAggregateType( TypeClass *type ) {
-        BoundVarsType oldBoundVars( boundVars );
+        ValueGuard<BoundVarsType> oldBoundVars( boundVars );
         // bind type variables from forall-qualifiers
         if ( freeOnly ) {
@@ -177 +176 @@
         } // if
         Type *ret = Mutator::mutate( type );
-        boundVars = oldBoundVars;
         return ret;
 }
@@ -233 +231 @@
 }
 
-TypeSubstitution * TypeSubstitution::acceptMutator( Mutator & mutator ) {
-        for ( auto & p : typeEnv ) {
-                p.second = maybeMutate( p.second, mutator );
-        }
-        for ( auto & p : varEnv ) {
-                p.second = maybeMutate( p.second, mutator );
-        }
-        return this;
-}
-
-void TypeSubstitution::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Types:" << std::endl;
+void TypeSubstitution::print( std::ostream &os, Indenter indent ) const {
+        os << indent << "Types:" << std::endl;
         for ( TypeEnvType::const_iterator i = typeEnv.begin(); i != typeEnv.end(); ++i ) {
-                os << std::string( indent+2, ' ' ) << i->first << " -> ";
-                i->second->print( os, indent+4 );
+                os << indent+1 << i->first << " -> ";
+                i->second->print( os, indent+2 );
                 os << std::endl;
         } // for
-        os << std::string( indent, ' ' ) << "Non-types:" << std::endl;
+        os << indent << "Non-types:" << std::endl;
         for ( VarEnvType::const_iterator i = varEnv.begin(); i != varEnv.end(); ++i ) {
-                os << std::string( indent+2, ' ' ) << i->first << " -> ";
-                i->second->print( os, indent+4 );
+                os << indent+1 << i->first << " -> ";
+                i->second->print( os, indent+2 );
                 os << std::endl;
         } // for