* array.c (rb_ary_fill): previous commit disabled this usage:

    a = [0,1,2,3,4,5,6,7,8,9]
    a.fill {|i| a[i] * 10} #=> [nil, nil, ...., nil]

  previous commit has advantange for early garbage collection, but
  potensially would break some script. so I reverted behavior.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 11 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index d96d72ea9c..0e88963e95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Nov 15 16:36:03 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* array.c (rb_ary_fill): previous commit disabled this usage:
+
+	    a = [0,1,2,3,4,5,6,7,8,9]
+	    a.fill {|i| a[i] * 10} #=> [nil, nil, ...., nil]
+
+	  previous commit has advantange for early garbage collection, but
+	  potensially would break some script. so I reverted behavior.
+
 Tue Nov 15 16:15:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* file.c (file_load_ok): use eaccess() instead of actually opening
diff --git a/array.c b/array.c
index 9ca499b5ef..68cbb6bfe3 100644
--- a/array.c
+++ b/array.c
@@ -2137,13 +2137,8 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
 	    REALLOC_N(RARRAY(ary)->ptr, VALUE, end);
 	    RARRAY(ary)->aux.capa = end;
 	}
-	RARRAY(ary)->len = end;
-    }
-    if (beg > RARRAY(ary)->len) {
 	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, end - RARRAY(ary)->len);
-    }
-    else {
-	rb_mem_clear(RARRAY(ary)->ptr + beg, end - beg);
+	RARRAY(ary)->len = end;
     }
 
     if (block_p) {