admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

block_given? should work; close #262

Browse Source
This commit is contained in:
Yukihiro Matsumoto
2012-06-12 19:09:11 +09:00
parent 4348639e1c
commit f537e2bb96
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel.c
+12 -7
View File
@@ -269,12 +269,6 @@ mrb_f_send(mrb_state *mrb, mrb_value self)
return mrb_funcall_with_block(mrb,self, mrb_string_value_ptr(mrb, name), argc, argv, block);
}
static mrb_value
mrb_f_block_given_p(void)
{
return mrb_false_value(); /* dummy */
}
/* 15.3.1.2.2 */
/* 15.3.1.2.5 */
/* 15.3.1.3.6 */
@@ -302,7 +296,18 @@ mrb_f_block_given_p(void)
static mrb_value
mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self)
{
return mrb_f_block_given_p();
mrb_callinfo *ci = mrb->ci;
mrb_value *bp, *p;
p = mrb->stbase + ci->stackidx;
bp = mrb->stbase + ci->stackidx + 1;
ci--;
if (ci <= mrb->cibase) return mrb_false_value();
if (ci->argc > 0) {
bp += ci->argc;
}
if (mrb_nil_p(*bp)) return mrb_false_value();
return mrb_true_value();
}
/* 15.3.1.3.7 */