diff options
author | Martin Odersky <odersky@gmail.com> | 2009-10-02 13:19:34 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2009-10-02 13:19:34 +0000 |
commit | 321338da04a6ca9bcc9b77ae663ed27f26a67d85 (patch) | |
tree | 4cea0a435568b760b688740f5d559a4033cf7962 /src/compiler/scala/tools/nsc/transform/OverridingPairs.scala | |
parent | 1bc50a7c84b0abc53299b3efcfec4f6a77c759e6 (diff) | |
download | scala-321338da04a6ca9bcc9b77ae663ed27f26a67d85.tar.gz scala-321338da04a6ca9bcc9b77ae663ed27f26a67d85.tar.bz2 scala-321338da04a6ca9bcc9b77ae663ed27f26a67d85.zip |
Fixed #1939,plus some moving things around.
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/OverridingPairs.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/OverridingPairs.scala | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala b/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala index cad86ea024..6cf9020520 100644 --- a/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala +++ b/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala @@ -172,7 +172,14 @@ abstract class OverridingPairs { do { do { nextEntry = decls.lookupNextEntry(nextEntry); - } while ((nextEntry ne null) && + /* DEBUG + if ((nextEntry ne null) && + !(nextEntry.sym hasFlag PRIVATE) && + !(overriding.owner == nextEntry.sym.owner) && + !matches(overriding, nextEntry.sym)) + println("skipping "+overriding+":"+self.memberType(overriding)+overriding.locationString+" to "+nextEntry.sym+":"+self.memberType(nextEntry.sym)+nextEntry.sym.locationString) + */ + } while ((nextEntry ne null) && ((nextEntry.sym hasFlag PRIVATE) || (overriding.owner == nextEntry.sym.owner) || (!matches(overriding, nextEntry.sym)) || |