Changeset 908cc83

Timestamp:

Sep 10, 2016, 1:31:37 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, resolv-new, with_gc

Children:

8f7cea1

Parents:

5af62f1

Message:

make mass assignment resolve correctly

Location:

src

Files:

• ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)
• ResolvExpr/AlternativeFinder.h (modified) (1 diff)
• Tuples/TupleAssignment.cc (modified) (7 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -64 +64 @@
         }
 
+        Cost sumCost( const AltList &in ) {
+                Cost total;
+                for ( AltList::const_iterator i = in.begin(); i != in.end(); ++i ) {
+                        total += i->cost;
+                }
+                return total;
+        }
+
         namespace {
                 void printAlts( const AltList &list, std::ostream &os, int indent = 0 ) {
@@ -76 +84 @@
                                 out.push_back( i->expr->clone() );
                         }
-                }
-
-                Cost sumCost( const AltList &in ) {
-                        Cost total;
-                        for ( AltList::const_iterator i = in.begin(); i != in.end(); ++i ) {
-                                total += i->cost;
-                        }
-                        return total;
                 }
 

src/ResolvExpr/AlternativeFinder.h

@@ -109 +109 @@
                 std::copy( alternatives.begin(), alternatives.end(), out );
         }
+
+        Cost sumCost( const AltList &in );
 } // namespace ResolvExpr
 

src/Tuples/TupleAssignment.cc

@@ -56 +56 @@
                         virtual ~Matcher() {}
                         virtual void match( std::list< Expression * > &out ) = 0;
-                        virtual void solve( std::list< Expression * > &assigns ) = 0;
+                        virtual void solve() = 0;
                         static UntypedExpr *createAssgn( Expression *left, Expression *right );
                   protected:
@@ -69 +69 @@
                         }
                         virtual void match( std::list< Expression * > &out );
-                        virtual void solve( std::list< Expression * > &assigns );
+                        virtual void solve();
                 };
 
@@ -76 +76 @@
                         MultipleAssignMatcher( TupleAssignSpotter &spot, Expression *lhs, Expression *rhs );
                         virtual void match( std::list< Expression * > &out );
-                        virtual void solve( std::list< Expression * > &assigns );
+                        virtual void solve();
                 };
 
@@ -150 +150 @@
                 if ( new_assigns.empty() ) return;
                 std::list< Expression * > solved_assigns;
-                ResolvExpr::AltList solved_alts;
                 ResolvExpr::AltList current;
                 // now resolve new assignments
@@ -160 +159 @@
                         assert( alts.size() == 1 );
                         assert( alts.front().expr != 0 );
-                        current.push_back( finder.get_alternatives().front() );
-                        solved_assigns.push_back( alts.front().expr->clone() );
+                        current.push_back( alts.front() );
                 }
                 options.options.push_back( current );
 
-                matcher->solve( new_assigns );
+                matcher->solve();
         }
 
@@ -197 +195 @@
         }
 
-        void TupleAssignSpotter::MassAssignMatcher::solve( std::list< Expression * > &assigns ) {
+        void TupleAssignSpotter::MassAssignMatcher::solve() {
                 assert( ! spotter.options.empty() );
-                ResolvExpr::AltList winners;
                 for ( std::list< ResolvExpr::AltList >::iterator i = spotter.options.begin(); i != spotter.options.end(); ++i ) {
-                        findMinCost( i->begin(), i->end(), back_inserter(winners) );
-                }
-
-                std::list< Expression *> solved_assigns;
-                for ( ResolvExpr::AltList::iterator i = winners.begin(); i != winners.end(); ++i ) {
-                        solved_assigns.push_back( i->expr );
-                }
-                spotter.currentFinder.get_alternatives().push_front( ResolvExpr::Alternative(new SolvedTupleExpr(solved_assigns), spotter.currentFinder.get_environ(), ResolvExpr::Cost() ) );
+                        // extract expressions from the alternatives to produce a list of assignments that
+                        // together form a single alternative
+                        std::list< Expression *> solved_assigns;
+                        for ( ResolvExpr::Alternative & alt : *i ) {
+                                solved_assigns.push_back( alt.expr );
+                        }
+                        spotter.currentFinder.get_alternatives().push_front( ResolvExpr::Alternative(new SolvedTupleExpr(solved_assigns), spotter.currentFinder.get_environ(), ResolvExpr::sumCost( *i ) ) );
+                }
         }
 
@@ -218 +215 @@
         }
 
-        void TupleAssignSpotter::MultipleAssignMatcher::solve( std::list< Expression * > &assigns ) {
+        void TupleAssignSpotter::MultipleAssignMatcher::solve() {
                 // options.print( std::cerr );
                 std::list< ResolvExpr::AltList > best = spotter.options.get_best();