diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2018-12-17 16:29:00 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-12-17 16:29:00 +0900 |
| commit | 11071b9ab11160c6708a3ac6863b1170776f15da (patch) | |
| tree | 8a2b6e8c32726d49271768c5545cf948dba37894 /src/array.c | |
| parent | ccc5edc60dd8f60d4e829586ac5541cb6f4e9461 (diff) | |
| parent | d8c70167f736dc4c3828f008658b69cd45f93363 (diff) | |
| download | mruby-11071b9ab11160c6708a3ac6863b1170776f15da.tar.gz mruby-11071b9ab11160c6708a3ac6863b1170776f15da.zip | |
Merge pull request #4189 from sdottaka/fix-mrb_ary_clear
Make mrb_ary_clear() function callable from C again
Diffstat (limited to 'src/array.c')
| -rw-r--r-- | src/array.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/array.c b/src/array.c index 084b48dc0..707820ab9 100644 --- a/src/array.c +++ b/src/array.c @@ -1089,7 +1089,6 @@ mrb_ary_clear(mrb_state *mrb, mrb_value self) { struct RArray *a = mrb_ary_ptr(self); - mrb_get_args(mrb, ""); ary_modify(mrb, a); if (ARY_SHARED_P(a)) { mrb_ary_decref(mrb, a->as.heap.aux.shared); @@ -1104,6 +1103,13 @@ mrb_ary_clear(mrb_state *mrb, mrb_value self) } static mrb_value +mrb_ary_clear_m(mrb_state *mrb, mrb_value self) +{ + mrb_get_args(mrb, ""); + return mrb_ary_clear(mrb, self); +} + +static mrb_value mrb_ary_empty_p(mrb_state *mrb, mrb_value self) { struct RArray *a = mrb_ary_ptr(self); @@ -1268,7 +1274,7 @@ mrb_init_array(mrb_state *mrb) mrb_define_method(mrb, a, "<<", mrb_ary_push_m, MRB_ARGS_REQ(1)); /* 15.2.12.5.3 */ mrb_define_method(mrb, a, "[]", mrb_ary_aget, MRB_ARGS_ANY()); /* 15.2.12.5.4 */ mrb_define_method(mrb, a, "[]=", mrb_ary_aset, MRB_ARGS_ANY()); /* 15.2.12.5.5 */ - mrb_define_method(mrb, a, "clear", mrb_ary_clear, MRB_ARGS_NONE()); /* 15.2.12.5.6 */ + mrb_define_method(mrb, a, "clear", mrb_ary_clear_m, MRB_ARGS_NONE()); /* 15.2.12.5.6 */ mrb_define_method(mrb, a, "concat", mrb_ary_concat_m, MRB_ARGS_REQ(1)); /* 15.2.12.5.8 */ mrb_define_method(mrb, a, "delete_at", mrb_ary_delete_at, MRB_ARGS_REQ(1)); /* 15.2.12.5.9 */ mrb_define_method(mrb, a, "empty?", mrb_ary_empty_p, MRB_ARGS_NONE()); /* 15.2.12.5.12 */ |