Changeset b7d6a36 for src/AST/TypeEnvironment.cpp

Timestamp:

Feb 20, 2020, 4:15:51 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

6a490b2

Parents:

dca5802 (diff), 2cbfe92 (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' into relaxed_ready

File:

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

src/AST/TypeEnvironment.cpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Wed May 29 11:00:00 2019
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Wed May 29 11:00:00 2019
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Dec 11 21:49:13 2019
+// Update Count     : 4
 //
 
@@ -240 +240 @@
                 return true;
         } else if ( auto typeInst = dynamic_cast< const TypeInstType * >( type ) ) {
-                return typeInst->kind == TypeVar::Ftype;
+                return typeInst->kind == TypeDecl::Ftype;
         } else return false;
 }
@@ -248 +248 @@
         bool tyVarCompatible( const TypeDecl::Data & data, const Type * type ) {
                 switch ( data.kind ) {
-                  case TypeVar::Dtype:
+                  case TypeDecl::Dtype:
                         // to bind to an object type variable, the type must not be a function type.
                         // if the type variable is specified to be a complete type then the incoming
@@ -254 +254 @@
                         // xxx - should this also check that type is not a tuple type and that it's not a ttype?
                         return ! isFtype( type ) && ( ! data.isComplete || type->isComplete() );
-                  case TypeVar::Ftype:
+                  case TypeDecl::Ftype:
                         return isFtype( type );
-                  case TypeVar::Ttype:
+                  case TypeDecl::Ttype:
                         // ttype unifies with any tuple type
                         return dynamic_cast< const TupleType * >( type ) || Tuples::isTtype( type );