archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Macro elimination - easy cases first. No logic changes.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-02 16:20:40 -04:00
parent d402e09411
commit 63f53c026d
2 changed files with 123 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

90
advent.h
View file

@ -20,73 +20,55 @@ extern lcg_state lcgstate;
#define READ_MODE "rb" #define READ_MODE "rb"
#define WRITE_MODE "wb" #define WRITE_MODE "wb"
extern void fSPEAK(long); extern void SPEAK(long);
#define SPEAK(N) fSPEAK(N) extern void PSPEAK(long,long);
extern void fPSPEAK(long,long); extern void RSPEAK(long);
#define PSPEAK(MSG,SKIP) fPSPEAK(MSG,SKIP) extern void SETPRM(long,long,long);
extern void fRSPEAK(long);
#define RSPEAK(I) fRSPEAK(I)
extern void fSETPRM(long,long,long);
#define SETPRM(FIRST,P1,P2) fSETPRM(FIRST,P1,P2)
extern bool fGETIN(FILE *,long*,long*,long*,long*); extern bool fGETIN(FILE *,long*,long*,long*,long*);
#define GETIN(input,WORD1,WORD1X,WORD2,WORD2X) fGETIN(input,&WORD1,&WORD1X,&WORD2,&WORD2X) #define GETIN(input,WORD1,WORD1X,WORD2,WORD2X) fGETIN(input,&WORD1,&WORD1X,&WORD2,&WORD2X)
extern long fYES(FILE *,long,long,long);
#define YES(input,X,Y,Z) fYES(input,X,Y,Z) extern long YES(FILE *,long,long,long);
extern long fGETNUM(FILE *); extern long GETNUM(FILE *);
#define GETNUM(K) fGETNUM(K) extern long GETTXT(long,long,long);
extern long fGETTXT(long,long,long); extern long MAKEWD(long);
#define GETTXT(SKIP,ONEWRD,UPPER) fGETTXT(SKIP,ONEWRD,UPPER)
extern long fMAKEWD(long);
#define MAKEWD(LETTRS) fMAKEWD(LETTRS)
extern void fPUTTXT(long,long*,long); extern void fPUTTXT(long,long*,long);
#define PUTTXT(WORD,STATE,CASE) fPUTTXT(WORD,&STATE,CASE) #define PUTTXT(WORD,STATE,CASE) fPUTTXT(WORD,&STATE,CASE)
extern void fSHFTXT(long,long);
#define SHFTXT(FROM,DELTA) fSHFTXT(FROM,DELTA) extern void SHFTXT(long,long);
extern void fTYPE0(); extern void TYPE0();
#define TYPE0() fTYPE0()
extern void fSAVWDS(long*,long*,long*,long*,long*,long*,long*); extern void fSAVWDS(long*,long*,long*,long*,long*,long*,long*);
#define SAVWDS(W1,W2,W3,W4,W5,W6,W7) fSAVWDS(&W1,&W2,&W3,&W4,&W5,&W6,&W7) #define SAVWDS(W1,W2,W3,W4,W5,W6,W7) fSAVWDS(&W1,&W2,&W3,&W4,&W5,&W6,&W7)
extern void fSAVARR(long*,long); extern void fSAVARR(long*,long);
#define SAVARR(ARR,N) fSAVARR(ARR,N) #define SAVARR(ARR,N) fSAVARR(ARR,N)
extern void fSAVWRD(long,long*); extern void fSAVWRD(long,long*);
#define SAVWRD(OP,WORD) fSAVWRD(OP,&WORD) #define SAVWRD(OP,WORD) fSAVWRD(OP,&WORD)
extern long fVOCAB(long,long);
#define VOCAB(ID,INIT) fVOCAB(ID,INIT) extern long VOCAB(long,long);
extern void fDSTROY(long); extern void DSTROY(long);
#define DSTROY(OBJECT) fDSTROY(OBJECT) extern void JUGGLE(long);
extern void fJUGGLE(long); extern void MOVE(long,long);
#define JUGGLE(OBJECT) fJUGGLE(OBJECT) extern long PUT(long,long,long);
extern void fMOVE(long,long); extern void CARRY(long,long);
#define MOVE(OBJECT,WHERE) fMOVE(OBJECT,WHERE) extern void DROP(long,long);
extern long fPUT(long,long,long); extern long ATDWRF(long);
#define PUT(OBJECT,WHERE,PVAL) fPUT(OBJECT,WHERE,PVAL) extern long SETBIT(long);
extern void fCARRY(long,long); extern long TSTBIT(long,long);
#define CARRY(OBJECT,WHERE) fCARRY(OBJECT,WHERE) extern long RNDVOC(long,long);
extern void fDROP(long,long); extern void BUG(long);
#define DROP(OBJECT,WHERE) fDROP(OBJECT,WHERE) extern void MAPLIN(FILE *);
extern long fATDWRF(long); extern void TYPE();
#define ATDWRF(WHERE) fATDWRF(WHERE) extern void MPINIT();
extern long fSETBIT(long);
#define SETBIT(BIT) fSETBIT(BIT)
extern long fTSTBIT(long,long);
#define TSTBIT(MASK,BIT) fTSTBIT(MASK,BIT)
extern long fRNDVOC(long,long);
#define RNDVOC(CHAR,FORCE) fRNDVOC(CHAR,FORCE)
extern void fBUG(long);
#define BUG(NUM) fBUG(NUM)
extern void fMAPLIN(FILE *);
#define MAPLIN(FIL) fMAPLIN(FIL)
extern void fTYPE();
#define TYPE() fTYPE()
extern void fMPINIT();
#define MPINIT() fMPINIT()
extern void fSAVEIO(long,long,long*); extern void fSAVEIO(long,long,long*);
#define SAVEIO(OP,IN,ARR) fSAVEIO(OP,IN,ARR) #define SAVEIO(OP,IN,ARR) fSAVEIO(OP,IN,ARR)
extern void DATIME(long*, long*); extern void DATIME(long*, long*);
extern long fIABS(long);
#define IABS(N) fIABS(N) extern long IABS(long);
extern long fMOD(long,long); extern long MOD(long,long);
#define MOD(N,M) fMOD(N,M)
extern void set_seed(long); extern void set_seed(long);
extern unsigned long get_next_lcg_value(void); extern unsigned long get_next_lcg_value(void);
extern long randrange(long); extern long randrange(long);

294
misc.c
View file

@ -12,14 +12,12 @@
/* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */ /* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */
#undef SPEAK void SPEAK(long N) {
void fSPEAK(long N) {
long BLANK, CASE, I, K, L, NEG, NPARMS, PARM, PRMTYP, STATE; long BLANK, CASE, I, K, L, NEG, NPARMS, PARM, PRMTYP, STATE;
/* 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 BLKLIN is false. */ * unless BLKLIN is false. */
if(N == 0)return; if(N == 0)return;
BLANK=BLKLIN; BLANK=BLKLIN;
K=N; K=N;
@ -113,11 +111,7 @@ L40: if(BLANK)TYPE0();
return; return;
} }
void PSPEAK(long MSG,long SKIP) {
#define SPEAK(N) fSPEAK(N)
#undef PSPEAK
void fPSPEAK(long MSG,long SKIP) {
long I, M; long I, M;
/* Find the skip+1st message from msg and print it. MSG should be the index of /* Find the skip+1st message from msg and print it. MSG should be the index of
@ -135,12 +129,7 @@ L9: SPEAK(M);
return; return;
} }
void RSPEAK(long I) {
#define PSPEAK(MSG,SKIP) fPSPEAK(MSG,SKIP)
#undef RSPEAK
void fRSPEAK(long I) {
;
/* Print the I-TH "random" message (section 6 of database). */ /* Print the I-TH "random" message (section 6 of database). */
@ -150,10 +139,7 @@ void fRSPEAK(long I) {
} }
void SETPRM(long FIRST, long P1, long P2) {
#define RSPEAK(I) fRSPEAK(I)
#undef SETPRM
void fSETPRM(long FIRST, long P1, long P2) {
; ;
/* Stores parameters into the PRMCOM parms array for use by speak. P1 and P2 /* Stores parameters into the PRMCOM parms array for use by speak. P1 and P2
@ -167,8 +153,6 @@ void fSETPRM(long FIRST, long P1, long P2) {
} }
#define SETPRM(FIRST,P1,P2) fSETPRM(FIRST,P1,P2)
#undef GETIN #undef GETIN
#define WORD1 (*wORD1) #define WORD1 (*wORD1)
#define WORD1X (*wORD1X) #define WORD1X (*wORD1X)
@ -209,10 +193,9 @@ L22: JUNK=GETTXT(false,true,true);
#undef WORD2 #undef WORD2
#undef WORD2X #undef WORD2X
#define GETIN(SRC,WORD1,WORD1X,WORD2,WORD2X) fGETIN(SRC,&WORD1,&WORD1X,&WORD2,&WORD2X) #define GETIN(SRC,WORD1,WORD1X,WORD2,WORD2X) fGETIN(SRC,&WORD1,&WORD1X,&WORD2,&WORD2X)
#undef YES
long fYES(FILE *input, long X, long Y, long Z) {
long YES, REPLY, JUNK1, JUNK2, JUNK3; long YES(FILE *input, long X, long Y, long Z) {
long YEAH, REPLY, JUNK1, JUNK2, JUNK3;
/* Print message X, wait for yes/no answer. If yes, print Y and return true; /* Print message X, wait for yes/no answer. If yes, print Y and return true;
* if no, print Z and return false. */ * if no, print Z and return false. */
@ -223,31 +206,25 @@ L1: RSPEAK(X);
if(REPLY == MAKEWD(1415) || REPLY == MAKEWD(14)) goto L20; if(REPLY == MAKEWD(1415) || REPLY == MAKEWD(14)) goto L20;
RSPEAK(185); RSPEAK(185);
goto L1; goto L1;
L10: YES=true; L10: YEAH=true;
RSPEAK(Y); RSPEAK(Y);
return(YES); return(YEAH);
L20: YES=false; L20: YEAH=false;
RSPEAK(Z); RSPEAK(Z);
return(YES); return(YEAH);
} }
/* Line-parsing routines (GETNUM, GETTXT, MAKEWD, PUTTXT, SHFTXT, TYPE0) /* Line-parsing routines (GETNUM, GETTXT, MAKEWD, PUTTXT, SHFTXT, TYPE0)
*/ */
/* The routines on this page handle all the stuff that would normally be /* The routines on this page handle all the stuff that would normally be
* taken care of by format statements. We do it this way instead so that * taken care of by format statements. We do it this way instead so that
* we can handle textual data in a machine independent fashion. All the * we can handle textual data in a machine independent fashion. All the
* machine dependent i/o stuff is on the following page. See that page * machine dependent i/o stuff is on the following page. See that page
* for a description of MAPCOM's inline array. */ * for a description of MAPCOM's inline array. */
#define YES(X,Y,Z) fYES(X,Y,Z) long GETNUM(FILE *source) {
#undef GETNUM long DIGIT, NUMBER, SIGN;
long fGETNUM(FILE *source) {
long DIGIT, GETNUM, SIGN;
/* Obtain the next integer from an input line. If K>0, we first read a /* Obtain the next integer from an input line. If K>0, we first read a
* new input line from a file; if K<0, we read a line from the keyboard; * new input line from a file; if K<0, we read a line from the keyboard;
@ -257,8 +234,8 @@ long DIGIT, GETNUM, SIGN;
if(source != NULL)MAPLIN(source); if(source != NULL)MAPLIN(source);
GETNUM=0; NUMBER=0;
L10: if(LNPOSN > LNLENG)return(GETNUM); L10: if(LNPOSN > LNLENG)return(NUMBER);
if(INLINE[LNPOSN] != 0) goto L20; if(INLINE[LNPOSN] != 0) goto L20;
LNPOSN=LNPOSN+1; LNPOSN=LNPOSN+1;
goto L10; goto L10;
@ -270,66 +247,58 @@ L30: LNPOSN=LNPOSN+1;
L32: if(LNPOSN > LNLENG || INLINE[LNPOSN] == 0) goto L42; L32: if(LNPOSN > LNLENG || INLINE[LNPOSN] == 0) goto L42;
DIGIT=INLINE[LNPOSN]-64; DIGIT=INLINE[LNPOSN]-64;
if(DIGIT < 0 || DIGIT > 9) goto L40; if(DIGIT < 0 || DIGIT > 9) goto L40;
GETNUM=GETNUM*10+DIGIT; NUMBER=NUMBER*10+DIGIT;
goto L30; goto L30;
L40: GETNUM=0; L40: NUMBER=0;
L42: GETNUM=GETNUM*SIGN; L42: NUMBER=NUMBER*SIGN;
LNPOSN=LNPOSN+1; LNPOSN=LNPOSN+1;
return(GETNUM); return(NUMBER);
} }
long GETTXT(long SKIP,long ONEWRD, long UPPER) {
long CHAR, TEXT, I; static long SPLITTING = -1;
#define GETNUM(K) fGETNUM(K)
#undef GETTXT
long fGETTXT(long SKIP,long ONEWRD, long UPPER) {
long CHAR, GETTXT, I; static long SPLITTING = -1;
/* Take characters from an input line and pack them into 30-bit words. /* Take characters from an input line and pack them into 30-bit words.
* Skip says to skip leading blanks. ONEWRD says stop if we come to a * Skip says to skip leading blanks. ONEWRD says stop if we come to a
* blank. UPPER says to map all letters to uppercase. If we reach the * blank. UPPER says to map all letters to uppercase. If we reach the
* end of the line, the word is filled up with blanks (which encode as 0's). * end of the line, the word is filled up with blanks (which encode as 0's).
* If we're already at end of line when GETTXT is called, we return -1. */ * If we're already at end of line when TEXT is called, we return -1. */
if(LNPOSN != SPLITTING)SPLITTING = -1; if(LNPOSN != SPLITTING)SPLITTING = -1;
GETTXT= -1; TEXT= -1;
L10: if(LNPOSN > LNLENG)return(GETTXT); L10: if(LNPOSN > LNLENG)return(TEXT);
if((!SKIP) || INLINE[LNPOSN] != 0) goto L11; if((!SKIP) || INLINE[LNPOSN] != 0) goto L11;
LNPOSN=LNPOSN+1; LNPOSN=LNPOSN+1;
goto L10; goto L10;
L11: GETTXT=0; L11: TEXT=0;
/* 15 */ for (I=1; I<=5; I++) { /* 15 */ for (I=1; I<=5; I++) {
GETTXT=GETTXT*64; TEXT=TEXT*64;
if(LNPOSN > LNLENG || (ONEWRD && INLINE[LNPOSN] == 0)) goto L15; if(LNPOSN > LNLENG || (ONEWRD && INLINE[LNPOSN] == 0)) goto L15;
CHAR=INLINE[LNPOSN]; CHAR=INLINE[LNPOSN];
if(CHAR >= 63) goto L12; if(CHAR >= 63) goto L12;
SPLITTING = -1; SPLITTING = -1;
if(UPPER && CHAR >= 37)CHAR=CHAR-26; if(UPPER && CHAR >= 37)CHAR=CHAR-26;
GETTXT=GETTXT+CHAR; TEXT=TEXT+CHAR;
goto L14; goto L14;
L12: if(SPLITTING == LNPOSN) goto L13; L12: if(SPLITTING == LNPOSN) goto L13;
GETTXT=GETTXT+63; TEXT=TEXT+63;
SPLITTING = LNPOSN; SPLITTING = LNPOSN;
goto L15; goto L15;
L13: GETTXT=GETTXT+CHAR-63; L13: TEXT=TEXT+CHAR-63;
SPLITTING = -1; SPLITTING = -1;
L14: LNPOSN=LNPOSN+1; L14: LNPOSN=LNPOSN+1;
L15: /*etc*/ ; L15: /*etc*/ ;
} /* end loop */ } /* end loop */
return(GETTXT); return(TEXT);
} }
long MAKEWD(long LETTRS) {
long I, L, WORD;
#define GETTXT(SKIP,ONEWRD,UPPER) fGETTXT(SKIP,ONEWRD,UPPER)
#undef MAKEWD
long fMAKEWD(long LETTRS) {
long I, L, MAKEWD;
/* Combine five uppercase letters (represented by pairs of decimal digits /* Combine five uppercase letters (represented by pairs of decimal digits
* in lettrs) to form a 30-bit value matching the one that GETTXT would * in lettrs) to form a 30-bit value matching the one that GETTXT would
@ -339,23 +308,20 @@ long I, L, MAKEWD;
* the next pair of digits. */ * the next pair of digits. */
MAKEWD=0; WORD=0;
I=1; I=1;
L=LETTRS; L=LETTRS;
L10: MAKEWD=MAKEWD+I*(MOD(L,50)+10); L10: WORD=WORD+I*(MOD(L,50)+10);
I=I*64; I=I*64;
if(MOD(L,100) > 50)MAKEWD=MAKEWD+I*5; if(MOD(L,100) > 50)WORD=WORD+I*5;
L=L/100; L=L/100;
if(L != 0) goto L10; if(L != 0) goto L10;
I=64L*64L*64L*64L*64L/I; I=64L*64L*64L*64L*64L/I;
MAKEWD=MAKEWD*I; WORD=WORD*I;
return(MAKEWD); return(WORD);
} }
#define MAKEWD(LETTRS) fMAKEWD(LETTRS)
#undef PUTTXT
#define STATE (*sTATE) #define STATE (*sTATE)
void fPUTTXT(long WORD, long *sTATE, long CASE) { void fPUTTXT(long WORD, long *sTATE, long CASE) {
long ALPH1, ALPH2, BYTE, DIV, I, W; long ALPH1, ALPH2, BYTE, DIV, I, W;
@ -395,12 +361,10 @@ L18: W=(W-BYTE*DIV)*64;
return; return;
} }
#undef STATE #undef STATE
#define PUTTXT(WORD,STATE,CASE) fPUTTXT(WORD,&STATE,CASE) #define PUTTXT(WORD,STATE,CASE) fPUTTXT(WORD,&STATE,CASE)
#undef SHFTXT
void fSHFTXT(long FROM, long DELTA) { void SHFTXT(long FROM, long DELTA) {
long I, II, JJ; long I, II, JJ;
/* Move INLINE(N) to INLINE(N+DELTA) for N=FROM,LNLENG. Delta can be /* Move INLINE(N) to INLINE(N+DELTA) for N=FROM,LNLENG. Delta can be
@ -419,16 +383,11 @@ L2: LNLENG=LNLENG+DELTA;
} }
void TYPE0() {
#define SHFTXT(FROM,DELTA) fSHFTXT(FROM,DELTA)
#undef TYPE0
void fTYPE0() {
long TEMP; long TEMP;
/* Type a blank line. This procedure is provided as a convenience for callers /* Type a blank line. This procedure is provided as a convenience for callers
* who otherwise have no use for MAPCOM. */ * who otherwise have no use for MAPCOM. */
TEMP=LNLENG; TEMP=LNLENG;
LNLENG=0; LNLENG=0;
TYPE(); TYPE();
@ -436,11 +395,6 @@ long TEMP;
return; return;
} }
#define TYPE0() fTYPE0()
/* Suspend/resume I/O routines (SAVWDS, SAVARR, SAVWRD) */ /* Suspend/resume I/O routines (SAVWDS, SAVARR, SAVWRD) */
#undef SAVWDS #undef SAVWDS
@ -448,7 +402,6 @@ void fSAVWDS(long *W1, long *W2, long *W3, long *W4, long *W5, long *W6, long *W
/* Write or read 7 variables. See SAVWRD. */ /* Write or read 7 variables. See SAVWRD. */
SAVWRD(0,(*W1)); SAVWRD(0,(*W1));
SAVWRD(0,(*W2)); SAVWRD(0,(*W2));
SAVWRD(0,(*W3)); SAVWRD(0,(*W3));
@ -491,7 +444,6 @@ static long BUF[250], CKSUM = 0, H1, HASH = 0, N = 0, STATE = 0;
* poking within the saved file. When we finish reading/writing the file, * poking within the saved file. When we finish reading/writing the file,
* we store zero into WORD if there's no checksum error, else nonzero. */ * we store zero into WORD if there's no checksum error, else nonzero. */
if(OP != 0){long ifvar; ifvar=(STATE); switch (ifvar<0? -1 : ifvar>0? 1 : if(OP != 0){long ifvar; ifvar=(STATE); switch (ifvar<0? -1 : ifvar>0? 1 :
0) { case -1: goto L30; case 0: goto L10; case 1: goto L30; }} 0) { case -1: goto L30; case 0: goto L10; case 1: goto L30; }}
if(STATE == 0)return; if(STATE == 0)return;
@ -540,9 +492,9 @@ L32: N--; WORD=BUF[N]-CKSUM; N++;
#undef WORD #undef WORD
#define SAVWRD(OP,WORD) fSAVWRD(OP,&WORD) #define SAVWRD(OP,WORD) fSAVWRD(OP,&WORD)
#undef VOCAB
long fVOCAB(long ID, long INIT) { long VOCAB(long ID, long INIT) {
long I, VOCAB; long I, LEXEME;
/* Look up ID in the vocabulary (ATAB) and return its "definition" (KTAB), or /* Look up ID in the vocabulary (ATAB) and return its "definition" (KTAB), or
* -1 if not found. If INIT is positive, this is an initialisation call setting * -1 if not found. If INIT is positive, this is an initialisation call setting
@ -559,40 +511,28 @@ L1: /*etc*/ ;
} /* end loop */ } /* end loop */
BUG(21); BUG(21);
L2: VOCAB= -1; L2: LEXEME= -1;
if(INIT < 0)return(VOCAB); if(INIT < 0)return(LEXEME);
BUG(5); BUG(5);
L3: VOCAB=KTAB[I]; L3: LEXEME=KTAB[I];
if(INIT >= 0)VOCAB=MOD(VOCAB,1000); if(INIT >= 0)LEXEME=MOD(LEXEME,1000);
return(VOCAB); return(LEXEME);
} }
void DSTROY(long OBJECT) {
#define VOCAB(ID,INIT) fVOCAB(ID,INIT)
#undef DSTROY
void fDSTROY(long OBJECT) {
;
/* Permanently eliminate "OBJECT" by moving to a non-existent location. */ /* Permanently eliminate "OBJECT" by moving to a non-existent location. */
MOVE(OBJECT,0); MOVE(OBJECT,0);
return; return;
} }
void JUGGLE(long OBJECT) {
#define DSTROY(OBJECT) fDSTROY(OBJECT)
#undef JUGGLE
void fJUGGLE(long OBJECT) {
long I, J; long I, J;
/* Juggle an object by picking it up and putting it down again, the purpose /* Juggle an object by picking it up and putting it down again, the purpose
* being to get the object to the front of the chain of things at its loc. */ * being to get the object to the front of the chain of things at its loc. */
I=PLACE[OBJECT]; I=PLACE[OBJECT];
J=FIXED[OBJECT]; J=FIXED[OBJECT];
MOVE(OBJECT,I); MOVE(OBJECT,I);
@ -600,11 +540,7 @@ long I, J;
return; return;
} }
void MOVE(long OBJECT, long WHERE) {
#define JUGGLE(OBJECT) fJUGGLE(OBJECT)
#undef MOVE
void fMOVE(long OBJECT, long WHERE) {
long FROM; long FROM;
/* Place any object anywhere by picking it up and dropping it. May already be /* Place any object anywhere by picking it up and dropping it. May already be
@ -621,34 +557,24 @@ L2: if(FROM > 0 && FROM <= 300)CARRY(OBJECT,FROM);
return; return;
} }
long PUT(long OBJECT, long WHERE, long PVAL) {
long X;
#define MOVE(OBJECT,WHERE) fMOVE(OBJECT,WHERE)
#undef PUT
long fPUT(long OBJECT, long WHERE, long PVAL) {
long PUT;
/* PUT is the same as MOVE, except it returns a value used to set up the /* PUT is the same as MOVE, except it returns a value used to set up the
* negated PROP values for the repository objects. */ * negated PROP values for the repository objects. */
MOVE(OBJECT,WHERE); MOVE(OBJECT,WHERE);
PUT=(-1)-PVAL; X=(-1)-PVAL;
return(PUT); return(X);
} }
void CARRY(long OBJECT, long WHERE) {
#define PUT(OBJECT,WHERE,PVAL) fPUT(OBJECT,WHERE,PVAL)
#undef CARRY
void fCARRY(long OBJECT, long WHERE) {
long TEMP; long TEMP;
/* Start toting an object, removing it from the list of things at its former /* Start toting an object, removing it from the list of things at its former
* location. Incr holdng unless it was already being toted. If OBJECT>100 * location. Incr holdng unless it was already being toted. If OBJECT>100
* (moving "fixed" second loc), don't change PLACE or HOLDNG. */ * (moving "fixed" second loc), don't change PLACE or HOLDNG. */
if(OBJECT > 100) goto L5; if(OBJECT > 100) goto L5;
if(PLACE[OBJECT] == -1)return; if(PLACE[OBJECT] == -1)return;
PLACE[OBJECT]= -1; PLACE[OBJECT]= -1;
@ -664,17 +590,10 @@ L8: LINK[TEMP]=LINK[OBJECT];
return; return;
} }
void DROP(long OBJECT, long WHERE) {
#define CARRY(OBJECT,WHERE) fCARRY(OBJECT,WHERE)
#undef DROP
void fDROP(long OBJECT, long WHERE) {
;
/* Place an object at a given loc, prefixing it onto the ATLOC list. Decr /* Place an object at a given loc, prefixing it onto the ATLOC list. Decr
* HOLDNG if the object was being toted. */ * HOLDNG if the object was being toted. */
if(OBJECT > 100) goto L1; if(OBJECT > 100) goto L1;
if(PLACE[OBJECT] == -1)HOLDNG=HOLDNG-1; if(PLACE[OBJECT] == -1)HOLDNG=HOLDNG-1;
PLACE[OBJECT]=WHERE; PLACE[OBJECT]=WHERE;
@ -688,72 +607,52 @@ L2: if(WHERE <= 0)return;
#define DROP(OBJECT,WHERE) fDROP(OBJECT,WHERE) long ATDWRF(long WHERE) {
#undef ATDWRF long AT, I;
long fATDWRF(long WHERE) {
long ATDWRF, I;
/* Return the index of first dwarf at the given location, zero if no dwarf is /* Return the index of first dwarf at the given location, zero if no dwarf is
* there (or if dwarves not active yet), -1 if all dwarves are dead. Ignore * there (or if dwarves not active yet), -1 if all dwarves are dead. Ignore
* the pirate (6th dwarf). */ * the pirate (6th dwarf). */
ATDWRF=0; AT=0;
if(DFLAG < 2)return(ATDWRF); if(DFLAG < 2)return(AT);
ATDWRF= -1; AT= -1;
for (I=1; I<=5; I++) { for (I=1; I<=5; I++) {
if(DLOC[I] == WHERE) goto L2; if(DLOC[I] == WHERE) goto L2;
if(DLOC[I] != 0)ATDWRF=0; if(DLOC[I] != 0)AT=0;
} /* end loop */ } /* end loop */
return(ATDWRF); return(AT);
L2: ATDWRF=I; L2: AT=I;
return(ATDWRF); return(AT);
} }
#define ATDWRF(WHERE) fATDWRF(WHERE)
/* Utility routines (SETBIT, TSTBIT, set_seed, get_next_lcg_value, /* Utility routines (SETBIT, TSTBIT, set_seed, get_next_lcg_value,
* randrange, RNDVOC, BUG) */ * randrange, RNDVOC, BUG) */
#undef SETBIT long SETBIT(long BIT) {
long fSETBIT(long BIT) { long I, IND;
long I, SETBIT;
/* Returns 2**bit for use in constructing bit-masks. */ /* Returns 2**bit for use in constructing bit-masks. */
IND=1;
SETBIT=1; if(BIT <= 0)return(IND);
if(BIT <= 0)return(SETBIT);
for (I=1; I<=BIT; I++) { for (I=1; I<=BIT; I++) {
SETBIT=SETBIT+SETBIT; IND=IND+IND;
} /* end loop */ } /* end loop */
return(SETBIT); return(IND);
} }
#define SETBIT(BIT) fSETBIT(BIT) long TSTBIT(long MASK, long BIT) {
#undef TSTBIT
long fTSTBIT(long MASK, long BIT) {
long TSTBIT;
/* Returns true if the specified bit is set in the mask. */ /* Returns true if the specified bit is set in the mask. */
return(MOD(MASK/SETBIT(BIT),2) != 0);
TSTBIT=MOD(MASK/SETBIT(BIT),2) != 0;
return(TSTBIT);
} }
#define TSTBIT(MASK,BIT) fTSTBIT(MASK,BIT)
void set_seed(long seedval) void set_seed(long seedval)
{ {
lcgstate.x = (unsigned long) seedval % lcgstate.m; lcgstate.x = (unsigned long) seedval % lcgstate.m;
@ -774,23 +673,22 @@ long randrange(long range)
return(result); return(result);
} }
#undef RNDVOC long RNDVOC(long CHAR, long FORCE) {
long fRNDVOC(long CHAR, long FORCE) {
/* Searches the vocabulary for a word whose second character is char, and /* Searches the vocabulary for a word whose second character is char, and
* changes that word such that each of the other four characters is a * changes that word such that each of the other four characters is a
* random letter. If force is non-zero, it is used as the new word. * random letter. If force is non-zero, it is used as the new word.
* Returns the new word. */ * Returns the new word. */
long RNDVOC; long RND;
RNDVOC=FORCE; RND=FORCE;
if (RNDVOC == 0) { if (RND == 0) {
for (int I = 1; I <= 5; I++) { for (int I = 1; I <= 5; I++) {
long J = 11 + randrange(26); long J = 11 + randrange(26);
if (I == 2) if (I == 2)
J = CHAR; J = CHAR;
RNDVOC = RNDVOC * 64 + J; RND = RND * 64 + J;
} }
} }
@ -798,19 +696,15 @@ long fRNDVOC(long CHAR, long FORCE) {
for (int I = 1; I <= TABSIZ; I++) { for (int I = 1; I <= TABSIZ; I++) {
if (MOD(ATAB[I]/DIV, 64L) == CHAR) if (MOD(ATAB[I]/DIV, 64L) == CHAR)
{ {
ATAB[I] = RNDVOC; ATAB[I] = RND;
break; break;
} }
} }
return(RNDVOC); return(RND);
} }
void BUG(long NUM) {
#define RNDVOC(CHAR,FORCE) fRNDVOC(CHAR,FORCE)
#undef BUG
void fBUG(long NUM) {
/* The following conditions are currently considered fatal bugs. Numbers < 20 /* The following conditions are currently considered fatal bugs. Numbers < 20
* are detected while reading the database; the others occur at "run time". * are detected while reading the database; the others occur at "run time".
@ -848,9 +742,7 @@ void fBUG(long NUM) {
/* Machine dependent routines (MAPLIN, TYPE, MPINIT, SAVEIO) */ /* Machine dependent routines (MAPLIN, TYPE, MPINIT, SAVEIO) */
#define BUG(NUM) fBUG(NUM) void MAPLIN(FILE *OPENED) {
#undef MAPLIN
void fMAPLIN(FILE *OPENED) {
long I, VAL; long I, VAL;
/* Read a line of input, from the specified input source, /* Read a line of input, from the specified input source,
@ -904,17 +796,14 @@ long I, VAL;
LNPOSN=1; LNPOSN=1;
} }
} }
#define MAPLIN(FIL) fMAPLIN(FIL)
#undef TYPE void TYPE(void) {
void fTYPE(void) {
long I, VAL; long I, VAL;
/* Type the first "LNLENG" characters stored in inline, mapping them /* Type the first "LNLENG" characters stored in inline, mapping them
* from integers to text per the rules described above. INLINE(I), * from integers to text per the rules described above. INLINE(I),
* I=1,LNLENG may be changed by this routine. */ * I=1,LNLENG may be changed by this routine. */
if(LNLENG != 0) goto L10; if(LNLENG != 0) goto L10;
printf("\n"); printf("\n");
return; return;
@ -929,15 +818,10 @@ L10: if(MAP2[1] == 0)MPINIT();
return; return;
} }
void MPINIT(void) {
#define TYPE() fTYPE()
#undef MPINIT
void fMPINIT(void) {
long FIRST, I, J, LAST, VAL; long FIRST, I, J, LAST, VAL;
static long RUNS[7][2] = { {32,34}, {39,46}, {65,90}, {97,122}, {37,37}, {48,57}, {0,126} }; static long RUNS[7][2] = { {32,34}, {39,46}, {65,90}, {97,122}, {37,37}, {48,57}, {0,126} };
for (I=1; I<=128; I++) { for (I=1; I<=128; I++) {
MAP1[I]= -1; MAP1[I]= -1;
} /* end loop */ } /* end loop */
@ -967,9 +851,6 @@ L22: J--;
return; return;
} }
#define MPINIT() fMPINIT()
#undef SAVEIO #undef SAVEIO
void fSAVEIO(long OP, long IN, long ARR[]) { void fSAVEIO(long OP, long IN, long ARR[]) {
static FILE *F; char NAME[50]; static FILE *F; char NAME[50];
@ -1001,13 +882,12 @@ L30: if(IN)IGNORE(fread(ARR,sizeof(long),250,F));
} }
void DATIME(long* D, long* T) { void DATIME(long* D, long* T) {
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
*D = (long) tv.tv_sec; *D = (long) tv.tv_sec;
*T = (long) tv.tv_usec; *T = (long) tv.tv_usec;
} }
long fIABS(N)long N; {return(N<0? -N : N);}
long fMOD(N,M)long N, M; {return(N%M);} long IABS(N)long N; {return(N<0? -N : N);}
long MOD(N,M)long N, M; {return(N%M);}