Ignore:
Timestamp:
Dec 15, 2015, 5:33:25 PM (6 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
aaron-thesis, arm-eh, 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, resolv-new, string, with_gc
Children:
35304009, 8360977
Parents:
ffad73a (diff), 4389966 (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 changes from Peter

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/GenPoly/GenPoly.cc

    rffad73a r5f6c42c  
    99// Author           : Richard C. Bilson
    1010// Created On       : Mon May 18 07:44:20 2015
    11 // Last Modified By : Rob Schluntz
    12 // Last Modified On : Tue Nov 24 15:23:08 2015
    13 // Update Count     : 11
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Tue Dec 15 16:11:18 2015
     13// Update Count     : 13
    1414//
    1515
     
    8080       
    8181        Type *isPolyType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
    82                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) {
     82                if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
    8383                        if ( env ) {
    8484                                if ( Type *newType = env->lookup( typeInst->get_name() ) ) {
    8585                                        return isPolyType( newType, tyVars, env );
    86                                 } // if
    8786                        } // if
     87                } // if
    8888                        if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
    8989                                return type;
    90                         }
     90        }
    9191                } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) {
    9292                        if ( hasPolyParams( structType->get_parameters(), tyVars, env ) ) return type;
Note: See TracChangeset for help on using the changeset viewer.