diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-12-11 19:36:18 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-12-11 19:36:18 +0100 |
commit | 44ccf7fc30faeaca9e325453268bd443add01e49 (patch) | |
tree | 27f68b8bd88e15b81792a78fa504f7dfb18a4d4d /test/files | |
parent | ceeab40611dde9183e7a8de32b7eba87ef133094 (diff) | |
parent | a774157a4b666f29b7cd4bd958ea1ac150380959 (diff) | |
download | scala-44ccf7fc30faeaca9e325453268bd443add01e49.tar.gz scala-44ccf7fc30faeaca9e325453268bd443add01e49.tar.bz2 scala-44ccf7fc30faeaca9e325453268bd443add01e49.zip |
Merge commit 'a774157' into merge/2.10.x-to-master
Conflicts:
src/compiler/scala/tools/nsc/transform/Erasure.scala
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/run/t8010.scala | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/test/files/run/t8010.scala b/test/files/run/t8010.scala new file mode 100644 index 0000000000..8636bbd12e --- /dev/null +++ b/test/files/run/t8010.scala @@ -0,0 +1,22 @@ +trait Base { + def t = 1 + def t(n: Int) = n + def bt = 2 + def bt(n: Int) = n +} +trait Derived extends Base { + // was: double defintion error + override def t = 1 + super.t + override def t(n: Int) = 1 + super.t(n) + override def bt = 1 + super.bt + override def bt(n: Int) = 1 + super.bt(n) +} + +object Test extends App { + val d = new Derived {} + // not the focus of thie bug, but let's just check the runtime behaviour while we're here. + assert(d.t == 2) + assert(d.t(1) == 2) + assert(d.bt == 3) + assert(d.bt(1) == 2) +} |