From d817beea39b06c0b55fee8fa2b847b30dbe7c8c7 Mon Sep 17 00:00:00 2001 From: Lex Spoon Date: Sun, 9 Mar 2008 14:58:33 +0000 Subject: Array.zip supports arrays of different lengths. --- src/library/scala/runtime/BoxedArray.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/library/scala/runtime/BoxedArray.scala b/src/library/scala/runtime/BoxedArray.scala index d0555e8e62..f3193ec017 100644 --- a/src/library/scala/runtime/BoxedArray.scala +++ b/src/library/scala/runtime/BoxedArray.scala @@ -99,9 +99,7 @@ abstract class BoxedArray extends Array.Array0[Any] { final override def ++[b >: Any](that: Iterable[b]): Array[b] = super.++(that).toArray final def zip[b](that: Array[b]): Array[Tuple2[Any,b]] = { - val len = length - if(len != that.length) - throw new Error("zipping arrays of different length") + val len = length min that.length val result = new Array[Tuple2[Any,b]](len) var i = 0 while (i < len) { -- cgit v1.2.3