made Stream.length not be recursive

1 files changed, 9 insertions, 1 deletions

diff --git a/src/library/scala/Stream.scala b/src/library/scala/Stream.scala
index 51c96b3f0c..5a4a705a61 100644
--- a/src/library/scala/Stream.scala
+++ b/src/library/scala/Stream.scala
@@ -195,7 +195,15 @@ trait Stream[+A] extends Seq.Projection[A] {
   def tail: Stream[A]
 
   /** The length of this stream */
-  override def length: Int = if (isEmpty) 0 else tail.length + 1
+  override def length: Int = {
+    var len = 0
+    var here = this
+    while (!here.isEmpty) {
+      len += 1
+      here = here.tail
+    }
+    len
+  }
 
   /** returns length - l without calling length
    */