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

File:

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

src/ResolvExpr/Unify.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:27:10 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 26 14:57:05 2015
-// Update Count     : 7
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Sep 02 14:43:22 2015
+// Update Count     : 36
 //
 
@@ -28 +28 @@
 
 
-//#define DEBUG
+// #define DEBUG
 
 namespace ResolvExpr {
@@ -81 +81 @@
         bool typesCompatible( Type *first, Type *second, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 TypeEnvironment newEnv;
-                OpenVarSet openVars;
+                OpenVarSet openVars, closedVars; // added closedVars
                 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;
@@ -426 +432 @@
 
         void Unify::visit(ArrayType *arrayType) {
-                // XXX -- compare array dimension
                 ArrayType *otherArray = dynamic_cast< ArrayType* >( type2 );
-                if ( otherArray && arrayType->get_isVarLen() == otherArray->get_isVarLen() ) {
+                // 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;
+                                }
+                        }
+
                         result = unifyExact( arrayType->get_base(), otherArray->get_base(), env, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer );
                 } // if
@@ -436 +466 @@
         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;
@@ -450 +482 @@
                 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 ) ) {
         
@@ -476 +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() );
         }