Changeset 779a4a3 for src/ResolvExpr

Timestamp:

May 3, 2018, 4:33:19 PM (8 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, stuck-waitfor-destruct, with_gc

Children:

f3152ab

Parents:

f465f0e (diff), c9d5c4f (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 fix-reference-overloading

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (1 diff)
• AlternativeFinder.h (modified) (1 diff)
• Resolver.cc (modified) (2 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -459 +459 @@
         /// Adds type variables to the open variable set and marks their assertions
         void makeUnifiableVars( Type *type, OpenVarSet &unifiableVars, AssertionSet &needAssertions ) {
-                for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+                for ( Type::ForallList::const_iterator tyvar = type->forall.begin(); tyvar != type->forall.end(); ++tyvar ) {
                         unifiableVars[ (*tyvar)->get_name() ] = TypeDecl::Data{ *tyvar };
-                        for ( std::list< DeclarationWithType* >::iterator assert = (*tyvar)->get_assertions().begin(); assert != (*tyvar)->get_assertions().end(); ++assert ) {
+                        for ( std::list< DeclarationWithType* >::iterator assert = (*tyvar)->assertions.begin(); assert != (*tyvar)->assertions.end(); ++assert ) {
                                 needAssertions[ *assert ].isUsed = true;
                         }

src/ResolvExpr/AlternativeFinder.h

@@ -126 +126 @@
         void printAlts( const AltList &list, std::ostream &os, unsigned int indentAmt = 0 );
 
+        /// Adds type variables to the open variable set and marks their assertions
+        void makeUnifiableVars( Type *type, OpenVarSet &unifiableVars, AssertionSet &needAssertions );
+
         template< typename InputIterator >
         void simpleCombineEnvironments( InputIterator begin, InputIterator end, TypeEnvironment &result ) {

src/ResolvExpr/Resolver.cc

@@ -544 +544 @@
                                                         OpenVarSet openVars;
                                                         AssertionSet resultNeed, resultHave;
-                                                        TypeEnvironment resultEnv;
+                                                        TypeEnvironment resultEnv( func.env );
+                                                        makeUnifiableVars( function, openVars, resultNeed );
+                                                        // add all type variables as open variables now so that those not used in the parameter
+                                                        // list are still considered open.
+                                                        resultEnv.add( function->forall );
 
                                                         // Load type variables from arguemnts into one shared space
@@ -583 +587 @@
                                                                         ss << "' to '";
                                                                         arg.expr->get_result()->print( ss );
+                                                                        ss << "' with env '";
+                                                                        resultEnv.print(ss);
                                                                         ss << "'\n";
                                                                         SemanticError( function, ss.str() );