Changeset a2eda27

Timestamp:

Nov 18, 2015, 4:21:37 PM (8 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:

258eb5c9

Parents:

d8847b7

Message:

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

File:

• src/GenPoly/InstantiateGeneric.cc (modified) (2 diffs)

src/GenPoly/InstantiateGeneric.cc

@@ -23 +23 @@
 #include "PolyMutator.h"
 
-#include "SymTab/TypeEquality.h"
+#include "ResolvExpr/typeops.h"
+#include "SymTab/Indexer.h"
 #include "SynTree/Declaration.h"
 #include "SynTree/Mutator.h"
@@ -67 +68 @@
                         
                         bool operator== (const ConcreteType& that) const {
+                                SymTab::Indexer dummy;
+                                
                                 if ( base != that.base ) return false;
                                 if ( params.size() != that.params.size() ) return false;
                                 for ( std::list< Type* >::const_iterator it = params.begin(), jt = that.params.begin(); it != params.end(); ++it, ++jt ) {
-                                        if ( ! SymTab::typeEquals(*it, *jt) ) return false;
+                                        if ( ! ResolvExpr::typesCompatible( *it, *jt, dummy ) ) return false;
                                 }
                                 return true;