[git commit] bc: preparation to stop using p->exits when parsing if()
Denys Vlasenko
vda.linux at googlemail.com
Sun Dec 16 20:21:27 UTC 2018
commit: https://git.busybox.net/busybox/commit/?id=741563312805fa99fc9588c3673eff4a219d5e9f
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
miscutils/bc.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/miscutils/bc.c b/miscutils/bc.c
index 9f40a551e..ad716fac3 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -4141,15 +4141,17 @@ static BC_STATUS zbc_parse_if(BcParse *p)
dbg_lex("%s:%d in if after stmt: p->l.t.t:%d", __func__, __LINE__, p->l.t.t);
if (p->l.t.t == BC_LEX_KEY_ELSE) {
+ BcInstPtr ip2;
+
s = zbc_lex_next_and_skip_NLINE(&p->l);
if (s) RETURN_STATUS(s);
- ip.idx = p->func->labels.len;
- ip.func = ip.len = 0;
+ ip2.idx = p->func->labels.len;
+ ip2.func = ip.len = 0;
dbg_lex("%s:%d after if() body: BC_INST_JUMP to %d", __func__, __LINE__, ip.idx);
bc_parse_push(p, BC_INST_JUMP);
- bc_parse_pushIndex(p, ip.idx);
+ bc_parse_pushIndex(p, ip2.idx);
ipp = bc_vec_top(&p->exits);
label = bc_vec_item(&p->func->labels, ipp->idx);
@@ -4157,8 +4159,8 @@ static BC_STATUS zbc_parse_if(BcParse *p)
*label = p->func->code.len;
bc_vec_pop(&p->exits);
- bc_vec_push(&p->exits, &ip);
- bc_vec_push(&p->func->labels, &ip.idx);
+ bc_vec_push(&p->exits, &ip2);
+ bc_vec_push(&p->func->labels, &ip2.idx);
s = zbc_parse_stmt(p);
if (s) RETURN_STATUS(s);
More information about the busybox-cvs
mailing list