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
ef0b2397
Commit
ef0b2397
authored
Aug 11, 2017
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unnecessary inline function `ary_elt`.
And the function does not conform the naming convention anyway.
parent
67e2dddb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
15 deletions
+10
-15
include/mruby/array.h
include/mruby/array.h
+0
-9
mrbgems/mruby-array-ext/src/array.c
mrbgems/mruby-array-ext/src/array.c
+6
-5
src/array.c
src/array.c
+4
-1
No files found.
include/mruby/array.h
View file @
ef0b2397
...
...
@@ -276,15 +276,6 @@ MRB_API mrb_value mrb_ary_join(mrb_state *mrb, mrb_value ary, mrb_value sep);
*/
MRB_API
mrb_value
mrb_ary_resize
(
mrb_state
*
mrb
,
mrb_value
ary
,
mrb_int
new_len
);
static
inline
mrb_value
ary_elt
(
mrb_value
ary
,
mrb_int
offset
)
{
if
(
offset
<
0
||
RARRAY_LEN
(
ary
)
<=
offset
)
{
return
mrb_nil_value
();
}
return
RARRAY_PTR
(
ary
)[
offset
];
}
MRB_END_DECL
#endif
/* MRUBY_ARRAY_H */
mrbgems/mruby-array-ext/src/array.c
View file @
ef0b2397
...
...
@@ -127,19 +127,20 @@ mrb_ary_to_h(mrb_state *mrb, mrb_value ary)
hash
=
mrb_hash_new_capa
(
mrb
,
0
);
for
(
i
=
0
;
i
<
RARRAY_LEN
(
ary
);
++
i
)
{
v
=
mrb_check_array_type
(
mrb
,
RARRAY_PTR
(
ary
)[
i
]);
mrb_value
elt
=
RARRAY_PTR
(
ary
)[
i
];
v
=
mrb_check_array_type
(
mrb
,
elt
);
if
(
mrb_nil_p
(
v
))
{
mrb_raisef
(
mrb
,
E_TYPE_ERROR
,
"wrong element type %S at %S (expected array)"
,
mrb_str_new_cstr
(
mrb
,
mrb_obj_classname
(
mrb
,
ary_elt
(
ary
,
i
)
)),
mrb_fixnum_value
(
i
)
mrb_str_new_cstr
(
mrb
,
mrb_obj_classname
(
mrb
,
elt
)),
mrb_fixnum_value
(
i
)
);
}
if
(
RARRAY_LEN
(
v
)
!=
2
)
{
mrb_raisef
(
mrb
,
E_ARGUMENT_ERROR
,
"wrong array length at %S (expected 2, was %S)"
,
mrb_fixnum_value
(
i
),
mrb_fixnum_value
(
RARRAY_LEN
(
v
))
mrb_fixnum_value
(
i
),
mrb_fixnum_value
(
RARRAY_LEN
(
v
))
);
}
...
...
src/array.c
View file @
ef0b2397
...
...
@@ -1074,7 +1074,10 @@ mrb_ary_entry(mrb_value ary, mrb_int offset)
if
(
offset
<
0
)
{
offset
+=
RARRAY_LEN
(
ary
);
}
return
ary_elt
(
ary
,
offset
);
if
(
offset
<
0
||
RARRAY_LEN
(
ary
)
<=
offset
)
{
return
mrb_nil_value
();
}
return
RARRAY_PTR
(
ary
)[
offset
];
}
static
mrb_value
...
...
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