[前][次][番号順一覧][スレッド一覧]

ruby-changes:25452

From: marcandre <ko1@a...>
Date: Wed, 7 Nov 2012 02:13:12 +0900 (JST)
Subject: [ruby-changes:25452] marcandRe: r37509 (trunk): * enum.c (enum_each_cons): Support for Enumerable#each_cons.size

marcandre	2012-11-07 02:13:04 +0900 (Wed, 07 Nov 2012)

  New Revision: 37509

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

  Log:
    * enum.c (enum_each_cons): Support for Enumerable#each_cons.size
      [Feature #6636]

  Modified files:
    trunk/enum.c
    trunk/test/ruby/test_enumerator.rb

Index: enum.c
===================================================================
--- enum.c	(revision 37508)
+++ enum.c	(revision 37509)
@@ -1849,6 +1849,20 @@
     return v;
 }
 
+static VALUE
+enum_each_cons_size(VALUE obj, VALUE args)
+{
+    VALUE n, size;
+    long cons_size = NUM2LONG(RARRAY_PTR(args)[0]);
+    if (cons_size <= 0) rb_raise(rb_eArgError, "invalid size");
+
+    size = enum_size(obj, 0);
+    if (size == Qnil) return Qnil;
+
+    n = rb_funcall(size, '+', 1, LONG2NUM(1 - cons_size));
+    return (rb_cmpint(rb_funcall(n, id_cmp, 1, LONG2FIX(0)), n, LONG2FIX(0)) == -1) ? LONG2FIX(0) : n;
+}
+
 /*
  *  call-seq:
  *    enum.each_cons(n) { ... } ->  nil
@@ -1877,7 +1891,7 @@
     NODE *memo;
 
     if (size <= 0) rb_raise(rb_eArgError, "invalid size");
-    RETURN_ENUMERATOR(obj, 1, &n);
+    RETURN_SIZED_ENUMERATOR(obj, 1, &n, enum_each_cons_size);
     memo = NEW_MEMO(rb_ary_new2(size), 0, size);
     rb_block_call(obj, id_each, 0, 0, each_cons_i, (VALUE)memo);
 
Index: test/ruby/test_enumerator.rb
===================================================================
--- test/ruby/test_enumerator.rb	(revision 37508)
+++ test/ruby/test_enumerator.rb	(revision 37509)
@@ -490,5 +490,12 @@
     assert_equal 1, @sized.each_slice(70).size
     assert_raise(ArgumentError){ @obj.each_slice(0).size }
   end
+
+  def test_size_for_each_cons
+    assert_equal nil, @obj.each_cons(3).size
+    assert_equal 33, @sized.each_cons(10).size
+    assert_equal 0, @sized.each_cons(70).size
+    assert_raise(ArgumentError){ @obj.each_cons(0).size }
+  end
 end
 

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

[前][次][番号順一覧][スレッド一覧]