refactor vc array creation

Author: VladimirNik

src/scala/Array.scala

@@ -118,71 +118,53 @@ object Array extends FallbackArrayBuilding {
     */
   def apply[T](xs: T*)(implicit ct: ClassTag[T]): Array[T] = {
     var i = 0
+    val array = new Array[T](xs.length)
     xs match {
       case vcwra: VCWrappedArray[T] =>
         (vcwra.array: Object) match {
           case vcia: VCIntArray[_] =>
             val oldUndArr = vcia.arr
-            val newArr = new Array[T](vcia.length)
-            val newUndArr = newArr.asInstanceOf[VCIntArray[_]].arr
+            val newUndArr = array.asInstanceOf[VCIntArray[_]].arr
             for (x <- oldUndArr.iterator) { newUndArr(i) = x; i += 1 }
-            newArr
           case vcoa: VCObjectArray[_] =>
             val oldUndArr = vcoa.arr
-            val newArr = new Array[T](vcoa.length)
-            val newUndArr = newArr.asInstanceOf[VCObjectArray[_]].arr
+            val newUndArr = array.asInstanceOf[VCObjectArray[_]].arr
             for (x <- oldUndArr.iterator) { newUndArr(i) = x; i += 1 }
-            newArr
           case vcba: VCByteArray[_] =>
             val oldUndArr = vcba.arr
-            val newArr = new Array[T](vcba.length)
-            val newUndArr = newArr.asInstanceOf[VCByteArray[_]].arr
+            val newUndArr = array.asInstanceOf[VCByteArray[_]].arr
             for (x <- oldUndArr.iterator) { newUndArr(i) = x; i += 1 }
-            newArr
           case vcboola: VCBooleanArray[_] =>
             val oldUndArr = vcboola.arr
-            val newArr = new Array[T](vcboola.length)
-            val newUndArr = newArr.asInstanceOf[VCBooleanArray[_]].arr
+            val newUndArr = array.asInstanceOf[VCBooleanArray[_]].arr
             for (x <- oldUndArr.iterator) { newUndArr(i) = x; i += 1 }
-            newArr
           case vcla: VCLongArray[_] =>
             val oldUndArr = vcla.arr
-            val newArr = new Array[T](vcla.length)
-            val newUndArr = newArr.asInstanceOf[VCLongArray[_]].arr
+            val newUndArr = array.asInstanceOf[VCLongArray[_]].arr
             for (x <- oldUndArr.iterator) { newUndArr(i) = x; i += 1 }
-            newArr
           case vcfa: VCFloatArray[_] =>
             val oldUndArr = vcfa.arr
-            val newArr = new Array[T](vcfa.length)
-            val newUndArr = newArr.asInstanceOf[VCFloatArray[_]].arr
+            val newUndArr = array.asInstanceOf[VCFloatArray[_]].arr
             for (x <- oldUndArr.iterator) { newUndArr(i) = x; i += 1 }
-            newArr
           case vcda: VCDoubleArray[_] =>
             val oldUndArr = vcda.arr
-            val newArr = new Array[T](vcda.length)
-            val newUndArr = newArr.asInstanceOf[VCDoubleArray[_]].arr
+            val newUndArr = array.asInstanceOf[VCDoubleArray[_]].arr
             for (x <- oldUndArr.iterator) { newUndArr(i) = x; i += 1 }
-            newArr
           case vcca: VCCharArray[_] =>
             val oldUndArr = vcca.arr
-            val newArr = new Array[T](vcca.length)
-            val newUndArr = newArr.asInstanceOf[VCCharArray[_]].arr
+            val newUndArr = array.asInstanceOf[VCCharArray[_]].arr
             for (x <- oldUndArr.iterator) { newUndArr(i) = x; i += 1 }
-            newArr
           case vcsa: VCShortArray[_] =>
             val oldUndArr = vcsa.arr
-            val newArr = new Array[T](vcsa.length)
-            val newUndArr = newArr.asInstanceOf[VCShortArray[_]].arr
+            val newUndArr = array.asInstanceOf[VCShortArray[_]].arr
             for (x <- oldUndArr.iterator) { newUndArr(i) = x; i += 1 }
-            newArr
         }
       case _ =>
         // Subject to a compiler optimization in Cleanup.
         // Array(e0, ..., en) is translated to { val a = new Array(3); a(i) = ei; a }
-        val array = new Array[T](xs.length)
         for (x <- xs.iterator) { array(i) = x; i += 1 }
-        array
     }
+    array
   }
 
   /** Creates an array of `Boolean` objects */