Generalizes catch blocks to include any Partial...

Generalizes catch blocks to include any PartialFunction[Throwable, T].
Existing catch blocks will compile exactly as before. Anything else
(which mean: the token after CATCH is not a left brace, or it is a left
brace not immediately followed by CASE) is desugared as follows:

  try body catch expr
  // becomes
  try body
  catch { case x =>
    val catchFn = expr
    if (catchFn isDefinedAt x) catchFn(x)
    else throw x
  }

Review by odersky.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index e1a8daf6c8..072bda9097 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -1195,8 +1195,8 @@ trait Namers { self: Analyzer =>
               }
 
               def isValidSelector(from: Name)(fun : => Unit) {
-                  if (base.nonLocalMember(from) == NoSymbol &&
-                      base.nonLocalMember(from.toTypeName) == NoSymbol) fun
+                if (from.bothNames forall (x => (base nonLocalMember x) == NoSymbol))
+                  fun
               }
 
               def checkSelectors(selectors: List[ImportSelector]): Unit = selectors match {