archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Extract checks for the block in lazy enumerator

Browse source
This commit is contained in:
Nobuyoshi Nakada 2025-07-28 17:54:09 +09:00
parent 32977f3869
commit 1a68f1b199
No known key found for this signature in database
GPG key ID: 3582D74E1FEE4465
1 changed files with 13 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

44
enumerator.c
View file

@ -1602,6 +1602,11 @@ lazy_init_block_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
#define LAZY_MEMO_SET_PACKED(memo) ((memo)->memo_flags |= LAZY_MEMO_PACKED) #define LAZY_MEMO_SET_PACKED(memo) ((memo)->memo_flags |= LAZY_MEMO_PACKED)
#define LAZY_MEMO_RESET_PACKED(memo) ((memo)->memo_flags &= ~LAZY_MEMO_PACKED) #define LAZY_MEMO_RESET_PACKED(memo) ((memo)->memo_flags &= ~LAZY_MEMO_PACKED)
#define LAZY_NEED_BLOCK(func) \
if (!rb_block_given_p()) { \
rb_raise(rb_eArgError, "tried to call lazy " #func " without a block"); \
}
static VALUE lazy_yielder_result(struct MEMO *result, VALUE yielder, VALUE procs_array, VALUE memos, long i); static VALUE lazy_yielder_result(struct MEMO *result, VALUE yielder, VALUE procs_array, VALUE memos, long i);
static VALUE static VALUE
@ -1805,9 +1810,7 @@ lazy_initialize(int argc, VALUE *argv, VALUE self)
VALUE generator; VALUE generator;
rb_check_arity(argc, 1, 2); rb_check_arity(argc, 1, 2);
if (!rb_block_given_p()) { LAZY_NEED_BLOCK(new);
rb_raise(rb_eArgError, "tried to call lazy new without a block");
}
obj = argv[0]; obj = argv[0];
if (argc > 1) { if (argc > 1) {
size = argv[1]; size = argv[1];
@ -2065,10 +2068,7 @@ static const lazyenum_funcs lazy_map_funcs = {
static VALUE static VALUE
lazy_map(VALUE obj) lazy_map(VALUE obj)
{ {
if (!rb_block_given_p()) { LAZY_NEED_BLOCK(map);
rb_raise(rb_eArgError, "tried to call lazy map without a block");
}
return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_map_funcs); return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_map_funcs);
} }
@ -2150,10 +2150,7 @@ static const lazyenum_funcs lazy_flat_map_funcs = {
static VALUE static VALUE
lazy_flat_map(VALUE obj) lazy_flat_map(VALUE obj)
{ {
if (!rb_block_given_p()) { LAZY_NEED_BLOCK(flat_map);
rb_raise(rb_eArgError, "tried to call lazy flat_map without a block");
}
return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_flat_map_funcs); return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_flat_map_funcs);
} }
@ -2180,10 +2177,7 @@ static const lazyenum_funcs lazy_select_funcs = {
static VALUE static VALUE
lazy_select(VALUE obj) lazy_select(VALUE obj)
{ {
if (!rb_block_given_p()) { LAZY_NEED_BLOCK(select);
rb_raise(rb_eArgError, "tried to call lazy select without a block");
}
return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_select_funcs); return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_select_funcs);
} }
@ -2214,10 +2208,7 @@ static const lazyenum_funcs lazy_filter_map_funcs = {
static VALUE static VALUE
lazy_filter_map(VALUE obj) lazy_filter_map(VALUE obj)
{ {
if (!rb_block_given_p()) { LAZY_NEED_BLOCK(filter_map);
rb_raise(rb_eArgError, "tried to call lazy filter_map without a block");
}
return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_filter_map_funcs); return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_filter_map_funcs);
} }
@ -2243,10 +2234,7 @@ static const lazyenum_funcs lazy_reject_funcs = {
static VALUE static VALUE
lazy_reject(VALUE obj) lazy_reject(VALUE obj)
{ {
if (!rb_block_given_p()) { LAZY_NEED_BLOCK(reject);
rb_raise(rb_eArgError, "tried to call lazy reject without a block");
}
return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_reject_funcs); return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_reject_funcs);
} }
@ -2529,10 +2517,7 @@ static const lazyenum_funcs lazy_take_while_funcs = {
static VALUE static VALUE
lazy_take_while(VALUE obj) lazy_take_while(VALUE obj)
{ {
if (!rb_block_given_p()) { LAZY_NEED_BLOCK(take_while);
rb_raise(rb_eArgError, "tried to call lazy take_while without a block");
}
return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_take_while_funcs); return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_take_while_funcs);
} }
@ -2627,10 +2612,7 @@ static const lazyenum_funcs lazy_drop_while_funcs = {
static VALUE static VALUE
lazy_drop_while(VALUE obj) lazy_drop_while(VALUE obj)
{ {
if (!rb_block_given_p()) { LAZY_NEED_BLOCK(drop_while);
rb_raise(rb_eArgError, "tried to call lazy drop_while without a block");
}
return lazy_add_method(obj, 0, 0, Qfalse, Qnil, &lazy_drop_while_funcs); return lazy_add_method(obj, 0, 0, Qfalse, Qnil, &lazy_drop_while_funcs);
} }