From b0c8e271562411b761aba42a812982adc7772f9d Mon Sep 17 00:00:00 2001
From: Aleksandar Pokopec <aleksandar.prokopec@epfl.ch>
Date: Tue, 31 Aug 2010 10:29:42 +0000
Subject: Fixes #3684. Closes #3684. No review.

---
 .../scala/collection/mutable/ArrayBuilder.scala    | 30 ++++++++--------------
 1 file changed, 10 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/library/scala/collection/mutable/ArrayBuilder.scala b/src/library/scala/collection/mutable/ArrayBuilder.scala
index 5199fb9051..cab7a4bd7f 100644
--- a/src/library/scala/collection/mutable/ArrayBuilder.scala
+++ b/src/library/scala/collection/mutable/ArrayBuilder.scala
@@ -63,9 +63,8 @@ object ArrayBuilder {
     }
 
     private def ensureSize(size: Int) {
-      if (capacity == 0) resize(16)
       if (capacity < size) {
-        var newsize = capacity * 2
+        var newsize = if (capacity == 0) 16 else capacity * 2
         while (newsize < size) newsize *= 2
         resize(newsize)
       }
@@ -128,9 +127,8 @@ object ArrayBuilder {
     }
 
     private def ensureSize(size: Int) {
-      if (capacity == 0) resize(16)
       if (capacity < size) {
-        var newsize = capacity * 2
+        var newsize = if (capacity == 0) 16 else capacity * 2
         while (newsize < size) newsize *= 2
         resize(newsize)
       }
@@ -193,9 +191,8 @@ object ArrayBuilder {
     }
 
     private def ensureSize(size: Int) {
-      if (capacity == 0) resize(16)
       if (capacity < size) {
-        var newsize = capacity * 2
+        var newsize = if (capacity == 0) 16 else capacity * 2
         while (newsize < size) newsize *= 2
         resize(newsize)
       }
@@ -258,9 +255,8 @@ object ArrayBuilder {
     }
 
     private def ensureSize(size: Int) {
-      if (capacity == 0) resize(16)
       if (capacity < size) {
-        var newsize = capacity * 2
+        var newsize = if (capacity == 0) 16 else capacity * 2
         while (newsize < size) newsize *= 2
         resize(newsize)
       }
@@ -323,9 +319,8 @@ object ArrayBuilder {
     }
 
     private def ensureSize(size: Int) {
-      if (capacity == 0) resize(16)
       if (capacity < size) {
-        var newsize = capacity * 2
+        var newsize = if (capacity == 0) 16 else capacity * 2
         while (newsize < size) newsize *= 2
         resize(newsize)
       }
@@ -388,9 +383,8 @@ object ArrayBuilder {
     }
 
     private def ensureSize(size: Int) {
-      if (capacity == 0) resize(16)
       if (capacity < size) {
-        var newsize = capacity * 2
+        var newsize = if (capacity == 0) 16 else capacity * 2
         while (newsize < size) newsize *= 2
         resize(newsize)
       }
@@ -453,9 +447,8 @@ object ArrayBuilder {
     }
 
     private def ensureSize(size: Int) {
-      if (capacity == 0) resize(16)
       if (capacity < size) {
-        var newsize = capacity * 2
+        var newsize = if (capacity == 0) 16 else capacity * 2
         while (newsize < size) newsize *= 2
         resize(newsize)
       }
@@ -518,9 +511,8 @@ object ArrayBuilder {
     }
 
     private def ensureSize(size: Int) {
-      if (capacity == 0) resize(16)
       if (capacity < size) {
-        var newsize = capacity * 2
+        var newsize = if (capacity == 0) 16 else capacity * 2
         while (newsize < size) newsize *= 2
         resize(newsize)
       }
@@ -583,9 +575,8 @@ object ArrayBuilder {
     }
 
     private def ensureSize(size: Int) {
-      if (capacity == 0) resize(16)
       if (capacity < size) {
-        var newsize = capacity * 2
+        var newsize = if (capacity == 0) 16 else capacity * 2
         while (newsize < size) newsize *= 2
         resize(newsize)
       }
@@ -648,9 +639,8 @@ object ArrayBuilder {
     }
 
     private def ensureSize(size: Int) {
-      if (capacity == 0) resize(16)
       if (capacity < size) {
-        var newsize = capacity * 2
+        var newsize = if (capacity == 0) 16 else capacity * 2
         while (newsize < size) newsize *= 2
         resize(newsize)
       }
-- 
cgit v1.2.3