Changes in src/ResolvExpr/Unify.cc [1dcd52a3:36a2367]

File:

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

src/ResolvExpr/Unify.cc

@@ -563 +563 @@
                         flatten( dcl->get_type(), back_inserter( types ) );
                         for ( Type * t : types ) {
-                                // outermost const, volatile, _Atomic qualifiers in parameters should not play a role in the unification of function types, since they do not determine whether a function is callable.
-                                // Note: MUST consider at least mutex qualifier, since functions can be overloaded on outermost mutex and a mutex function has different requirements than a non-mutex function.
-                                t->get_qualifiers() -= Type::Qualifiers(Type::Const | Type::Volatile | Type::Atomic);
-
                                 dst.push_back( new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::C, nullptr, t, nullptr ) );
                         }
@@ -584 +580 @@
 
                         // sizes don't have to match if ttypes are involved; need to be more precise wrt where the ttype is to prevent errors
-                        if ( (flatFunc->parameters.size() == flatOther->parameters.size() && flatFunc->returnVals.size() == flatOther->returnVals.size()) || flatFunc->isTtype() || flatOther->isTtype() ) {
-                                if ( unifyDeclList( flatFunc->parameters.begin(), flatFunc->parameters.end(), flatOther->parameters.begin(), flatOther->parameters.end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
-                                        if ( unifyDeclList( flatFunc->returnVals.begin(), flatFunc->returnVals.end(), flatOther->returnVals.begin(), flatOther->returnVals.end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
+                        if ( (flatFunc->get_parameters().size() == flatOther->get_parameters().size() && flatFunc->get_returnVals().size() == flatOther->get_returnVals().size()) || flatFunc->isTtype() || flatOther->isTtype() ) {
+                                if ( unifyDeclList( flatFunc->get_parameters().begin(), flatFunc->get_parameters().end(), flatOther->get_parameters().begin(), flatOther->get_parameters().end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
+                                        if ( unifyDeclList( flatFunc->get_returnVals().begin(), flatFunc->get_returnVals().end(), flatOther->get_returnVals().begin(), flatOther->get_returnVals().end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
 
                                                 // the original types must be used in mark assertions, since pointer comparisons are used
@@ -603 +599 @@
                 // check that other type is compatible and named the same
                 RefType *otherStruct = dynamic_cast< RefType* >( other );
-                result = otherStruct && inst->name == otherStruct->name;
+                result = otherStruct && inst->get_name() == otherStruct->get_name();
         }
 
@@ -612 +608 @@
                 if ( ! result ) return;
                 // Check that parameters of types unify, if any
-                std::list< Expression* > params = inst->parameters;
-                std::list< Expression* > otherParams = ((RefType*)other)->parameters;
+                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();