summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorDonna Malayeri <lindydonna@gmail.com>2009-11-27 11:05:04 +0000
committerDonna Malayeri <lindydonna@gmail.com>2009-11-27 11:05:04 +0000
commit252ebb328144c843266264ad40b59634685cb4cf (patch)
tree60ba37348ba8b20e2a6a76d1af8b4e0967d31fc5 /src/compiler
parent5be23003fd06ec551c30c4692bce0e91eed00725 (diff)
downloadscala-252ebb328144c843266264ad40b59634685cb4cf.tar.gz
scala-252ebb328144c843266264ad40b59634685cb4cf.tar.bz2
scala-252ebb328144c843266264ad40b59634685cb4cf.zip
Closes #2540 and closes #2593.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala21
1 files changed, 1 insertions, 20 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 58146ffd80..59362e2874 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -3898,26 +3898,7 @@ trait Typers { self: Analyzer =>
if (util.Statistics.enabled) selcnt += 1
var qual1 = checkDead(typedQualifier(qual, mode))
if (name.isTypeName) qual1 = checkStable(qual1)
-
- val tree1 = // temporarily use `filter' and an alternative for `withFilter'
- if (name == nme.withFilter)
- silent(_ => typedSelect(qual1, name)) match {
- case result1: Tree =>
- result1
- case ex1: TypeError =>
- silent(_ => typed1(Select(qual1, nme.filter) setPos tree.pos, mode, pt)) match {
- case result2: Tree =>
- unit.deprecationWarning(
- tree.pos, "`withFilter' method does not yet exist on "+qual1.tpe.widen+
- ", using `filter' method instead")
- result2
- case ex2: TypeError =>
- reportTypeError(tree.pos, ex1)
- setError(tree)
- }
- }
- else
- typedSelect(qual1, name)
+ val tree1 = typedSelect(qual1, name)
if (qual1.symbol == RootPackage) treeCopy.Ident(tree1, name)
else tree1