diff options
| author | Paul Phillips <paulp@improving.org> | 2010-03-24 17:18:03 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-03-24 17:18:03 +0000 |
| commit | a09cf5dbf7ed64e1ff52bebb53971d16304b58e5 (patch) | |
| tree | 1fc48d708f2768e5135814bf5763c2ab87b04484 /src/continuations | |
| parent | d43ccc679de41aca085072d96a61e363e5e23e34 (diff) | |
| download | scala-a09cf5dbf7ed64e1ff52bebb53971d16304b58e5.tar.gz scala-a09cf5dbf7ed64e1ff52bebb53971d16304b58e5.tar.bz2 scala-a09cf5dbf7ed64e1ff52bebb53971d16304b58e5.zip | |
Renamed partialMap to collect.
method on Iterator called collect which I had to remove, because if
the method is overloaded it puts a bullet in the type inference, an
intolerable result for a function which takes a partial function as its
argument. I don't think there's much chance of confusion, but I put a
migration warning on collect just in case. No review.
Diffstat (limited to 'src/continuations')
| -rw-r--r-- | src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala b/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala index 14135a24ae..6acc685dc2 100644 --- a/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala +++ b/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala @@ -422,11 +422,11 @@ abstract class CPSAnnotationChecker extends CPSUtils { case Match(select, cases) => - // TODO: can there be cases that are not CaseDefs?? check partialMap vs map! - transChildrenInOrder(tree, tpe, List(select), cases:::(cases partialMap { case CaseDef(_, _, body) => body })) + // TODO: can there be cases that are not CaseDefs?? check collect vs map! + transChildrenInOrder(tree, tpe, List(select), cases:::(cases collect { case CaseDef(_, _, body) => body })) case Try(block, catches, finalizer) => - val tpe1 = transChildrenInOrder(tree, tpe, Nil, block::catches:::(catches partialMap { case CaseDef(_, _, body) => body })) + val tpe1 = transChildrenInOrder(tree, tpe, Nil, block::catches:::(catches collect { case CaseDef(_, _, body) => body })) val annots = filterAttribs(tpe1, MarkerCPSTypes) if (annots.nonEmpty) { |