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

codegen.c: fixed a bug when value is taken from while and until.

Browse Source 
```ruby
p ((while true; p 1; break; end))
```

should print `1 nil` but was `1`.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2021-07-23 15:48:54 +09:00
parent 9dd3e23fc9
commit 2910af0010
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-compiler/core/codegen.c
+17 -5
View File
@@ -1932,6 +1932,7 @@ codegen(codegen_scope *s, node *tree, int val)
{
struct loopinfo *lp = loop_push(s, LOOP_NORMAL);
if (!val) lp->acc = -1;
lp->pc0 = new_label(s);
lp->pc1 = genjmp_0(s, OP_JMP);
lp->pc2 = new_label(s);
@@ -1949,6 +1950,7 @@ codegen(codegen_scope *s, node *tree, int val)
{
struct loopinfo *lp = loop_push(s, LOOP_NORMAL);
if (!val) lp->acc = -1;
lp->pc0 = new_label(s);
lp->pc1 = genjmp_0(s, OP_JMP);
lp->pc2 = new_label(s);
@@ -3338,11 +3340,16 @@ loop_break(codegen_scope *s, node *tree)
else {
struct loopinfo *loop;
if (tree) {
gen_retval(s, tree);
}
loop = s->loop;
if (tree) {
if (loop->acc < 0) {
codegen(s, tree, NOVAL);
}
else {
gen_retval(s, tree);
}
}
while (loop) {
if (loop->type == LOOP_BEGIN) {
loop = loop->prev;
@@ -3362,8 +3369,13 @@ loop_break(codegen_scope *s, node *tree)
if (loop->type == LOOP_NORMAL) {
int tmp;
if (tree) {
gen_move(s, loop->acc, cursp(), 0);
if (loop->acc >= 0) {
if (tree) {
gen_move(s, loop->acc, cursp(), 0);
}
else {
genop_1(s, OP_LOADNIL, loop->acc);
}
}
tmp = genjmp(s, OP_JMPUW, loop->pc3);
loop->pc3 = tmp;