Changeset 02ec390

Timestamp:

Nov 25, 2015, 2:53:22 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:

7e23d0a

Parents:

70d4b4f

Message:

First attempt at properly resolving functions on generic types

File:

• src/ResolvExpr/Unify.cc (modified) (2 diffs)

src/ResolvExpr/Unify.cc

@@ -61 +61 @@
 
                 template< typename RefType > void handleRefType( RefType *inst, Type *other );
+                template< typename RefType > void handleGenericRefType( RefType *inst, Type *other );
 
                 bool result;
@@ -464 +465 @@
 
         template< typename RefType >
-        void Unify::handleRefType( RefType *inst, Type *other ) {  
+        void Unify::handleRefType( RefType *inst, Type *other ) {
+                // check that other type is compatible and named the same
                 RefType *otherStruct = dynamic_cast< RefType* >( other );
                 result = otherStruct && inst->get_name() == otherStruct->get_name();
-        }  
+        }
+
+        template< typename RefType >
+        void Unify::handleGenericRefType( RefType *inst, Type *other ) {
+                // Check that other type is compatible and named the same
+                handleRefType( inst, other );
+                if ( ! result ) return;
+                // Check that parameters of type unify, if any
+                std::list< Expression* > params = inst->get_parameters();
+                if ( ! params.empty() ) {
+                        std::list< TypeDecl* > *baseParams = inst->get_baseParameters();
+                        if ( ! baseParams ) {
+                                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;
+                        }
+                }
+        }
 
         void Unify::visit(StructInstType *structInst) {
-                handleRefType( structInst, type2 );
+                handleGenericRefType( structInst, type2 );
         }
 
         void Unify::visit(UnionInstType *unionInst) {
-                handleRefType( unionInst, type2 );
+                handleGenericRefType( unionInst, type2 );
         }