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

Fix stack position in multiple assignment; fix #4008

Browse Source 
This was caused by a patch from #2684.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2018-05-01 12:25:04 +09:00
parent 59c8fdd651
commit a8122a9d56
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-compiler/core/codegen.c
+11 -12
View File
@@ -1088,8 +1088,12 @@ gen_vmassignment(codegen_scope *s, node *tree, int rhs, int val)
t = tree->car;
n = 0;
while (t) {
genop(s, MKOP_ABC(OP_AREF, cursp(), rhs, n));
gen_assignment(s, t->car, cursp(), NOVAL);
int sp = cursp();
genop(s, MKOP_ABC(OP_AREF, sp, rhs, n));
push();
gen_assignment(s, t->car, sp, NOVAL);
pop();
n++;
t = t->cdr;
}
@@ -1103,14 +1107,9 @@ gen_vmassignment(codegen_scope *s, node *tree, int rhs, int val)
p = p->cdr;
}
}
if (val) {
genop(s, MKOP_AB(OP_MOVE, cursp(), rhs));
}
else {
pop();
}
push_n(post);
pop_n(post);
genop(s, MKOP_AB(OP_MOVE, cursp(), rhs));
push_n(post+1);
pop_n(post+1);
genop(s, MKOP_ABC(OP_APOST, cursp(), n, post));
n = 1;
if (t->car) { /* rest */
@@ -1124,8 +1123,8 @@ gen_vmassignment(codegen_scope *s, node *tree, int rhs, int val)
n++;
}
}
if (!val) {
push();
if (val) {
genop(s, MKOP_AB(OP_MOVE, cursp(), rhs));
}
}
}