Changeset f8d05ee for src/AST/TypeEnvironment.cpp

Timestamp:

Aug 12, 2020, 12:19:39 PM (5 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:

74807be, fb0ae06

Parents:

7f66cec (diff), 7ff3e522 (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 'new-ast' of plg.uwaterloo.ca:software/cfa/cfa-cc into new-ast

File:

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

src/AST/TypeEnvironment.cpp

@@ -59 +59 @@
         std::copy( clz.vars.begin(), clz.vars.end(), std::ostream_iterator< std::string >( out, " " ) );
         out << ")";
-        
+
         if ( clz.bound ) {
                 out << " -> ";
@@ -92 +92 @@
                                 }
                         }
-                        
+
                         i = next;  // go to next node even if this removed
                 }
@@ -161 +161 @@
                 Pass<Occurs> occur{ var, env };
                 maybe_accept( ty, occur );
-                return occur.pass.result;
-        }
-}
-
-bool TypeEnvironment::combine( 
+                return occur.core.result;
+        }
+}
+
+bool TypeEnvironment::combine(
                 const TypeEnvironment & o, OpenVarSet & open, const SymbolTable & symtab ) {
         // short-circuit easy cases
@@ -199 +199 @@
                                 auto st = internal_lookup( *vt );
                                 if ( st == env.end() ) {
-                                        // unbound, safe to add if occurs 
+                                        // unbound, safe to add if occurs
                                         if ( r.bound && occurs( r.bound, *vt, *this ) ) return false;
                                         r.vars.emplace( *vt );
@@ -266 +266 @@
 }
 
-bool TypeEnvironment::bindVar( 
-                const TypeInstType * typeInst, const Type * bindTo, const TypeDecl::Data & data, 
-                AssertionSet & need, AssertionSet & have, const OpenVarSet & open, WidenMode widen, 
-                const SymbolTable & symtab 
+bool TypeEnvironment::bindVar(
+                const TypeInstType * typeInst, const Type * bindTo, const TypeDecl::Data & data,
+                AssertionSet & need, AssertionSet & have, const OpenVarSet & open, WidenMode widen,
+                const SymbolTable & symtab
 ) {
         // remove references from bound type, so that type variables can only bind to value types
@@ -286 +286 @@
                         ptr<Type> newType = it->bound;
                         reset_qualifiers( newType, typeInst->qualifiers );
-                        if ( unifyInexact( 
-                                        newType, target, *this, need, have, open, 
+                        if ( unifyInexact(
+                                        newType, target, *this, need, have, open,
                                         widen & WidenMode{ it->allowWidening, true }, symtab, common ) ) {
                                 if ( common ) {
@@ -300 +300 @@
                 }
         } else {
-                env.emplace_back( 
+                env.emplace_back(
                         typeInst->name, target, widen.first && widen.second, data );
         }
@@ -306 +306 @@
 }
 
-bool TypeEnvironment::bindVarToVar( 
-                const TypeInstType * var1, const TypeInstType * var2, TypeDecl::Data && data, 
-                AssertionSet & need, AssertionSet & have, const OpenVarSet & open, 
-                WidenMode widen, const SymbolTable & symtab 
+bool TypeEnvironment::bindVarToVar(
+                const TypeInstType * var1, const TypeInstType * var2, TypeDecl::Data && data,
+                AssertionSet & need, AssertionSet & have, const OpenVarSet & open,
+                WidenMode widen, const SymbolTable & symtab
 ) {
         auto c1 = internal_lookup( var1->name );
         auto c2 = internal_lookup( var2->name );
-        
+
         // exit early if variables already bound together
         if ( c1 != env.end() && c1 == c2 ) {
@@ -396 +396 @@
 }
 
-bool TypeEnvironment::mergeBound( 
+bool TypeEnvironment::mergeBound(
                 EqvClass & to, const EqvClass & from, OpenVarSet & open, const SymbolTable & symtab ) {
         if ( from.bound ) {
@@ -406 +406 @@
                         AssertionSet need, have;
 
-                        if ( unifyInexact( 
+                        if ( unifyInexact(
                                         toType, fromType, *this, need, have, open, widen, symtab, common ) ) {
                                 // unifies, set common type if necessary
@@ -424 +424 @@
 }
 
-bool TypeEnvironment::mergeClasses( 
+bool TypeEnvironment::mergeClasses(
         ClassList::iterator to, ClassList::iterator from, OpenVarSet & open, const SymbolTable & symtab
 ) {