michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(util/lazy_list): par template missing case

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2013-11-24 00:38:31 -08:00
parent 4e24dfd5a6
commit b74aeb1216
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/util/lazy_list_fn.h
View file

@ -262,12 +262,10 @@ lazy_list<T> par(lazy_list<T> const & l1, lazy_list<T> const & l2, unsigned chec
th2.request_interrupt();
th1.join();
th2.join();
// TODO(Leo): check why the following commented code does not work
// if (r1 && r2) {
// lazy_list<T> tail([=]() { return some(mk_pair(r2->first, par(r1->second, r2->second))); });
// return some(mk_pair(r1->first, tail));
// } else
if (r1) {
if (r1 && r2) {
lazy_list<T> tail(r2->first, par(r1->second, r2->second));
return some(mk_pair(r1->first, tail));
} else if (r1) {
return some(mk_pair(r1->first, par(r1->second, l2)));
} else if (r2) {
return some(mk_pair(r2->first, par(l1, r2->second)));