diff options
author | Martin Odersky <odersky@gmail.com> | 2009-05-08 16:33:15 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2009-05-08 16:33:15 +0000 |
commit | 14a631a5fec42d04d0723355a0b93e482b5e4662 (patch) | |
tree | f639c2a22e89e193b9abea391993ecfd4d5326ee /test/files/pos | |
parent | 2379eb4ebbd28c8892b50a1d9fa8a687099eea4d (diff) | |
download | scala-14a631a5fec42d04d0723355a0b93e482b5e4662.tar.gz scala-14a631a5fec42d04d0723355a0b93e482b5e4662.tar.bz2 scala-14a631a5fec42d04d0723355a0b93e482b5e4662.zip |
massive new collections checkin.
Diffstat (limited to 'test/files/pos')
-rw-r--r-- | test/files/pos/bug0029.scala | 2 | ||||
-rw-r--r-- | test/files/pos/bug1049.scala | 4 | ||||
-rw-r--r-- | test/files/pos/bug1050.scala | 2 | ||||
-rw-r--r-- | test/files/pos/bug247.scala | 3 | ||||
-rw-r--r-- | test/files/pos/bug516.scala.disabled (renamed from test/files/pos/bug516.scala) | 4 | ||||
-rw-r--r-- | test/files/pos/bug927.scala | 2 | ||||
-rw-r--r-- | test/files/pos/collections.scala.disabled (renamed from test/files/pos/collections.scala) | 0 | ||||
-rw-r--r-- | test/files/pos/sudoku.scala | 2 | ||||
-rwxr-xr-x | test/files/pos/t0165.scala | 2 | ||||
-rwxr-xr-x | test/files/pos/t1049.scala | 9 |
10 files changed, 11 insertions, 19 deletions
diff --git a/test/files/pos/bug0029.scala b/test/files/pos/bug0029.scala index 1b33c6cffd..0af45ab62d 100644 --- a/test/files/pos/bug0029.scala +++ b/test/files/pos/bug0029.scala @@ -1,3 +1,3 @@ object Main { - def f[a]: List[List[a]] = for (val l1 <- Nil; val l2 <- Nil) yield l1; + def f[a]: List[List[a]] = for (val l1 <- Nil; val l2 <- Nil) yield l1 } diff --git a/test/files/pos/bug1049.scala b/test/files/pos/bug1049.scala index 452259b9f8..3cc9d0cc58 100644 --- a/test/files/pos/bug1049.scala +++ b/test/files/pos/bug1049.scala @@ -2,6 +2,6 @@ package bug1049 abstract class Test { type T <: A - class A requires T - class B requires T extends A + class A { self: T => } + class B extends A { self: T => } } diff --git a/test/files/pos/bug1050.scala b/test/files/pos/bug1050.scala index 8ca79716a9..1dfa20c988 100644 --- a/test/files/pos/bug1050.scala +++ b/test/files/pos/bug1050.scala @@ -2,7 +2,7 @@ package bug1050 abstract class A { type T <: scala.ScalaObject - class A requires T { + class A { this: T => def b = 3 def c = b b diff --git a/test/files/pos/bug247.scala b/test/files/pos/bug247.scala index bfd9d9694f..e2655c6ab3 100644 --- a/test/files/pos/bug247.scala +++ b/test/files/pos/bug247.scala @@ -16,10 +16,11 @@ class Tree[KEY,Entry](order:Order[KEY]) { def size =0; } -class TreeMap[KEY,VALUE](_factory:TreeMapFactory[KEY]) extends Tree[KEY,Pair[KEY,VALUE]](_factory.order) with Map[KEY, VALUE] { +class TreeMap[KEY,VALUE](_factory:TreeMapFactory[KEY]) extends Tree[KEY,Pair[KEY,VALUE]](_factory.order) with scala.collection.DefaultMap[KEY, VALUE] with Map[KEY, VALUE] { val factory = _factory val order = _factory.order; def this(newOrder:Order[KEY]) = this(new TreeMapFactory[KEY](newOrder)); def get(key:KEY) = null; def elements:Iterator[Pair[KEY,VALUE]] = null; + override def size = super[Tree].size } diff --git a/test/files/pos/bug516.scala b/test/files/pos/bug516.scala.disabled index 67e1799f28..623684e582 100644 --- a/test/files/pos/bug516.scala +++ b/test/files/pos/bug516.scala.disabled @@ -3,7 +3,7 @@ import scala.collection.mutable._; class Members; object subscriber extends Subscriber[Message[String] with Undoable, Members] { - def notify(pub: Members, event: Message[String] with Undoable): Unit = + def notify(pub: Members, event: Message[String] with Undoable): Unit = (event: Message[String]) match { case Include(elem) => Console.println("ADD: " + elem); case Remove(elem) => Console.println("REM: " + elem); @@ -11,4 +11,4 @@ object subscriber extends Subscriber[Message[String] with Undoable, Members] { //case r : Remove [HasTree] with Undoable => } } - + diff --git a/test/files/pos/bug927.scala b/test/files/pos/bug927.scala index 1a906cd9bc..5887aba255 100644 --- a/test/files/pos/bug927.scala +++ b/test/files/pos/bug927.scala @@ -2,7 +2,7 @@ object Test { def sum(stream: Stream[Int]): Int = stream match { - case Stream.empty => 0 + case Stream.Empty => 0 case Stream.cons(hd, tl) => hd + sum(tl) } val str: Stream[Int] = Stream.fromIterator(List(1,2,3).elements) diff --git a/test/files/pos/collections.scala b/test/files/pos/collections.scala.disabled index 4f45a42786..4f45a42786 100644 --- a/test/files/pos/collections.scala +++ b/test/files/pos/collections.scala.disabled diff --git a/test/files/pos/sudoku.scala b/test/files/pos/sudoku.scala index 8f42e56264..9875b22cfd 100644 --- a/test/files/pos/sudoku.scala +++ b/test/files/pos/sudoku.scala @@ -2,7 +2,7 @@ object SudokuSolver extends Application { // The board is represented by an array of strings (arrays of chars), // held in a global variable m. The program begins by reading 9 lines // of input to fill the board - var m: Array[Array[Char]] = List.tabulate(9, (x: Int) => readLine.toArray).toArray + var m: Array[Array[Char]] = Array.tabulate(9)((x: Int) => readLine.toArray) // For printing m, a method print is defined def print = { println(""); m map (carr => println(new String(carr))) } diff --git a/test/files/pos/t0165.scala b/test/files/pos/t0165.scala index 05c4a1c77a..76aef85240 100755 --- a/test/files/pos/t0165.scala +++ b/test/files/pos/t0165.scala @@ -1,5 +1,5 @@ package test3 -import scala.collection.jcl.LinkedHashMap +import scala.collection.mutable.LinkedHashMap trait Main { def asMany : ArrayResult = { diff --git a/test/files/pos/t1049.scala b/test/files/pos/t1049.scala deleted file mode 100755 index dad83579a6..0000000000 --- a/test/files/pos/t1049.scala +++ /dev/null @@ -1,9 +0,0 @@ -class J { - type tttt[a, b] <: _root_.scala.collection.mutable.Map[a, b] - - def r(a : tttt[String, String]) = { - 0 match { - case a : a.MapTo => - } - } -} |