From 3921e5be742ff9523825037056e82b7b82db5932 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 20 Oct 2011 22:28:44 +0000 Subject: dependent methods types are now always enabled for now, left the old if(settings.YdepMethTpes.value) guards in comments removed *.flags containing -Ydependent-method-types also updated one check file with one fewer error no review --- test/files/neg/depmet_1.flags | 1 - test/files/neg/structural.check | 5 +---- test/files/neg/t3873.flags | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 test/files/neg/depmet_1.flags delete mode 100644 test/files/neg/t3873.flags (limited to 'test/files/neg') diff --git a/test/files/neg/depmet_1.flags b/test/files/neg/depmet_1.flags deleted file mode 100644 index 1c26b24745..0000000000 --- a/test/files/neg/depmet_1.flags +++ /dev/null @@ -1 +0,0 @@ --Ydependent-method-types \ No newline at end of file diff --git a/test/files/neg/structural.check b/test/files/neg/structural.check index 100b989a2f..6ef57db1b4 100644 --- a/test/files/neg/structural.check +++ b/test/files/neg/structural.check @@ -1,9 +1,6 @@ structural.scala:47: error: Parameter type in structural refinement may not refer to the type of that refinement (self type) val s1 = new { def f(p: this.type): Unit = () } ^ -structural.scala:19: error: illegal dependent method type - def f9[C <: Object](x: Object{ type D <: Object; def m[E >: Null <: Object](x: Object): D }) = x.m[Tata](null) //fail - ^ structural.scala:10: error: Parameter type in structural refinement may not refer to an abstract type defined outside that refinement def f1[C <: Object](x: Object{ type D <: Object; def m[E >: Null <: Object](x: A): Object; val x: A }) = x.m[Tata](x.x) //fail ^ @@ -28,4 +25,4 @@ structural.scala:49: error: Parameter type in structural refinement may not refe structural.scala:52: error: Parameter type in structural refinement may not refer to an abstract type defined outside that refinement def s3[U >: Null <: Object](p: { def f(p: U): Unit; def u: U }) = () ^ -10 errors found +9 errors found diff --git a/test/files/neg/t3873.flags b/test/files/neg/t3873.flags deleted file mode 100644 index 1c26b24745..0000000000 --- a/test/files/neg/t3873.flags +++ /dev/null @@ -1 +0,0 @@ --Ydependent-method-types \ No newline at end of file -- cgit v1.2.3