Changeset 67130fe for src/ResolvExpr/TypeEnvironment.cc

Timestamp:

Jun 4, 2019, 6:39:23 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

c6a1e8a

Parents:

7564e10 (diff), 1346914 (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) (9 diffs)

src/ResolvExpr/TypeEnvironment.cc

@@ -205 +205 @@
                                 // attempt to unify bound types
                                 std::unique_ptr<Type> toType{ to.type->clone() }, fromType{ from.type->clone() };
-                                WidenMode widenMode{ to.allowWidening, from.allowWidening };
+                                WidenMode widen{ to.allowWidening, from.allowWidening };
                                 Type* common = nullptr;
                                 AssertionSet need, have;
-                                if ( unifyInexact( toType.get(), fromType.get(), *this, need, have, openVars, widenMode, indexer, common ) ) {
+                                if ( unifyInexact( toType.get(), fromType.get(), *this, need, have, openVars, widen, indexer, common ) ) {
                                         // unifies, set common type if necessary
                                         if ( common ) {
@@ -343 +343 @@
         }
 
-        bool TypeEnvironment::bindVar( TypeInstType *typeInst, Type *bindTo, const TypeDecl::Data & data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer ) {
+        bool TypeEnvironment::bindVar( 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
@@ -362 +362 @@
                                 std::unique_ptr< Type > newType( curClass->type->clone() );
                                 newType->get_qualifiers() = typeInst->get_qualifiers();
-                                if ( unifyInexact( newType.get(), bindTo, *this, need, have, openVars, widenMode & WidenMode( curClass->allowWidening, true ), indexer, common ) ) {
+                                if ( unifyInexact( newType.get(), bindTo, *this, need, have, openVars, widen & WidenMode( curClass->allowWidening, true ), indexer, common ) ) {
                                         if ( common ) {
                                                 common->get_qualifiers() = Type::Qualifiers{};
@@ -372 +372 @@
                                 newType->get_qualifiers() = Type::Qualifiers{};
                                 curClass->set_type( newType );
-                                curClass->allowWidening = widenMode.widenFirst && widenMode.widenSecond;
+                                curClass->allowWidening = widen.first && widen.second;
                         } // if
                 } else {
@@ -379 +379 @@
                         newClass.type = bindTo->clone();
                         newClass.type->get_qualifiers() = Type::Qualifiers();
-                        newClass.allowWidening = widenMode.widenFirst && widenMode.widenSecond;
+                        newClass.allowWidening = widen.first && widen.second;
                         newClass.data = data;
                         env.push_back( std::move(newClass) );
@@ -388 +388 @@
         bool TypeEnvironment::bindVarToVar( TypeInstType *var1, TypeInstType *var2, 
                         TypeDecl::Data && data, AssertionSet &need, AssertionSet &have, 
-                        const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer ) {
+                        const OpenVarSet &openVars, WidenMode widen, const SymTab::Indexer &indexer ) {
 
                 auto class1 = internal_lookup( var1->get_name() );
@@ -395 +395 @@
                 // exit early if variables already bound together
                 if ( class1 != env.end() && class1 == class2 ) {
-                        class1->allowWidening &= widenMode;
+                        class1->allowWidening &= widen;
                         return true;
                 }
@@ -408 +408 @@
                                 type1 = class1->type;
                         } // if
-                        widen1 = widenMode.widenFirst && class1->allowWidening;
+                        widen1 = widen.first && class1->allowWidening;
                 } // if
                 if ( class2 != env.end() ) {
@@ -415 +415 @@
                                 type2 = class2->type;
                         } // if
-                        widen2 = widenMode.widenSecond && class2->allowWidening;
+                        widen2 = widen.second && class2->allowWidening;
                 } // if