marcandre	2012-11-07 02:14:46 +0900 (Wed, 07 Nov 2012)

  New Revision: 37516

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37516

  Log:
    * range.c: Support for Range#size and Range#each.size
      [Feature #6636]

  Modified files:
    trunk/range.c
    trunk/test/ruby/test_range.rb

Index: range.c
===================================================================
--- range.c	(revision 37515)
+++ range.c	(revision 37516)
@@ -458,6 +458,25 @@
 
 /*
  *  call-seq:
+ *     rng.size                   -> num
+ *
+ *  Returns the number of elements in the range.
+ *
+ *    (10..20).size    #=> 11
+ */
+
+static VALUE
+range_size(VALUE range)
+{
+    VALUE b = RANGE_BEG(range), e = RANGE_END(range);
+    if (rb_obj_is_kind_of(b, rb_cNumeric) && rb_obj_is_kind_of(e, rb_cNumeric)) {
+	return num_interval_step_size(b, e, INT2FIX(1), EXCL(range));
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
  *     rng.each {| i | block } -> rng
  *     rng.each                -> an_enumerator
  *
@@ -482,7 +501,7 @@
 {
     VALUE beg, end;
 
-    RETURN_ENUMERATOR(range, 0, 0);
+    RETURN_SIZED_ENUMERATOR(range, 0, 0, range_size);
 
     beg = RANGE_BEG(range);
     end = RANGE_END(range);
@@ -1076,6 +1095,7 @@
     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, "size", range_size, 0);
     rb_define_method(rb_cRange, "to_s", range_to_s, 0);
     rb_define_method(rb_cRange, "inspect", range_inspect, 0);
 
Index: test/ruby/test_range.rb
===================================================================
--- test/ruby/test_range.rb	(revision 37515)
+++ test/ruby/test_range.rb	(revision 37516)
@@ -347,4 +347,12 @@
       assert !x.eql?(z)
     }
   end
+
+  def test_size
+    assert_equal 42, (1..42).size
+    assert_equal 41, (1...42).size
+    assert_equal 6, (1...6.3).size
+    assert_equal 5, (1.1...6).size
+    assert_equal 42, (1..42).each.size
+  end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/