Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
65c9baae
Commit
65c9baae
authored
Jan 22, 2017
by
ksss
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rewrite mrb_ary_splice
Referenced to CRuby's array.c(rb_ary_splice) fix #3405
parent
bd50273b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
32 additions
and
20 deletions
+32
-20
src/array.c
src/array.c
+32
-20
No files found.
src/array.c
View file @
65c9baae
...
...
@@ -589,7 +589,6 @@ MRB_API mrb_value
mrb_ary_splice
(
mrb_state
*
mrb
,
mrb_value
ary
,
mrb_int
head
,
mrb_int
len
,
mrb_value
rpl
)
{
struct
RArray
*
a
=
mrb_ary_ptr
(
ary
);
mrb_int
tail
,
size
;
const
mrb_value
*
argv
;
mrb_int
i
,
argc
;
...
...
@@ -608,7 +607,6 @@ mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_val
if
(
a
->
len
<
len
||
a
->
len
<
head
+
len
)
{
len
=
a
->
len
-
head
;
}
tail
=
head
+
len
;
/* size check */
if
(
mrb_array_p
(
rpl
))
{
...
...
@@ -623,30 +621,44 @@ mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_val
argc
=
1
;
argv
=
&
rpl
;
}
size
=
head
+
argc
;
if
(
tail
<
a
->
len
)
size
+=
a
->
len
-
tail
;
if
(
size
<
0
||
size
>
ARY_MAX_SIZE
)
mrb_raise
(
mrb
,
E_ARGUMENT_ERROR
,
"array size too big"
);
if
(
size
>
a
->
aux
.
capa
)
ary_expand_capa
(
mrb
,
a
,
size
);
if
(
head
>
a
->
len
)
{
if
(
head
>=
a
->
len
)
{
if
(
head
>
ARY_MAX_SIZE
-
argc
)
{
mrb_raisef
(
mrb
,
E_INDEX_ERROR
,
"index %S too big"
,
mrb_fixnum_value
(
head
));
}
len
=
head
+
argc
;
if
(
len
>
a
->
aux
.
capa
)
{
ary_expand_capa
(
mrb
,
a
,
head
+
argc
);
}
ary_fill_with_nil
(
a
->
ptr
+
a
->
len
,
head
-
a
->
len
);
if
(
argc
>
0
)
{
for
(
int
i
=
0
;
i
<
argc
;
i
++
)
{
a
->
ptr
[
head
+
i
]
=
argv
[
i
];
}
}
a
->
len
=
len
;
}
else
if
(
head
<
a
->
len
)
{
value_move
(
a
->
ptr
+
head
+
argc
,
a
->
ptr
+
tail
,
a
->
len
-
tail
);
}
else
{
mrb_int
alen
;
if
(
a
->
len
-
len
>
ARY_MAX_SIZE
-
argc
)
{
mrb_raisef
(
mrb
,
E_INDEX_ERROR
,
"index %S too big"
,
mrb_fixnum_value
(
a
->
len
+
argc
-
len
));
}
alen
=
a
->
len
+
argc
-
len
;
if
(
alen
>
a
->
aux
.
capa
)
{
ary_expand_capa
(
mrb
,
a
,
alen
);
}
if
(
len
!=
argc
)
{
value_move
(
a
->
ptr
+
head
+
argc
,
a
->
ptr
+
head
+
len
,
a
->
len
-
(
head
+
len
));
a
->
len
=
alen
;
}
if
(
argc
>
0
)
{
value_move
(
a
->
ptr
+
head
,
argv
,
argc
);
}
}
for
(
i
=
0
;
i
<
argc
;
i
++
)
{
*
(
a
->
ptr
+
head
+
i
)
=
*
(
argv
+
i
);
mrb_field_write_barrier_value
(
mrb
,
(
struct
RBasic
*
)
a
,
argv
[
i
]);
}
a
->
len
=
size
;
return
ary
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment