kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Decide lambdaness of (f << g) using g (#2729)

Browse source 
* Deciding lambdaness of (f << g) using g

* Use version guards for spec changes
This commit is contained in:
Alan Wu 2019-12-30 17:47:58 -05:00 committed by GitHub
parent 3e2418e2a6
commit 99c7b0b7ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
Notes: git 2019-12-31 07:48:31 +09:00 
Merged-By: XrXr
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
proc.c
View file

@ -3386,8 +3386,14 @@ rb_proc_compose_to_left(VALUE self, VALUE g)
procs[1] = g; procs[1] = g;
args = rb_ary_tmp_new_from_values(0, 2, procs); args = rb_ary_tmp_new_from_values(0, 2, procs);
GetProcPtr(self, procp); if (rb_obj_is_proc(g)) {
GetProcPtr(g, procp);
is_lambda = procp->is_lambda; is_lambda = procp->is_lambda;
}
else {
VM_ASSERT(rb_obj_is_method(g) || rb_obj_respond_to(g, idCall, TRUE));
is_lambda = 1;
}
proc = rb_proc_new(compose, args); proc = rb_proc_new(compose, args);
GetProcPtr(proc, procp); GetProcPtr(proc, procp);

3
spec/ruby/core/method/compose_spec.rb
View file

@ -39,7 +39,8 @@ ruby_version_is "2.6" do
double = proc { |x| x + x } double = proc { |x| x + x }
(pow_2 << double).is_a?(Proc).should == true (pow_2 << double).is_a?(Proc).should == true
(pow_2 << double).lambda?.should == true ruby_version_is(''...'2.8') { (pow_2 << double).lambda?.should == true }
ruby_version_is('2.8') { (pow_2 << double).lambda?.should == false }
end end
it "may accept multiple arguments" do it "may accept multiple arguments" do

6
test/ruby/test_proc.rb
View file

@ -1413,9 +1413,13 @@ class TestProc < Test::Unit::TestCase
def test_compose_with_lambda def test_compose_with_lambda
f = lambda {|x| x * 2} f = lambda {|x| x * 2}
g = lambda {|x| x} g = lambda {|x| x}
not_lambda = proc {|x| x}
assert_predicate((f << g), :lambda?) assert_predicate((f << g), :lambda?)
assert_predicate((g >> f), :lambda?) assert_predicate((g >> f), :lambda?)
assert_predicate((not_lambda << f), :lambda?)
assert_not_predicate((f << not_lambda), :lambda?)
assert_not_predicate((not_lambda >> f), :lambda?)
end end
def test_compose_with_method def test_compose_with_method
@ -1427,6 +1431,7 @@ class TestProc < Test::Unit::TestCase
assert_equal(6, (f << g).call(2)) assert_equal(6, (f << g).call(2))
assert_equal(5, (f >> g).call(2)) assert_equal(5, (f >> g).call(2))
assert_predicate((f << g), :lambda?)
end end
def test_compose_with_callable def test_compose_with_callable
@ -1438,6 +1443,7 @@ class TestProc < Test::Unit::TestCase
assert_equal(6, (f << g).call(2)) assert_equal(6, (f << g).call(2))
assert_equal(5, (f >> g).call(2)) assert_equal(5, (f >> g).call(2))
assert_predicate((f << g), :lambda?)
end end
def test_compose_with_noncallable def test_compose_with_noncallable