More goto elimination.

This commit is contained in:
Eric S. Raymond 2017-06-12 08:03:10 -04:00
parent c04fa7e446
commit b0eb54b125

11
main.c
View file

@ -1017,11 +1017,11 @@ L2630:
switch (KQ-1) switch (KQ-1)
{ {
case 0: goto L8; case 0: goto L8;
case 1: part=unknown; obj = KMOD; goto Laction; case 1: part=unknown; obj = KMOD; break;
case 2: part=intransitive; VERB = KMOD; goto Laction; case 2: part=intransitive; VERB = KMOD; break;
case 3: RSPEAK(KMOD); goto L2012; case 3: RSPEAK(KMOD); goto L2012;
default: BUG(22);
} }
BUG(22);
Laction: Laction:
switch (action(cmdin, part, VERB, obj)) { switch (action(cmdin, part, VERB, obj)) {
@ -1050,8 +1050,11 @@ Laction:
RSPEAK(136); RSPEAK(136);
score(0); score(0);
return true; return true;
default:
BUG(99);
} }
BUG(99);
/* no fallthrough here */
/* Figure out the new location */ /* Figure out the new location */
L8: if (playermove(cmdin, VERB, KMOD)) L8: if (playermove(cmdin, VERB, KMOD))