Changeset 9a19608 for src/AST/TypeEnvironment.cpp

Timestamp:

Jun 4, 2019, 4:49:30 PM (5 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

9519aba

Parents:

1867c96 (diff), de8dfac2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/AST/TypeEnvironment.cpp (modified) (5 diffs)

src/AST/TypeEnvironment.cpp

@@ -235 +235 @@
 }
 
+/// true if a type is a function type
+bool isFtype( const Type * type ) {
+        if ( dynamic_cast< const FunctionType * >( type ) ) {
+                return true;
+        } else if ( auto typeInst = dynamic_cast< const TypeInstType * >( type ) ) {
+                return typeInst->kind == TypeVar::Ftype;
+        } else return false;
+}
+
 namespace {
-        /// true if a type is a function type
-        bool isFtype( const Type * type ) {
-                if ( dynamic_cast< const FunctionType * >( type ) ) {
-                        return true;
-                } else if ( auto typeInst = dynamic_cast< const TypeInstType * >( type ) ) {
-                        return typeInst->kind == TypeVar::Ftype;
-                } else return false;
-        }
-
         /// true if the given type can be bound to the given type variable
         bool tyVarCompatible( const TypeDecl::Data & data, const Type * type ) {
@@ -285 +285 @@
                         ptr<Type> common;
                         ptr<Type> newType = it->bound;
-                        newType.get_and_mutate()->qualifiers = typeInst->qualifiers;
+                        reset_qualifiers( newType, typeInst->qualifiers );
                         if ( unifyInexact( 
                                         newType, target, *this, need, have, open, 
@@ -291 +291 @@
                                 if ( common ) {
                                         it->bound = std::move(common);
-                                        clear_qualifiers( it->bound );
+                                        reset_qualifiers( it->bound );
                                 }
                         } else return false;
                 } else {
                         it->bound = std::move(target);
-                        clear_qualifiers( it->bound );
+                        reset_qualifiers( it->bound );
                         it->allowWidening = widen.first && widen.second;
                 }
@@ -351 +351 @@
                         if ( common ) {
                                 c1->bound = std::move(common);
-                                clear_qualifiers( c1->bound );
+                                reset_qualifiers( c1->bound );
                         }
                         c1->data.isComplete |= data.isComplete;
@@ -411 +411 @@
                                 if ( common ) {
                                         to.bound = std::move(common);
-                                        clear_qualifiers( to.bound );
+                                        reset_qualifiers( to.bound );
                                 }
                         } else return false; // cannot unify