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

ruby-changes:22959

From: nobu <ko1@a...>
Date: Wed, 14 Mar 2012 10:44:48 +0900 (JST)
Subject: [ruby-changes:22959] nobu:r35008 (trunk): * enumerator.c (lazy_grep_func): should use === instead of =~, as

nobu	2012-03-14 10:44:37 +0900 (Wed, 14 Mar 2012)

  New Revision: 35008

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

  Log:
    * enumerator.c (lazy_grep_func): should use === instead of =~, as
      well as Enumerable#grep

  Modified files:
    trunk/ChangeLog
    trunk/enumerator.c
    trunk/test/ruby/test_lazy_enumerator.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35007)
+++ ChangeLog	(revision 35008)
@@ -1,3 +1,8 @@
+Wed Mar 14 10:44:35 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* enumerator.c (lazy_grep_func): should use === instead of =~, as
+	  well as Enumerable#grep
+
 Wed Mar 14 08:15:54 2012  Shugo Maeda  <shugo@r...>
 
 	* enumerator.c (lazy_zip_func): use each for non-Array objects.
Index: enumerator.c
===================================================================
--- enumerator.c	(revision 35007)
+++ enumerator.c	(revision 35008)
@@ -103,7 +103,8 @@
  */
 VALUE rb_cEnumerator;
 VALUE rb_cLazy;
-static ID id_rewind, id_each, id_new, id_initialize, id_yield, id_call, id_next, id_result, id_lazy;
+static ID id_rewind, id_each, id_new, id_initialize, id_yield, id_call;
+static ID id_eqq, id_next, id_result, id_lazy;
 static VALUE sym_each;
 
 VALUE rb_eStopIteration;
@@ -1377,7 +1378,7 @@
 lazy_grep_func(VALUE val, VALUE m, int argc, VALUE *argv)
 {
     VALUE element = argv[1];
-    VALUE result = rb_funcall(m, rb_intern("=~"), 1, element);
+    VALUE result = rb_funcall(m, id_eqq, 1, element);
 
     if (RTEST(result)) {
 	return rb_funcall(argv[0], id_yield, 1, element);
@@ -1530,6 +1531,7 @@
     id_next = rb_intern("next");
     id_result = rb_intern("result");
     id_lazy = rb_intern("lazy");
+    id_eqq = rb_intern("===");
     sym_each = ID2SYM(id_each);
 
     InitVM(Enumerator);
Index: test/ruby/test_lazy_enumerator.rb
===================================================================
--- test/ruby/test_lazy_enumerator.rb	(revision 35007)
+++ test/ruby/test_lazy_enumerator.rb	(revision 35008)
@@ -118,6 +118,8 @@
     assert_equal('f', a.current)
     assert_equal('c', a.lazy.grep(/c/).first)
     assert_equal('c', a.current)
+    assert_equal(%w[a e], a.grep(proc {|x| /[aeiou]/ =~ x}))
+    assert_equal(%w[a e], a.lazy.grep(proc {|x| /[aeiou]/ =~ x}).to_a)
   end
 
   def test_zip

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

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