diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-08-23 00:49:57 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-08-23 00:49:57 -0700 |
| commit | 1a1678dac0d4ff7d08efffbe2c80f324c173a69e (patch) | |
| tree | e5aa80eadb0c12b94148f5738ba5d07b54602750 /src/compiler | |
| parent | cc85db9d403c0210472319c7da5839f2531c6948 (diff) | |
| parent | fcf2b29010fd20acb3c27204e4dd9e795eabe00c (diff) | |
| download | scala-1a1678dac0d4ff7d08efffbe2c80f324c173a69e.tar.gz scala-1a1678dac0d4ff7d08efffbe2c80f324c173a69e.tar.bz2 scala-1a1678dac0d4ff7d08efffbe2c80f324c173a69e.zip | |
Merge pull request #1182 from paulp/issue/1987
Improved fix for SI-1987, overloading in package objects.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 9 |
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 |