diff options
author | Martin Odersky <odersky@gmail.com> | 2009-08-14 19:30:49 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2009-08-14 19:30:49 +0000 |
commit | d601240fe665e303436093b108dd203ace42c743 (patch) | |
tree | 110656b58b54b6843e6666a9e9e1736ae94c0987 /test/files/neg | |
parent | 5e1deae36170e68a15dd6ffbbc3d902673892f59 (diff) | |
download | scala-d601240fe665e303436093b108dd203ace42c743.tar.gz scala-d601240fe665e303436093b108dd203ace42c743.tar.bz2 scala-d601240fe665e303436093b108dd203ace42c743.zip |
Blocks can now end in definitions.
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/bug555.check | 4 | ||||
-rw-r--r-- | test/files/neg/bug555.scala | 5 | ||||
-rw-r--r-- | test/files/neg/bug987.check | 29 |
3 files changed, 16 insertions, 22 deletions
diff --git a/test/files/neg/bug555.check b/test/files/neg/bug555.check deleted file mode 100644 index e72714d36c..0000000000 --- a/test/files/neg/bug555.check +++ /dev/null @@ -1,4 +0,0 @@ -bug555.scala:4: error: block must end in result expression, not in definition - } - ^ -one error found diff --git a/test/files/neg/bug555.scala b/test/files/neg/bug555.scala deleted file mode 100644 index 26dbe6cc0d..0000000000 --- a/test/files/neg/bug555.scala +++ /dev/null @@ -1,5 +0,0 @@ -object Main extends Application { - def tata = { - def titi = {} - } -} diff --git a/test/files/neg/bug987.check b/test/files/neg/bug987.check index ec2ca621fd..4cad622ab8 100644 --- a/test/files/neg/bug987.check +++ b/test/files/neg/bug987.check @@ -1,16 +1,19 @@ -bug987.scala:15: error: the type intersection D with ScalaObject is malformed - --- because --- -no common type instance of base types B[C], and B[D] exists. +bug987.scala:15: error: illegal inheritance; + class E inherits different type instances of trait B: +B[D] and B[C] class E extends D - ^ -bug987.scala:20: error: the type intersection D with ScalaObject is malformed - --- because --- -no common type instance of base types B[C], and B[D] exists. + ^ +bug987.scala:20: error: illegal inheritance; + class F inherits different type instances of trait B: +B[D] and B[C] class F extends D - ^ -bug987.scala:25: error: the type intersection C with B[D] with ScalaObject is malformed - --- because --- -no common type instance of base types B[D], and B[C] exists. + ^ +bug987.scala:25: error: illegal inheritance; + class D inherits different type instances of trait B: +B[D] and B[C] abstract class D extends C with B[D] {} - ^ -three errors found + ^ +bug987.scala:25: error: type arguments [D] do not conform to trait B's type parameter bounds [T <: B[T]] +abstract class D extends C with B[D] {} + ^ +four errors found |