diff options
author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2009-05-27 19:35:02 +0000 |
---|---|---|
committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2009-05-27 19:35:02 +0000 |
commit | cc5e79c9ec9cea8d0f22020b528877d8f6e00153 (patch) | |
tree | 94e43f77c7b7271b3d0b6f9fb7372ae83b39360d /test/files/neg | |
parent | 4b8be5d8bec86358276407d6521c41702ccda835 (diff) | |
download | scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.tar.gz scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.tar.bz2 scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.zip |
In "Iterable" and in all its subclasses, "itera...
In "Iterable" and in all its subclasses, "iterator" replaces "elements"
(and assorted changes).
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/bug112706A.check | 4 | ||||
-rw-r--r-- | test/files/neg/bug112706A.scala | 2 | ||||
-rw-r--r-- | test/files/neg/bug563.check | 4 | ||||
-rw-r--r-- | test/files/neg/bug563.scala | 2 | ||||
-rw-r--r-- | test/files/neg/bug765.check | 4 | ||||
-rw-r--r-- | test/files/neg/bug765.scala | 2 | ||||
-rw-r--r-- | test/files/neg/bug766.check | 4 | ||||
-rw-r--r-- | test/files/neg/bug766.scala | 2 | ||||
-rw-r--r-- | test/files/neg/viewtest.check | 10 | ||||
-rw-r--r-- | test/files/neg/viewtest.scala | 6 |
10 files changed, 7 insertions, 33 deletions
diff --git a/test/files/neg/bug112706A.check b/test/files/neg/bug112706A.check index f84dbcd051..8fb5bfc390 100644 --- a/test/files/neg/bug112706A.check +++ b/test/files/neg/bug112706A.check @@ -1,10 +1,6 @@ -bug112706A.scala:4: warning: for (val x <- ... ) has been deprecated; use for (x <- ... ) instead - for (val t <- p) t._1 match { - ^ bug112706A.scala:5: error: constructor cannot be instantiated to expected type; found : (T1, T2) required: java.lang.String case Tuple2(node,_) => ^ -one warning found one error found diff --git a/test/files/neg/bug112706A.scala b/test/files/neg/bug112706A.scala index fb98ad300c..af8491e6ef 100644 --- a/test/files/neg/bug112706A.scala +++ b/test/files/neg/bug112706A.scala @@ -1,7 +1,7 @@ package test; trait Test { def foo(p : List[Tuple2[String,String]]) = { - for (val t <- p) t._1 match { + for (t <- p) t._1 match { case Tuple2(node,_) => } } diff --git a/test/files/neg/bug563.check b/test/files/neg/bug563.check index b88c949883..c10f504635 100644 --- a/test/files/neg/bug563.check +++ b/test/files/neg/bug563.check @@ -1,8 +1,4 @@ -bug563.scala:5: warning: for (val x <- ... ) has been deprecated; use for (x <- ... ) instead - for (val n <- sn) - ^ bug563.scala:6: error: missing parameter type map(n,ptr => new Cell(ptr.elem)); ^ -one warning found one error found diff --git a/test/files/neg/bug563.scala b/test/files/neg/bug563.scala index d559226bdb..d8e026e656 100644 --- a/test/files/neg/bug563.scala +++ b/test/files/neg/bug563.scala @@ -2,6 +2,6 @@ object Test { def map[A,R](a : List[A], f : A => R) : List[R] = a.map(f); def split(sn : Iterable[List[Cell[int]]]) : unit = - for (val n <- sn) + for (n <- sn) map(n,ptr => new Cell(ptr.elem)); } diff --git a/test/files/neg/bug765.check b/test/files/neg/bug765.check index f022c72f94..02bd111ef7 100644 --- a/test/files/neg/bug765.check +++ b/test/files/neg/bug765.check @@ -1,8 +1,4 @@ -bug765.scala:2: warning: for (val x <- ... ) has been deprecated; use for (x <- ... ) instead - for (val e <- List()) { //required - ^ bug765.scala:3: error: not found: type Bar123 val bar = new Bar123 ^ -one warning found one error found diff --git a/test/files/neg/bug765.scala b/test/files/neg/bug765.scala index f1100df55a..3e5371b533 100644 --- a/test/files/neg/bug765.scala +++ b/test/files/neg/bug765.scala @@ -1,5 +1,5 @@ object test { - for (val e <- List()) { //required + for (e <- List()) { //required val bar = new Bar123 val res = bar.f //required () diff --git a/test/files/neg/bug766.check b/test/files/neg/bug766.check index 3900f782ca..d259db6835 100644 --- a/test/files/neg/bug766.check +++ b/test/files/neg/bug766.check @@ -1,8 +1,4 @@ -bug766.scala:4: warning: for (val x <- ... ) has been deprecated; use for (x <- ... ) instead - for (val n <- Nil; val m <- Nil) { - ^ bug766.scala:5: error: not found: value badIdentifier val p = badIdentifier ^ -one warning found one error found diff --git a/test/files/neg/bug766.scala b/test/files/neg/bug766.scala index 9829b23217..b4b04d9642 100644 --- a/test/files/neg/bug766.scala +++ b/test/files/neg/bug766.scala @@ -1,7 +1,7 @@ object B { def a = { - for (val n <- Nil; val m <- Nil) { + for (n <- Nil; m <- Nil) { val p = badIdentifier false } diff --git a/test/files/neg/viewtest.check b/test/files/neg/viewtest.check index 9ae41b7728..5415ba4f92 100644 --- a/test/files/neg/viewtest.check +++ b/test/files/neg/viewtest.check @@ -1,12 +1,3 @@ -viewtest.scala:96: warning: for (val x <- ... ) has been deprecated; use for (x <- ... ) instead - for (val s <- args) { - ^ -viewtest.scala:103: warning: for (val x <- ... ) has been deprecated; use for (x <- ... ) instead - for (val s <- args) { - ^ -viewtest.scala:110: warning: for (val x <- ... ) has been deprecated; use for (x <- ... ) instead - for (val s <- args) { - ^ viewtest.scala:43: error: type mismatch; found : List[a(in method compareTo)] required: List[a(in method view3)] @@ -18,5 +9,4 @@ viewtest.scala:104: error: ambiguous implicit values: match expected type (test.Str) => test.Ordered[test.Str] t = t insert Str(s) ^ -three warnings found two errors found diff --git a/test/files/neg/viewtest.scala b/test/files/neg/viewtest.scala index 4c603b61bc..778e672d91 100644 --- a/test/files/neg/viewtest.scala +++ b/test/files/neg/viewtest.scala @@ -93,21 +93,21 @@ object Test { def main(args: Array[String]) = { { var t: Tree[String] = Empty - for (val s <- args) { + for (s <- args) { t = t insert s } Console.println(t.elements) } { var t: Tree[Str] = Empty - for (val s <- args) { + for (s <- args) { t = t insert Str(s) } Console.println(t.elements) } { var t: Tree[List[char]] = Empty - for (val s <- args) { + for (s <- args) { t = t insert toCharList(s) } Console.println(t.elements) |