ruby-changes:31828
From: nobu <ko1@a...>
Date: Fri, 29 Nov 2013 11:26:57 +0900 (JST)
Subject: [ruby-changes:31828] nobu:r43907 (trunk): ruby/ruby.h: add blockarg to rb_block_call_func
nobu 2013-11-29 11:26:48 +0900 (Fri, 29 Nov 2013) New Revision: 43907 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43907 Log: ruby/ruby.h: add blockarg to rb_block_call_func * include/ruby/ruby.h (rb_block_call_func): add blockarg. block function can take block argument, e.g., proc {|&blockarg| ...}. Modified files: trunk/ChangeLog trunk/array.c trunk/enum.c trunk/enumerator.c trunk/include/ruby/ruby.h trunk/io.c trunk/process.c trunk/range.c trunk/thread.c Index: array.c =================================================================== --- array.c (revision 43906) +++ array.c (revision 43907) @@ -2616,7 +2616,7 @@ rb_ary_bsearch(VALUE ary) https://github.com/ruby/ruby/blob/trunk/array.c#L2616 static VALUE -sort_by_i(VALUE i) +sort_by_i(VALUE i, VALUE dummy, int argc, VALUE *argv, VALUE blockarg) { return rb_yield(i); } @@ -3169,7 +3169,7 @@ rb_ary_delete_if(VALUE ary) https://github.com/ruby/ruby/blob/trunk/array.c#L3169 } static VALUE -take_i(VALUE val, VALUE *args, int argc, VALUE *argv) +take_i(VALUE val, VALUE *args, int argc, VALUE *argv, VALUE blockarg) { if (args[1]-- == 0) rb_iter_break(); if (argc > 1) val = rb_ary_new4(argc, argv); Index: include/ruby/ruby.h =================================================================== --- include/ruby/ruby.h (revision 43906) +++ include/ruby/ruby.h (revision 43907) @@ -1493,7 +1493,8 @@ PRINTF_ARGS(void rb_compile_warn(const c https://github.com/ruby/ruby/blob/trunk/include/ruby/ruby.h#L1493 #define RB_IO_WAIT_READABLE 0 #define RB_IO_WAIT_WRITABLE 1 -typedef VALUE rb_block_call_func(VALUE, VALUE, int, VALUE*); +typedef VALUE rb_block_call_func(VALUE, VALUE, int, VALUE*, VALUE); +#define RUBY_BLOCK_CALL_FUNC_TAKES_BLOCKARG 1 VALUE rb_each(VALUE); VALUE rb_yield(VALUE); Index: ChangeLog =================================================================== --- ChangeLog (revision 43906) +++ ChangeLog (revision 43907) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Fri Nov 29 11:26:43 2013 Nobuyoshi Nakada <nobu@r...> + + * include/ruby/ruby.h (rb_block_call_func): add blockarg. block + function can take block argument, e.g., proc {|&blockarg| ...}. + Thu Nov 28 21:43:48 2013 Zachary Scott <e@z...> * doc/dtrace_probes.rdoc: [DOC] Import dtrace probes doc from wiki Index: enumerator.c =================================================================== --- enumerator.c (revision 43906) +++ enumerator.c (revision 43907) @@ -493,7 +493,7 @@ enumerator_each(int argc, VALUE *argv, V https://github.com/ruby/ruby/blob/trunk/enumerator.c#L493 } static VALUE -enumerator_with_index_i(VALUE val, VALUE m, int argc, VALUE *argv) +enumerator_with_index_i(VALUE val, VALUE m, int argc, VALUE *argv, VALUE blockarg) { VALUE *memo = (VALUE *)m; VALUE idx = *memo; @@ -557,7 +557,7 @@ enumerator_each_with_index(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enumerator.c#L557 } static VALUE -enumerator_with_object_i(VALUE val, VALUE memo, int argc, VALUE *argv) +enumerator_with_object_i(VALUE val, VALUE memo, int argc, VALUE *argv, VALUE blockarg) { if (argc <= 1) return rb_yield_values(2, val, memo); @@ -604,7 +604,7 @@ enumerator_with_object(VALUE obj, VALUE https://github.com/ruby/ruby/blob/trunk/enumerator.c#L604 } static VALUE -next_ii(VALUE i, VALUE obj, int argc, VALUE *argv) +next_ii(VALUE i, VALUE obj, int argc, VALUE *argv, VALUE blockarg) { struct enumerator *e = enumerator_ptr(obj); VALUE feedvalue = Qnil; @@ -1147,7 +1147,7 @@ static VALUE yielder_yield_push(VALUE ob https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1147 } static VALUE -yielder_yield_i(VALUE obj, VALUE memo, int argc, VALUE *argv) +yielder_yield_i(VALUE obj, VALUE memo, int argc, VALUE *argv, VALUE blockarg) { return rb_yield_values2(argc, argv); } @@ -1318,7 +1318,7 @@ lazy_receiver_size(VALUE generator, VALU https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1318 } static VALUE -lazy_init_iterator(VALUE val, VALUE m, int argc, VALUE *argv) +lazy_init_iterator(VALUE val, VALUE m, int argc, VALUE *argv, VALUE blockarg) { VALUE result; if (argc == 1) { @@ -1344,7 +1344,7 @@ lazy_init_iterator(VALUE val, VALUE m, i https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1344 } static VALUE -lazy_init_block_i(VALUE val, VALUE m, int argc, VALUE *argv) +lazy_init_block_i(VALUE val, VALUE m, int argc, VALUE *argv, VALUE blockarg) { rb_block_call(m, id_each, argc-1, argv+1, lazy_init_iterator, val); return Qnil; @@ -1504,7 +1504,7 @@ lazy_to_enum(int argc, VALUE *argv, VALU https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1504 } static VALUE -lazy_map_func(VALUE val, VALUE m, int argc, VALUE *argv) +lazy_map_func(VALUE val, VALUE m, int argc, VALUE *argv, VALUE blockarg) { VALUE result = rb_yield_values2(argc - 1, &argv[1]); @@ -1525,7 +1525,7 @@ lazy_map(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1525 } static VALUE -lazy_flat_map_i(VALUE i, VALUE yielder, int argc, VALUE *argv) +lazy_flat_map_i(VALUE i, VALUE yielder, int argc, VALUE *argv, VALUE blockarg) { return rb_funcall2(yielder, id_yield, argc, argv); } @@ -1554,7 +1554,7 @@ lazy_flat_map_to_ary(VALUE obj, VALUE yi https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1554 } static VALUE -lazy_flat_map_func(VALUE val, VALUE m, int argc, VALUE *argv) +lazy_flat_map_func(VALUE val, VALUE m, int argc, VALUE *argv, VALUE blockarg) { VALUE result = rb_yield_values2(argc - 1, &argv[1]); if (RB_TYPE_P(result, T_ARRAY)) { @@ -1610,7 +1610,7 @@ lazy_flat_map(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1610 } static VALUE -lazy_select_func(VALUE val, VALUE m, int argc, VALUE *argv) +lazy_select_func(VALUE val, VALUE m, int argc, VALUE *argv, VALUE blockarg) { VALUE element = rb_enum_values_pack(argc - 1, argv + 1); @@ -1633,7 +1633,7 @@ lazy_select(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1633 } static VALUE -lazy_reject_func(VALUE val, VALUE m, int argc, VALUE *argv) +lazy_reject_func(VALUE val, VALUE m, int argc, VALUE *argv, VALUE blockarg) { VALUE element = rb_enum_values_pack(argc - 1, argv + 1); @@ -1656,7 +1656,7 @@ lazy_reject(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1656 } static VALUE -lazy_grep_func(VALUE val, VALUE m, int argc, VALUE *argv) +lazy_grep_func(VALUE val, VALUE m, int argc, VALUE *argv, VALUE blockarg) { VALUE i = rb_enum_values_pack(argc - 1, argv + 1); VALUE result = rb_funcall(m, id_eqq, 1, i); @@ -1668,7 +1668,7 @@ lazy_grep_func(VALUE val, VALUE m, int a https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1668 } static VALUE -lazy_grep_iter(VALUE val, VALUE m, int argc, VALUE *argv) +lazy_grep_iter(VALUE val, VALUE m, int argc, VALUE *argv, VALUE blockarg) { VALUE i = rb_enum_values_pack(argc - 1, argv + 1); VALUE result = rb_funcall(m, id_eqq, 1, i); @@ -1702,7 +1702,7 @@ next_stopped(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1702 } static VALUE -lazy_zip_arrays_func(VALUE val, VALUE arrays, int argc, VALUE *argv) +lazy_zip_arrays_func(VALUE val, VALUE arrays, int argc, VALUE *argv, VALUE blockarg) { VALUE yielder, ary, memo; long i, count; @@ -1722,7 +1722,7 @@ lazy_zip_arrays_func(VALUE val, VALUE ar https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1722 } static VALUE -lazy_zip_func(VALUE val, VALUE zip_args, int argc, VALUE *argv) +lazy_zip_func(VALUE val, VALUE zip_args, int argc, VALUE *argv, VALUE blockarg) { VALUE yielder, ary, arg, v; long i; @@ -1787,7 +1787,7 @@ lazy_zip(int argc, VALUE *argv, VALUE ob https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1787 } static VALUE -lazy_take_func(VALUE val, VALUE args, int argc, VALUE *argv) +lazy_take_func(VALUE val, VALUE args, int argc, VALUE *argv, VALUE blockarg) { long remain; VALUE memo = rb_attr_get(argv[0], id_memo); @@ -1836,7 +1836,7 @@ lazy_take(VALUE obj, VALUE n) https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1836 } static VALUE -lazy_take_while_func(VALUE val, VALUE args, int argc, VALUE *argv) +lazy_take_while_func(VALUE val, VALUE args, int argc, VALUE *argv, VALUE blockarg) { VALUE result = rb_yield_values2(argc - 1, &argv[1]); if (!RTEST(result)) return Qundef; @@ -1870,7 +1870,7 @@ lazy_drop_size(VALUE generator, VALUE ar https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1870 } static VALUE -lazy_drop_func(VALUE val, VALUE args, int argc, VALUE *argv) +lazy_drop_func(VALUE val, VALUE args, int argc, VALUE *argv, VALUE blockarg) { long remain; VALUE memo = rb_attr_get(argv[0], id_memo); @@ -1900,7 +1900,7 @@ lazy_drop(VALUE obj, VALUE n) https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1900 } static VALUE -lazy_drop_while_func(VALUE val, VALUE args, int argc, VALUE *argv) +lazy_drop_while_func(VALUE val, VALUE args, int argc, VALUE *argv, VALUE blockarg) { VALUE memo = rb_attr_get(argv[0], id_memo); if (NIL_P(memo) && !RTEST(rb_yield_values2(argc - 1, &argv[1]))) { Index: enum.c =================================================================== --- enum.c (revision 43906) +++ enum.c (revision 43907) @@ -44,7 +44,7 @@ rb_enum_values_pack(int argc, VALUE *arg https://github.com/ruby/ruby/blob/trunk/enum.c#L44 #define enum_yield rb_yield_values2 static VALUE -grep_i(VALUE i, VALUE args, int argc, VALUE *argv) +grep_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(args); ENUM_WANT_SVALUE(); @@ -56,7 +56,7 @@ grep_i(VALUE i, VALUE args, int argc, VA https://github.com/ruby/ruby/blob/trunk/enum.c#L56 } static VALUE -grep_iter_i(VALUE i, VALUE args, int argc, VALUE *argv) +grep_iter_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(args); ENUM_WANT_SVALUE(); @@ -97,7 +97,7 @@ enum_grep(VALUE obj, VALUE pat) https://github.com/ruby/ruby/blob/trunk/enum.c#L97 } static VALUE -count_i(VALUE i, VALUE memop, int argc, VALUE *argv) +count_i(VALUE i, VALUE memop, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(memop); @@ -110,7 +110,7 @@ count_i(VALUE i, VALUE memop, int argc, https://github.com/ruby/ruby/blob/trunk/enum.c#L110 } static VALUE -count_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv) +count_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(memop); @@ -121,7 +121,7 @@ count_iter_i(VALUE i, VALUE memop, int a https://github.com/ruby/ruby/blob/trunk/enum.c#L121 } static VALUE -count_all_i(VALUE i, VALUE memop, int argc, VALUE *argv) +count_all_i(VALUE i, VALUE memop, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(memop); @@ -176,7 +176,7 @@ enum_count(int argc, VALUE *argv, VALUE https://github.com/ruby/ruby/blob/trunk/enum.c#L176 } static VALUE -find_i(VALUE i, VALUE memop, int argc, VALUE *argv) +find_i(VALUE i, VALUE memop, int argc, VALUE *argv, VALUE blockarg) { ENUM_WANT_SVALUE(); @@ -228,7 +228,7 @@ enum_find(int argc, VALUE *argv, VALUE o https://github.com/ruby/ruby/blob/trunk/enum.c#L228 } static VALUE -find_index_i(VALUE i, VALUE memop, int argc, VALUE *argv) +find_index_i(VALUE i, VALUE memop, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(memop); @@ -243,7 +243,7 @@ find_index_i(VALUE i, VALUE memop, int a https://github.com/ruby/ruby/blob/trunk/enum.c#L243 } static VALUE -find_index_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv) +find_index_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(memop); @@ -299,7 +299,7 @@ enum_find_index(int argc, VALUE *argv, V https://github.com/ruby/ruby/blob/trunk/enum.c#L299 } static VALUE -find_all_i(VALUE i, VALUE ary, int argc, VALUE *argv) +find_all_i(VALUE i, VALUE ary, int argc, VALUE *argv, VALUE blockarg) { ENUM_WANT_SVALUE(); @@ -351,7 +351,7 @@ enum_find_all(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enum.c#L351 } static VALUE -reject_i(VALUE i, VALUE ary, int argc, VALUE *argv) +reject_i(VALUE i, VALUE ary, int argc, VALUE *argv, VALUE blockarg) { ENUM_WANT_SVALUE(); @@ -392,7 +392,7 @@ enum_reject(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enum.c#L392 } static VALUE -collect_i(VALUE i, VALUE ary, int argc, VALUE *argv) +collect_i(VALUE i, VALUE ary, int argc, VALUE *argv, VALUE blockarg) { rb_ary_push(ary, enum_yield(argc, argv)); @@ -439,7 +439,7 @@ enum_collect(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enum.c#L439 } static VALUE -flat_map_i(VALUE i, VALUE ary, int argc, VALUE *argv) +flat_map_i(VALUE i, VALUE ary, int argc, VALUE *argv, VALUE blockarg) { VALUE tmp; @@ -510,7 +510,7 @@ enum_to_a(int argc, VALUE *argv, VALUE o https://github.com/ruby/ruby/blob/trunk/enum.c#L510 } static VALUE -enum_to_h_i(VALUE i, VALUE hash, int argc, VALUE *argv) +enum_to_h_i(VALUE i, VALUE hash, int argc, VALUE *argv, VALUE blockarg) { ENUM_WANT_SVALUE(); rb_thread_check_ints(); @@ -543,7 +543,7 @@ enum_to_h(int argc, VALUE *argv, VALUE o https://github.com/ruby/ruby/blob/trunk/enum.c#L543 } static VALUE -inject_i(VALUE i, VALUE p, int argc, VALUE *argv) +inject_i(VALUE i, VALUE p, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(p); @@ -560,7 +560,7 @@ inject_i(VALUE i, VALUE p, int argc, VAL https://github.com/ruby/ruby/blob/trunk/enum.c#L560 } static VALUE -inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv) +inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(p); VALUE name; @@ -631,7 +631,7 @@ enum_inject(int argc, VALUE *argv, VALUE https://github.com/ruby/ruby/blob/trunk/enum.c#L631 { NODE *memo; VALUE init, op; - VALUE (*iter)(VALUE, VALUE, int, VALUE*) = inject_i; + rb_block_call_func *iter = inject_i; ID id; switch (rb_scan_args(argc, argv, "02", &init, &op)) { @@ -662,7 +662,7 @@ enum_inject(int argc, VALUE *argv, VALUE https://github.com/ruby/ruby/blob/trunk/enum.c#L662 } static VALUE -partition_i(VALUE i, VALUE arys, int argc, VALUE *argv) +partition_i(VALUE i, VALUE arys, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(arys); VALUE ary; @@ -707,7 +707,7 @@ enum_partition(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enum.c#L707 } static VALUE -group_by_i(VALUE i, VALUE hash, int argc, VALUE *argv) +group_by_i(VALUE i, VALUE hash, int argc, VALUE *argv, VALUE blockarg) { VALUE group; VALUE values; @@ -756,7 +756,7 @@ enum_group_by(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enum.c#L756 } static VALUE -first_i(VALUE i, VALUE params, int argc, VALUE *argv) +first_i(VALUE i, VALUE params, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(params); ENUM_WANT_SVALUE(); @@ -832,7 +832,7 @@ struct sort_by_data { https://github.com/ruby/ruby/blob/trunk/enum.c#L832 }; static VALUE -sort_by_i(VALUE i, VALUE _data, int argc, VALUE *argv) +sort_by_i(VALUE i, VALUE _data, int argc, VALUE *argv, VALUE blockarg) { struct sort_by_data *data = (struct sort_by_data *)&RNODE(_data)->u1; VALUE ary = data->ary; @@ -1162,7 +1162,7 @@ enum_none(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enum.c#L1162 } static VALUE -min_i(VALUE i, VALUE args, int argc, VALUE *argv) +min_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg) { VALUE cmp; NODE *memo = RNODE(args); @@ -1234,7 +1234,7 @@ enum_min(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enum.c#L1234 } static VALUE -max_i(VALUE i, VALUE args, int argc, VALUE *argv) +max_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(args); VALUE cmp; @@ -1334,7 +1334,7 @@ minmax_i_update(VALUE i, VALUE j, struct https://github.com/ruby/ruby/blob/trunk/enum.c#L1334 } static VALUE -minmax_i(VALUE i, VALUE _memo, int argc, VALUE *argv) +minmax_i(VALUE i, VALUE _memo, int argc, VALUE *argv, VALUE blockarg) { struct minmax_t *memo = (struct minmax_t *)&RNODE(_memo)->u1.value; int n; @@ -1458,7 +1458,7 @@ enum_minmax(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enum.c#L1458 } static VALUE -min_by_i(VALUE i, VALUE args, int argc, VALUE *argv) +min_by_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(args); VALUE v; @@ -1504,7 +1504,7 @@ enum_min_by(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enum.c#L1504 } static VALUE -max_by_i(VALUE i, VALUE args, int argc, VALUE *argv) +max_by_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(args); VALUE v; @@ -1580,7 +1580,7 @@ minmax_by_i_update(VALUE v1, VALUE v2, V https://github.com/ruby/ruby/blob/trunk/enum.c#L1580 } static VALUE -minmax_by_i(VALUE i, VALUE _memo, int argc, VALUE *argv) +minmax_by_i(VALUE i, VALUE _memo, int argc, VALUE *argv, VALUE blockarg) { struct minmax_by_t *memo = MEMO_FOR(struct minmax_by_t, _memo); VALUE vi, vj, j; @@ -1656,7 +1656,7 @@ enum_minmax_by(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enum.c#L1656 } static VALUE -member_i(VALUE iter, VALUE args, int argc, VALUE *argv) +member_i(VALUE iter, VALUE args, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(args); @@ -1690,7 +1690,7 @@ enum_member(VALUE obj, VALUE val) https://github.com/ruby/ruby/blob/trunk/enum.c#L1690 } static VALUE -each_with_index_i(VALUE i, VALUE memo, int argc, VALUE *argv) +each_with_index_i(VALUE i, VALUE memo, int argc, VALUE *argv, VALUE blockarg) { long n = RNODE(memo)->u3.cnt++; @@ -1766,7 +1766,7 @@ enum_reverse_each(int argc, VALUE *argv, https://github.com/ruby/ruby/blob/trunk/enum.c#L1766 static VALUE -each_val_i(VALUE i, VALUE p, int argc, VALUE *argv) +each_val_i(VALUE i, VALUE p, int argc, VALUE *argv, VALUE blockarg) { ENUM_WANT_SVALUE(); rb_yield(i); @@ -1811,7 +1811,7 @@ enum_each_entry(int argc, VALUE *argv, V https://github.com/ruby/ruby/blob/trunk/enum.c#L1811 } static VALUE -each_slice_i(VALUE i, VALUE m, int argc, VALUE *argv) +each_slice_i(VALUE i, VALUE m, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(m); VALUE ary = memo->u1.value; @@ -1878,7 +1878,7 @@ enum_each_slice(VALUE obj, VALUE n) https://github.com/ruby/ruby/blob/trunk/enum.c#L1878 } static VALUE -each_cons_i(VALUE i, VALUE args, int argc, VALUE *argv) +each_cons_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(args); VALUE ary = memo->u1.value; @@ -1946,7 +1946,7 @@ enum_each_cons(VALUE obj, VALUE n) https://github.com/ruby/ruby/blob/trunk/enum.c#L1946 } static VALUE -each_with_object_i(VALUE i, VALUE memo, int argc, VALUE *argv) +each_with_object_i(VALUE i, VALUE memo, int argc, VALUE *argv, VALUE blockarg) { ENUM_WANT_SVALUE(); return rb_yield_values(2, i, memo); @@ -1977,8 +1977,9 @@ enum_each_with_object(VALUE obj, VALUE m https://github.com/ruby/ruby/blob/trunk/enum.c#L1977 } static VALUE -zip_ary(VALUE val, NODE *memo, int argc, VALUE *argv) +zip_ary(VALUE val, VALUE memoval, int argc, VALUE *argv, VALUE blockarg) { + NODE *memo = (NODE *)memoval; volatile VALUE result = memo->u1.value; volatile VALUE args = memo->u2.value; long n = memo->u3.cnt++; @@ -2019,8 +2020,9 @@ call_stop(VALUE *v) https://github.com/ruby/ruby/blob/trunk/enum.c#L2020 } static VALUE -zip_i(VALUE val, NODE *memo, int argc, VALUE *argv) +zip_i(VALUE val, VALUE memoval, int argc, VALUE *argv, VALUE blockarg) { + NODE *memo = (NODE *)memoval; volatile VALUE result = memo->u1.value; volatile VALUE args = memo->u2.value; volatile VALUE tmp; @@ -2116,7 +2118,7 @@ enum_zip(int argc, VALUE *argv, VALUE ob https://github.com/ruby/ruby/blob/trunk/enum.c#L2118 } static VALUE -take_i(VALUE i, VALUE args, int argc, VALUE *argv) +take_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg) { NODE *memo = RNODE(args); rb_ary_push(memo->u1.value, rb_enum_values_pack(argc, argv)); @@ -2155,7 +2157,7 @@ enum_take(VALUE obj, VALUE n) https://github.com/ruby/ruby/blob/trunk/enum.c#L2157 static VALUE -take_while_i(VALUE i, VALUE ary, int argc, VALUE *argv) +take_while_i(VALUE i (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/