Skip to content

Commit 33feb9d

Browse files
committed
Merge pull request #236 from smarter/fix/overriding
Add overriding tests
2 parents 8bdc690 + c02811a commit 33feb9d

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

test/dotc/tests.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ class tests extends CompilerTest {
5151
@Test def pos_assignments() = compileFile(posDir, "assignments", doErase)
5252
@Test def pos_packageobject() = compileFile(posDir, "packageobject", doErase)
5353
@Test def pos_overloaded() = compileFile(posDir, "overloaded", doErase)
54+
@Test def pos_overrides() = compileFile(posDir, "overrides", doErase)
5455
@Test def pos_templateParents() = compileFile(posDir, "templateParents", doErase)
5556
@Test def pos_structural() = compileFile(posDir, "structural", doErase)
5657
@Test def pos_overloadedAccess = compileFile(posDir, "overloadedAccess", doErase)
@@ -75,7 +76,7 @@ class tests extends CompilerTest {
7576
@Test def neg_autoTupling2 = compileFile(negDir, "autoTuplingTest", xerrors = 4)
7677
@Test def neg_companions = compileFile(negDir, "companions", xerrors = 1)
7778
@Test def neg_over = compileFile(negDir, "over", xerrors = 1)
78-
@Test def neg_overrides = compileFile(negDir, "overrides", xerrors = 5)
79+
@Test def neg_overrides = compileFile(negDir, "overrides", xerrors = 7)
7980
@Test def neg_projections = compileFile(negDir, "projections", xerrors = 1)
8081
@Test def neg_i39 = compileFile(negDir, "i39", xerrors = 1)
8182
@Test def neg_i50_volatile = compileFile(negDir, "i50-volatile", xerrors = 4)

tests/neg/overrides.scala

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,14 @@ class X1 {
6868
class Y1 extends X1 {
6969
override def f(): B1 = ???
7070
}
71+
72+
class X2 {
73+
type T = A1
74+
}
75+
class Y2 extends X2 {
76+
type T = B1
77+
}
78+
79+
class X3 {
80+
override type T = A1
81+
}

tests/pos/overrides.scala

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,12 @@ class B extends A[Int] {
1111
f(2)()
1212

1313
}
14+
15+
class A1
16+
class A2
17+
class X1 {
18+
type T = A1
19+
}
20+
class Y1 extends X1 {
21+
override type T = A2
22+
}

0 commit comments

Comments
 (0)