Changeset 63afee0 for src/SynTree/TypeSubstitution.cc

Timestamp:

Nov 20, 2015, 10:32:05 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

66a2a61

Parents:

f066321 (diff), 258eb5c9 (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' of /u/cforall/software/cfa/cfa-cc

File:

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

src/SynTree/TypeSubstitution.cc

@@ -126 +126 @@
 Type *TypeSubstitution::handleType( TypeClass *type ) {
         BoundVarsType oldBoundVars( boundVars );
+        // bind type variables from forall-qualifiers
         if ( freeOnly ) {
                 for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
@@ -136 +137 @@
 }
 
+template< typename TypeClass >
+Type *TypeSubstitution::handleAggregateType( TypeClass *type ) {
+        BoundVarsType oldBoundVars( boundVars );
+        // bind type variables from forall-qualifiers
+        if ( freeOnly ) {
+                for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+                        boundVars.insert( (*tyvar )->get_name() );
+                } // for
+        } // if
+        // bind type variables from generic type instantiations
+        for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_baseParameters().begin(); tyvar != type->get_baseParameters().end(); ++tyvar ) {
+                boundVars.insert( (*tyvar)->get_name() );
+        } // for
+        Type *ret = Mutator::mutate( type );
+        boundVars = oldBoundVars;
+        return ret;
+}
+
 Type * TypeSubstitution::mutate( VoidType *basicType ) {
         return handleType( basicType );
@@ -157 +176 @@
 
 Type * TypeSubstitution::mutate( StructInstType *aggregateUseType ) {
-        return handleType( aggregateUseType );
+        return handleAggregateType( aggregateUseType );
 }
 
 Type * TypeSubstitution::mutate( UnionInstType *aggregateUseType ) {
-        return handleType( aggregateUseType );
+        return handleAggregateType( aggregateUseType );
 }