summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-04-13 03:26:10 +0000
committerPaul Phillips <paulp@improving.org>2011-04-13 03:26:10 +0000
commitfe268d97789b518c7a3d08428f2577cc08b91ede (patch)
tree1de611429d79111be974b7508d700a8a366d7de2 /src
parent4e9a38be508eaad2c0376206a9dad68d6f84afa6 (diff)
downloadscala-fe268d97789b518c7a3d08428f2577cc08b91ede.tar.gz
scala-fe268d97789b518c7a3d08428f2577cc08b91ede.tar.bz2
scala-fe268d97789b518c7a3d08428f2577cc08b91ede.zip
An alteration to r24740 to fix failing test fil...
An alteration to r24740 to fix failing test files/neg/protected-constructors. Review by odersky.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 4e527c4189..09786a4aae 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -3575,7 +3575,9 @@ trait Typers extends Modes {
}) setType qual.tpe,
name)
case accErr: Inferencer#AccessError =>
- val qual1 = adaptToMemberWithArgs(tree, qual, name, mode)
+ val qual1 =
+ try adaptToMemberWithArgs(tree, qual, name, mode)
+ catch { case _: TypeError => qual }
if (qual1 ne qual) typed(Select(qual1, name) setPos tree.pos, mode, pt)
else accErr.emit()
case _ =>