diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | array.c | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Tue Nov 15 14:39:16 2005 Yukihiro Matsumoto <matz@ruby-lang.org> + + * array.c (rb_ary_fill): should adjust array length correctly when + an array is expanded in the fill process. [ruby-core:06625] + Mon Nov 14 23:49:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (rb_file_s_readlink): ERANGE will occur only on GPFS. @@ -1088,6 +1088,7 @@ rb_ary_insert(argc, argv, ary) { long pos; + if (argc == 1) return ary; if (argc < 1) { rb_raise(rb_eArgError, "wrong number of arguments (at least 1)"); } @@ -1095,11 +1096,9 @@ rb_ary_insert(argc, argv, ary) if (pos == -1) { pos = RARRAY(ary)->len; } - else if (pos < 0) { + if (pos < 0) { pos++; } - - if (argc == 1) return ary; rb_ary_splice(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1)); return ary; } @@ -2265,7 +2264,6 @@ rb_ary_fill(argc, argv, ary) if (beg > RARRAY(ary)->len) { rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, end - RARRAY(ary)->len); } - RARRAY(ary)->len = end; } if (block_p) { @@ -2276,9 +2274,11 @@ rb_ary_fill(argc, argv, ary) v = rb_yield(LONG2NUM(i)); if (i>=RARRAY(ary)->len) break; RARRAY(ary)->ptr[i] = v; + RARRAY(ary)->len = i+1; } } else { + RARRAY(ary)->len = end; p = RARRAY(ary)->ptr + beg; pend = p + len; while (p < pend) { |