Changeset 447c356

Timestamp:

Oct 19, 2017, 11:15:35 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

6fc5c14

Parents:

84733c1

git-author:

Rob Schluntz <rschlunt@…> (10/17/17 10:25:17)

git-committer:

Rob Schluntz <rschlunt@…> (10/19/17 11:15:35)

Message:

Add support for TypeSubstitution? in PassVisitor?

Location:

src

Files:

• Common/PassVisitor.h (modified) (1 diff)
• Common/PassVisitor.impl.h (modified) (1 diff)
• SynTree/Mutator.cc (modified) (1 diff)
• SynTree/Mutator.h (modified) (1 diff)
• SynTree/TypeSubstitution.cc (modified) (5 diffs)
• SynTree/TypeSubstitution.h (modified) (2 diffs)

src/Common/PassVisitor.h

@@ -238 +238 @@
         virtual Attribute * mutate( Attribute * attribute ) override final;
 
+        virtual TypeSubstitution * mutate( TypeSubstitution * sub ) final;
+
 private:
         template<typename pass_t> friend void acceptAll( std::list< Declaration* > &decls, PassVisitor< pass_t >& visitor );

src/Common/PassVisitor.impl.h

@@ -2127 +2127 @@
         MUTATE_BODY( Attribute, node );
 }
+
+template< typename pass_type >
+TypeSubstitution * PassVisitor< pass_type >::mutate( TypeSubstitution * node ) {
+        MUTATE_START( node );
+
+        for ( auto & p : node->typeEnv ) {
+                indexerScopedMutate( p.second, *this );
+        }
+        for ( auto & p : node->varEnv ) {
+                indexerScopedMutate( p.second, *this );
+        }
+
+        MUTATE_END( TypeSubstitution, node );
+}

src/SynTree/Mutator.cc

@@ -626 +626 @@
 }
 
+TypeSubstitution * Mutator::mutate( TypeSubstitution * sub ) {
+        for ( auto & p : sub->typeEnv ) {
+                p.second = maybeMutate( p.second, *this );
+        }
+        for ( auto & p : sub->varEnv ) {
+                p.second = maybeMutate( p.second, *this );
+        }
+        return sub;
+}
+
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/Mutator.h

@@ -117 +117 @@
 
         virtual Attribute * mutate( Attribute * attribute );
+
+        virtual TypeSubstitution * mutate( TypeSubstitution * sub );
   private:
         virtual Declaration * handleAggregateDecl(AggregateDecl * aggregateDecl );

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;
 }
@@ -231 +229 @@
 Type * TypeSubstitution::mutate( OneType *oneType ) {
         return handleType( oneType );
-}
-
-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;
 }
 

src/SynTree/TypeSubstitution.h

@@ -59 +59 @@
         void normalize();
 
-        TypeSubstitution * acceptMutator( Mutator & mutator );
+        TypeSubstitution * acceptMutator( Mutator & m ) { return m.mutate( this ); }
 
         void print( std::ostream &os, Indenter indent = {} ) const;
@@ -89 +89 @@
 
         void initialize( const TypeSubstitution &src, TypeSubstitution &dest );
+
+        friend class Mutator;
+
+        template<typename pass_type>
+        friend class PassVisitor;
 
         typedef std::map< std::string, Type* > TypeEnvType;