show deprecation warning correctly for lambda(&b)
lambda(&b) where b is given block of method (like: def foo(&b)) should warn correctly. [Feature #17361] Also labmda(&labmda_block) or lambda(&:to_s) (Symbol#to_proc) should not warn (but I'm not sure who cares about it).
This commit is contained in:
parent
ad6573163f
commit
b53ccb9c69
14
proc.c
14
proc.c
@ -858,15 +858,23 @@ rb_block_lambda(void)
|
|||||||
static VALUE
|
static VALUE
|
||||||
f_lambda(VALUE _)
|
f_lambda(VALUE _)
|
||||||
{
|
{
|
||||||
VALUE block_handler = rb_vm_frame_block_handler(GET_EC()->cfp);
|
rb_control_frame_t *cfp = GET_EC()->cfp;
|
||||||
|
VALUE block_handler = rb_vm_frame_block_handler(cfp);
|
||||||
|
|
||||||
if (block_handler != VM_BLOCK_HANDLER_NONE) {
|
if (block_handler != VM_BLOCK_HANDLER_NONE) {
|
||||||
switch (vm_block_handler_type(block_handler)) {
|
switch (vm_block_handler_type(block_handler)) {
|
||||||
case block_handler_type_proc:
|
case block_handler_type_iseq:
|
||||||
|
if (RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp)->ep == VM_BH_TO_ISEQ_BLOCK(block_handler)->ep) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
case block_handler_type_symbol:
|
case block_handler_type_symbol:
|
||||||
|
break;
|
||||||
|
case block_handler_type_proc:
|
||||||
|
if (rb_proc_lambda_p(VM_BH_TO_PROC(block_handler))) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
case block_handler_type_ifunc:
|
case block_handler_type_ifunc:
|
||||||
rb_warn_deprecated("lambda without a literal block", "the proc without lambda");
|
rb_warn_deprecated("lambda without a literal block", "the proc without lambda");
|
||||||
default:
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -291,6 +291,45 @@ class TestProc < Test::Unit::TestCase
|
|||||||
assert_equal(true, Proc.new(&l).lambda?)
|
assert_equal(true, Proc.new(&l).lambda?)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.helper_test_warn_lamda_with_passed_block &b
|
||||||
|
lambda(&b)
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.def_lambda_warning name, warn
|
||||||
|
define_method(name, proc do
|
||||||
|
prev = Warning[:deprecated]
|
||||||
|
assert_warn warn do
|
||||||
|
Warning[:deprecated] = true
|
||||||
|
yield
|
||||||
|
end
|
||||||
|
ensure
|
||||||
|
Warning[:deprecated] = prev
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
|
def_lambda_warning 'test_lambda_warning_normal', '' do
|
||||||
|
lambda{}
|
||||||
|
end
|
||||||
|
|
||||||
|
def_lambda_warning 'test_lambda_warning_pass_lambda', '' do
|
||||||
|
b = lambda{}
|
||||||
|
lambda(&b)
|
||||||
|
end
|
||||||
|
|
||||||
|
def_lambda_warning 'test_lambda_warning_pass_proc', /deprecated/ do
|
||||||
|
b = proc{}
|
||||||
|
lambda(&b)
|
||||||
|
end
|
||||||
|
|
||||||
|
def_lambda_warning 'test_lambda_warning_pass_proc', /deprecated/ do
|
||||||
|
helper_test_warn_lamda_with_passed_block{}
|
||||||
|
end
|
||||||
|
|
||||||
|
def_lambda_warning 'test_lambda_warning_pass_proc', '' do
|
||||||
|
# Symbol#to_proc returns lambda
|
||||||
|
helper_test_warn_lamda_with_passed_block(&:to_s)
|
||||||
|
end
|
||||||
|
|
||||||
def test_curry_ski_fib
|
def test_curry_ski_fib
|
||||||
s = proc {|f, g, x| f[x][g[x]] }.curry
|
s = proc {|f, g, x| f[x][g[x]] }.curry
|
||||||
k = proc {|x, y| x }.curry
|
k = proc {|x, y| x }.curry
|
||||||
|
Loading…
x
Reference in New Issue
Block a user