Changeset 7030dab for src/AST/TypeEnvironment.hpp

Timestamp:

Apr 6, 2020, 4:46:28 PM (4 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:

e3bc51c

Parents:

71d6bd8 (diff), 057298e (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 new-ast

File:

• src/AST/TypeEnvironment.hpp (modified) (3 diffs)

src/AST/TypeEnvironment.hpp

@@ -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:55:54 2019
+// Update Count     : 3
 //
 
@@ -28 +28 @@
 #include "Type.hpp"
 #include "TypeSubstitution.hpp"
-#include "TypeVar.hpp"
 #include "Common/Indenter.h"
 #include "ResolvExpr/WidenMode.h"
@@ -107 +106 @@
         /// Singleton class constructor from substitution
         EqvClass( const std::string & v, const Type * b )
-        : vars{ v }, bound( b ), allowWidening( false ), data( TypeVar::Dtype, false ) {}
+        : vars{ v }, bound( b ), allowWidening( false ), data( TypeDecl::Dtype, false ) {}
 
         /// Single-var constructor (strips qualifiers from bound type)