misc.c is goto-free.

This commit is contained in:
Eric S. Raymond 2017-06-08 01:35:50 -04:00
parent 3674588968
commit a418ebb38c

40
misc.c
View file

@ -34,13 +34,13 @@ void SPEAK(vocab_t msg)
PUTTXT(LINES[i],state,2); PUTTXT(LINES[i],state,2);
} }
LNPOSN=0; LNPOSN=0;
L30:
++LNPOSN; ++LNPOSN;
L32:
if (LNPOSN > LNLENG) while (LNPOSN <= LNLENG) {
goto L40; if (INLINE[LNPOSN] != PERCENT) {
if (INLINE[LNPOSN] != PERCENT) ++LNPOSN;
goto L30; continue;
}
prmtyp = INLINE[LNPOSN+1]; prmtyp = INLINE[LNPOSN+1];
/* A "%"; the next character determine the type of /* A "%"; the next character determine the type of
* parameter: 1 (!) = suppress message completely, 29 (S) = NULL * parameter: 1 (!) = suppress message completely, 29 (S) = NULL
@ -57,21 +57,22 @@ L32:
INLINE[LNPOSN] = 55; INLINE[LNPOSN] = 55;
if (PARMS[nparms] == 1) if (PARMS[nparms] == 1)
SHFTXT(LNPOSN+1,-1); SHFTXT(LNPOSN+1,-1);
goto L395; ++nparms;
continue;
} }
if (prmtyp == 30) { if (prmtyp == 30) {
SHFTXT(LNPOSN+2,-2); SHFTXT(LNPOSN+2,-2);
state=0; state=0;
casemake=2; casemake=2;
for (;;) { while (PARMS[nparms] > 0) {
if (PARMS[nparms] < 0)
goto L395;
if (PARMS[nparms+1] < 0) if (PARMS[nparms+1] < 0)
casemake=0; casemake=0;
PUTTXT(PARMS[nparms],state,casemake); PUTTXT(PARMS[nparms],state,casemake);
nparms=nparms+1; nparms=nparms+1;
} }
++nparms;
continue;
} }
if (prmtyp == 12) { if (prmtyp == 12) {
prmtyp=PARMS[nparms]; prmtyp=PARMS[nparms];
@ -79,10 +80,11 @@ L32:
if (prmtyp != 0) { if (prmtyp != 0) {
for (i=1; i<=prmtyp; i++) { for (i=1; i<=prmtyp; i++) {
INLINE[LNPOSN]=0; INLINE[LNPOSN]=0;
LNPOSN=LNPOSN+1; ++LNPOSN;
} }
} }
goto L395; ++nparms;
continue;
} }
if (prmtyp == 33 || prmtyp == 22 || prmtyp == 31 || prmtyp == 13) { if (prmtyp == 33 || prmtyp == 22 || prmtyp == 31 || prmtyp == 13) {
SHFTXT(LNPOSN+2,-2); SHFTXT(LNPOSN+2,-2);
@ -98,11 +100,14 @@ L32:
if (prmtyp == 13 && INLINE[i] >= 37 && INLINE[i] <= 62) if (prmtyp == 13 && INLINE[i] >= 37 && INLINE[i] <= 62)
INLINE[i] -= 26; INLINE[i] -= 26;
nparms += 2; nparms += 2;
goto L32; continue;
} }
prmtyp=prmtyp-64; prmtyp=prmtyp-64;
if (prmtyp < 1 || prmtyp > 9) if (prmtyp < 1 || prmtyp > 9) {
goto L30; ++LNPOSN;
continue;
}
SHFTXT(LNPOSN+2,prmtyp-2); SHFTXT(LNPOSN+2,prmtyp-2);
LNPOSN += prmtyp; LNPOSN += prmtyp;
param=labs(PARMS[nparms]); param=labs(PARMS[nparms]);
@ -119,11 +124,10 @@ L32:
param=param/10; param=param/10;
} }
LNPOSN += prmtyp; LNPOSN += prmtyp;
L395:
++nparms; ++nparms;
goto L32; continue;
}
L40:
if (blank) if (blank)
TYPE0(); TYPE0();
blank=false; blank=false;