Changeset ac9ca96 for src/Tuples

Timestamp:

Oct 13, 2016, 11:19:23 AM (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, resolv-new, with_gc

Children:

7756647

Parents:

65660bd

Message:

consider tuples managed if a tuple constructor is declared, combine environments in tuple assignment

File:

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

src/Tuples/TupleAssignment.cc

@@ -142 +142 @@
                 for ( std::list< Expression * >::iterator i = new_assigns.begin(); i != new_assigns.end(); ++i ) {
                         ResolvExpr::AlternativeFinder finder( currentFinder.get_indexer(), currentFinder.get_environ() );
-                        finder.findWithAdjustment(*i);
+                        try {
+                                finder.findWithAdjustment(*i);
+                        } catch (...) {
+                                return; // xxx - no match should not mean failure, it just means this particular tuple assignment isn't valid
+                        }
                         // prune expressions that don't coincide with
                         ResolvExpr::AltList alts = finder.get_alternatives();
@@ -157 +161 @@
                 }
                 // xxx - need to do this??
-                // TypeEnvironment compositeEnv;
-                // simpleCombineEnvironments( i->begin(), i->end(), compositeEnv );
-                currentFinder.get_alternatives().push_front( ResolvExpr::Alternative(new TupleAssignExpr(solved_assigns, matcher->tmpDecls), currentFinder.get_environ(), ResolvExpr::sumCost( current ) ) );
+                ResolvExpr::TypeEnvironment compositeEnv;
+                simpleCombineEnvironments( current.begin(), current.end(), compositeEnv );
+                currentFinder.get_alternatives().push_front( ResolvExpr::Alternative(new TupleAssignExpr(solved_assigns, matcher->tmpDecls), compositeEnv, ResolvExpr::sumCost( current ) ) );
         }