Skip to content

Commit 9f45081

Browse files
nobunobu
committed
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| ...}. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 93bfdb9 commit 9f45081

File tree

9 files changed

+87
-78
lines changed

9 files changed

+87
-78
lines changed

‎ChangeLog

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Fri Nov 29 11:26:43 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
2+
3+
* include/ruby/ruby.h (rb_block_call_func): add blockarg. block
4+
function can take block argument, e.g., proc {|&blockarg| ...}.
5+
16
Thu Nov 28 21:43:48 2013 Zachary Scott <e@zzak.io>
27

38
* doc/dtrace_probes.rdoc: [DOC] Import dtrace probes doc from wiki

‎array.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2616,7 +2616,7 @@ rb_ary_bsearch(VALUE ary)
26162616

26172617

26182618
static VALUE
2619-
sort_by_i(VALUE i)
2619+
sort_by_i(VALUE i, VALUE dummy, int argc, VALUE *argv, VALUE blockarg)
26202620
{
26212621
return rb_yield(i);
26222622
}
@@ -3169,7 +3169,7 @@ rb_ary_delete_if(VALUE ary)
31693169
}
31703170

31713171
static VALUE
3172-
take_i(VALUE val, VALUE *args, int argc, VALUE *argv)
3172+
take_i(VALUE val, VALUE *args, int argc, VALUE *argv, VALUE blockarg)
31733173
{
31743174
if (args[1]-- == 0) rb_iter_break();
31753175
if (argc > 1) val = rb_ary_new4(argc, argv);

‎enum.c

+43-41
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ rb_enum_values_pack(int argc, VALUE *argv)
4444
#define enum_yield rb_yield_values2
4545

4646
static VALUE
47-
grep_i(VALUE i, VALUE args, int argc, VALUE *argv)
47+
grep_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg)
4848
{
4949
NODE *memo = RNODE(args);
5050
ENUM_WANT_SVALUE();
@@ -56,7 +56,7 @@ grep_i(VALUE i, VALUE args, int argc, VALUE *argv)
5656
}
5757

5858
static VALUE
59-
grep_iter_i(VALUE i, VALUE args, int argc, VALUE *argv)
59+
grep_iter_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg)
6060
{
6161
NODE *memo = RNODE(args);
6262
ENUM_WANT_SVALUE();
@@ -97,7 +97,7 @@ enum_grep(VALUE obj, VALUE pat)
9797
}
9898

9999
static VALUE
100-
count_i(VALUE i, VALUE memop, int argc, VALUE *argv)
100+
count_i(VALUE i, VALUE memop, int argc, VALUE *argv, VALUE blockarg)
101101
{
102102
NODE *memo = RNODE(memop);
103103

@@ -110,7 +110,7 @@ count_i(VALUE i, VALUE memop, int argc, VALUE *argv)
110110
}
111111

112112
static VALUE
113-
count_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
113+
count_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv, VALUE blockarg)
114114
{
115115
NODE *memo = RNODE(memop);
116116

@@ -121,7 +121,7 @@ count_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
121121
}
122122

123123
static VALUE
124-
count_all_i(VALUE i, VALUE memop, int argc, VALUE *argv)
124+
count_all_i(VALUE i, VALUE memop, int argc, VALUE *argv, VALUE blockarg)
125125
{
126126
NODE *memo = RNODE(memop);
127127

@@ -176,7 +176,7 @@ enum_count(int argc, VALUE *argv, VALUE obj)
176176
}
177177

178178
static VALUE
179-
find_i(VALUE i, VALUE memop, int argc, VALUE *argv)
179+
find_i(VALUE i, VALUE memop, int argc, VALUE *argv, VALUE blockarg)
180180
{
181181
ENUM_WANT_SVALUE();
182182

@@ -228,7 +228,7 @@ enum_find(int argc, VALUE *argv, VALUE obj)
228228
}
229229

230230
static VALUE
231-
find_index_i(VALUE i, VALUE memop, int argc, VALUE *argv)
231+
find_index_i(VALUE i, VALUE memop, int argc, VALUE *argv, VALUE blockarg)
232232
{
233233
NODE *memo = RNODE(memop);
234234

@@ -243,7 +243,7 @@ find_index_i(VALUE i, VALUE memop, int argc, VALUE *argv)
243243
}
244244

245245
static VALUE
246-
find_index_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
246+
find_index_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv, VALUE blockarg)
247247
{
248248
NODE *memo = RNODE(memop);
249249

@@ -299,7 +299,7 @@ enum_find_index(int argc, VALUE *argv, VALUE obj)
299299
}
300300

301301
static VALUE
302-
find_all_i(VALUE i, VALUE ary, int argc, VALUE *argv)
302+
find_all_i(VALUE i, VALUE ary, int argc, VALUE *argv, VALUE blockarg)
303303
{
304304
ENUM_WANT_SVALUE();
305305

@@ -351,7 +351,7 @@ enum_find_all(VALUE obj)
351351
}
352352

353353
static VALUE
354-
reject_i(VALUE i, VALUE ary, int argc, VALUE *argv)
354+
reject_i(VALUE i, VALUE ary, int argc, VALUE *argv, VALUE blockarg)
355355
{
356356
ENUM_WANT_SVALUE();
357357

@@ -392,7 +392,7 @@ enum_reject(VALUE obj)
392392
}
393393

394394
static VALUE
395-
collect_i(VALUE i, VALUE ary, int argc, VALUE *argv)
395+
collect_i(VALUE i, VALUE ary, int argc, VALUE *argv, VALUE blockarg)
396396
{
397397
rb_ary_push(ary, enum_yield(argc, argv));
398398

@@ -439,7 +439,7 @@ enum_collect(VALUE obj)
439439
}
440440

441441
static VALUE
442-
flat_map_i(VALUE i, VALUE ary, int argc, VALUE *argv)
442+
flat_map_i(VALUE i, VALUE ary, int argc, VALUE *argv, VALUE blockarg)
443443
{
444444
VALUE tmp;
445445

@@ -510,7 +510,7 @@ enum_to_a(int argc, VALUE *argv, VALUE obj)
510510
}
511511

512512
static VALUE
513-
enum_to_h_i(VALUE i, VALUE hash, int argc, VALUE *argv)
513+
enum_to_h_i(VALUE i, VALUE hash, int argc, VALUE *argv, VALUE blockarg)
514514
{
515515
ENUM_WANT_SVALUE();
516516
rb_thread_check_ints();
@@ -543,7 +543,7 @@ enum_to_h(int argc, VALUE *argv, VALUE obj)
543543
}
544544

545545
static VALUE
546-
inject_i(VALUE i, VALUE p, int argc, VALUE *argv)
546+
inject_i(VALUE i, VALUE p, int argc, VALUE *argv, VALUE blockarg)
547547
{
548548
NODE *memo = RNODE(p);
549549

@@ -560,7 +560,7 @@ inject_i(VALUE i, VALUE p, int argc, VALUE *argv)
560560
}
561561

562562
static VALUE
563-
inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv)
563+
inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv, VALUE blockarg)
564564
{
565565
NODE *memo = RNODE(p);
566566
VALUE name;
@@ -631,7 +631,7 @@ enum_inject(int argc, VALUE *argv, VALUE obj)
631631
{
632632
NODE *memo;
633633
VALUE init, op;
634-
VALUE (*iter)(VALUE, VALUE, int, VALUE*) = inject_i;
634+
rb_block_call_func *iter = inject_i;
635635
ID id;
636636

637637
switch (rb_scan_args(argc, argv, "02", &init, &op)) {
@@ -662,7 +662,7 @@ enum_inject(int argc, VALUE *argv, VALUE obj)
662662
}
663663

664664
static VALUE
665-
partition_i(VALUE i, VALUE arys, int argc, VALUE *argv)
665+
partition_i(VALUE i, VALUE arys, int argc, VALUE *argv, VALUE blockarg)
666666
{
667667
NODE *memo = RNODE(arys);
668668
VALUE ary;
@@ -707,7 +707,7 @@ enum_partition(VALUE obj)
707707
}
708708

709709
static VALUE
710-
group_by_i(VALUE i, VALUE hash, int argc, VALUE *argv)
710+
group_by_i(VALUE i, VALUE hash, int argc, VALUE *argv, VALUE blockarg)
711711
{
712712
VALUE group;
713713
VALUE values;
@@ -756,7 +756,7 @@ enum_group_by(VALUE obj)
756756
}
757757

758758
static VALUE
759-
first_i(VALUE i, VALUE params, int argc, VALUE *argv)
759+
first_i(VALUE i, VALUE params, int argc, VALUE *argv, VALUE blockarg)
760760
{
761761
NODE *memo = RNODE(params);
762762
ENUM_WANT_SVALUE();
@@ -832,7 +832,7 @@ struct sort_by_data {
832832
};
833833

834834
static VALUE
835-
sort_by_i(VALUE i, VALUE _data, int argc, VALUE *argv)
835+
sort_by_i(VALUE i, VALUE _data, int argc, VALUE *argv, VALUE blockarg)
836836
{
837837
struct sort_by_data *data = (struct sort_by_data *)&RNODE(_data)->u1;
838838
VALUE ary = data->ary;
@@ -1162,7 +1162,7 @@ enum_none(VALUE obj)
11621162
}
11631163

11641164
static VALUE
1165-
min_i(VALUE i, VALUE args, int argc, VALUE *argv)
1165+
min_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg)
11661166
{
11671167
VALUE cmp;
11681168
NODE *memo = RNODE(args);
@@ -1234,7 +1234,7 @@ enum_min(VALUE obj)
12341234
}
12351235

12361236
static VALUE
1237-
max_i(VALUE i, VALUE args, int argc, VALUE *argv)
1237+
max_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg)
12381238
{
12391239
NODE *memo = RNODE(args);
12401240
VALUE cmp;
@@ -1334,7 +1334,7 @@ minmax_i_update(VALUE i, VALUE j, struct minmax_t *memo)
13341334
}
13351335

13361336
static VALUE
1337-
minmax_i(VALUE i, VALUE _memo, int argc, VALUE *argv)
1337+
minmax_i(VALUE i, VALUE _memo, int argc, VALUE *argv, VALUE blockarg)
13381338
{
13391339
struct minmax_t *memo = (struct minmax_t *)&RNODE(_memo)->u1.value;
13401340
int n;
@@ -1458,7 +1458,7 @@ enum_minmax(VALUE obj)
14581458
}
14591459

14601460
static VALUE
1461-
min_by_i(VALUE i, VALUE args, int argc, VALUE *argv)
1461+
min_by_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg)
14621462
{
14631463
NODE *memo = RNODE(args);
14641464
VALUE v;
@@ -1504,7 +1504,7 @@ enum_min_by(VALUE obj)
15041504
}
15051505

15061506
static VALUE
1507-
max_by_i(VALUE i, VALUE args, int argc, VALUE *argv)
1507+
max_by_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg)
15081508
{
15091509
NODE *memo = RNODE(args);
15101510
VALUE v;
@@ -1580,7 +1580,7 @@ minmax_by_i_update(VALUE v1, VALUE v2, VALUE i1, VALUE i2, struct minmax_by_t *m
15801580
}
15811581

15821582
static VALUE
1583-
minmax_by_i(VALUE i, VALUE _memo, int argc, VALUE *argv)
1583+
minmax_by_i(VALUE i, VALUE _memo, int argc, VALUE *argv, VALUE blockarg)
15841584
{
15851585
struct minmax_by_t *memo = MEMO_FOR(struct minmax_by_t, _memo);
15861586
VALUE vi, vj, j;
@@ -1656,7 +1656,7 @@ enum_minmax_by(VALUE obj)
16561656
}
16571657

16581658
static VALUE
1659-
member_i(VALUE iter, VALUE args, int argc, VALUE *argv)
1659+
member_i(VALUE iter, VALUE args, int argc, VALUE *argv, VALUE blockarg)
16601660
{
16611661
NODE *memo = RNODE(args);
16621662

@@ -1690,7 +1690,7 @@ enum_member(VALUE obj, VALUE val)
16901690
}
16911691

16921692
static VALUE
1693-
each_with_index_i(VALUE i, VALUE memo, int argc, VALUE *argv)
1693+
each_with_index_i(VALUE i, VALUE memo, int argc, VALUE *argv, VALUE blockarg)
16941694
{
16951695
long n = RNODE(memo)->u3.cnt++;
16961696

@@ -1766,7 +1766,7 @@ enum_reverse_each(int argc, VALUE *argv, VALUE obj)
17661766

17671767

17681768
static VALUE
1769-
each_val_i(VALUE i, VALUE p, int argc, VALUE *argv)
1769+
each_val_i(VALUE i, VALUE p, int argc, VALUE *argv, VALUE blockarg)
17701770
{
17711771
ENUM_WANT_SVALUE();
17721772
rb_yield(i);
@@ -1811,7 +1811,7 @@ enum_each_entry(int argc, VALUE *argv, VALUE obj)
18111811
}
18121812

18131813
static VALUE
1814-
each_slice_i(VALUE i, VALUE m, int argc, VALUE *argv)
1814+
each_slice_i(VALUE i, VALUE m, int argc, VALUE *argv, VALUE blockarg)
18151815
{
18161816
NODE *memo = RNODE(m);
18171817
VALUE ary = memo->u1.value;
@@ -1878,7 +1878,7 @@ enum_each_slice(VALUE obj, VALUE n)
18781878
}
18791879

18801880
static VALUE
1881-
each_cons_i(VALUE i, VALUE args, int argc, VALUE *argv)
1881+
each_cons_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg)
18821882
{
18831883
NODE *memo = RNODE(args);
18841884
VALUE ary = memo->u1.value;
@@ -1946,7 +1946,7 @@ enum_each_cons(VALUE obj, VALUE n)
19461946
}
19471947

19481948
static VALUE
1949-
each_with_object_i(VALUE i, VALUE memo, int argc, VALUE *argv)
1949+
each_with_object_i(VALUE i, VALUE memo, int argc, VALUE *argv, VALUE blockarg)
19501950
{
19511951
ENUM_WANT_SVALUE();
19521952
return rb_yield_values(2, i, memo);
@@ -1977,8 +1977,9 @@ enum_each_with_object(VALUE obj, VALUE memo)
19771977
}
19781978

19791979
static VALUE
1980-
zip_ary(VALUE val, NODE *memo, int argc, VALUE *argv)
1980+
zip_ary(VALUE val, VALUE memoval, int argc, VALUE *argv, VALUE blockarg)
19811981
{
1982+
NODE *memo = (NODE *)memoval;
19821983
volatile VALUE result = memo->u1.value;
19831984
volatile VALUE args = memo->u2.value;
19841985
long n = memo->u3.cnt++;
@@ -2019,8 +2020,9 @@ call_stop(VALUE *v)
20192020
}
20202021

20212022
static VALUE
2022-
zip_i(VALUE val, NODE *memo, int argc, VALUE *argv)
2023+
zip_i(VALUE val, VALUE memoval, int argc, VALUE *argv, VALUE blockarg)
20232024
{
2025+
NODE *memo = (NODE *)memoval;
20242026
volatile VALUE result = memo->u1.value;
20252027
volatile VALUE args = memo->u2.value;
20262028
volatile VALUE tmp;
@@ -2116,7 +2118,7 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
21162118
}
21172119

21182120
static VALUE
2119-
take_i(VALUE i, VALUE args, int argc, VALUE *argv)
2121+
take_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg)
21202122
{
21212123
NODE *memo = RNODE(args);
21222124
rb_ary_push(memo->u1.value, rb_enum_values_pack(argc, argv));
@@ -2155,7 +2157,7 @@ enum_take(VALUE obj, VALUE n)
21552157

21562158

21572159
static VALUE
2158-
take_while_i(VALUE i, VALUE ary, int argc, VALUE *argv)
2160+
take_while_i(VALUE i, VALUE ary, int argc, VALUE *argv, VALUE blockarg)
21592161
{
21602162
if (!RTEST(enum_yield(argc, argv))) rb_iter_break();
21612163
rb_ary_push(ary, rb_enum_values_pack(argc, argv));
@@ -2189,7 +2191,7 @@ enum_take_while(VALUE obj)
21892191
}
21902192

21912193
static VALUE
2192-
drop_i(VALUE i, VALUE args, int argc, VALUE *argv)
2194+
drop_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg)
21932195
{
21942196
NODE *memo = RNODE(args);
21952197
if (memo->u3.cnt == 0) {
@@ -2232,7 +2234,7 @@ enum_drop(VALUE obj, VALUE n)
22322234

22332235

22342236
static VALUE
2235-
drop_while_i(VALUE i, VALUE args, int argc, VALUE *argv)
2237+
drop_while_i(VALUE i, VALUE args, int argc, VALUE *argv, VALUE blockarg)
22362238
{
22372239
NODE *memo = RNODE(args);
22382240
ENUM_WANT_SVALUE();
@@ -2276,7 +2278,7 @@ enum_drop_while(VALUE obj)
22762278
}
22772279

22782280
static VALUE
2279-
cycle_i(VALUE i, VALUE ary, int argc, VALUE *argv)
2281+
cycle_i(VALUE i, VALUE ary, int argc, VALUE *argv, VALUE blockarg)
22802282
{
22812283
ENUM_WANT_SVALUE();
22822284

@@ -2413,7 +2415,7 @@ chunk_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
24132415
}
24142416

24152417
static VALUE
2416-
chunk_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
2418+
chunk_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv, VALUE blockarg)
24172419
{
24182420
VALUE enumerable;
24192421
VALUE arg;
@@ -2587,7 +2589,7 @@ slicebefore_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
25872589
}
25882590

25892591
static VALUE
2590-
slicebefore_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
2592+
slicebefore_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv, VALUE blockarg)
25912593
{
25922594
VALUE enumerable;
25932595
VALUE arg;

0 commit comments

Comments
 (0)