summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Typers.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-08-22 21:55:26 +0200
committerPaul Phillips <paulp@improving.org>2012-08-22 22:18:53 +0200
commitfcf2b29010fd20acb3c27204e4dd9e795eabe00c (patch)
treefd09231b79253d744b2569fe7f2dec44d2a6cf5c /src/compiler/scala/tools/nsc/typechecker/Typers.scala
parent6e344bc3d323a42589f8bd6f74af623a87b573db (diff)
downloadscala-fcf2b29010fd20acb3c27204e4dd9e795eabe00c.tar.gz
scala-fcf2b29010fd20acb3c27204e4dd9e795eabe00c.tar.bz2
scala-fcf2b29010fd20acb3c27204e4dd9e795eabe00c.zip
Improved fix for SI-1987, overloading in package objects.
When reformulating an errant package object overload, don't forget to fully qualify it lest you trade one error for another.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index dfe08c398e..f6baf02c3e 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -4730,8 +4730,13 @@ trait Typers extends Modes with Adaptations with Tags {
if (isInPackageObject(defEntry.sym, pre.typeSymbol)) {
defSym = pre.member(defEntry.sym.name)
if (defSym ne defEntry.sym) {
- log("!!! Overloaded package object member resolved incorrectly.\n Discarded: " +
- defEntry.sym.defString + "\n Using: " + defSym.defString)
+ qual = gen.mkAttributedQualifier(pre)
+ log(s"""
+ | !!! Overloaded package object member resolved incorrectly.
+ | prefix: $pre
+ | Discarded: ${defEntry.sym.defString}
+ | Using: ${defSym.defString}
+ """.stripMargin)
}
}
else