Index: src/ResolvExpr/AlternativeFinder.cc =================================================================== --- src/ResolvExpr/AlternativeFinder.cc (revision add7117c7fabc334eeb5508d12db94492b7fcdbc) +++ src/ResolvExpr/AlternativeFinder.cc (revision 5af62f116761c48d951dab0d109ca3854f147542) @@ -142,24 +142,4 @@ } - template< typename InputIterator, typename OutputIterator > - void findMinCost( InputIterator begin, InputIterator end, OutputIterator out ) { - AltList alternatives; - - // select the alternatives that have the minimum parameter cost - Cost minCost = Cost::infinity; - for ( AltList::iterator i = begin; i != end; ++i ) { - if ( i->cost < minCost ) { - minCost = i->cost; - i->cost = i->cvtCost; - alternatives.clear(); - alternatives.push_back( *i ); - } else if ( i->cost == minCost ) { - i->cost = i->cvtCost; - alternatives.push_back( *i ); - } - } - std::copy( alternatives.begin(), alternatives.end(), out ); - } - template< typename InputIterator > void simpleCombineEnvironments( InputIterator begin, InputIterator end, TypeEnvironment &result ) { @@ -254,4 +234,16 @@ template< typename StructOrUnionType > void AlternativeFinder::addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member ) { + + // // member must be either a tuple expression or a name expr + // if ( NameExpr * nameExpr = dynamic_cast< NameExpr * >( memberExpr->get_member() ) ) { + // addAggMembers( structInst, agg->expr, agg->cost, nameExpr->get_name() ); + // } else { + // TupleExpr * tupleExpr = safe_dynamic_cast< TupleExpr * >( memberExpr->get_member() ); + // // xxx - ... + // assert( false ); + // } + // if ( TupleExpr * tupleExpr = dynamic_cast< TupleExpr * >( memberExpr->get_member() ) ) { + + // } NameExpr * nameExpr = safe_dynamic_cast< NameExpr * >( member ); const std::string & name = nameExpr->get_name(); @@ -639,9 +631,7 @@ combos( argAlternatives.begin(), argAlternatives.end(), back_inserter( possibilities ) ); - Tuples::TupleAssignSpotter tassign( this ); - if ( tassign.isTupleAssignment( untypedExpr, possibilities ) ) { - // take care of possible tuple assignments, or discard expression - return; - } // else ... + // take care of possible tuple assignments + // if not tuple assignment, assignment is taken care of as a normal function call + Tuples::handleTupleAssignment( *this, untypedExpr, possibilities ); AltList candidates; Index: src/ResolvExpr/AlternativeFinder.h =================================================================== --- src/ResolvExpr/AlternativeFinder.h (revision add7117c7fabc334eeb5508d12db94492b7fcdbc) +++ src/ResolvExpr/AlternativeFinder.h (revision 5af62f116761c48d951dab0d109ca3854f147542) @@ -67,11 +67,9 @@ virtual void visit( ImplicitCopyCtorExpr * impCpCtorExpr ); virtual void visit( ConstructorExpr * ctorExpr ); - public: // xxx - temporary hack - should make Tuples::TupleAssignment a friend - /// Runs a new alternative finder on each element in [begin, end) - /// and writes each alternative finder to out. + /// Runs a new alternative finder on each element in [begin, end) + /// and writes each alternative finder to out. template< typename InputIterator, typename OutputIterator > void findSubExprs( InputIterator begin, InputIterator end, OutputIterator out ); - private: /// Adds alternatives for member expressions, given the aggregate, conversion cost for that aggregate, and name of the member template< typename StructOrUnionType > void addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member ); @@ -91,4 +89,24 @@ Expression *resolveInVoidContext( Expression *expr, const SymTab::Indexer &indexer, TypeEnvironment &env ); + + template< typename InputIterator, typename OutputIterator > + void findMinCost( InputIterator begin, InputIterator end, OutputIterator out ) { + AltList alternatives; + + // select the alternatives that have the minimum parameter cost + Cost minCost = Cost::infinity; + for ( InputIterator i = begin; i != end; ++i ) { + if ( i->cost < minCost ) { + minCost = i->cost; + i->cost = i->cvtCost; + alternatives.clear(); + alternatives.push_back( *i ); + } else if ( i->cost == minCost ) { + i->cost = i->cvtCost; + alternatives.push_back( *i ); + } + } + std::copy( alternatives.begin(), alternatives.end(), out ); + } } // namespace ResolvExpr Index: src/Tuples/TupleAssignment.cc =================================================================== --- src/Tuples/TupleAssignment.cc (revision add7117c7fabc334eeb5508d12db94492b7fcdbc) +++ src/Tuples/TupleAssignment.cc (revision 5af62f116761c48d951dab0d109ca3854f147542) @@ -5,5 +5,5 @@ // file "LICENCE" distributed with Cforall. // -// TupleAssignment.cc -- +// TupleAssignment.cc -- // // Author : Rodolfo G. Esteves @@ -27,383 +27,235 @@ #include #include +#include namespace Tuples { - TupleAssignSpotter::TupleAssignSpotter( ResolvExpr::AlternativeFinder *f = 0 ) - : currentFinder(f), matcher(0), hasMatched( false ) {} - - bool TupleAssignSpotter::pointsToTuple( Expression *expr ) { + class TupleAssignSpotter { + public: + // dispatcher for Tuple (multiple and mass) assignment operations + TupleAssignSpotter( ResolvExpr::AlternativeFinder & ); + void spot( UntypedExpr * expr, std::list &possibilities ); + + private: + void match(); + // records for assignment generation + struct Options { + std::list< ResolvExpr::AltList > get_best(); + void print( std::ostream & ); + int size() const { return options.size(); } + bool empty() const { return options.empty(); } + typedef std::list< ResolvExpr::AltList >::iterator iterator; + iterator begin() { return options.begin(); } + iterator end() { return options.end(); } + + std::list< ResolvExpr::AltList > options; + }; + + class Matcher { + public: + Matcher( TupleAssignSpotter &spotter, Expression *_lhs, Expression *_rhs ); + virtual ~Matcher() {} + virtual void match( std::list< Expression * > &out ) = 0; + virtual void solve( std::list< Expression * > &assigns ) = 0; + static UntypedExpr *createAssgn( Expression *left, Expression *right ); + protected: + std::list< Expression * > lhs, rhs; + TupleAssignSpotter &spotter; + }; + + class MassAssignMatcher : public Matcher { + public: + MassAssignMatcher( TupleAssignSpotter &spotter, Expression *lhs, Expression *rhs ) : Matcher( spotter, lhs, rhs ) { + this->rhs.push_back( rhs ); + } + virtual void match( std::list< Expression * > &out ); + virtual void solve( std::list< Expression * > &assigns ); + }; + + class MultipleAssignMatcher : public Matcher { + public: + MultipleAssignMatcher( TupleAssignSpotter &spot, Expression *lhs, Expression *rhs ); + virtual void match( std::list< Expression * > &out ); + virtual void solve( std::list< Expression * > &assigns ); + }; + + ResolvExpr::AlternativeFinder ¤tFinder; + Expression *rhs, *lhs; + Matcher *matcher = nullptr; + Options options; + }; + + bool isTupleVar( DeclarationWithType *decl ) { + return dynamic_cast< TupleType * >( decl->get_type() ); + } + + /// true if expr is an expression of tuple type, i.e. a tuple expression, tuple variable, or MRV (multiple-return-value) function + bool isTuple( Expression *expr ) { + if ( ! expr ) return false; + + // xxx - used to include cast to varExpr and call to isTupleVar, but this doesn't seem like it should be necessary + return dynamic_cast(expr) || expr->get_results().size() > 1; + } + + bool pointsToTuple( Expression *expr ) { // also check for function returning tuple of reference types - if (AddressExpr *addr = dynamic_cast(expr) ) - if ( isTuple(addr->get_arg() ) ) - return true; + if ( AddressExpr *addr = dynamic_cast< AddressExpr * >( expr) ) { + return isTuple( addr->get_arg() ); + } return false; } - bool TupleAssignSpotter::isTupleVar( DeclarationWithType *decl ) { - if ( dynamic_cast(decl->get_type()) ) - return true; - return false; - } - - bool TupleAssignSpotter::isTuple( Expression *expr, bool isRight ) { - // true if `expr' is an expression returning a tuple: tuple, tuple variable or MRV function - if ( ! expr ) return false; - - if ( dynamic_cast(expr) ) - return true; - else if ( VariableExpr *var = dynamic_cast(expr) ) { - if ( isTupleVar(var->get_var()) ) - return true; - } - - return false; - } - - bool TupleAssignSpotter::match() { - assert ( matcher != 0 ); - - std::list< Expression * > new_assigns; - if ( ! matcher->match(new_assigns) ) - return false; - - if ( new_assigns.empty() ) return false; - /*return */matcher->solve( new_assigns ); - if ( dynamic_cast( matcher ) ) { - // now resolve new assignments - std::list< Expression * > solved_assigns; - ResolvExpr::AltList solved_alts; - assert( currentFinder != 0 ); - - ResolvExpr::AltList current; - for ( std::list< Expression * >::iterator i = new_assigns.begin(); i != new_assigns.end(); ++i ) { - //try { - ResolvExpr::AlternativeFinder finder( currentFinder->get_indexer(), currentFinder->get_environ() ); - finder.findWithAdjustment(*i); - // prune expressions that don't coincide with - ResolvExpr::AltList alts = finder.get_alternatives(); - assert( alts.size() == 1 ); - assert(alts.front().expr != 0 ); - current.push_back( finder.get_alternatives().front() ); - solved_assigns.push_back( alts.front().expr->clone() ); - //solved_assigns.back()->print(std::cerr); - /*} catch( ... ) { - continue; // no reasonable alternative found - }*/ - } - options.add_option( current ); - - return true; - } else { // mass assignment - //if ( new_assigns.empty() ) return false; - std::list< Expression * > solved_assigns; - ResolvExpr::AltList solved_alts; - assert( currentFinder != 0 ); - - ResolvExpr::AltList current; - if ( optMass.empty() ) { - for ( std::list< Expression * >::size_type i = 0; i != new_assigns.size(); ++i ) - optMass.push_back( ResolvExpr::AltList() ); - } - int cnt = 0; - for ( std::list< Expression * >::iterator i = new_assigns.begin(); i != new_assigns.end(); ++i, cnt++ ) { - - ResolvExpr::AlternativeFinder finder( currentFinder->get_indexer(), currentFinder->get_environ() ); - finder.findWithAdjustment(*i); - ResolvExpr::AltList alts = finder.get_alternatives(); - assert( alts.size() == 1 ); - assert(alts.front().expr != 0 ); - current.push_back( finder.get_alternatives().front() ); - optMass[cnt].push_back( finder.get_alternatives().front() ); - solved_assigns.push_back( alts.front().expr->clone() ); - } - - return true; - } - - return false; - } - - bool TupleAssignSpotter::isMVR( Expression *expr ) { - if ( expr->get_results().size() > 1 ) { - // MVR processing - return true; - } - return false; - } - - bool TupleAssignSpotter::isTupleAssignment( UntypedExpr * expr, std::list &possibilities ) { + bool isTupleExpr( Expression *expr ) { + return expr->get_results().size() > 1; + } + + void handleTupleAssignment( ResolvExpr::AlternativeFinder & currentFinder, UntypedExpr * expr, std::list &possibilities ) { + TupleAssignSpotter spotter( currentFinder ); + spotter.spot( expr, possibilities ); + } + + TupleAssignSpotter::TupleAssignSpotter( ResolvExpr::AlternativeFinder &f ) + : currentFinder(f) {} + + void TupleAssignSpotter::spot( UntypedExpr * expr, std::list &possibilities ) { if ( NameExpr *assgnop = dynamic_cast< NameExpr * >(expr->get_function()) ) { - if ( assgnop->get_name() == std::string("?=?") ) { - for ( std::list::iterator ali = possibilities.begin(); ali != possibilities.end(); ++ali ) { assert( ali->size() == 2 ); - ResolvExpr::AltList::iterator opit = ali->begin(); - ResolvExpr::Alternative op1 = *opit, op2 = *(++opit); - + ResolvExpr::Alternative op1 = ali->front(), op2 = ali->back(); + + MultipleAssignMatcher multiMatcher( *this, op1.expr, op2.expr ); + MassAssignMatcher massMatcher( *this, op1.expr, op2.expr ); if ( pointsToTuple(op1.expr) ) { // also handles tuple vars - if ( isTuple( op2.expr, true ) ) - matcher = new MultipleAssignMatcher(op1.expr, op2.expr); - else if ( isMVR( op2.expr ) ) { - // handle MVR differently - } else + if ( isTuple( op2.expr ) ) { + matcher = &multiMatcher; + } else { // mass assignment - matcher = new MassAssignMatcher(op1.expr, op2.expr); - - std::list< ResolvExpr::AltList > options; - if ( match() ) - /* - if ( hasMatched ) { - // throw SemanticError("Ambiguous tuple assignment"); - } else {*/ - // Matched for the first time - hasMatched = true; - /*} */ - } /* else if ( isTuple( op2 ) ) - throw SemanticError("Inapplicable tuple assignment."); - */ - } - - if ( hasMatched ) { - if ( dynamic_cast( matcher ) ) { - //options.print( std::cerr ); - std::list< ResolvExpr::AltList >best = options.get_best(); - if ( best.size() == 1 ) { - std::list solved_assigns; - for ( ResolvExpr::AltList::iterator i = best.front().begin(); i != best.front().end(); ++i ) { - solved_assigns.push_back( i->expr ); - } - /* assigning cost zero? */ - currentFinder->get_alternatives().push_front( ResolvExpr::Alternative(new SolvedTupleExpr(solved_assigns/*, SolvedTupleExpr::MULTIPLE*/), currentFinder->get_environ(), ResolvExpr::Cost() ) ); + matcher = &massMatcher; } - } else { - assert( ! optMass.empty() ); - ResolvExpr::AltList winners; - for ( std::vector< ResolvExpr::AltList >::iterator i = optMass.begin(); i != optMass.end(); ++i ) - findMinCostAlt( 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 ); - currentFinder->get_alternatives().push_front( ResolvExpr::Alternative(new SolvedTupleExpr(solved_assigns/*, SolvedTupleExpr::MASS*/), currentFinder->get_environ(), ResolvExpr::Cost() ) ); + match(); + } else if ( isTuple( op2.expr ) ) { + throw SemanticError("Cannot assign a tuple value into a non-tuple lvalue.", expr); } } } } - return hasMatched; - } - - void TupleAssignSpotter::Matcher::init( Expression *_lhs, Expression *_rhs ) { - lhs.clear(); - if (AddressExpr *addr = dynamic_cast(_lhs) ) + } + + void TupleAssignSpotter::match() { + assert ( matcher != 0 ); + + std::list< Expression * > new_assigns; + matcher->match( new_assigns ); + + if ( new_assigns.empty() ) return; + std::list< Expression * > solved_assigns; + ResolvExpr::AltList solved_alts; + ResolvExpr::AltList current; + // now resolve new assignments + 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); + // prune expressions that don't coincide with + ResolvExpr::AltList alts = finder.get_alternatives(); + assert( alts.size() == 1 ); + assert( alts.front().expr != 0 ); + current.push_back( finder.get_alternatives().front() ); + solved_assigns.push_back( alts.front().expr->clone() ); + } + options.options.push_back( current ); + + matcher->solve( new_assigns ); + } + + TupleAssignSpotter::Matcher::Matcher( TupleAssignSpotter &spotter, Expression *lhs, Expression *rhs ) : spotter(spotter) { + // xxx - shouldn't need to be &, just & + if (AddressExpr *addr = dynamic_cast(lhs) ) if ( TupleExpr *tuple = dynamic_cast(addr->get_arg()) ) - std::copy( tuple->get_exprs().begin(), tuple->get_exprs().end(), back_inserter(lhs) ); - - rhs.clear(); - } - - TupleAssignSpotter::Matcher::Matcher( /*TupleAssignSpotter &spot,*/ Expression *_lhs, Expression *_rhs ) /*: own_spotter(spot) */{ - init(_lhs,_rhs); - } - - TupleAssignSpotter::MultipleAssignMatcher::MultipleAssignMatcher( Expression *_lhs, Expression *_rhs )/* : own_spotter(spot) */{ - init(_lhs,_rhs); - - if ( TupleExpr *tuple = dynamic_cast(_rhs) ) - std::copy( tuple->get_exprs().begin(), tuple->get_exprs().end(), back_inserter(rhs) ); + std::copy( tuple->get_exprs().begin(), tuple->get_exprs().end(), back_inserter(this->lhs) ); + } + + TupleAssignSpotter::MultipleAssignMatcher::MultipleAssignMatcher( TupleAssignSpotter &spotter, Expression *lhs, Expression *rhs ) : Matcher( spotter, lhs, rhs ) { + + if ( TupleExpr *tuple = dynamic_cast(rhs) ) + std::copy( tuple->get_exprs().begin(), tuple->get_exprs().end(), back_inserter(this->rhs) ); } UntypedExpr *TupleAssignSpotter::Matcher::createAssgn( Expression *left, Expression *right ) { - if ( left && right ) { - std::list< Expression * > args; - args.push_back(new AddressExpr(left->clone())); args.push_back(right->clone()); - return new UntypedExpr(new NameExpr("?=?"), args); - } else - throw 0; // xxx - diagnose the problem - } - - bool TupleAssignSpotter::MassAssignMatcher::match( std::list< Expression * > &out ) { - if ( lhs.empty() || (rhs.size() != 1) ) return false; - - for ( std::list< Expression * >::iterator l = lhs.begin(); l != lhs.end(); l++ ) { - std::list< Expression * > args; - args.push_back( new AddressExpr(*l) ); - args.push_back( rhs.front() ); - out.push_back( new UntypedExpr(new NameExpr("?=?"), args) ); - } - - return true; - } - - bool TupleAssignSpotter::MassAssignMatcher::solve( std::list< Expression * > &assigns ) { - /* - std::list< Expression * > solved_assigns; - ResolvExpr::AltList solved_alts; - assert( currentFinder != 0 ); - - ResolvExpr::AltList current; - if ( optMass.empty() ) { - for ( std::list< Expression * >::size_type i = 0; i != new_assigns.size(); ++i ) - optMass.push_back( ResolvExpr::AltList() ); - } - int cnt = 0; - for ( std::list< Expression * >::iterator i = new_assigns.begin(); i != new_assigns.end(); ++i, cnt++ ) { - - ResolvExpr::AlternativeFinder finder( currentFinder->get_indexer(), currentFinder->get_environ() ); - finder.findWithAdjustment(*i); - ResolvExpr::AltList alts = finder.get_alternatives(); - assert( alts.size() == 1 ); - assert(alts.front().expr != 0 ); - current.push_back( finder.get_alternatives().front() ); - optMass[cnt].push_back( finder.get_alternatives().front() ); - solved_assigns.push_back( alts.front().expr->clone() ); - } - */ - return true; - } - - bool TupleAssignSpotter::MultipleAssignMatcher::match( std::list< Expression * > &out ) { - // need more complicated matching + assert( left && right ); + std::list< Expression * > args; + args.push_back( new AddressExpr( left->clone() ) ); + args.push_back( right->clone() ); + return new UntypedExpr( new NameExpr( "?=?" ), args ); + } + + void TupleAssignSpotter::MassAssignMatcher::match( std::list< Expression * > &out ) { + assert ( ! lhs.empty() && rhs.size() == 1); + + for ( Expression * l : lhs ) { + out.push_back( createAssgn( l, rhs.front() ) ); + } + } + + void TupleAssignSpotter::MassAssignMatcher::solve( std::list< Expression * > &assigns ) { + 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() ) ); + } + + void TupleAssignSpotter::MultipleAssignMatcher::match( std::list< Expression * > &out ) { + // xxx - need more complicated matching? if ( lhs.size() == rhs.size() ) { zipWith( lhs.begin(), lhs.end(), rhs.begin(), rhs.end(), back_inserter(out), TupleAssignSpotter::Matcher::createAssgn ); - return true; - } //else - //std::cerr << "The length of (left, right) is: (" << lhs.size() << "," << rhs.size() << ")" << std::endl;*/ - return false; - } - - bool TupleAssignSpotter::MultipleAssignMatcher::solve( std::list< Expression * > &assigns ) { - /* - std::list< Expression * > solved_assigns; - ResolvExpr::AltList solved_alts; - assert( currentFinder != 0 ); - - ResolvExpr::AltList current; - for ( std::list< Expression * >::iterator i = new_assigns.begin(); i != new_assigns.end(); ++i ) { - //try { - ResolvExpr::AlternativeFinder finder( currentFinder->get_indexer(), currentFinder->get_environ() ); - finder.findWithAdjustment(*i); - // prune expressions that don't coincide with - ResolvExpr::AltList alts = finder.get_alternatives(); - assert( alts.size() == 1 ); - assert(alts.front().expr != 0 ); - current.push_back( finder.get_alternatives().front() ); - solved_assigns.push_back( alts.front().expr->clone() ); - //solved_assigns.back()->print(std::cerr); - //} catch( ... ) { - //continue; // no reasonable alternative found - //} - } - options.add_option( current ); - */ - - return true; - } - - void TupleAssignSpotter::Options::add_option( ResolvExpr::AltList &opt ) { - using namespace std; - - options.push_back( opt ); - /* - vector< Cost > costs; - costs.reserve( opt.size() ); - transform( opt.begin(), opt.end(), back_inserter(costs), ptr_fun(extract_cost) ); - */ - // transpose matrix - if ( costMatrix.empty() ) - for ( unsigned int i = 0; i< opt.size(); ++i) - costMatrix.push_back( vector() ); - - int cnt = 0; - for ( ResolvExpr::AltList::iterator i = opt.begin(); i != opt.end(); ++i, cnt++ ) - costMatrix[cnt].push_back( i->cost ); - - return; + } + } + + void TupleAssignSpotter::MultipleAssignMatcher::solve( std::list< Expression * > &assigns ) { + // options.print( std::cerr ); + std::list< ResolvExpr::AltList > best = spotter.options.get_best(); + if ( best.size() == 1 ) { + std::list solved_assigns; + for ( ResolvExpr::AltList::iterator i = best.front().begin(); i != best.front().end(); ++i ) { + solved_assigns.push_back( i->expr ); + } + /* assigning cost zero? */ + spotter.currentFinder.get_alternatives().push_front( ResolvExpr::Alternative(new SolvedTupleExpr(solved_assigns), spotter.currentFinder.get_environ(), ResolvExpr::Cost() ) ); + } } std::list< ResolvExpr::AltList > TupleAssignSpotter::Options::get_best() { - using namespace std; - using namespace ResolvExpr; - list< ResolvExpr::AltList > ret; - list< multiset > solns; - for ( vector< vector >::iterator i = costMatrix.begin(); i != costMatrix.end(); ++i ) { - list current; - findMinCost( i->begin(), i->end(), back_inserter(current) ); - solns.push_back( multiset(current.begin(), current.end()) ); - } - // need to combine - multiset result; - lift_intersection( solns.begin(), solns.end(), inserter( result, result.begin() ) ); - if ( result.size() != 1 ) + std::list< ResolvExpr::AltList > ret; + std::list< ResolvExpr::AltList > solns; + for ( ResolvExpr::AltList & i : options ) { + ResolvExpr::AltList current; + findMinCost( i.begin(), i.end(), back_inserter(current) ); + solns.push_back( ResolvExpr::AltList(current.begin(), current.end()) ); + } + // need to combine -- previously "lift_intersection", which + // did some madness involving, effectively, the intersection of + // a bunch of AltLists + std::list result = solns; + if ( result.size() != 1 ) { throw SemanticError("Ambiguous tuple expression"); - ret.push_back(get_option( *(result.begin() ))); + } + ret.push_back( *result.begin() ); return ret; } void TupleAssignSpotter::Options::print( std::ostream &ostr ) { - using namespace std; - - for ( vector< vector < ResolvExpr::Cost > >::iterator i = costMatrix.begin(); i != costMatrix.end(); ++i ) { - for ( vector < ResolvExpr::Cost >::iterator j = i->begin(); j != i->end(); ++j ) - ostr << *j << " " ; + for ( ResolvExpr::AltList & l : options ) { + for ( ResolvExpr::Alternative & alt : l ) { + alt.print( ostr ); + ostr << " "; + } ostr << std::endl; } // for - return; - } - - ResolvExpr::Cost extract_cost( ResolvExpr::Alternative &alt ) { - return alt.cost; - } - - template< typename InputIterator, typename OutputIterator > - void TupleAssignSpotter::Options::findMinCost( InputIterator begin, InputIterator end, OutputIterator out ) { - using namespace ResolvExpr; - std::list alternatives; - - // select the alternatives that have the minimum parameter cost - Cost minCost = Cost::infinity; - unsigned int index = 0; - for ( InputIterator i = begin; i != end; ++i, index++ ) { - if ( *i < minCost ) { - minCost = *i; - alternatives.clear(); - alternatives.push_back( index ); - } else if ( *i == minCost ) { - alternatives.push_back( index ); - } - } - std::copy( alternatives.begin(), alternatives.end(), out ); - } - - template< class InputIterator, class OutputIterator > - void TupleAssignSpotter::Options::lift_intersection( InputIterator begin, InputIterator end, OutputIterator out ) { - if ( begin == end ) return; - InputIterator test = begin; - - if (++test == end) - { copy(begin->begin(), begin->end(), out); return; } - - - std::multiset cur; // InputIterator::value_type::value_type - copy( begin->begin(), begin->end(), inserter( cur, cur.begin() ) ); - - while ( test != end ) { - std::multiset temp; - set_intersection( cur.begin(), cur.end(), test->begin(), test->end(), inserter(temp,temp.begin()) ); - cur.clear(); - copy( temp.begin(), temp.end(), inserter(cur,cur.begin())); - ++test; - } - - copy( cur.begin(), cur.end(), out ); - return; - } - - ResolvExpr::AltList TupleAssignSpotter::Options::get_option( std::list< ResolvExpr::AltList >::size_type index ) { - if ( index >= options.size() ) - throw 0; // XXX - std::list< ResolvExpr::AltList >::iterator it = options.begin(); - for ( std::list< ResolvExpr::AltList >::size_type i = 0; i < index; ++i, ++it ); - return *it; } } // namespace Tuples Index: src/Tuples/TupleAssignment.h =================================================================== --- src/Tuples/TupleAssignment.h (revision add7117c7fabc334eeb5508d12db94492b7fcdbc) +++ src/Tuples/TupleAssignment.h (revision 5af62f116761c48d951dab0d109ca3854f147542) @@ -5,5 +5,5 @@ // file "LICENCE" distributed with Cforall. // -// TupleAssignment.h -- +// TupleAssignment.h -- // // Author : Rodolfo G. Esteves @@ -26,104 +26,5 @@ namespace Tuples { - class TupleAssignSpotter { - public: - // dispatcher for Tuple (multiple and mass) assignment operations - TupleAssignSpotter( ResolvExpr::AlternativeFinder * ); - ~TupleAssignSpotter() { delete matcher; matcher = 0; } - - bool pointsToTuple( Expression * ); - static bool isTupleVar( DeclarationWithType * ); - bool isTuple( Expression *, bool isRight = false ); - bool isMVR( Expression * ); - bool isTupleAssignment( UntypedExpr *, std::list & ); - bool match(); - private: - // records for assignment generation - class Options { - public: - void add_option( ResolvExpr::AltList &opt ); - std::list< ResolvExpr::AltList > get_best(); - void print( std::ostream & ); - int size() const { return options.size(); } - ResolvExpr::AltList get_option( std::list< ResolvExpr::AltList >::size_type index ); - - // should really use the one in ResolvExpr/AlternativeFinder, but it's too coupled with the object - template< typename InputIterator, typename OutputIterator > - void findMinCost( InputIterator begin, InputIterator end, OutputIterator out ); - - template< typename InputIterator, typename OutputIterator > - void lift_intersection( InputIterator begin, InputIterator end, OutputIterator out ); - private: - std::list< ResolvExpr::AltList > options; - std::vector< std::vector< ResolvExpr::Cost > > costMatrix; - }; - - class Matcher { - public: - Matcher( /*TupleAssignSpotter &spot, */Expression *_lhs, Expression *_rhs ); - virtual ~Matcher() {} - virtual bool match( std::list< Expression * > &out ) = 0; - virtual bool solve( std::list< Expression * > &assigns ) = 0; - static UntypedExpr *createAssgn( Expression *left, Expression *right ); - protected: - Matcher() /*: own_spotter( TupleAssignSpotter(0) ) */{} - void init(/* TupleAssignSpotter &, */Expression *_lhs, Expression *_rhs ); - std::list< Expression * > lhs, rhs; - //TupleAssignSpotter &own_spotter; - }; - - class MassAssignMatcher : public Matcher { - public: - MassAssignMatcher( Expression *_lhs, Expression *_rhs ) : Matcher( _lhs, _rhs ) { - rhs.push_back( _rhs ); - } - virtual bool match( std::list< Expression * > &out ); - virtual bool solve( std::list< Expression * > &assigns ); - private: - //std::vector< ResolvExpr::AltList > optMass; - }; - - class MultipleAssignMatcher : public Matcher { - public: - MultipleAssignMatcher( Expression *_lhs, Expression *_rhs ); - virtual bool match( std::list< Expression * > &out ); - virtual bool solve( std::list< Expression * > &assigns ); - private: - //Options options; - }; - - friend class Matcher; - - ResolvExpr::AlternativeFinder *currentFinder; - //std::list rhs, lhs; - Expression *rhs, *lhs; - Matcher *matcher; - bool hasMatched; - Options options; - std::vector< ResolvExpr::AltList > optMass; - }; - - ResolvExpr::Cost extract_cost( ResolvExpr::Alternative & ); - - template< typename InputIterator, typename OutputIterator > - void findMinCostAlt( InputIterator begin, InputIterator end, OutputIterator out ) { - using namespace ResolvExpr; - AltList alternatives; - - // select the alternatives that have the minimum parameter cost - Cost minCost = Cost::infinity; - for ( AltList::iterator i = begin; i != end; ++i ) { - if ( i->cost < minCost ) { - minCost = i->cost; - i->cost = i->cvtCost; - alternatives.clear(); - alternatives.push_back( *i ); - } else if ( i->cost == minCost ) { - i->cost = i->cvtCost; - alternatives.push_back( *i ); - } - } - std::copy( alternatives.begin(), alternatives.end(), out ); - } + void handleTupleAssignment( ResolvExpr::AlternativeFinder & currentFinder, UntypedExpr * assign, std::list & possibilities ); } // namespace Tuples