Changeset 8f9cc50 for src/ResolvExpr

Timestamp:

Nov 11, 2016, 1:31:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

33a7b6d

Parents:

30b65d8 (diff), 668e971a (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 tuples

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (1 diff)
• Resolver.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -1004 +1004 @@
                                         AssertionSet needAssertions, haveAssertions;
                                         Alternative newAlt( 0, third->env, first->cost + second->cost + third->cost );
-                                        Type* commonType;
+                                        Type* commonType = nullptr;
                                         if ( unify( second->expr->get_result(), third->expr->get_result(), newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
                                                 ConditionalExpr *newExpr = new ConditionalExpr( first->expr->clone(), second->expr->clone(), third->expr->clone() );

src/ResolvExpr/Resolver.cc

@@ -72 +72 @@
                 Type * functionReturn = nullptr;
                 Type *initContext = nullptr;
-                Type *switchType = nullptr;
                 bool inEnumDecl = false;
         };