diff options
author | Martin Odersky <odersky@gmail.com> | 2006-04-28 17:23:53 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2006-04-28 17:23:53 +0000 |
commit | 2c7b0f4cedeb9d011079e7404d2ae44e7b428c99 (patch) | |
tree | f14f057706a2e4aff40e7ac63b5a1b446da730b0 | |
parent | 62fb3c42e4c5a73e40f28b66be24976205283390 (diff) | |
download | scala-2c7b0f4cedeb9d011079e7404d2ae44e7b428c99.tar.gz scala-2c7b0f4cedeb9d011079e7404d2ae44e7b428c99.tar.bz2 scala-2c7b0f4cedeb9d011079e7404d2ae44e7b428c99.zip |
fixed bug 581
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/OverridingPairs.scala | 2 | ||||
-rw-r--r-- | test/pending/pos/bug577.scala | 21 |
2 files changed, 1 insertions, 22 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala b/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala index 2f80216dbe..fc3aaacaef 100644 --- a/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala +++ b/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala @@ -103,8 +103,8 @@ abstract class OverridingPairs { } while (nextEntry != null && ((nextEntry.sym hasFlag PRIVATE) || (overriding.owner == nextEntry.sym.owner) || - (hasCommonParent(overriding, nextEntry.sym)) || (!matches(overriding, nextEntry.sym)) || + (hasCommonParent(overriding, nextEntry.sym)) || (overriding hasFlag LOCAL))) } if (nextEntry != null) { diff --git a/test/pending/pos/bug577.scala b/test/pending/pos/bug577.scala deleted file mode 100644 index ede45399a0..0000000000 --- a/test/pending/pos/bug577.scala +++ /dev/null @@ -1,21 +0,0 @@ -trait PriorityTree { - type Node <: BasicTreeNode; - - val top = initTree; - top.next = (initTree); - top.next.prev = (top); - - def initTree : Node; - - - - - trait BasicTreeNode { - private[PriorityTree] var next : Node = _; - private[PriorityTree] var prev : Node = _; - private[PriorityTree] var chld : Node = _; - //var next : Node = _; - //var prev : Node = _; - //var chld : Node = _; - } -} |