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

File:

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

src/ResolvExpr/Unify.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:27:10 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Sep 02 14:43:22 2015
-// Update Count     : 36
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jun 26 14:57:05 2015
+// Update Count     : 7
 //
 
@@ -28 +28 @@
 
 
-// #define DEBUG
+//#define DEBUG
 
 namespace ResolvExpr {
@@ -61 +61 @@
 
                 template< typename RefType > void handleRefType( RefType *inst, Type *other );
+                template< typename RefType > void handleGenericRefType( RefType *inst, Type *other );
 
                 bool result;
@@ -80 +81 @@
         bool typesCompatible( Type *first, Type *second, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 TypeEnvironment newEnv;
-                OpenVarSet openVars, closedVars; // added closedVars
+                OpenVarSet openVars;
                 AssertionSet needAssertions, haveAssertions;
                 Type *newFirst = first->clone(), *newSecond = second->clone();
                 env.apply( newFirst );
                 env.apply( newSecond );
-
-                // do we need to do this? Seems like we do, types should be able to be compatible if they
-                // have free variables that can unify
-                findOpenVars( newFirst, openVars, closedVars, needAssertions, haveAssertions, false );
-                findOpenVars( newSecond, openVars, closedVars, needAssertions, haveAssertions, true );
-
                 bool result = unifyExact( newFirst, newSecond, newEnv, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer );
                 delete newFirst;
@@ -431 +426 @@
 
         void Unify::visit(ArrayType *arrayType) {
+                // XXX -- compare array dimension
                 ArrayType *otherArray = dynamic_cast< ArrayType* >( type2 );
-                // to unify, array types must both be VLA or both not VLA
-                // and must both have a dimension expression or not have a dimension
-                if ( otherArray && arrayType->get_isVarLen() == otherArray->get_isVarLen() 
-                                && ((arrayType->get_dimension() != 0 && otherArray->get_dimension() != 0)
-                                        || (arrayType->get_dimension() == 0 && otherArray->get_dimension() == 0))) {
-
-                        // not positive this is correct in all cases, but it's needed for typedefs
-                        if ( arrayType->get_isVarLen() || otherArray->get_isVarLen() ) {
-                                return;
-                        }
-
-                        if ( ! arrayType->get_isVarLen() && ! otherArray->get_isVarLen() &&
-                                arrayType->get_dimension() != 0 && otherArray->get_dimension() != 0 ) {
-                                ConstantExpr * ce1 = dynamic_cast< ConstantExpr * >( arrayType->get_dimension() );
-                                ConstantExpr * ce2 = dynamic_cast< ConstantExpr * >( otherArray->get_dimension() );
-                                assert(ce1 && ce2);
-
-                                Constant * c1 = ce1->get_constant();
-                                Constant * c2 = ce2->get_constant();
-
-                                if ( c1->get_value() != c2->get_value() ) {
-                                        // does not unify if the dimension is different
-                                        return;
-                                }
-                        }
-
+                if ( otherArray && arrayType->get_isVarLen() == otherArray->get_isVarLen() ) {
                         result = unifyExact( arrayType->get_base(), otherArray->get_base(), env, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer );
                 } // if
@@ -465 +436 @@
         bool unifyDeclList( Iterator1 list1Begin, Iterator1 list1End, Iterator2 list2Begin, Iterator2 list2End, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, const SymTab::Indexer &indexer ) {
                 for ( ; list1Begin != list1End && list2Begin != list2End; ++list1Begin, ++list2Begin ) {
-                        // Type * commonType;
-                        // if ( ! unifyInexact( (*list1Begin)->get_type(), (*list2Begin)->get_type(), env, needAssertions, haveAssertions, openVars, WidenMode( true, true ), indexer, commonType ) ) {
                         if ( ! unifyExact( (*list1Begin)->get_type(), (*list2Begin)->get_type(), env, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer ) ) {
                                 return false;
@@ -481 +450 @@
                 FunctionType *otherFunction = dynamic_cast< FunctionType* >( type2 );
                 if ( otherFunction && functionType->get_isVarArgs() == otherFunction->get_isVarArgs() ) {
-
+  
                         if ( unifyDeclList( functionType->get_parameters().begin(), functionType->get_parameters().end(), otherFunction->get_parameters().begin(), otherFunction->get_parameters().end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
         
@@ -496 +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 );
         }