diff options
author | Martin Odersky <odersky@gmail.com> | 2014-03-01 13:17:05 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2014-03-01 13:41:00 +0100 |
commit | d8356b6dc9221bfc38b1f167e5cfafcc9261f3d7 (patch) | |
tree | 3bb6fda0feb33680f68f61908a7076162159701e /tests | |
parent | 5a8f4c822be82e23a0c230071673425423664442 (diff) | |
download | dotty-d8356b6dc9221bfc38b1f167e5cfafcc9261f3d7.tar.gz dotty-d8356b6dc9221bfc38b1f167e5cfafcc9261f3d7.tar.bz2 dotty-d8356b6dc9221bfc38b1f167e5cfafcc9261f3d7.zip |
Reorganization of template parents.
Template parents always were constructor calls before. This is not correct because in a situation like the one
elaborated in templateParents, the trait D has the class C as supertype, but it does not call its constructor (in fact, if we added a () parameter list to make it into a constructor this would be wrong because C takes parameters.
Now parents can be either types or constructor calls.
The logic in Namer and Typer that deals with parents is cleaned up. In particular, we now construct any synthetic class parent as a full type, before calling normalizeToClassRefs. This obviates the forwardRefs logic that needed to be done in a cleanup of Namers.
Also added two more checks: (1) All parents except the first one must point to traits. (2) A trait may not call a parent class constructor.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/neg/privates.scala | 11 | ||||
-rw-r--r-- | tests/neg/templateParents.scala | 9 | ||||
-rw-r--r-- | tests/pos/templateParents.scala | 12 |
3 files changed, 32 insertions, 0 deletions
diff --git a/tests/neg/privates.scala b/tests/neg/privates.scala new file mode 100644 index 000000000..6cc1ab67f --- /dev/null +++ b/tests/neg/privates.scala @@ -0,0 +1,11 @@ +trait T { + private def foo = 0; + private[this] def bar = 0 + +} + +class C { self: T => + foo + bar +} + diff --git a/tests/neg/templateParents.scala b/tests/neg/templateParents.scala new file mode 100644 index 000000000..637c6037a --- /dev/null +++ b/tests/neg/templateParents.scala @@ -0,0 +1,9 @@ +object templateParentsNeg { + + class C(x: String) + class C2 + trait D extends C("a") // error: traits may not call class constructors + + new C("b") with C2 // error: C2 is not a trait + +} diff --git a/tests/pos/templateParents.scala b/tests/pos/templateParents.scala new file mode 100644 index 000000000..530f8c148 --- /dev/null +++ b/tests/pos/templateParents.scala @@ -0,0 +1,12 @@ +object templateParents { + +// traits do not call a constructor + class C[+T](x: T) + trait D extends C[String] + trait E extends C[Int] + new C("abc") with D + + //val x = new D with E + + //val y: C = x +}
\ No newline at end of file |