X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=784ae534320d0acb01224a1c7ef463d7af8a6007;hb=62ee15c892eb1cd1e0333ff8d83888765923e1b4;hp=3aca465d0d5bd960095249db46e98449018057f2;hpb=44c444d6389d2342dca94f5fbe8c9de540a83c7b;p=open-adventure.git diff --git a/misc.c b/misc.c index 3aca465..784ae53 100644 --- a/misc.c +++ b/misc.c @@ -3,9 +3,7 @@ #include #include #include -#include "main.h" -#include "share.h" /* for SETUP */ -#include "misc.h" +#include "advent.h" #include "funcs.h" #include "database.h" @@ -14,19 +12,17 @@ /* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */ -#undef SPEAK -void fSPEAK(long N) { +void SPEAK(vocab_t 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. */ - + * unless game.blklin is false. */ if(N == 0)return; - BLANK=BLKLIN; + BLANK=game.blklin; K=N; NPARMS=1; -L10: L=IABS(LINES[K])-1; +L10: L=labs(LINES[K])-1; K=K+1; LNLENG=0; LNPOSN=1; @@ -56,7 +52,7 @@ L32: if(LNPOSN > LNLENG) goto L40; if(PRMTYP < 1 || PRMTYP > 9) goto L30; SHFTXT(LNPOSN+2,PRMTYP-2); LNPOSN=LNPOSN+PRMTYP; - PARM=IABS(PARMS[NPARMS]); + PARM=labs(PARMS[NPARMS]); NEG=0; if(PARMS[NPARMS] < 0)NEG=9; /* 390 */ for (I=1; I<=PRMTYP; I++) { @@ -115,11 +111,7 @@ L40: if(BLANK)TYPE0(); return; } - - -#define SPEAK(N) fSPEAK(N) -#undef PSPEAK -void fPSPEAK(long MSG,long SKIP) { +void PSPEAK(vocab_t MSG,int SKIP) { long I, M; /* Find the skip+1st message from msg and print it. MSG should be the index of @@ -129,7 +121,7 @@ long I, M; M=PTEXT[MSG]; if(SKIP < 0) goto L9; for (I=0; I<=SKIP; I++) { -L1: M=IABS(LINES[M]); +L1: M=labs(LINES[M]); if(LINES[M] >= 0) goto L1; /*etc*/ ; } /* end loop */ @@ -137,12 +129,7 @@ L9: SPEAK(M); return; } - - -#define PSPEAK(MSG,SKIP) fPSPEAK(MSG,SKIP) -#undef RSPEAK -void fRSPEAK(long I) { -; +void RSPEAK(vocab_t I) { /* Print the I-TH "random" message (section 6 of database). */ @@ -152,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 @@ -169,8 +153,6 @@ 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) @@ -186,12 +168,12 @@ long JUNK; * WORD2 (chars 6 thru 10 in WORD2X), else WORD2 is -1. */ -L10: if(BLKLIN)TYPE0(); +L10: if(game.blklin)TYPE0(); MAPLIN(input); if (feof(input)) return false; WORD1=GETTXT(true,true,true); - if(BLKLIN && WORD1 < 0) goto L10; + if(game.blklin && WORD1 < 0) goto L10; WORD1X=GETTXT(false,true,true); L12: JUNK=GETTXT(false,true,true); if(JUNK > 0) goto L12; @@ -211,10 +193,9 @@ L22: JUNK=GETTXT(false,true,true); #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, vocab_t X, vocab_t Y, vocab_t Z) { +token_t 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. */ @@ -225,162 +206,121 @@ 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) +/* Line-parsing routines (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; - -/* 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; - * if K=0 we use a line that has already been read (and perhaps partially - * scanned). If we're at the end of the line or encounter an illegal - * character (not a digit, hyphen, or blank), we return 0. */ - - - if(source != NULL)MAPLIN(source); - GETNUM=0; -L10: if(LNPOSN > LNLENG)return(GETNUM); - if(INLINE[LNPOSN] != 0) goto L20; - LNPOSN=LNPOSN+1; - goto L10; - -L20: SIGN=1; - if(INLINE[LNPOSN] != 9) goto L32; - SIGN= -1; -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; - goto L30; - -L40: GETNUM=0; -L42: GETNUM=GETNUM*SIGN; - LNPOSN=LNPOSN+1; - return(GETNUM); -} - - - -#define GETNUM(K) fGETNUM(K) -#undef GETTXT -long fGETTXT(long SKIP,long ONEWRD, long UPPER) { -long CHAR, GETTXT, I; static long SPLITTING = -1; - +long GETTXT(bool SKIP,bool ONEWRD, bool 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. 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 */ - - return(GETTXT); -} - - - -#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 - * in lettrs) to form a 30-bit value matching the one that GETTXT would - * 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; + * 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<=TOKLEN; 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); +} + +token_t MAKEWD(long LETTRS) { +long I, L, WORD; + +/* Combine TOKLEN (currently 5) 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. 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. */ + + WORD=0; I=1; - L=LETTRS; -L10: MAKEWD=MAKEWD+I*(MOD(L,50)+10); - I=I*64; - if(MOD(L,100) > 50)MAKEWD=MAKEWD+I*5; - L=L/100; - if(L != 0) goto L10; + for (L=LETTRS; L != 0; L=L/100) { + WORD=WORD+I*(MOD(L,50)+10); + I=I*64; + if(MOD(L,100) > 50)WORD=WORD+I*5; + } 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) { +void fPUTTXT(token_t 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. 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. - * If CASE=1, all letters are made uppercase; if -1, lowercase; if 0, as is. - * any other value for case is the same as 0 but also causes trailing blanks - * to be included (in anticipation of subsequent additional text). */ +/* Unpack the 30-bit value in word to obtain up to TOKLEN (currently + * 5) integer-encoded chars, and store them in inline starting at + * LNPOSN. If LNLENG>=LNPOSN, shift 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. + * If CASE=1, all letters are made uppercase; if -1, lowercase; if 0, + * as is. any other value for case is the same as 0 but also causes + * trailing blanks to be included (in anticipation of subsequent + * additional text). */ ALPH1=13*CASE+24; - ALPH2=26*IABS(CASE)+ALPH1; - if(IABS(CASE) > 1)ALPH1=ALPH2; + ALPH2=26*labs(CASE)+ALPH1; + if(labs(CASE) > 1)ALPH1=ALPH2; /* ALPH1&2 DEFINE RANGE OF WRONG-CASE CHARS, 11-36 OR 37-62 OR EMPTY. */ DIV=64L*64L*64L*64L; W=WORD; - /* 18 */ for (I=1; I<=5; I++) { - if(W <= 0 && STATE == 0 && IABS(CASE) <= 1)return; + /* 18 */ for (I=1; I<=TOKLEN; I++) { + if(W <= 0 && STATE == 0 && labs(CASE) <= 1)return; BYTE=W/DIV; if(STATE != 0 || BYTE != 63) goto L12; STATE=63; @@ -397,12 +337,10 @@ L18: W=(W-BYTE*DIV)*64; return; } - - #undef STATE #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; /* Move INLINE(N) to INLINE(N+DELTA) for N=FROM,LNLENG. Delta can be @@ -421,16 +359,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(); @@ -438,11 +371,6 @@ long TEMP; return; } - - -#define TYPE0() fTYPE0() - - /* Suspend/resume I/O routines (SAVWDS, SAVARR, SAVWRD) */ #undef SAVWDS @@ -450,7 +378,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)); @@ -493,7 +420,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; @@ -542,9 +468,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 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 @@ -561,52 +487,36 @@ 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); - MOVE(OBJECT+100,J); + MOVE(OBJECT+NOBJECTS,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 @@ -614,44 +524,34 @@ long FROM; * are not at any loc, since carry wants to remove objects from ATLOC chains. */ - if(OBJECT > 100) goto L1; + if(OBJECT > NOBJECTS) goto L1; FROM=PLACE[OBJECT]; goto L2; -L1: {long x = OBJECT-100; FROM=FIXED[x];} +L1: {long x = OBJECT-NOBJECTS; FROM=FIXED[x];} L2: if(FROM > 0 && FROM <= 300)CARRY(OBJECT,FROM); DROP(OBJECT,WHERE); 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 + * location. Incr holdng unless it was already being toted. If OBJECT>NOBJECTS * (moving "fixed" second loc), don't change PLACE or HOLDNG. */ - - if(OBJECT > 100) goto L5; + if(OBJECT > NOBJECTS) goto L5; if(PLACE[OBJECT] == -1)return; PLACE[OBJECT]= -1; HOLDNG=HOLDNG+1; @@ -666,22 +566,15 @@ 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(OBJECT > NOBJECTS) goto L1; if(PLACE[OBJECT] == -1)HOLDNG=HOLDNG-1; PLACE[OBJECT]=WHERE; goto L2; -L1: {long x = OBJECT-100; FIXED[x]=WHERE;} +L1: {long x = OBJECT-NOBJECTS; FIXED[x]=WHERE;} L2: if(WHERE <= 0)return; LINK[OBJECT]=ATLOC[WHERE]; ATLOC[WHERE]=OBJECT; @@ -690,72 +583,40 @@ 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; - for (I=1; I<=5; I++) { - if(DLOC[I] == WHERE) goto L2; - if(DLOC[I] != 0)ATDWRF=0; + AT=0; + if(DFLAG < 2)return(AT); + AT= -1; + for (I=1; I<=NDWARVES-1; I++) { + if(game.dloc[I] == WHERE) goto L2; + if(game.dloc[I] != 0)AT=0; } /* end loop */ - return(ATDWRF); + return(AT); -L2: ATDWRF=I; - return(ATDWRF); +L2: AT=I; + return(AT); } - - - -#define ATDWRF(WHERE) fATDWRF(WHERE) - - - /* Utility routines (SETBIT, TSTBIT, set_seed, get_next_lcg_value, * randrange, 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); + return(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) - void set_seed(long seedval) { lcgstate.x = (unsigned long) seedval % lcgstate.m; @@ -776,23 +637,22 @@ long randrange(long range) return(result); } -#undef RNDVOC -long fRNDVOC(long CHAR, long FORCE) { +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 RNDVOC; + long RND; - RNDVOC=FORCE; + RND=FORCE; - if (RNDVOC == 0) { + if (RND == 0) { for (int I = 1; I <= 5; I++) { long J = 11 + randrange(26); if (I == 2) J = CHAR; - RNDVOC = RNDVOC * 64 + J; + RND = RND * 64 + J; } } @@ -800,19 +660,15 @@ long fRNDVOC(long CHAR, long FORCE) { for (int I = 1; I <= TABSIZ; I++) { if (MOD(ATAB[I]/DIV, 64L) == CHAR) { - ATAB[I] = RNDVOC; + ATAB[I] = RND; break; } } - return(RNDVOC); + 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". @@ -850,9 +706,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, @@ -882,7 +736,7 @@ long I, VAL; if(MAP2[1] == 0)MPINIT(); - if (!oldstyle && SETUP && OPENED == stdin) + if (!oldstyle && OPENED == stdin) fputs("> ", stdout); do { IGNORE(fgets(rawbuf,sizeof(rawbuf)-1,OPENED)); @@ -906,17 +760,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,15 +782,10 @@ 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} }; - for (I=1; I<=128; I++) { MAP1[I]= -1; } /* end loop */ @@ -969,9 +815,6 @@ L22: J--; return; } - - -#define MPINIT() fMPINIT() #undef SAVEIO void fSAVEIO(long OP, long IN, long ARR[]) { static FILE *F; char NAME[50]; @@ -1003,13 +846,11 @@ 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 MOD(N,M)long N, M; {return(N%M);}