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

Use mrb_true_or_false_value() / in mrb_f_block_given_p_m().

Browse Source
This commit is contained in:
Masaki Muranaka
2013-03-19 10:37:21 +09:00
parent 70baae2573
commit 57e345c767
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel.c
+17 -10
View File
@@ -219,21 +219,28 @@ mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self)
{
mrb_callinfo *ci = mrb->ci;
mrb_value *bp;
mrb_bool given_p;
bp = mrb->stbase + ci->stackidx + 1;
ci--;
if (ci <= mrb->cibase) return mrb_false_value();
/* block_given? called within block; check upper scope */
if (ci->proc->env && ci->proc->env->stack) {
if (ci->proc->env->stack == mrb->stbase || mrb_nil_p(ci->proc->env->stack[1]))
return mrb_false_value();
return mrb_true_value();
if (ci <= mrb->cibase) {
given_p = 0;
}
if (ci->argc > 0) {
bp += ci->argc;
else {
/* block_given? called within block; check upper scope */
if (ci->proc->env && ci->proc->env->stack) {
given_p = !(ci->proc->env->stack == mrb->stbase ||
mrb_nil_p(ci->proc->env->stack[1]));
}
else {
if (ci->argc > 0) {
bp += ci->argc;
}
given_p = !mrb_nil_p(*bp);
}
}
if (mrb_nil_p(*bp)) return mrb_false_value();
return mrb_true_value();
return mrb_true_or_false_value(given_p);
}
/* 15.3.1.3.7 */