Changeset ed94eac for src/SynTree/TypeSubstitution.cc

Timestamp:

Nov 20, 2015, 12:27:01 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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, 70d4b4f, 839ccbb

Parents:

258eb5c9

Message:

Fixed bug with get_baseParameters()

File:

• src/SynTree/TypeSubstitution.cc (modified) (1 diff)

src/SynTree/TypeSubstitution.cc

@@ -147 +147 @@
         } // 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
+        std::list< TypeDecl* > *baseParameters = type->get_baseParameters();
+        if ( baseParameters && ! type->get_parameters().empty() ) {
+                for ( std::list< TypeDecl* >::const_iterator tyvar = baseParameters->begin(); tyvar != baseParameters->end(); ++tyvar ) {
+                        boundVars.insert( (*tyvar)->get_name() );
+                } // for
+        } // if
         Type *ret = Mutator::mutate( type );
         boundVars = oldBoundVars;