diff options
author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-10-04 11:21:54 +0200 |
---|---|---|
committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-10-04 11:21:54 +0200 |
commit | c1492ac08e69e64e258ee9c5a0e5173165f4cba1 (patch) | |
tree | 11b155006310ca98617f8294388cc5052b16c66f /test/files/neg | |
parent | 192d65f718ab042cb57090d580c83e15a0509964 (diff) | |
parent | 0d8ca1f5fe335565f861ce2c58f7f684f15a4064 (diff) | |
download | scala-c1492ac08e69e64e258ee9c5a0e5173165f4cba1.tar.gz scala-c1492ac08e69e64e258ee9c5a0e5173165f4cba1.tar.bz2 scala-c1492ac08e69e64e258ee9c5a0e5173165f4cba1.zip |
Merge pull request #4024 from retronym/ticket/8217
SI-8217 allow abstract type members in objects
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/t3240.check | 4 | ||||
-rw-r--r-- | test/files/neg/t3240.scala | 8 | ||||
-rw-r--r-- | test/files/neg/t8217-local-alias-requires-rhs.check | 10 | ||||
-rw-r--r-- | test/files/neg/t8217-local-alias-requires-rhs.scala | 15 | ||||
-rw-r--r-- | test/files/neg/t845.check | 4 | ||||
-rw-r--r-- | test/files/neg/t845.scala | 16 |
6 files changed, 25 insertions, 32 deletions
diff --git a/test/files/neg/t3240.check b/test/files/neg/t3240.check deleted file mode 100644 index efae682c66..0000000000 --- a/test/files/neg/t3240.check +++ /dev/null @@ -1,4 +0,0 @@ -t3240.scala:3: error: only classes can have declared but undefined members - type t - ^ -one error found diff --git a/test/files/neg/t3240.scala b/test/files/neg/t3240.scala deleted file mode 100644 index cf197a406d..0000000000 --- a/test/files/neg/t3240.scala +++ /dev/null @@ -1,8 +0,0 @@ -class A { - val foo = new { - type t - def apply(a: Option[t], defVal: Any) = { - a.getOrElse(defVal).asInstanceOf[t] - } - } -}
\ No newline at end of file diff --git a/test/files/neg/t8217-local-alias-requires-rhs.check b/test/files/neg/t8217-local-alias-requires-rhs.check new file mode 100644 index 0000000000..0d4f0864ba --- /dev/null +++ b/test/files/neg/t8217-local-alias-requires-rhs.check @@ -0,0 +1,10 @@ +t8217-local-alias-requires-rhs.scala:6: error: only classes can have declared but undefined members + type B + ^ +t8217-local-alias-requires-rhs.scala:3: error: only classes can have declared but undefined members + type A + ^ +t8217-local-alias-requires-rhs.scala:14: error: only classes can have declared but undefined members + def this(a: Any) = { this(); type C } + ^ +three errors found diff --git a/test/files/neg/t8217-local-alias-requires-rhs.scala b/test/files/neg/t8217-local-alias-requires-rhs.scala new file mode 100644 index 0000000000..12b7976835 --- /dev/null +++ b/test/files/neg/t8217-local-alias-requires-rhs.scala @@ -0,0 +1,15 @@ +trait Alias { + def foo = { + type A + } + val bar = { + type B + object O { + type OK + } + } +} + +class C { + def this(a: Any) = { this(); type C } +} diff --git a/test/files/neg/t845.check b/test/files/neg/t845.check deleted file mode 100644 index 07ed7e417b..0000000000 --- a/test/files/neg/t845.check +++ /dev/null @@ -1,4 +0,0 @@ -t845.scala:4: error: only classes can have declared but undefined members - type Bar; - ^ -one error found diff --git a/test/files/neg/t845.scala b/test/files/neg/t845.scala deleted file mode 100644 index ddf6a16f32..0000000000 --- a/test/files/neg/t845.scala +++ /dev/null @@ -1,16 +0,0 @@ -package test; - -object Test extends App { - type Bar; - trait FooImpl; - - trait Bob { - def bar : Bar with FooImpl; - } - def ifn[A,B](a : A)(f : A => B) = - if (a != null) f(a) else null; - - val bob : Bob = null; - val bar = ifn(bob)(_.bar); - assert(bar == null); -} |