aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/transform/OverridingPairs.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2014-11-17 17:47:03 +0100
committerMartin Odersky <odersky@gmail.com>2014-11-17 17:47:03 +0100
commitb60f085e543e71577e0132b938facd0b6d544e81 (patch)
treeddb2279830c9db58919f215e417e6f1482fdfa90 /src/dotty/tools/dotc/transform/OverridingPairs.scala
parent222e9a478f7b851582550973df6a9d141766e49a (diff)
downloaddotty-b60f085e543e71577e0132b938facd0b6d544e81.tar.gz
dotty-b60f085e543e71577e0132b938facd0b6d544e81.tar.bz2
dotty-b60f085e543e71577e0132b938facd0b6d544e81.zip
Fixes of reviewers comments.
Diffstat (limited to 'src/dotty/tools/dotc/transform/OverridingPairs.scala')
-rw-r--r--src/dotty/tools/dotc/transform/OverridingPairs.scala8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/dotty/tools/dotc/transform/OverridingPairs.scala b/src/dotty/tools/dotc/transform/OverridingPairs.scala
index 813082f2e..bc3c085a9 100644
--- a/src/dotty/tools/dotc/transform/OverridingPairs.scala
+++ b/src/dotty/tools/dotc/transform/OverridingPairs.scala
@@ -18,8 +18,6 @@ import scala.annotation.tailrec
*/
object OverridingPairs {
- private val ExcludedType = ExpandedName.toTypeFlags | TypeArgument
-
/** The cursor class
* @param base the base class that contains the overriding pairs
*/
@@ -111,7 +109,7 @@ object OverridingPairs {
@tailrec def loop(): Unit =
if (curEntry ne null) {
overriding = curEntry.sym
- if (visited.contains(overriding) || exclude(overriding)) {
+ if (visited.contains(overriding)) {
curEntry = curEntry.prev
loop()
}
@@ -130,9 +128,7 @@ object OverridingPairs {
nextEntry = decls.lookupNextEntry(nextEntry)
if (nextEntry ne null) {
overridden = nextEntry.sym
- if (overriding.owner != overridden.owner &&
- matches(overriding, overridden) &&
- !exclude(overridden)) {
+ if (overriding.owner != overridden.owner && matches(overriding, overridden)) {
visited += overridden
if (!hasCommonParentAsSubclass(overriding.owner, overridden.owner)) return
}