Merge branch 'work'

Conflicts:
	src/library/scala/concurrent/SyncVar.scala

1 files changed, 23 insertions, 0 deletions

diff --git a/test/files/run/scan.scala b/test/files/run/scan.scala
new file mode 100644
index 0000000000..47e0a7d976
--- /dev/null
+++ b/test/files/run/scan.scala
@@ -0,0 +1,23 @@
+
+
+
+
+object Test {
+
+  def main(args: Array[String]) {
+    val lst = List(1, 2, 3, 4, 5)
+
+    assert(lst.scanLeft(0)(_ + _) == List(0, 1, 3, 6, 10, 15))
+    assert(lst.scanRight(0)(_ + _) == List(15, 14, 12, 9, 5, 0))
+
+    val emp = List[Int]()
+    assert(emp.scanLeft(0)(_ + _) == List(0))
+    assert(emp.scanRight(0)(_ + _) == List(0))
+
+    val stream = Stream(1, 2, 3, 4, 5)
+    assert(stream.scanLeft(0)(_ + _) == Stream(0, 1, 3, 6, 10, 15))
+
+    assert(Stream.from(1).scanLeft(0)(_ + _).take(5) == Stream(0, 1, 3, 6, 10))
+  }
+
+}
\ No newline at end of file