Changeset 72b3605 for src/ResolvExpr/TypeEnvironment.cc

Timestamp:

Aug 20, 2018, 3:03:20 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

efa8b6a

Parents:

f7d3215 (diff), ec91336 (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 'demangler'

File:

• src/ResolvExpr/TypeEnvironment.cc (modified) (6 diffs)

src/ResolvExpr/TypeEnvironment.cc

@@ -69 +69 @@
         }
 
-        EqvClass::EqvClass( EqvClass &&other ) 
-        : vars{std::move(other.vars)}, type{other.type}, 
+        EqvClass::EqvClass( EqvClass &&other )
+        : vars{std::move(other.vars)}, type{other.type},
           allowWidening{std::move(other.allowWidening)}, data{std::move(other.data)} {
                   other.type = nullptr;
@@ -85 +85 @@
                 if ( this == &other ) return *this;
                 delete type;
-                
+
                 vars = std::move(other.vars);
                 type = other.type;
@@ -132 +132 @@
                         ++next;
                         std::set<std::string> intersection;
-                        std::set_intersection( i->vars.begin(), i->vars.end(), eqvClass.vars.begin(), eqvClass.vars.end(), 
+                        std::set_intersection( i->vars.begin(), i->vars.end(), eqvClass.vars.begin(), eqvClass.vars.end(),
                                 std::inserter( intersection, intersection.begin() ) );
                         if ( ! intersection.empty() ) { env.erase( i ); }
@@ -240 +240 @@
                         // ttype unifies with any tuple type
                         return dynamic_cast< TupleType * >( type ) || Tuples::isTtype( type );
+                  default:
+                        assertf(false, "Unhandled tyvar kind: %d", data.kind);
                 } // switch
                 return false;
@@ -245 +247 @@
 
         bool TypeEnvironment::bindVar( TypeInstType *typeInst, Type *bindTo, const TypeDecl::Data & data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer ) {
-                
+
                 // remove references from other, so that type variables can only bind to value types
                 bindTo = bindTo->stripReferences();
@@ -291 +293 @@
                 auto class1 = internal_lookup( var1->get_name() );
                 auto class2 = internal_lookup( var2->get_name() );
-                
+
                 // exit early if variables already bound together
                 if ( class1 != env.end() && class1 == class2 ) {