diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | array.c | 1 | ||||
| -rw-r--r-- | enumerator.c | 14 | ||||
| -rw-r--r-- | eval.c | 19 | ||||
| -rw-r--r-- | range.c | 14 |
5 files changed, 56 insertions, 3 deletions
@@ -1,3 +1,14 @@ +Tue Oct 3 02:31:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * eval.c (splat_value): use "to_splat" instead of "to_ary" to + prepare splat values as an array. + + * array.c (Init_Array): define to_splat. + + * range.c (range_to_splat): new method. + + * enumerator.c (enumerator_to_splat): ditto. + Tue Oct 3 01:36:47 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * string.c (rb_str_lines): returns an Enumerator instead of an @@ -3017,6 +3017,7 @@ Init_Array(void) rb_define_method(rb_cArray, "to_s", rb_ary_inspect, 0); rb_define_method(rb_cArray, "inspect", rb_ary_inspect, 0); rb_define_method(rb_cArray, "to_a", rb_ary_to_a, 0); + rb_define_method(rb_cArray, "to_splat", rb_ary_to_a, 0); rb_define_method(rb_cArray, "to_ary", rb_ary_to_ary_m, 0); rb_define_method(rb_cArray, "frozen?", rb_ary_frozen_p, 0); diff --git a/enumerator.c b/enumerator.c index ec348ded37..727990f652 100644 --- a/enumerator.c +++ b/enumerator.c @@ -359,6 +359,19 @@ enumerator_with_index(VALUE obj) enumerator_with_index_i, (VALUE)&memo); } +/* + * call-seq: + * e.to_splat => array + * + * Convert this enumerator object to an array to splat. + */ + +static VALUE +enumerator_to_splat(VALUE range) +{ + return rb_convert_type(range, T_ARRAY, "Array", "to_a"); +} + void Init_Enumerator(void) { @@ -378,6 +391,7 @@ Init_Enumerator(void) rb_define_method(rb_cEnumerator, "initialize", enumerator_initialize, -1); rb_define_method(rb_cEnumerator, "each", enumerator_each, 0); rb_define_method(rb_cEnumerator, "with_index", enumerator_with_index, 0); + rb_define_method(rb_cEnumerator, "to_splat", enumerator_to_splat, 0); sym_each = ID2SYM(rb_intern("each")); sym_each_with_index = ID2SYM(rb_intern("each_with_index")); @@ -2620,6 +2620,19 @@ svalue_to_avalue(VALUE v) } static VALUE +splat_value(VALUE v) +{ + VALUE tmp; + + if (v == Qundef) return rb_ary_new2(0); + tmp = rb_check_convert_type(v, T_ARRAY, "Array", "to_splat"); + if (NIL_P(tmp)) { + return rb_ary_new3(1, v); + } + return tmp; +} + +static VALUE class_prefix(VALUE self, NODE *cpath) { if (!cpath) { @@ -2703,7 +2716,7 @@ when_check(NODE *tag, VALUE val, VALUE self) } break; case NODE_SPLAT: - elm = svalue_to_avalue(rb_eval(self, tag->nd_head)); + elm = splat_value(rb_eval(self, tag->nd_head)); for (i=0; i<RARRAY_LEN(elm); i++) { if (when_cond(val, RARRAY_PTR(elm)[i])) { return Qtrue; @@ -2976,7 +2989,7 @@ rb_eval(VALUE self, NODE *n) break; case NODE_SPLAT: - result = svalue_to_avalue(rb_eval(self, node->nd_head)); + result = splat_value(rb_eval(self, node->nd_head)); break; case NODE_TO_ARY: @@ -3137,7 +3150,7 @@ rb_eval(VALUE self, NODE *n) case NODE_ARGSCAT: { VALUE args = rb_eval(self, node->nd_head); - result = rb_ary_concat(args, svalue_to_avalue(rb_eval(self, node->nd_body))); + result = rb_ary_concat(args, splat_value(rb_eval(self, node->nd_body))); } break; @@ -571,6 +571,19 @@ range_to_s(VALUE range) /* * call-seq: + * rng.to_splat => array + * + * Convert this range object to an array to splat. + */ + +static VALUE +range_to_splat(VALUE range) +{ + return rb_convert_type(range, T_ARRAY, "Array", "to_a"); +} + +/* + * call-seq: * rng.inspect => string * * Convert this range object to a printable form (using @@ -746,6 +759,7 @@ Init_Range(void) rb_define_method(rb_cRange, "max", range_max, 0); rb_define_method(rb_cRange, "to_s", range_to_s, 0); rb_define_method(rb_cRange, "inspect", range_inspect, 0); + rb_define_method(rb_cRange, "to_splat", range_to_splat, 0); rb_define_method(rb_cRange, "exclude_end?", range_exclude_end_p, 0); |