Changeset a2eda27


Ignore:
Timestamp:
Nov 18, 2015, 4:21:37 PM (6 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, 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:
258eb5c9
Parents:
d8847b7
Message:

Switch type matching to use typesCompatible (on Rob's recommendation)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/GenPoly/InstantiateGeneric.cc

    rd8847b7 ra2eda27  
    2323#include "PolyMutator.h"
    2424
    25 #include "SymTab/TypeEquality.h"
     25#include "ResolvExpr/typeops.h"
     26#include "SymTab/Indexer.h"
    2627#include "SynTree/Declaration.h"
    2728#include "SynTree/Mutator.h"
     
    6768                       
    6869                        bool operator== (const ConcreteType& that) const {
     70                                SymTab::Indexer dummy;
     71                               
    6972                                if ( base != that.base ) return false;
    7073                                if ( params.size() != that.params.size() ) return false;
    7174                                for ( std::list< Type* >::const_iterator it = params.begin(), jt = that.params.begin(); it != params.end(); ++it, ++jt ) {
    72                                         if ( ! SymTab::typeEquals(*it, *jt) ) return false;
     75                                        if ( ! ResolvExpr::typesCompatible( *it, *jt, dummy ) ) return false;
    7376                                }
    7477                                return true;
Note: See TracChangeset for help on using the changeset viewer.