conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix: shift/reset should respect dynamic environments

This commit is contained in:
Yuichi Nishiwaki 2017-05-10 10:47:01 +09:00
parent ee59df9300
commit aa4f94e378
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ext/cont.c
View File

@ -38,6 +38,7 @@ shift_call(pic_state *pic)
CONTEXT_INIT(pic, &cxt, pic_closure_ref(pic, 0), 1, &x);
cxt.reset = 1;
pic->dyn_env = pic_closure_ref(pic, 1);
pic_vm(pic, &cxt);
return pic_protect(pic, cxt.fp->regs[1]);
}
@ -53,7 +54,7 @@ pic_cont_shift(pic_state *pic)
pic_error(pic, "c function call interleaved in delimited continuation", 0);
}
k = pic_lambda(pic, shift_call, 1, pic->cxt->fp->regs[1]);
k = pic_lambda(pic, shift_call, 2, pic->cxt->fp->regs[1], pic->dyn_env);
CONTEXT_INITK(pic, pic->cxt, f, pic->halt, 1, &k);
return pic_invalid_value(pic);
}