Fixes #3350. review by extempore

2 files changed, 25 insertions, 0 deletions

diff --git a/src/library/scala/collection/immutable/Stream.scala b/src/library/scala/collection/immutable/Stream.scala
index 50fa07c2cf..fbda0b918b 100644
--- a/src/library/scala/collection/immutable/Stream.scala
+++ b/src/library/scala/collection/immutable/Stream.scala
@@ -104,6 +104,16 @@ self =>
     loop(this, "")
   }
 
+  override def length: Int = {
+    var len = 0
+    var left = this
+    while (!left.isEmpty) {
+      len += 1
+      left = left.tail
+    }
+    len
+  }
+
   /** It's an imperfect world, but at least we can bottle up the
    *  imperfection in a capsule.
    */
diff --git a/test/files/run/stream_length.scala b/test/files/run/stream_length.scala
new file mode 100644
index 0000000000..68e9cad5ac
--- /dev/null
+++ b/test/files/run/stream_length.scala
@@ -0,0 +1,15 @@
+
+
+object Test {
+  def walk(depth: Int, bias: String): Stream[String] = {
+    if (depth == 0)
+      Stream(bias)
+    else {
+      Stream.concat(Stream.range(1, 100).map((x: Int) => walk(depth-1, bias + x)))
+    }
+  }
+
+  def main(args: Array[String]) {
+    println("Length: " + walk(3, "---").length)
+  }
+}