Changes in src/Tuples/TupleAssignment.cc [2c187378:753bf60]

File:

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

src/Tuples/TupleAssignment.cc

@@ -62 +62 @@
                 struct Matcher {
                   public:
-                        Matcher( TupleAssignSpotter &spotter, const ResolvExpr::AltList& lhs, 
-                                const ResolvExpr::AltList& rhs );
+                        Matcher( TupleAssignSpotter &spotter, const ResolvExpr::AltList& lhs, const
+                                ResolvExpr::AltList& rhs );
                         virtual ~Matcher() {}
-                        
                         virtual void match( std::list< Expression * > &out ) = 0;
                         ObjectDecl * newObject( UniqueName & namer, Expression * expr );
-
-                        void combineState( const ResolvExpr::Alternative& alt ) {
-                                compositeEnv.simpleCombine( alt.env );
-                                ResolvExpr::mergeOpenVars( openVars, alt.openVars );
-                                cloneAll( alt.need, need );
-                        }
-
-                        void combineState( const ResolvExpr::AltList& alts ) {
-                                for ( const ResolvExpr::Alternative& alt : alts ) { combineState( alt ); }
-                        }
-                        
                         ResolvExpr::AltList lhs, rhs;
                         TupleAssignSpotter &spotter;
@@ -84 +72 @@
                         std::list< ObjectDecl * > tmpDecls;
                         ResolvExpr::TypeEnvironment compositeEnv;
-                        ResolvExpr::OpenVarSet openVars;
-                        ResolvExpr::AssertionSet need;
                 };
 
@@ -259 +245 @@
                 }
 
-                // extract expressions from the assignment alternatives to produce a list of assignments 
-                // that together form a single alternative
+                // extract expressions from the assignment alternatives to produce a list of assignments that
+                // together form a single alternative
                 std::list< Expression *> solved_assigns;
                 for ( ResolvExpr::Alternative & alt : current ) {
                         solved_assigns.push_back( alt.expr->clone() );
-                        matcher->combineState( alt );
-                }
-                
+                }
+                // combine assignment environments into combined expression environment
+                simpleCombineEnvironments( current.begin(), current.end(), matcher->compositeEnv );
                 // xxx -- was push_front
-                currentFinder.get_alternatives().push_back( ResolvExpr::Alternative{
-                        new TupleAssignExpr{ solved_assigns, matcher->tmpDecls }, matcher->compositeEnv, 
-                        matcher->openVars, 
-                        ResolvExpr::AssertionList( matcher->need.begin(), matcher->need.end() ), 
-                        ResolvExpr::sumCost( current ) + matcher->baseCost } );
+                currentFinder.get_alternatives().push_back( ResolvExpr::Alternative(
+                        new TupleAssignExpr(solved_assigns, matcher->tmpDecls), matcher->compositeEnv,
+                        ResolvExpr::sumCost( current ) + matcher->baseCost ) );
         }
 
@@ -279 +263 @@
         : lhs(lhs), rhs(rhs), spotter(spotter),
           baseCost( ResolvExpr::sumCost( lhs ) + ResolvExpr::sumCost( rhs ) ) {
-                combineState( lhs ); 
-                combineState( rhs );
+                simpleCombineEnvironments( lhs.begin(), lhs.end(), compositeEnv );
+                simpleCombineEnvironments( rhs.begin(), rhs.end(), compositeEnv );
         }