Project

General

Profile

Feature #15323 » 0001-Adding-Enumerable-filter_map.patch

alfonsojimenez (Alfonso Jiménez), 04/25/2019 09:49 AM

View differences:

enum.c
453 453
}
454 454

  
455 455
static VALUE
456
filter_map_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
457
{
458
    i = rb_yield_values2(argc, argv);
459

  
460
    if (RTEST(i)) {
461
      rb_ary_push(ary, i);
462
    }
463

  
464
    return Qnil;
465
}
466

  
467
/*
468
 *  call-seq:
469
 *     enum.filter_map { |obj| block } -> array
470
 *     enum.filter_map                 -> an_enumerator
471
 *
472
 *  Returns a new array containing the truthy results (everything except
473
 *  +false+ or +nil+) of running the +block+ for every element in +enum+.
474
 *
475
 *  If no block is given, an Enumerator is returned instead.
476
 *
477
 *
478
 *     (1..10).filter_map { |i| i * 2 if i.even? } #=> [4, 8, 12, 16, 20]
479
 *
480
 */
481
static VALUE
482
enum_filter_map(VALUE obj)
483
{
484
    VALUE ary;
485

  
486
    RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
487

  
488
    ary = rb_ary_new();
489
    rb_block_call(obj, id_each, 0, 0, filter_map_i, ary);
490

  
491
    return ary;
492
}
493

  
494

  
495
static VALUE
456 496
reject_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
457 497
{
458 498
    ENUM_WANT_SVALUE();
......
4104 4144
    rb_define_method(rb_mEnumerable, "find_all", enum_find_all, 0);
4105 4145
    rb_define_method(rb_mEnumerable, "select", enum_find_all, 0);
4106 4146
    rb_define_method(rb_mEnumerable, "filter", enum_find_all, 0);
4147
    rb_define_method(rb_mEnumerable, "filter_map", enum_filter_map, 0);
4107 4148
    rb_define_method(rb_mEnumerable, "reject", enum_reject, 0);
4108 4149
    rb_define_method(rb_mEnumerable, "collect", enum_collect, 0);
4109 4150
    rb_define_method(rb_mEnumerable, "map", enum_collect, 0);
spec/ruby/core/enumerable/filter_map_spec.rb
1
require_relative '../../spec_helper'
2
require_relative 'fixtures/classes'
3

  
4
ruby_version_is '2.7' do
5
  describe 'Enumerable#filter_map' do
6
    before :each do
7
      @numerous = EnumerableSpecs::Numerous.new(*(1..8).to_a)
8
    end
9

  
10
    it 'returns an empty array if there are no elements' do
11
      EnumerableSpecs::Empty.new.filter_map { true }.should == []
12
    end
13

  
14
    it 'returns an array with truthy results of passing each element to block' do
15
      @numerous.filter_map { |i| i * 2 if i.even? }.should == [4, 8, 12, 16]
16
      @numerous.filter_map { |i| i * 2 }.should == [2, 4, 6, 8, 10, 12, 14, 16]
17
      @numerous.filter_map { 0 }.should == [0, 0, 0, 0, 0, 0, 0, 0]
18
      @numerous.filter_map { false }.should == []
19
      @numerous.filter_map { nil }.should == []
20
    end
21

  
22
    it 'returns an enumerator when no block given' do
23
      @numerous.filter_map.should be_an_instance_of(Enumerator)
24
    end
25
  end
26
end
test/ruby/test_enum.rb
1135 1135
    end
1136 1136
    assert_equal [1, 2, 3, 4, 5], (1..5).sort_by{|e| klass.new e}
1137 1137
  end
1138

  
1139
  def test_filter_map
1140
    @obj = (1..8).to_a
1141
    assert_equal([4, 8, 12, 16], @obj.filter_map { |i| i * 2 if i.even? })
1142
    assert_equal([2, 4, 6, 8, 10, 12, 14, 16], @obj.filter_map { |i| i * 2 })
1143
    assert_equal([0, 0, 0, 0, 0, 0, 0, 0], @obj.filter_map { 0 })
1144
    assert_equal([], @obj.filter_map { false })
1145
    assert_equal([], @obj.filter_map { nil })
1146
    assert_instance_of(Enumerator, @obj.filter_map)
1147
  end
1138 1148
end
test/ruby/test_enumerator.rb
542 542

  
543 543
  def test_size_for_enum_created_from_enumerable
544 544
    %i[find_all reject map flat_map partition group_by sort_by min_by max_by
545
      minmax_by each_with_index reverse_each each_entry].each do |method|
545
      minmax_by each_with_index reverse_each each_entry filter_map].each do |method|
546 546
      assert_equal nil, @obj.send(method).size
547 547
      assert_equal 42, @sized.send(method).size
548 548
    end
549
-