Changes in src/ResolvExpr/Unify.cc [1cbca6e:f5234f3]

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;
@@ -496 +497 @@
 
         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 types unify, if any
+                std::list< Expression* > params = inst->get_parameters();
+                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;
+                        }
+                }
+                result = ( it == params.end() && jt == otherParams.end() );
+        }
 
         void Unify::visit(StructInstType *structInst) {
-                handleRefType( structInst, type2 );
+                handleGenericRefType( structInst, type2 );
         }
 
         void Unify::visit(UnionInstType *unionInst) {
-                handleRefType( unionInst, type2 );
+                handleGenericRefType( unionInst, type2 );
         }