diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-07-05 18:15:43 +0100 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-07-05 18:15:43 +0100 |
| commit | 290354ff4630b705c97f40e2f15820d2b7f70a4c (patch) | |
| tree | 504306816753eda73b06032ac84448487851a228 /Src/text.c | |
| parent | f2b2271fbe4a7acb1b026545481bf5cd6879d983 (diff) | |
| download | zsh-290354ff4630b705c97f40e2f15820d2b7f70a4c.tar.gz zsh-290354ff4630b705c97f40e2f15820d2b7f70a4c.tar.xz zsh-290354ff4630b705c97f40e2f15820d2b7f70a4c.zip | |
35688: Improved attempt to turn case wordcode into text.
Diffstat (limited to 'Src/text.c')
| -rw-r--r-- | Src/text.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Src/text.c b/Src/text.c index d63141b20..cf73004d5 100644 --- a/Src/text.c +++ b/Src/text.c @@ -681,7 +681,7 @@ gettext2(Estate state) case WC_CASE: if (!s) { Wordcode end = state->pc + WC_CASE_SKIP(code); - wordcode nalts, ialts; + wordcode ialts; taddstr("case "); taddstr(ecgetstr(state, EC_NODUP, NULL)); @@ -695,6 +695,7 @@ gettext2(Estate state) taddstr("esac"); stack = 1; } else { + Wordcode prev_pc; tindent++; if (tnewlins) taddnl(0); @@ -702,7 +703,8 @@ gettext2(Estate state) taddchr(' '); taddstr("("); code = *state->pc++; - nalts = ialts = *state->pc++; + prev_pc = state->pc++; + ialts = *prev_pc; while (ialts--) { taddstr(ecgetstr(state, EC_NODUP, NULL)); state->pc++; @@ -713,11 +715,11 @@ gettext2(Estate state) tindent++; n = tpush(code, 0); n->u._case.end = end; - n->pop = (state->pc - 2 - nalts + WC_CASE_SKIP(code) - >= end); + n->pop = (prev_pc + WC_CASE_SKIP(code) >= end); } } else if (state->pc < s->u._case.end) { - wordcode nalts, ialts; + Wordcode prev_pc; + wordcode ialts; dec_tindent(); switch (WC_CASE_TYPE(code)) { case WC_CASE_OR: @@ -738,7 +740,8 @@ gettext2(Estate state) taddchr(' '); taddstr("("); code = *state->pc++; - nalts = ialts = *state->pc++; + prev_pc = state->pc++; + ialts = *prev_pc; while (ialts--) { taddstr(ecgetstr(state, EC_NODUP, NULL)); state->pc++; @@ -748,7 +751,7 @@ gettext2(Estate state) taddstr(") "); tindent++; s->code = code; - s->pop = ((state->pc - 2 - nalts + WC_CASE_SKIP(code)) >= + s->pop = (prev_pc + WC_CASE_SKIP(code) >= s->u._case.end); } else { dec_tindent(); |