Changeset b226721

Timestamp:

Oct 25, 2017, 5:28: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:

598f50e

Parents:

4573e3c

Message:

Carry forward environment from function to function call

Location:

src

Files:

• GenPoly/Specialize.cc (modified) (1 diff)
• ResolvExpr/AlternativeFinder.cc (modified) (1 diff)

src/GenPoly/Specialize.cc

@@ -66 +66 @@
                                 if ( ! boundType ) continue;
                                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( boundType ) ) {
+                                        // bound to another type variable
                                         if ( closedVars.find( typeInst->get_name() ) == closedVars.end() ) {
+                                                // bound to a closed variable => must specialize
                                                 return true;
                                         } // if
                                 } else {
+                                        // variable is bound to a concrete type => must specialize
                                         return true;
                                 } // if
                         } // for
+                        // none of the type variables are bound
                         return false;
                 } else {
+                        // no env
                         return false;
                 } // if

src/ResolvExpr/AlternativeFinder.cc

@@ -680 +680 @@
                 OpenVarSet openVars;
                 AssertionSet resultNeed, resultHave;
-                TypeEnvironment resultEnv;
+                TypeEnvironment resultEnv( func.env );
                 makeUnifiableVars( funcType, openVars, resultNeed );
                 resultEnv.add( funcType->get_forall() ); // add all type variables as open variables now so that those not used in the parameter list are still considered open