diff options
| -rw-r--r-- | src/array.c | 19 | ||||
| -rw-r--r-- | src/kernel.c | 11 |
2 files changed, 21 insertions, 9 deletions
diff --git a/src/array.c b/src/array.c index 020b661b4..f80134de4 100644 --- a/src/array.c +++ b/src/array.c @@ -1078,11 +1078,11 @@ mrb_ary_rindex_m(mrb_state *mrb, mrb_value self) MRB_API mrb_value mrb_ary_splat(mrb_state *mrb, mrb_value v) { - mrb_value a; + mrb_value ary; + struct RArray *a; if (mrb_array_p(v)) { - struct RArray *a = mrb_ary_ptr(v); - a = ary_dup(mrb, a); + a = ary_dup(mrb, mrb_ary_ptr(v)); return mrb_obj_value(a); } @@ -1090,12 +1090,17 @@ mrb_ary_splat(mrb_state *mrb, mrb_value v) return mrb_ary_new_from_values(mrb, 1, &v); } - a = mrb_funcall(mrb, v, "to_a", 0); - if (mrb_nil_p(a)) { + ary = mrb_funcall(mrb, v, "to_a", 0); + if (mrb_nil_p(ary)) { return mrb_ary_new_from_values(mrb, 1, &v); } - mrb_ensure_array_type(mrb, a); - return a; + mrb_ensure_array_type(mrb, ary); + a = mrb_ary_ptr(ary); + if (mrb_frozen_p(a)) { + a = ary_dup(mrb, a); + return mrb_obj_value(a); + } + return ary; } static mrb_value diff --git a/src/kernel.c b/src/kernel.c index 34f9fd9ef..10ed9f88e 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -772,13 +772,20 @@ mrb_obj_ceqq(mrb_state *mrb, mrb_value self) if (mrb_array_p(self)) { ary = self; } - else if (!mrb_respond_to(mrb, v, mrb_intern_lit(mrb, "to_a"))) { + else if (mrb_nil_p(self)) { + return mrb_false_value(); + } + else if (!mrb_respond_to(mrb, self, mrb_intern_lit(mrb, "to_a"))) { mrb_value c = mrb_funcall_argv(mrb, self, eqq, 1, &v); if (mrb_test(c)) return mrb_true_value(); return mrb_false_value(); } else { - ary = mrb_ary_splat(mrb, self); + ary = mrb_funcall(mrb, self, "to_a", 0); + if (mrb_nil_p(ary)) { + return mrb_funcall_argv(mrb, self, eqq, 1, &v); + } + mrb_ensure_array_type(mrb, ary); } len = RARRAY_LEN(ary); for (i=0; i<len; i++) { |