diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-14 01:44:37 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-14 01:44:37 +0000 |
| commit | cb1d290886b9239487bf5d4d9bdfa7005ec0fdd5 (patch) | |
| tree | bc249372e5df1256daf5fca090a431f392133f24 | |
| parent | 8f30190dfecd4b32ca3d82515b8f59e959eed8a3 (diff) | |
| download | ruby-cb1d290886b9239487bf5d4d9bdfa7005ec0fdd5.tar.gz | |
* enumerator.c (lazy_grep_func): should use === instead of =~, as
well as Enumerable#grep
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | enumerator.c | 6 | ||||
| -rw-r--r-- | test/ruby/test_lazy_enumerator.rb | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed Mar 14 10:44:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * enumerator.c (lazy_grep_func): should use === instead of =~, as + well as Enumerable#grep + Wed Mar 14 08:15:54 2012 Shugo Maeda <shugo@ruby-lang.org> * enumerator.c (lazy_zip_func): use each for non-Array objects. diff --git a/enumerator.c b/enumerator.c index 9a00d95dcc..f4ccda0121 100644 --- a/enumerator.c +++ b/enumerator.c @@ -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 @@ static VALUE 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 @@ Init_Enumerator(void) 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); diff --git a/test/ruby/test_lazy_enumerator.rb b/test/ruby/test_lazy_enumerator.rb index caf222c235..9e50cd3a69 100644 --- a/test/ruby/test_lazy_enumerator.rb +++ b/test/ruby/test_lazy_enumerator.rb @@ -118,6 +118,8 @@ class TestLazyEnumerator < Test::Unit::TestCase 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 |