From eb79135b976114e75526a0d5b37401f110d47136 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 14 Aug 2006 16:40:46 +0000 Subject: Fixed bug 697 --- test/files/neg/bug700.check | 4 ++++ test/files/neg/bug700.scala | 10 ++++++++++ test/files/pos/bug202.scala | 8 -------- test/files/pos/bug697.scala | 3 +++ test/files/pos/bug698.scala | 12 ++++++++++++ test/files/pos/bug700.scala | 10 ---------- 6 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 test/files/neg/bug700.check create mode 100644 test/files/neg/bug700.scala delete mode 100644 test/files/pos/bug202.scala create mode 100644 test/files/pos/bug697.scala create mode 100644 test/files/pos/bug698.scala delete mode 100644 test/files/pos/bug700.scala (limited to 'test') diff --git a/test/files/neg/bug700.check b/test/files/neg/bug700.check new file mode 100644 index 0000000000..fb3fbb5e1b --- /dev/null +++ b/test/files/neg/bug700.check @@ -0,0 +1,4 @@ +bug700.scala:6 error: method foobar in trait Bar is accessed from super. It may not be abstract unless it is overridden by a member declared `abstract' and `override' + def foobar: unit = super.foobar + ^ +one error found diff --git a/test/files/neg/bug700.scala b/test/files/neg/bug700.scala new file mode 100644 index 0000000000..7477bb54f6 --- /dev/null +++ b/test/files/neg/bug700.scala @@ -0,0 +1,10 @@ +trait Foo { + def foobar: Unit; +} + +trait Bar extends Foo { + def foobar: unit = super.foobar +} + +// the following definition breaks the compiler +abstract class Foobar extends Bar diff --git a/test/files/pos/bug202.scala b/test/files/pos/bug202.scala deleted file mode 100644 index 087e1ff5d2..0000000000 --- a/test/files/pos/bug202.scala +++ /dev/null @@ -1,8 +0,0 @@ -trait C { - type T; - def f(x: T): unit; -} - -trait D extends C { - def f(x: T): unit = super.f(x); -} diff --git a/test/files/pos/bug697.scala b/test/files/pos/bug697.scala new file mode 100644 index 0000000000..6caea418d5 --- /dev/null +++ b/test/files/pos/bug697.scala @@ -0,0 +1,3 @@ +object test { + val x = 10 == 20 == 30 < 10; +} diff --git a/test/files/pos/bug698.scala b/test/files/pos/bug698.scala new file mode 100644 index 0000000000..a70acae213 --- /dev/null +++ b/test/files/pos/bug698.scala @@ -0,0 +1,12 @@ +abstract class Foo +{ + val x : Bar +} + +abstract class Bar + +object Test + extends Foo with Application +{ + object x extends Bar +} diff --git a/test/files/pos/bug700.scala b/test/files/pos/bug700.scala deleted file mode 100644 index 7477bb54f6..0000000000 --- a/test/files/pos/bug700.scala +++ /dev/null @@ -1,10 +0,0 @@ -trait Foo { - def foobar: Unit; -} - -trait Bar extends Foo { - def foobar: unit = super.foobar -} - -// the following definition breaks the compiler -abstract class Foobar extends Bar -- cgit v1.2.3