summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2011-10-20 22:28:44 +0000
committerAdriaan Moors <adriaan.moors@epfl.ch>2011-10-20 22:28:44 +0000
commit3921e5be742ff9523825037056e82b7b82db5932 (patch)
tree046e7f6ff585ba66c80825132974f52f5a3638e0 /test/files
parent24eb4c5bb5b3ed0e6bb4ede3e68876cdbe7d18fc (diff)
downloadscala-3921e5be742ff9523825037056e82b7b82db5932.tar.gz
scala-3921e5be742ff9523825037056e82b7b82db5932.tar.bz2
scala-3921e5be742ff9523825037056e82b7b82db5932.zip
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
Diffstat (limited to 'test/files')
-rw-r--r--test/files/buildmanager/t2650_3/t2650_3.check1
-rw-r--r--test/files/buildmanager/t2650_4/t2650_4.check1
-rw-r--r--test/files/neg/depmet_1.flags1
-rw-r--r--test/files/neg/structural.check5
-rw-r--r--test/files/neg/t3873.flags1
-rw-r--r--test/files/pos/depmet_1_pos.flags1
-rw-r--r--test/files/pos/depmet_implicit_chaining_zw.flags1
-rw-r--r--test/files/pos/depmet_implicit_norm_ret.flags1
-rw-r--r--test/files/pos/depmet_implicit_oopsla_session.flags1
-rw-r--r--test/files/pos/depmet_implicit_oopsla_session_2.flags1
-rw-r--r--test/files/pos/depmet_implicit_oopsla_session_simpler.flags1
-rw-r--r--test/files/pos/depmet_implicit_oopsla_zipwith.flags1
-rw-r--r--test/files/pos/depmet_implicit_tpbetareduce.flags1
-rw-r--r--test/files/pos/t1569.flags1
14 files changed, 3 insertions, 15 deletions
diff --git a/test/files/buildmanager/t2650_3/t2650_3.check b/test/files/buildmanager/t2650_3/t2650_3.check
index 5c6326d59f..c109800d9c 100644
--- a/test/files/buildmanager/t2650_3/t2650_3.check
+++ b/test/files/buildmanager/t2650_3/t2650_3.check
@@ -10,5 +10,6 @@ B.scala:2: error: type mismatch;
found : a.T
(which expands to) Long
required: Int
+ possible cause: missing arguments for method or constructor
def x(a: A): Int = a.x
^
diff --git a/test/files/buildmanager/t2650_4/t2650_4.check b/test/files/buildmanager/t2650_4/t2650_4.check
index a4aeaddfbb..89536776bd 100644
--- a/test/files/buildmanager/t2650_4/t2650_4.check
+++ b/test/files/buildmanager/t2650_4/t2650_4.check
@@ -10,5 +10,6 @@ B.scala:2: error: type mismatch;
found : a.T2
(which expands to) Long
required: Int
+ possible cause: missing arguments for method or constructor
def x(a: A): Int = a.x
^
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
diff --git a/test/files/pos/depmet_1_pos.flags b/test/files/pos/depmet_1_pos.flags
deleted file mode 100644
index 1c26b24745..0000000000
--- a/test/files/pos/depmet_1_pos.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ydependent-method-types \ No newline at end of file
diff --git a/test/files/pos/depmet_implicit_chaining_zw.flags b/test/files/pos/depmet_implicit_chaining_zw.flags
deleted file mode 100644
index 1c26b24745..0000000000
--- a/test/files/pos/depmet_implicit_chaining_zw.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ydependent-method-types \ No newline at end of file
diff --git a/test/files/pos/depmet_implicit_norm_ret.flags b/test/files/pos/depmet_implicit_norm_ret.flags
deleted file mode 100644
index 1c26b24745..0000000000
--- a/test/files/pos/depmet_implicit_norm_ret.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ydependent-method-types \ No newline at end of file
diff --git a/test/files/pos/depmet_implicit_oopsla_session.flags b/test/files/pos/depmet_implicit_oopsla_session.flags
deleted file mode 100644
index 1c26b24745..0000000000
--- a/test/files/pos/depmet_implicit_oopsla_session.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ydependent-method-types \ No newline at end of file
diff --git a/test/files/pos/depmet_implicit_oopsla_session_2.flags b/test/files/pos/depmet_implicit_oopsla_session_2.flags
deleted file mode 100644
index 1c26b24745..0000000000
--- a/test/files/pos/depmet_implicit_oopsla_session_2.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ydependent-method-types \ No newline at end of file
diff --git a/test/files/pos/depmet_implicit_oopsla_session_simpler.flags b/test/files/pos/depmet_implicit_oopsla_session_simpler.flags
deleted file mode 100644
index 1c26b24745..0000000000
--- a/test/files/pos/depmet_implicit_oopsla_session_simpler.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ydependent-method-types \ No newline at end of file
diff --git a/test/files/pos/depmet_implicit_oopsla_zipwith.flags b/test/files/pos/depmet_implicit_oopsla_zipwith.flags
deleted file mode 100644
index 1c26b24745..0000000000
--- a/test/files/pos/depmet_implicit_oopsla_zipwith.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ydependent-method-types \ No newline at end of file
diff --git a/test/files/pos/depmet_implicit_tpbetareduce.flags b/test/files/pos/depmet_implicit_tpbetareduce.flags
deleted file mode 100644
index 1c26b24745..0000000000
--- a/test/files/pos/depmet_implicit_tpbetareduce.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ydependent-method-types \ No newline at end of file
diff --git a/test/files/pos/t1569.flags b/test/files/pos/t1569.flags
deleted file mode 100644
index 1c26b24745..0000000000
--- a/test/files/pos/t1569.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ydependent-method-types \ No newline at end of file