X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=04792eb9c38fb3955cecaa2f1ce30ff0f65ee909;hp=a08720cbeb20b08cd7414d20eb743343bb3f1d83;hb=43aef9ceb16d0e2821c5ee81ea9d7c2f7ace84bb;hpb=2bc887c84efbcd9ea4ae589d29285bc187173e9a diff --git a/misc.c b/misc.c index a08720c..04792eb 100644 --- a/misc.c +++ b/misc.c @@ -1,24 +1,23 @@ #include #include #include -#include "main.h" -#include "share.h" /* for SETUP */ -#include "misc.h" +#include +#include +#include "advent.h" #include "funcs.h" +#include "database.h" /* hack to ignore GCC Unused Result */ #define IGNORE(r) do{if(r){}}while(0) /* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */ -#undef SPEAK -void fSPEAK(long N) { +void SPEAK(long N) { 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 * unless BLKLIN is false. */ - if(N == 0)return; BLANK=BLKLIN; K=N; @@ -29,7 +28,7 @@ L10: L=IABS(LINES[K])-1; LNPOSN=1; STATE=0; for (I=K; I<=L; I++) { - PUTTXT(LINES[I],STATE,2,I); + PUTTXT(LINES[I],STATE,2); } /* end loop */ LNPOSN=0; L30: LNPOSN=LNPOSN+1; @@ -78,7 +77,7 @@ L340: SHFTXT(LNPOSN+2,-2); CASE=2; L345: if(PARMS[NPARMS] < 0) goto L395; {long x = NPARMS+1; if(PARMS[x] < 0)CASE=0;} - PUTTXT(PARMS[NPARMS],STATE,CASE,0); + PUTTXT(PARMS[NPARMS],STATE,CASE); NPARMS=NPARMS+1; goto L345; @@ -97,8 +96,8 @@ L380: SHFTXT(LNPOSN+2,-2); if(PRMTYP == 31)CASE=1; if(PRMTYP == 33)CASE=0; I=LNPOSN; - PUTTXT(PARMS[NPARMS],STATE,CASE,0); - {long x = NPARMS+1; PUTTXT(PARMS[x],STATE,CASE,0);} + PUTTXT(PARMS[NPARMS],STATE,CASE); + {long x = NPARMS+1; PUTTXT(PARMS[x],STATE,CASE);} if(PRMTYP == 13 && INLINE[I] >= 37 && INLINE[I] <= 62)INLINE[I]=INLINE[I]-26; NPARMS=NPARMS+2; @@ -112,11 +111,7 @@ L40: if(BLANK)TYPE0(); return; } - - -#define SPEAK(N) fSPEAK(N) -#undef PSPEAK -void fPSPEAK(long MSG,long SKIP) { +void PSPEAK(long MSG,long SKIP) { long I, M; /* Find the skip+1st message from msg and print it. MSG should be the index of @@ -134,12 +129,7 @@ L9: SPEAK(M); return; } - - -#define PSPEAK(MSG,SKIP) fPSPEAK(MSG,SKIP) -#undef RSPEAK -void fRSPEAK(long I) { -; +void RSPEAK(long I) { /* Print the I-TH "random" message (section 6 of database). */ @@ -149,10 +139,7 @@ void fRSPEAK(long I) { } - -#define RSPEAK(I) fRSPEAK(I) -#undef SETPRM -void fSETPRM(long FIRST, long P1, long P2) { +void SETPRM(long FIRST, long P1, long P2) { ; /* Stores parameters into the PRMCOM parms array for use by speak. P1 and P2 @@ -166,14 +153,12 @@ void fSETPRM(long FIRST, long P1, long P2) { } - -#define SETPRM(FIRST,P1,P2) fSETPRM(FIRST,P1,P2) #undef GETIN #define WORD1 (*wORD1) #define WORD1X (*wORD1X) #define WORD2 (*wORD2) #define WORD2X (*wORD2X) -void fGETIN(FILE *input, long *wORD1, long *wORD1X, long *wORD2, long *wORD2X) { +bool fGETIN(FILE *input, long *wORD1, long *wORD1X, long *wORD2, long *wORD2X) { long JUNK; /* Get a command from the adventurer. Snarf out the first word, pad it with @@ -185,17 +170,18 @@ long JUNK; L10: if(BLKLIN)TYPE0(); MAPLIN(input); - if(input == stdin && feof(stdin)) score(1); - WORD1=GETTXT(true,true,true,0); + if (feof(input)) + return false; + WORD1=GETTXT(true,true,true); if(BLKLIN && WORD1 < 0) goto L10; - WORD1X=GETTXT(false,true,true,0); -L12: JUNK=GETTXT(false,true,true,0); + WORD1X=GETTXT(false,true,true); +L12: JUNK=GETTXT(false,true,true); if(JUNK > 0) goto L12; - WORD2=GETTXT(true,true,true,0); - WORD2X=GETTXT(false,true,true,0); -L22: JUNK=GETTXT(false,true,true,0); + WORD2=GETTXT(true,true,true); + WORD2X=GETTXT(false,true,true); +L22: JUNK=GETTXT(false,true,true); if(JUNK > 0) goto L22; - if(GETTXT(true,true,true,0) <= 0)return; + if(GETTXT(true,true,true) <= 0)return true; RSPEAK(53); goto L10; } @@ -207,10 +193,9 @@ L22: JUNK=GETTXT(false,true,true,0); #undef WORD2 #undef 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; * if no, print Z and return false. */ @@ -221,31 +206,25 @@ L1: RSPEAK(X); if(REPLY == MAKEWD(1415) || REPLY == MAKEWD(14)) goto L20; RSPEAK(185); goto L1; -L10: YES=true; +L10: YEAH=true; RSPEAK(Y); - return(YES); -L20: YES=false; + return(YEAH); +L20: YEAH=false; RSPEAK(Z); - return(YES); + return(YEAH); } - - - /* Line-parsing routines (GETNUM, GETTXT, MAKEWD, PUTTXT, SHFTXT, TYPE0) */ - /* 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 * 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 * for a description of MAPCOM's inline array. */ -#define YES(X,Y,Z) fYES(X,Y,Z) -#undef GETNUM -long fGETNUM(FILE *source) { -long DIGIT, GETNUM, SIGN; +long GETNUM(FILE *source) { +long DIGIT, NUMBER, SIGN; /* 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; @@ -255,8 +234,8 @@ long DIGIT, GETNUM, SIGN; if(source != NULL)MAPLIN(source); - GETNUM=0; -L10: if(LNPOSN > LNLENG)return(GETNUM); + NUMBER=0; +L10: if(LNPOSN > LNLENG)return(NUMBER); if(INLINE[LNPOSN] != 0) goto L20; LNPOSN=LNPOSN+1; goto L10; @@ -268,103 +247,96 @@ L30: LNPOSN=LNPOSN+1; L32: if(LNPOSN > LNLENG || INLINE[LNPOSN] == 0) goto L42; DIGIT=INLINE[LNPOSN]-64; if(DIGIT < 0 || DIGIT > 9) goto L40; - GETNUM=GETNUM*10+DIGIT; + NUMBER=NUMBER*10+DIGIT; goto L30; -L40: GETNUM=0; -L42: GETNUM=GETNUM*SIGN; +L40: NUMBER=0; +L42: NUMBER=NUMBER*SIGN; LNPOSN=LNPOSN+1; - return(GETNUM); + return(NUMBER); } - - -#define GETNUM(K) fGETNUM(K) -#undef GETTXT -long fGETTXT(long SKIP,long ONEWRD, long UPPER, long HASH) { -long CHAR, GETTXT, I; static long SPLITTING = -1; - +long GETTXT(long SKIP,long ONEWRD, long UPPER) { /* 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 - * blank. UPPER says to map all letters to uppercase. HASH may be used - * as a parameter for encrypting the text if desired; however, a hash of 0 - * should result in unmodified bytes being packed. 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). - * If we're already at end of line when GETTXT is called, we return -1. */ - - if(LNPOSN != SPLITTING)SPLITTING = -1; - GETTXT= -1; -L10: if(LNPOSN > LNLENG)return(GETTXT); - if((!SKIP) || INLINE[LNPOSN] != 0) goto L11; - LNPOSN=LNPOSN+1; - goto L10; - -L11: GETTXT=0; - /* 15 */ for (I=1; I<=5; I++) { - GETTXT=GETTXT*64; - if(LNPOSN > LNLENG || (ONEWRD && INLINE[LNPOSN] == 0)) goto L15; - CHAR=INLINE[LNPOSN]; - if(CHAR >= 63) goto L12; - SPLITTING = -1; - if(UPPER && CHAR >= 37)CHAR=CHAR-26; - GETTXT=GETTXT+CHAR; - goto L14; - -L12: if(SPLITTING == LNPOSN) goto L13; - GETTXT=GETTXT+63; - SPLITTING = LNPOSN; - goto L15; - -L13: GETTXT=GETTXT+CHAR-63; - SPLITTING = -1; -L14: LNPOSN=LNPOSN+1; -L15: /*etc*/ ; - } /* end loop */ - - if(HASH)GETTXT=GETTXT+MOD(HASH*13579L+5432L,97531L)*12345L+HASH; - return(GETTXT); -} - - - -#define GETTXT(SKIP,ONEWRD,UPPER,HASH) fGETTXT(SKIP,ONEWRD,UPPER,HASH) -#undef MAKEWD -long fMAKEWD(long LETTRS) { -long I, L, MAKEWD; + * If we're already at end of line when TEXT is called, we return -1. */ + + long TEXT; + static long SPLITTING = -1; + + if(LNPOSN != SPLITTING) + SPLITTING = -1; + TEXT= -1; + while (true) { + if(LNPOSN > LNLENG) + return(TEXT); + if((!SKIP) || INLINE[LNPOSN] != 0) + break; + LNPOSN=LNPOSN+1; + } + + TEXT=0; + for (int I=1; I<=5; I++) { + TEXT=TEXT*64; + if(LNPOSN > LNLENG || (ONEWRD && INLINE[LNPOSN] == 0)) + continue; + char current=INLINE[LNPOSN]; + if(current < 63) { + SPLITTING = -1; + if(UPPER && current >= 37) + current=current-26; + TEXT=TEXT+current; + LNPOSN=LNPOSN+1; + continue; + } + if(SPLITTING != LNPOSN) { + TEXT=TEXT+63; + SPLITTING = LNPOSN; + continue; + } + + TEXT=TEXT+current-63; + SPLITTING = -1; + LNPOSN=LNPOSN+1; + } + + return(TEXT); +} + +long MAKEWD(long LETTRS) { +long I, L, WORD; /* Combine five uppercase letters (represented by pairs of decimal digits * in lettrs) to form a 30-bit value matching the one that GETTXT would - * return given those characters plus trailing blanks and HASH=0. Caution: + * return given those characters plus trailing blanks. Caution: * lettrs will overflow 31 bits if 5-letter word starts with V-Z. As a * kludgey workaround, you can increment a letter by 5 by adding 50 to * the next pair of digits. */ - MAKEWD=0; + WORD=0; I=1; L=LETTRS; -L10: MAKEWD=MAKEWD+I*(MOD(L,50)+10); +L10: WORD=WORD+I*(MOD(L,50)+10); I=I*64; - if(MOD(L,100) > 50)MAKEWD=MAKEWD+I*5; + if(MOD(L,100) > 50)WORD=WORD+I*5; L=L/100; if(L != 0) goto L10; I=64L*64L*64L*64L*64L/I; - MAKEWD=MAKEWD*I; - return(MAKEWD); + WORD=WORD*I; + return(WORD); } - -#define MAKEWD(LETTRS) fMAKEWD(LETTRS) -#undef PUTTXT #define STATE (*sTATE) -void fPUTTXT(long WORD, long *sTATE, long CASE, long HASH) { +void fPUTTXT(long WORD, long *sTATE, long CASE) { long ALPH1, ALPH2, BYTE, DIV, I, W; /* Unpack the 30-bit value in word to obtain up to 5 integer-encoded chars, * and store them in inline starting at LNPOSN. If LNLENG>=LNPOSN, shift - * existing characters to the right to make room. HASH must be the same - * as it was when gettxt created the 30-bit word. STATE will be zero when + * existing characters to the right to make room. STATE will be zero when * puttxt is called with the first of a sequence of words, but is thereafter * unchanged by the caller, so PUTTXT can use it to maintain state across * calls. LNPOSN and LNLENG are incremented by the number of chars stored. @@ -379,7 +351,6 @@ long ALPH1, ALPH2, BYTE, DIV, I, W; /* ALPH1&2 DEFINE RANGE OF WRONG-CASE CHARS, 11-36 OR 37-62 OR EMPTY. */ DIV=64L*64L*64L*64L; W=WORD; - if(HASH)W=W-MOD(HASH*13579L+5432L,97531L)*12345L-HASH; /* 18 */ for (I=1; I<=5; I++) { if(W <= 0 && STATE == 0 && IABS(CASE) <= 1)return; BYTE=W/DIV; @@ -398,12 +369,10 @@ L18: W=(W-BYTE*DIV)*64; return; } - - #undef STATE -#define PUTTXT(WORD,STATE,CASE,HASH) fPUTTXT(WORD,&STATE,CASE,HASH) -#undef SHFTXT -void fSHFTXT(long FROM, long DELTA) { +#define PUTTXT(WORD,STATE,CASE) fPUTTXT(WORD,&STATE,CASE) + +void SHFTXT(long FROM, long DELTA) { long I, II, JJ; /* Move INLINE(N) to INLINE(N+DELTA) for N=FROM,LNLENG. Delta can be @@ -422,16 +391,11 @@ L2: LNLENG=LNLENG+DELTA; } - -#define SHFTXT(FROM,DELTA) fSHFTXT(FROM,DELTA) -#undef TYPE0 -void fTYPE0() { +void TYPE0() { long TEMP; - /* Type a blank line. This procedure is provided as a convenience for callers * who otherwise have no use for MAPCOM. */ - TEMP=LNLENG; LNLENG=0; TYPE(); @@ -439,11 +403,6 @@ long TEMP; return; } - - -#define TYPE0() fTYPE0() - - /* Suspend/resume I/O routines (SAVWDS, SAVARR, SAVWRD) */ #undef SAVWDS @@ -451,7 +410,6 @@ void fSAVWDS(long *W1, long *W2, long *W3, long *W4, long *W5, long *W6, long *W /* Write or read 7 variables. See SAVWRD. */ - SAVWRD(0,(*W1)); SAVWRD(0,(*W2)); SAVWRD(0,(*W3)); @@ -494,7 +452,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, * 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 : 0) { case -1: goto L30; case 0: goto L10; case 1: goto L30; }} if(STATE == 0)return; @@ -543,9 +500,9 @@ L32: N--; WORD=BUF[N]-CKSUM; N++; #undef WORD #define SAVWRD(OP,WORD) fSAVWRD(OP,&WORD) -#undef VOCAB -long fVOCAB(long ID, long INIT) { -long HASH, I, VOCAB; + +long VOCAB(long ID, long INIT) { +long I, LEXEME; /* 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 @@ -554,50 +511,36 @@ long HASH, I, VOCAB; * (Thus "STEPS", which is a motion verb as well as an object, may be located * as an object.) And it also means the KTAB value is taken modulo 1000. */ - HASH=10000; /* 1 */ for (I=1; I<=TABSIZ; I++) { if(KTAB[I] == -1) goto L2; - HASH=HASH+7; if(INIT >= 0 && KTAB[I]/1000 != INIT) goto L1; - if(ATAB[I] == ID+HASH*HASH) goto L3; + if(ATAB[I] == ID) goto L3; L1: /*etc*/ ; } /* end loop */ BUG(21); -L2: VOCAB= -1; - if(INIT < 0)return(VOCAB); +L2: LEXEME= -1; + if(INIT < 0)return(LEXEME); BUG(5); -L3: VOCAB=KTAB[I]; - if(INIT >= 0)VOCAB=MOD(VOCAB,1000); - return(VOCAB); +L3: LEXEME=KTAB[I]; + if(INIT >= 0)LEXEME=MOD(LEXEME,1000); + return(LEXEME); } - - -#define VOCAB(ID,INIT) fVOCAB(ID,INIT) -#undef DSTROY -void fDSTROY(long OBJECT) { -; - +void DSTROY(long OBJECT) { /* Permanently eliminate "OBJECT" by moving to a non-existent location. */ - MOVE(OBJECT,0); return; } - - -#define DSTROY(OBJECT) fDSTROY(OBJECT) -#undef JUGGLE -void fJUGGLE(long OBJECT) { +void JUGGLE(long OBJECT) { long I, J; /* 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. */ - I=PLACE[OBJECT]; J=FIXED[OBJECT]; MOVE(OBJECT,I); @@ -605,11 +548,7 @@ long I, J; return; } - - -#define JUGGLE(OBJECT) fJUGGLE(OBJECT) -#undef MOVE -void fMOVE(long OBJECT, long WHERE) { +void MOVE(long OBJECT, long WHERE) { long FROM; /* Place any object anywhere by picking it up and dropping it. May already be @@ -626,34 +565,24 @@ L2: if(FROM > 0 && FROM <= 300)CARRY(OBJECT,FROM); return; } - - -#define MOVE(OBJECT,WHERE) fMOVE(OBJECT,WHERE) -#undef PUT -long fPUT(long OBJECT, long WHERE, long PVAL) { -long PUT; +long PUT(long OBJECT, long WHERE, long PVAL) { +long X; /* PUT is the same as MOVE, except it returns a value used to set up the * negated PROP values for the repository objects. */ - MOVE(OBJECT,WHERE); - PUT=(-1)-PVAL; - return(PUT); + X=(-1)-PVAL; + return(X); } - - -#define PUT(OBJECT,WHERE,PVAL) fPUT(OBJECT,WHERE,PVAL) -#undef CARRY -void fCARRY(long OBJECT, long WHERE) { +void CARRY(long OBJECT, long WHERE) { long TEMP; /* 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 * (moving "fixed" second loc), don't change PLACE or HOLDNG. */ - if(OBJECT > 100) goto L5; if(PLACE[OBJECT] == -1)return; PLACE[OBJECT]= -1; @@ -669,17 +598,10 @@ L8: LINK[TEMP]=LINK[OBJECT]; return; } - - -#define CARRY(OBJECT,WHERE) fCARRY(OBJECT,WHERE) -#undef DROP -void fDROP(long OBJECT, long WHERE) { -; - +void DROP(long OBJECT, long WHERE) { /* Place an object at a given loc, prefixing it onto the ATLOC list. Decr * HOLDNG if the object was being toted. */ - if(OBJECT > 100) goto L1; if(PLACE[OBJECT] == -1)HOLDNG=HOLDNG-1; PLACE[OBJECT]=WHERE; @@ -693,130 +615,92 @@ L2: if(WHERE <= 0)return; -#define DROP(OBJECT,WHERE) fDROP(OBJECT,WHERE) -#undef ATDWRF -long fATDWRF(long WHERE) { -long ATDWRF, I; +long ATDWRF(long WHERE) { +long AT, I; /* 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 * the pirate (6th dwarf). */ - ATDWRF=0; - if(DFLAG < 2)return(ATDWRF); - ATDWRF= -1; + AT=0; + if(DFLAG < 2)return(AT); + AT= -1; for (I=1; I<=5; I++) { if(DLOC[I] == WHERE) goto L2; - if(DLOC[I] != 0)ATDWRF=0; + if(DLOC[I] != 0)AT=0; } /* end loop */ - return(ATDWRF); + return(AT); -L2: ATDWRF=I; - return(ATDWRF); +L2: AT=I; + return(AT); } +/* Utility routines (SETBIT, TSTBIT, set_seed, get_next_lcg_value, + * randrange, RNDVOC, BUG) */ - - -#define ATDWRF(WHERE) fATDWRF(WHERE) - - - -/* Utility routines (SETBIT, TSTBIT, RAN, RNDVOC, BUG) */ - -#undef SETBIT -long fSETBIT(long BIT) { -long I, SETBIT; - +long SETBIT(long bit) { /* Returns 2**bit for use in constructing bit-masks. */ - - - SETBIT=1; - if(BIT <= 0)return(SETBIT); - for (I=1; I<=BIT; I++) { - SETBIT=SETBIT+SETBIT; - } /* end loop */ - return(SETBIT); + 2 << bit; } - - -#define SETBIT(BIT) fSETBIT(BIT) -#undef TSTBIT -long fTSTBIT(long MASK, long BIT) { -long TSTBIT; - +bool TSTBIT(long mask, int bit) { /* Returns true if the specified bit is set in the mask. */ - - - TSTBIT=MOD(MASK/SETBIT(BIT),2) != 0; - return(TSTBIT); + return((mask & (1 << bit)) != 0); } - - -#define TSTBIT(MASK,BIT) fTSTBIT(MASK,BIT) -#undef RAN -long fRAN(long RANGE) { -static long D, R = 0, RAN, T; - -/* Since the ran function in LIB40 seems to be a real lose, we'll use one of - * our own. It's been run through many of the tests in Knuth vol. 2 and - * seems to be quite reliable. RAN returns a value uniformly selected - * between 0 and range-1. */ - - - D=1; - if(R != 0 && RANGE >= 0) goto L1; - DATIME(D,T); - R=MOD(T+5,1048576L); - D=1000+MOD(D,1000); -L1: for (T=1; T<=D; T++) { - R=MOD(R*1093L+221587L,1048576L); - } /* end loop */ - RAN=(RANGE*R)/1048576; - return(RAN); +void set_seed(long seedval) +{ + lcgstate.x = (unsigned long) seedval % lcgstate.m; } +unsigned long get_next_lcg_value(void) +{ + /* Return the LCG's current value, and then iterate it. */ + unsigned long old_x = lcgstate.x; + lcgstate.x = (lcgstate.a * lcgstate.x + lcgstate.c) % lcgstate.m; + return(old_x); +} +long randrange(long range) +{ + /* Return a random integer from [0, range). */ + long result = range * get_next_lcg_value() / lcgstate.m; + return(result); +} -#define RAN(RANGE) fRAN(RANGE) -#undef RNDVOC -long fRNDVOC(long CHAR, long FORCE) { -long DIV, I, J, RNDVOC; - +long RNDVOC(long CHAR, long FORCE) { /* 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 * random letter. If force is non-zero, it is used as the new word. * Returns the new word. */ + long RND; - RNDVOC=FORCE; - if(RNDVOC != 0) goto L3; - for (I=1; I<=5; I++) { - J=11+RAN(26); - if(I == 2)J=CHAR; - RNDVOC=RNDVOC*64+J; - } /* end loop */ -L3: J=10000; - DIV=64L*64L*64L; - for (I=1; I<=TABSIZ; I++) { - J=J+7; - if(MOD((ATAB[I]-J*J)/DIV,64L) == CHAR) goto L8; - /*etc*/ ; - } /* end loop */ - BUG(5); + RND=FORCE; -L8: ATAB[I]=RNDVOC+J*J; - return(RNDVOC); -} + if (RND == 0) { + for (int I = 1; I <= 5; I++) { + long J = 11 + randrange(26); + if (I == 2) + J = CHAR; + RND = RND * 64 + J; + } + } + long DIV = 64L * 64L * 64L; + for (int I = 1; I <= TABSIZ; I++) { + if (MOD(ATAB[I]/DIV, 64L) == CHAR) + { + ATAB[I] = RND; + break; + } + } + return(RND); +} -#define RNDVOC(CHAR,FORCE) fRNDVOC(CHAR,FORCE) -#undef BUG -void fBUG(long NUM) { +void BUG(long NUM) { /* The following conditions are currently considered fatal bugs. Numbers < 20 * are detected while reading the database; the others occur at "run time". @@ -854,9 +738,7 @@ void fBUG(long NUM) { /* Machine dependent routines (MAPLIN, TYPE, MPINIT, SAVEIO) */ -#define BUG(NUM) fBUG(NUM) -#undef MAPLIN -void fMAPLIN(FILE *OPENED) { +void MAPLIN(FILE *OPENED) { long I, VAL; /* Read a line of input, from the specified input source, @@ -886,19 +768,23 @@ long I, VAL; if(MAP2[1] == 0)MPINIT(); - if (!oldstyle && SETUP) - fputs("> ", stdout); - IGNORE(fgets(INLINE+1,sizeof(INLINE)-1,OPENED)); + if (!oldstyle && SETUP && OPENED == stdin) + fputs("> ", stdout); + do { + IGNORE(fgets(rawbuf,sizeof(rawbuf)-1,OPENED)); + } while + (!feof(OPENED) && rawbuf[0] == '#'); if (feof(OPENED)) { - if (logfp) + if (logfp && OPENED == stdin) fclose(logfp); } else { - if (logfp) - IGNORE(fputs(INLINE+1, logfp)); + if (logfp && OPENED == stdin) + IGNORE(fputs(rawbuf, logfp)); else if (!isatty(0)) - IGNORE(fputs(INLINE+1, stdout)); + IGNORE(fputs(rawbuf, stdout)); + strcpy(INLINE+1, rawbuf); LNLENG=0; - for (I=1; I<=sizeof(INLINE) && INLINE[I]!=0; I++) { + for (I=1; I<=(long)sizeof(INLINE) && INLINE[I]!=0; I++) { VAL=INLINE[I]+1; INLINE[I]=MAP1[VAL]; if(INLINE[I] != 0)LNLENG=I; @@ -906,17 +792,14 @@ long I, VAL; LNPOSN=1; } } -#define MAPLIN(FIL) fMAPLIN(FIL) -#undef TYPE -void fTYPE(void) { +void TYPE(void) { long I, VAL; /* Type the first "LNLENG" characters stored in inline, mapping them * from integers to text per the rules described above. INLINE(I), * I=1,LNLENG may be changed by this routine. */ - if(LNLENG != 0) goto L10; printf("\n"); return; @@ -931,14 +814,9 @@ L10: if(MAP2[1] == 0)MPINIT(); return; } - - -#define TYPE() fTYPE() -#undef MPINIT -void fMPINIT(void) { +void MPINIT(void) { 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++) { MAP1[I]= -1; @@ -969,9 +847,6 @@ L22: J--; return; } - - -#define MPINIT() fMPINIT() #undef SAVEIO void fSAVEIO(long OP, long IN, long ARR[]) { static FILE *F; char NAME[50]; @@ -1003,7 +878,12 @@ L30: if(IN)IGNORE(fread(ARR,sizeof(long),250,F)); } +void DATIME(long* D, long* T) { + struct timeval tv; + gettimeofday(&tv, NULL); + *D = (long) tv.tv_sec; + *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);}