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 with nested block; fix #2695 close #2712

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2015-01-31 13:51:25 +09:00
parent 02b54e5379
commit 089f1f6c75
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel.c
+14 -7
View File
@@ -186,14 +186,21 @@ mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self)
}
else {
/* block_given? called within block; check upper scope */
if (ci->proc->env && ci->proc->env->stack) {
mrb_value *sp = ci->proc->env->stack;
if (ci->proc->env) {
struct REnv *e = ci->proc->env;
mrb_value *sp;
/* top-level does not have block slot (alway false) */
if (sp == mrb->c->stbase)
return mrb_false_value();
ci = mrb->c->cibase + ci->proc->env->cioff;
bp = ci[1].stackent + 1;
while (e->c) {
e = (struct REnv*)e->c;
}
sp = e->stack;
if (sp) {
/* top-level does not have block slot (alway false) */
if (sp == mrb->c->stbase)
return mrb_false_value();
ci = mrb->c->cibase + e->cioff;
bp = ci[1].stackent + 1;
}
}
if (ci->argc > 0) {
bp += ci->argc;