aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/neg/overrides.scala8
-rw-r--r--tests/pos-scala2/pos-special/i871.scala4
-rw-r--r--tests/run/t429.scala2
3 files changed, 12 insertions, 2 deletions
diff --git a/tests/neg/overrides.scala b/tests/neg/overrides.scala
index fe14f91ef..81a93a7a2 100644
--- a/tests/neg/overrides.scala
+++ b/tests/neg/overrides.scala
@@ -3,10 +3,16 @@ class Foo {
type B >: Int <: Int
def get: A = 42
}
-class Bar extends Foo {
+trait T {
+ lazy val x: Int
+ val y: Int
+}
+class Bar extends Foo with T {
override type A = Any // error
type B >: String <: Any // error
override def get: A = "bar"
+ val x = 2 // error
+ lazy val y = 3 // error
}
object Test {
def main(args: Array[String]): Unit = {
diff --git a/tests/pos-scala2/pos-special/i871.scala b/tests/pos-scala2/pos-special/i871.scala
new file mode 100644
index 000000000..2e5f100d8
--- /dev/null
+++ b/tests/pos-scala2/pos-special/i871.scala
@@ -0,0 +1,4 @@
+trait Message {
+ def first(x: Int)
+ def second
+}
diff --git a/tests/run/t429.scala b/tests/run/t429.scala
index e62a6b307..eeed4b080 100644
--- a/tests/run/t429.scala
+++ b/tests/run/t429.scala
@@ -1,7 +1,7 @@
object Test {
abstract class A {
Console.print("A");
- val x: Int;
+ lazy val x: Int;
val y: Int = {Console.print("y"); x + 1}
}
class B extends A {