Changeset f5234f3

Timestamp:

Nov 26, 2015, 3:48:04 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:

b81096f

Parents:

32d281d

Message:

Unify parameter types for generic types

File:

• src/ResolvExpr/Unify.cc (modified) (1 diff)

src/ResolvExpr/Unify.cc

@@ -508 +508 @@
                 handleRefType( inst, other );
                 if ( ! result ) return;
-                // Check that parameters of type unify, if any
+                // Check that parameters of types unify, if any
                 std::list< Expression* > params = inst->get_parameters();
-                if ( ! params.empty() ) {
-                        std::list< TypeDecl* > *baseParams = inst->get_baseParameters();
-                        if ( ! baseParams ) {
+                std::list< Expression* > otherParams = ((RefType*)other)->get_parameters();
+
+                std::list< Expression* >::const_iterator it = params.begin(), jt = otherParams.begin();
+                for ( ; it != params.end() && jt != otherParams.end(); ++it, ++jt ) {
+                        TypeExpr *param = dynamic_cast< TypeExpr* >(*it);
+                        assert(param && "Aggregate parameters should be type expressions");
+                        TypeExpr *otherParam = dynamic_cast< TypeExpr* >(*jt);
+                        assert(otherParam && "Aggregate parameters should be type expressions");
+
+                        if ( ! unifyExact( param->get_type(), otherParam->get_type(), env, needAssertions, haveAssertions, openVars, WidenMode(false, false), indexer ) ) {
                                 result = false;
                                 return;
                         }
-                        std::list< Expression* >::const_iterator it = params.begin();
-                        std::list< TypeDecl* >::const_iterator baseIt = baseParams->begin();
-                        while ( it != params.end() && baseIt != baseParams->end()) {
-                                TypeExpr *param = dynamic_cast< TypeExpr* >(*it);
-                                assert(param && "Aggregate parameters should be type expressions");
-                                TypeInstType baseType(Type::Qualifiers(), (*baseIt)->get_name(), *baseIt);
-                                if ( ! unifyExact( param->get_type(), &baseType, env, needAssertions, haveAssertions, openVars, WidenMode(false, false), indexer ) ) {
-                                        result = false;
-                                        return;
-                                }
-                                
-                                ++it;
-                                ++baseIt;
-                        }
-                        if ( it != params.end() || baseIt != baseParams->end() ) {
-                                result = false;
-                        }
                 }
+                result = ( it == params.end() && jt == otherParams.end() );
         }