The continuing cleanup of misc.c

This commit is contained in:
Eric S. Raymond 2017-06-07 22:34:06 -04:00
parent ff36dff18f
commit 680788eb97

135
misc.c
View file

@ -12,80 +12,79 @@
/* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */ /* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */
void SPEAK(vocab_t N) void SPEAK(vocab_t msg)
/* Print the message which starts at LINES(N). Precede it with a blank line /* Print the message which starts at LINES[N]. Precede it with a blank line
* unless game.blklin is false. */ * unless game.blklin is false. */
{ {
long blank, casemake, I, K, L, NEG, NPARMS, PARM, PRMTYP, state; long blank, casemake, i, nxt, neg, nparms, param, prmtyp, state;
if (N == 0) if (msg == 0)
return; return;
blank=game.blklin; blank=game.blklin;
K=N; nparms=1;
NPARMS=1; do {
L10: nxt=labs(LINES[msg])-1;
L=labs(LINES[K])-1; msg=msg+1;
K=K+1;
LNLENG=0; LNLENG=0;
LNPOSN=1; LNPOSN=1;
state=0; state=0;
for (I=K; I<=L; I++) { for (i = msg; i <= nxt; i++) {
PUTTXT(LINES[I],state,2); PUTTXT(LINES[i],state,2);
} }
LNPOSN=0; LNPOSN=0;
L30: L30:
LNPOSN=LNPOSN+1; ++LNPOSN;
L32: L32:
if (LNPOSN > LNLENG) if (LNPOSN > LNLENG)
goto L40; goto L40;
if (INLINE[LNPOSN] != 63) if (INLINE[LNPOSN] != 63)
goto L30; goto L30;
{long x = LNPOSN+1; PRMTYP=INLINE[x];} prmtyp=INLINE[LNPOSN+1];
/* 63 is a "%"; the next character determine the type of /* 63 is a "%"; the next character determine the type of
* parameter: 1 (!) = suppress message completely, 29 (S) = NULL * parameter: 1 (!) = suppress message completely, 29 (S) = NULL
* If PARM=1, else 'S' (optional plural ending), 33 (W) = word * If PARAM=1, else 'S' (optional plural ending), 33 (W) = word
* (two 30-bit values) with trailing spaces suppressed, 22 (L) or * (two 30-bit values) with trailing spaces suppressed, 22 (L) or
* 31 (U) = word but map to lower/upper case, 13 (C) = word in * 31 (U) = word but map to lower/upper case, 13 (C) = word in
* lower case with first letter capitalised, 30 (T) = text ending * lower case with first letter capitalised, 30 (T) = text ending
* with a word of -1, 65-73 (1-9) = number using that many * with a word of -1, 65-73 (1-9) = number using that many
* characters, 12 (B) = variable number of blanks. */ * characters, 12 (B) = variable number of blanks. */
if (PRMTYP == 1) if (prmtyp == 1)
return; return;
if (PRMTYP == 29) if (prmtyp == 29)
goto L320; goto L320;
if (PRMTYP == 30) if (prmtyp == 30)
goto L340; goto L340;
if (PRMTYP == 12) if (prmtyp == 12)
goto L360; goto L360;
if (PRMTYP == 33 || PRMTYP == 22 || PRMTYP == 31 || PRMTYP == 13) if (prmtyp == 33 || prmtyp == 22 || prmtyp == 31 || prmtyp == 13)
goto L380; goto L380;
PRMTYP=PRMTYP-64; prmtyp=prmtyp-64;
if (PRMTYP < 1 || PRMTYP > 9) goto L30; if (prmtyp < 1 || prmtyp > 9)
SHFTXT(LNPOSN+2,PRMTYP-2); goto L30;
LNPOSN=LNPOSN+PRMTYP; SHFTXT(LNPOSN+2,prmtyp-2);
PARM=labs(PARMS[NPARMS]); LNPOSN += prmtyp;
NEG=0; param=labs(PARMS[nparms]);
if (PARMS[NPARMS] < 0) neg=0;
NEG=9; if (PARMS[nparms] < 0)
/* 390 */ for (I=1; I<=PRMTYP; I++) { neg=9;
LNPOSN=LNPOSN-1; for (i=1; i <= prmtyp; i++) {
INLINE[LNPOSN]=MOD(PARM,10)+64; --LNPOSN;
if (I == 1 || PARM != 0) INLINE[LNPOSN]=MOD(param,10)+64;
goto L390; if (i != 1 && param == 0) {
INLINE[LNPOSN]=NEG; INLINE[LNPOSN]=neg;
NEG=0; neg=0;
L390:
PARM=PARM/10;
} }
LNPOSN=LNPOSN+PRMTYP; param=param/10;
}
LNPOSN=LNPOSN+prmtyp;
L395: L395:
NPARMS=NPARMS+1; ++nparms;
goto L32; goto L32;
L320: L320:
SHFTXT(LNPOSN+2,-1); SHFTXT(LNPOSN+2,-1);
INLINE[LNPOSN]=55; INLINE[LNPOSN]=55;
if (PARMS[NPARMS] == 1) if (PARMS[nparms] == 1)
SHFTXT(LNPOSN+1,-1); SHFTXT(LNPOSN+1,-1);
goto L395; goto L395;
@ -93,38 +92,41 @@ L340:
SHFTXT(LNPOSN+2,-2); SHFTXT(LNPOSN+2,-2);
state=0; state=0;
casemake=2; casemake=2;
L345:
if (PARMS[NPARMS] < 0) goto L395; for (;;) {
{long x = NPARMS+1; if (PARMS[x] < 0) if (PARMS[nparms] < 0)
casemake=0;} goto L395;
PUTTXT(PARMS[NPARMS],state,casemake); if (PARMS[nparms+1] < 0)
NPARMS=NPARMS+1; casemake=0;
goto L345; PUTTXT(PARMS[nparms],state,casemake);
nparms=nparms+1;
}
L360: L360:
PRMTYP=PARMS[NPARMS]; prmtyp=PARMS[nparms];
SHFTXT(LNPOSN+2,PRMTYP-2); SHFTXT(LNPOSN+2,prmtyp-2);
if (PRMTYP == 0) goto L395; 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=LNPOSN+1;
} }
}
goto L395; goto L395;
L380: L380:
SHFTXT(LNPOSN+2,-2); SHFTXT(LNPOSN+2,-2);
state=0; state = 0;
casemake= -1; casemake = -1;
if (PRMTYP == 31) if (prmtyp == 31)
casemake=1; casemake=1;
if (PRMTYP == 33) if (prmtyp == 33)
casemake=0; casemake=0;
I=LNPOSN; i = LNPOSN;
PUTTXT(PARMS[NPARMS],state,casemake); PUTTXT(PARMS[nparms],state,casemake);
{long x = NPARMS+1; PUTTXT(PARMS[x],state,casemake);} PUTTXT(PARMS[nparms+1],state,casemake);
if (PRMTYP == 13 && INLINE[I] >= 37 && INLINE[I] <= if (prmtyp == 13 && INLINE[i] >= 37 && INLINE[i] <= 62)
62)INLINE[I]=INLINE[I]-26; INLINE[i] -= 26;
NPARMS=NPARMS+2; nparms = nparms+2;
goto L32; goto L32;
L40: L40:
@ -132,9 +134,9 @@ L40:
TYPE0(); TYPE0();
blank=false; blank=false;
TYPE(); TYPE();
K=L+1; msg = nxt + 1;
if (LINES[K] >= 0) } while
goto L10; (LINES[msg] >= 0);
} }
void PSPEAK(vocab_t msg,int skip) void PSPEAK(vocab_t msg,int skip)
@ -555,11 +557,10 @@ void CARRY(long object, long where)
return; return;
} }
temp=game.atloc[where]; temp=game.atloc[where];
L7: if (game.link[temp] == object) while (game.link[temp] != object) {
goto L8;
temp=game.link[temp]; temp=game.link[temp];
goto L7; }
L8: game.link[temp]=game.link[object]; game.link[temp]=game.link[object];
} }
void DROP(long object, long where) void DROP(long object, long where)