From c100ab5cd97f31a278551e4c1242d80fd5add536 Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 18 Oct 2007 06:58:35 +0000 Subject: * range.c (range_first): takes first n element if argument is given. [ruby-core:12697] * range.c (range_last): returns last n elements if argument is given. * array.c (rb_ary_subseq, rb_ary_last): export. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13736 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- range.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 65 insertions(+), 7 deletions(-) (limited to 'range.c') diff --git a/range.c b/range.c index 4823391d3..ee0dc5e52 100644 --- a/range.c +++ b/range.c @@ -437,14 +437,13 @@ range_each(VALUE range) /* * call-seq: - * rng.first => obj * rng.begin => obj * * Returns the first object in rng. */ static VALUE -range_first(VALUE range) +range_begin(VALUE range) { return RANGE_BEG(range); } @@ -453,7 +452,6 @@ range_first(VALUE range) /* * call-seq: * rng.end => obj - * rng.last => obj * * Returns the object that defines the end of rng. * @@ -463,11 +461,71 @@ range_first(VALUE range) static VALUE -range_last(VALUE range) +range_end(VALUE range) { return RANGE_END(range); } + +static VALUE +first_i(VALUE i, VALUE *ary) +{ + long n = NUM2LONG(ary[0]); + + if (n <= 0) { + rb_iter_break(); + } + rb_ary_push(ary[1], i); + n--; + ary[0] = INT2NUM(n); + return Qnil; +} + +/* + * call-seq: + * rng.first => obj + * rng.first(n) => an_array + * + * Returns the first object in rng, or the first +n+ elements. + */ + +static VALUE +range_first(int argc, VALUE *argv, VALUE range) +{ + VALUE n, ary[2]; + + if (argc == 0) return RANGE_BEG(range); + + rb_scan_args(argc, argv, "1", &n); + ary[0] = n; + ary[1] = rb_ary_new2(NUM2LONG(n)); + rb_block_call(range, rb_intern("each"), 0, 0, first_i, (VALUE)ary); + + return ary[1]; +} + + +/* + * call-seq: + * rng.last => obj + * rng.last(n) => an_array + * + * Returns the last object in rng, or the last +n+ elements. + */ + +static VALUE +range_last(int argc, VALUE *argv, VALUE range) +{ + VALUE n, a; + long i, nelem, len; + + if (argc == 0) return RANGE_END(range); + + rb_scan_args(argc, argv, "1", &n); + return rb_ary_last(argc, argv, rb_Array(range)); +} + + /* * call-seq: * rng.min => obj @@ -858,10 +916,10 @@ Init_Range(void) rb_define_method(rb_cRange, "hash", range_hash, 0); rb_define_method(rb_cRange, "each", range_each, 0); rb_define_method(rb_cRange, "step", range_step, -1); - rb_define_method(rb_cRange, "first", range_first, 0); - rb_define_method(rb_cRange, "last", range_last, 0); - rb_define_method(rb_cRange, "begin", range_first, 0); + rb_define_method(rb_cRange, "begin", range_begin, 0); rb_define_method(rb_cRange, "end", range_last, 0); + rb_define_method(rb_cRange, "first", range_first, -1); + rb_define_method(rb_cRange, "last", range_last, -1); rb_define_method(rb_cRange, "min", range_min, 0); rb_define_method(rb_cRange, "max", range_max, 0); rb_define_method(rb_cRange, "to_s", range_to_s, 0); -- cgit