summaryrefslogtreecommitdiff
path: root/array.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-22 04:00:12 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-22 04:00:12 +0000
commit8eb0a3cd5020ba2eeb540e4fd81fb88e43305ae4 (patch)
treeb7b0faea2b131e9e26934e22816cffa732ef5902 /array.c
parent4132ac3762c96d1180df14ca34848e1a9e7569ea (diff)
* array.c (ary_memfill): added.
* array.c (rb_ary_initialize): use ary_memfill(). * array.c (rb_ary_fill): ditto. * array.c (rb_ary_slice_bang): use RARRAY_RAWPTR() because this code creates no new references. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/array.c b/array.c
index eeeb989..c05ee1a 100644
--- a/array.c
+++ b/array.c
@@ -102,6 +102,15 @@ memfill(register VALUE *mem, register long size, register VALUE val)
}
static void
+ary_memfill(VALUE ary, long beg, long size, VALUE val)
+{
+ RARRAY_PTR_USE(ary, ptr, {
+ memfill(ptr + beg, size, val);
+ OBJ_WRITTEN(ary, Qundef, val);
+ });
+}
+
+static void
ary_memcpy(VALUE ary, long beg, long argc, const VALUE *argv)
{
#if 1
@@ -787,10 +796,7 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
}
}
else {
- RARRAY_PTR_USE(ary, ptr, {
- memfill((VALUE *)ptr, len, val);
- });
- OBJ_WRITTEN(ary, Qundef, val);
+ ary_memfill(ary, 0, len, val);
ARY_SET_LEN(ary, len);
}
return ary;
@@ -2999,7 +3005,7 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
len = orig_len - pos;
}
if (len == 0) return rb_ary_new2(0);
- arg2 = rb_ary_new4(len, RARRAY_PTR(ary)+pos);
+ arg2 = rb_ary_new4(len, RARRAY_RAWPTR(ary)+pos);
RBASIC_SET_CLASS(arg2, rb_obj_class(ary));
rb_ary_splice(ary, pos, len, Qundef);
return arg2;
@@ -3372,7 +3378,6 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
{
VALUE item, arg1, arg2;
long beg = 0, end = 0, len = 0;
- VALUE *p;
int block_p = FALSE;
if (rb_block_given_p()) {
@@ -3429,8 +3434,7 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
}
}
else {
- p = RARRAY_PTR(ary) + beg;
- memfill(p, len, item);
+ ary_memfill(ary, beg, len, item);
}
return ary;
}