Changeset 753bf60 for src/Tuples

Timestamp:

May 22, 2018, 4:09:29 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, with_gc

Children:

a8706fc

Parents:

3d2ae8d

Message:

Resolve RHS tuple assignment alternative with cast to include missing type bindings

File:

• src/Tuples/TupleAssignment.cc (modified) (2 diffs)

src/Tuples/TupleAssignment.cc

@@ -231 +231 @@
 
                         ResolvExpr::AlternativeFinder finder{ currentFinder.get_indexer(),
-                                currentFinder.get_environ() };
+                                matcher->compositeEnv };
+
                         try {
                                 finder.findWithAdjustment(*i);
@@ -349 +350 @@
                                 ltmp.push_back( lobj );
                                 rtmp.push_back( robj );
+
+                                // resolve the cast expression so that rhsAlt return type is bound by the cast type as needed, and transfer the resulting environment
+                                ResolvExpr::AlternativeFinder finder{ spotter.currentFinder.get_indexer(), compositeEnv };
+                                finder.findWithAdjustment( rhsAlt.expr );
+                                assert( finder.get_alternatives().size() == 1 );
+                                compositeEnv = std::move( finder.get_alternatives().front().env );
                         }
                         tmpDecls.splice( tmpDecls.end(), ltmp );