diff options
author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-08-31 10:29:42 +0000 |
---|---|---|
committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-08-31 10:29:42 +0000 |
commit | b0c8e271562411b761aba42a812982adc7772f9d (patch) | |
tree | e8a361ace7a38ae9c40761a44755391dd0b36d1a | |
parent | 9db3f49ff41bb9d037924cd6995ed598c9619650 (diff) | |
download | scala-b0c8e271562411b761aba42a812982adc7772f9d.tar.gz scala-b0c8e271562411b761aba42a812982adc7772f9d.tar.bz2 scala-b0c8e271562411b761aba42a812982adc7772f9d.zip |
Fixes #3684. Closes #3684. No review.
-rw-r--r-- | src/library/scala/collection/mutable/ArrayBuilder.scala | 30 |
1 files changed, 10 insertions, 20 deletions
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) } |