Changeset 83b52f1 for src/ResolvExpr/TypeEnvironment.cc

Timestamp:

Jul 24, 2019, 10:40:28 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

77d2432, 96ac72c

Parents:

6130304 (diff), 8fc15cf (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/ResolvExpr/TypeEnvironment.cc (modified) (7 diffs)

src/ResolvExpr/TypeEnvironment.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:19:47 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Mon Jun 18 11:58:00 2018
-// Update Count     : 4
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Jun 18 14:27:00 2019
+// Update Count     : 5
 //
 
@@ -315 +315 @@
         }
 
-        bool isFtype( Type *type ) {
-                if ( dynamic_cast< FunctionType* >( type ) ) {
+        bool isFtype( const Type * type ) {
+                if ( dynamic_cast< const FunctionType * >( type ) ) {
                         return true;
-                } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) {
+                } else if ( const TypeInstType *typeInst = dynamic_cast< const TypeInstType * >( type ) ) {
                         return typeInst->get_isFtype();
                 } // if
@@ -324 +324 @@
         }
 
-        bool tyVarCompatible( const TypeDecl::Data & data, Type *type ) {
+        bool tyVarCompatible( const TypeDecl::Data & data, const Type * type ) {
                 switch ( data.kind ) {
                   case TypeDecl::Dtype:
@@ -336 +336 @@
                   case TypeDecl::Ttype:
                         // ttype unifies with any tuple type
-                        return dynamic_cast< TupleType * >( type ) || Tuples::isTtype( type );
+                        return dynamic_cast< const TupleType * >( type ) || Tuples::isTtype( type );
                   default:
                         assertf(false, "Unhandled tyvar kind: %d", data.kind);
@@ -343 +343 @@
         }
 
-        bool TypeEnvironment::bindVar( TypeInstType *typeInst, Type *bindTo, const TypeDecl::Data & data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer ) {
+        bool TypeEnvironment::bindVar( const TypeInstType *typeInst, Type *bindTo, const TypeDecl::Data & data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer ) {
 
                 // remove references from other, so that type variables can only bind to value types
@@ -361 +361 @@
                                 // attempt to unify equivalence class type (which has qualifiers stripped, so they must be restored) with the type to bind to
                                 std::unique_ptr< Type > newType( curClass->type->clone() );
-                                newType->get_qualifiers() = typeInst->get_qualifiers();
+                                newType->tq = typeInst->tq;
                                 if ( unifyInexact( newType.get(), bindTo, *this, need, have, openVars, widen & WidenMode( curClass->allowWidening, true ), indexer, common ) ) {
                                         if ( common ) {
@@ -386 +386 @@
         }
 
-        bool TypeEnvironment::bindVarToVar( TypeInstType *var1, TypeInstType *var2, 
-                        TypeDecl::Data && data, AssertionSet &need, AssertionSet &have, 
+        bool TypeEnvironment::bindVarToVar( const TypeInstType * var1, const TypeInstType * var2,
+                        TypeDecl::Data && data, AssertionSet &need, AssertionSet &have,
                         const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer ) {