X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=546cf48cfb9d9aacd2d28586e77dc2102891efce;hp=e452be2a19c7299f912635ca2758b939481776ca;hb=3af993abcacd18f114e8dd54f9d3be6a3a62ea2e;hpb=a45f297dc70549131b96e8d4c65fa208330bd899 diff --git a/misc.c b/misc.c index e452be2..546cf48 100644 --- a/misc.c +++ b/misc.c @@ -3,138 +3,140 @@ #include #include #include + #include "advent.h" -#include "funcs.h" #include "database.h" +#include "linenoise/linenoise.h" + +#define PERCENT 63 /* partly hide the packed encoding */ -/* hack to ignore GCC Unused Result */ -#define IGNORE(r) do{if (r){}}while(0) +const char advent_to_ascii[] = {0, 32, 33, 34, 39, 40, 41, 42, 43, 44, 45, 46, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 37, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 0, 1, 2, 3, 4, 5, 6, 7, 8, 0, 0, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 35, 36, 38, 47, 58, 59, 60, 61, 62, 63, 64, 91, 92, 93, 94, 95, 96, 123, 124, 125, 126, 0}; +/* Rendered from the now-gone MPINIT() function */ +const char ascii_to_advent[] = {0, 74, 75, 76, 77, 78, 79, 80, 81, 82, 0, 0, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 0, 1, 2, 106, 107, 63, 108, 3, 4, 5, 6, 7, 8, 9, 10, 109, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 110, 111, 112, 113, 114, 115, 116, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 117, 118, 119, 120, 121, 122, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 123, 124, 125, 126, 83}; /* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */ -void SPEAK(vocab_t N) -/* Print the message which starts at LINES(N). Precede it with a blank line +void SPEAK(vocab_t msg) +/* Print the message which starts at LINES[N]. Precede it with a blank line * 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; blank=game.blklin; - K=N; - NPARMS=1; -L10: - L=labs(LINES[K])-1; - K=K+1; - LNLENG=0; - LNPOSN=1; - state=0; - for (I=K; I<=L; I++) { - PUTTXT(LINES[I],state,2); - } - LNPOSN=0; -L30: - LNPOSN=LNPOSN+1; -L32: - if (LNPOSN > LNLENG) - goto L40; - if (INLINE[LNPOSN] != 63) - goto L30; - {long x = LNPOSN+1; PRMTYP=INLINE[x];} - /* 63 is a "%"; the next character determine the type of - * parameter: 1 (!) = suppress message completely, 29 (S) = NULL - * If PARM=1, else 'S' (optional plural ending), 33 (W) = word - * (two 30-bit values) with trailing spaces suppressed, 22 (L) or - * 31 (U) = word but map to lower/upper case, 13 (C) = word in - * lower case with first letter capitalised, 30 (T) = text ending - * with a word of -1, 65-73 (1-9) = number using that many - * characters, 12 (B) = variable number of blanks. */ - if (PRMTYP == 1) - return; - if (PRMTYP == 29) - goto L320; - if (PRMTYP == 30) - goto L340; - if (PRMTYP == 12) - goto L360; - if (PRMTYP == 33 || PRMTYP == 22 || PRMTYP == 31 || PRMTYP == 13) - goto L380; - PRMTYP=PRMTYP-64; - if (PRMTYP < 1 || PRMTYP > 9) goto L30; - SHFTXT(LNPOSN+2,PRMTYP-2); - LNPOSN=LNPOSN+PRMTYP; - PARM=labs(PARMS[NPARMS]); - NEG=0; - if (PARMS[NPARMS] < 0) - NEG=9; - /* 390 */ for (I=1; I<=PRMTYP; I++) { - LNPOSN=LNPOSN-1; - INLINE[LNPOSN]=MOD(PARM,10)+64; - if (I == 1 || PARM != 0) - goto L390; - INLINE[LNPOSN]=NEG; - NEG=0; -L390: - PARM=PARM/10; - } - LNPOSN=LNPOSN+PRMTYP; -L395: - NPARMS=NPARMS+1; - goto L32; - -L320: - SHFTXT(LNPOSN+2,-1); - INLINE[LNPOSN]=55; - if (PARMS[NPARMS] == 1) - SHFTXT(LNPOSN+1,-1); - goto L395; - -L340: - SHFTXT(LNPOSN+2,-2); - state=0; - casemake=2; -L345: - if (PARMS[NPARMS] < 0) goto L395; - {long x = NPARMS+1; if (PARMS[x] < 0) - casemake=0;} - PUTTXT(PARMS[NPARMS],state,casemake); - NPARMS=NPARMS+1; - goto L345; - -L360: - PRMTYP=PARMS[NPARMS]; - SHFTXT(LNPOSN+2,PRMTYP-2); - if (PRMTYP == 0) goto L395; - for (I=1; I<=PRMTYP; I++) { - INLINE[LNPOSN]=0; - LNPOSN=LNPOSN+1; - } - goto L395; - -L380: - SHFTXT(LNPOSN+2,-2); - state=0; - casemake= -1; - if (PRMTYP == 31) - casemake=1; - if (PRMTYP == 33) - casemake=0; - I=LNPOSN; - PUTTXT(PARMS[NPARMS],state,casemake); - {long x = NPARMS+1; PUTTXT(PARMS[x],state,casemake);} - if (PRMTYP == 13 && INLINE[I] >= 37 && INLINE[I] <= - 62)INLINE[I]=INLINE[I]-26; - NPARMS=NPARMS+2; - goto L32; - -L40: - if (blank) - TYPE0(); - blank=false; - TYPE(); - K=L+1; - if (LINES[K] >= 0) - goto L10; + nparms=1; + do { + nxt=labs(LINES[msg])-1; + msg=msg+1; + LNLENG=0; + LNPOSN=1; + state=0; + for (i = msg; i <= nxt; i++) { + PUTTXT(LINES[i],&state,2); + } + LNPOSN=0; + ++LNPOSN; + + while (LNPOSN <= LNLENG) { + if (INLINE[LNPOSN] != PERCENT) { + ++LNPOSN; + continue; + } + prmtyp = INLINE[LNPOSN+1]; + /* A "%"; the next character determine the type of + * parameter: 1 (!) = suppress message completely, 29 (S) = NULL + * If PARAM=1, else 'S' (optional plural ending), 33 (W) = word + * (two 30-bit values) with trailing spaces suppressed, 22 (L) or + * 31 (U) = word but map to lower/upper case, 13 (C) = word in + * lower case with first letter capitalised, 30 (T) = text ending + * with a word of -1, 65-73 (1-9) = number using that many + * characters, 12 (B) = variable number of blanks. */ + if (prmtyp == 1) + return; + if (prmtyp == 29) { + SHFTXT(LNPOSN+2,-1); + INLINE[LNPOSN] = 55; + if (PARMS[nparms] == 1) + SHFTXT(LNPOSN+1,-1); + ++nparms; + continue; + } + if (prmtyp == 30) { + SHFTXT(LNPOSN+2,-2); + state=0; + casemake=2; + + while (PARMS[nparms] > 0) { + if (PARMS[nparms+1] < 0) + casemake=0; + PUTTXT(PARMS[nparms],&state,casemake); + nparms=nparms+1; + } + ++nparms; + continue; + } + if (prmtyp == 12) { + prmtyp=PARMS[nparms]; + SHFTXT(LNPOSN+2,prmtyp-2); + if (prmtyp != 0) { + for (i=1; i<=prmtyp; i++) { + INLINE[LNPOSN]=0; + ++LNPOSN; + } + } + ++nparms; + continue; + } + if (prmtyp == 33 || prmtyp == 22 || prmtyp == 31 || prmtyp == 13) { + SHFTXT(LNPOSN+2,-2); + state = 0; + casemake = -1; + if (prmtyp == 31) + casemake=1; + if (prmtyp == 33) + casemake=0; + i = LNPOSN; + PUTTXT(PARMS[nparms],&state,casemake); + PUTTXT(PARMS[nparms+1],&state,casemake); + if (prmtyp == 13 && INLINE[i] >= 37 && INLINE[i] <= 62) + INLINE[i] -= 26; + nparms += 2; + continue; + } + + prmtyp=prmtyp-64; + if (prmtyp < 1 || prmtyp > 9) { + ++LNPOSN; + continue; + } + SHFTXT(LNPOSN+2,prmtyp-2); + LNPOSN += prmtyp; + param=labs(PARMS[nparms]); + neg=0; + if (PARMS[nparms] < 0) + neg=9; + for (i=1; i <= prmtyp; i++) { + --LNPOSN; + INLINE[LNPOSN]=MOD(param,10)+64; + if (i != 1 && param == 0) { + INLINE[LNPOSN]=neg; + neg=0; + } + param=param/10; + } + LNPOSN += prmtyp; + ++nparms; + continue; + } + + if (blank) + TYPE0(); + blank=false; + TYPE(); + msg = nxt + 1; + } while + (LINES[msg] >= 0); } void PSPEAK(vocab_t msg,int skip) @@ -175,7 +177,7 @@ void SETPRM(long first, long p1, long p2) } } -bool fGETIN(FILE *input, +bool GETIN(FILE *input, long *pword1, long *pword1x, long *pword2, long *pword2x) /* Get a command from the adventurer. Snarf out the first word, pad it with @@ -189,8 +191,7 @@ bool fGETIN(FILE *input, for (;;) { if (game.blklin) TYPE0(); - MAPLIN(input); - if (feof(input)) + if (!MAPLIN(input)) return false; *pword1=GETTXT(true,true,true); if (game.blklin && *pword1 < 0) @@ -220,7 +221,7 @@ long YES(FILE *input, vocab_t x, vocab_t y, vocab_t z) for (;;) { RSPEAK(x); - GETIN(input, reply,junk1,junk2,junk3); + GETIN(input, &reply, &junk1, &junk2, &junk3); if (reply == MAKEWD(250519) || reply == MAKEWD(25)) { RSPEAK(y); return true; @@ -262,7 +263,7 @@ long GETTXT(bool skip, bool onewrd, bool upper) if (LNPOSN > LNLENG || (onewrd && INLINE[LNPOSN] == 0)) continue; char current=INLINE[LNPOSN]; - if (current < 63) { + if (current < PERCENT) { splitting = -1; if (upper && current >= 37) current=current-26; @@ -271,12 +272,12 @@ long GETTXT(bool skip, bool onewrd, bool upper) continue; } if (splitting != LNPOSN) { - text=text+63; + text=text+PERCENT; splitting = LNPOSN; continue; } - text=text+current-63; + text=text+current-PERCENT; splitting = -1; LNPOSN=LNPOSN+1; } @@ -305,7 +306,7 @@ token_t MAKEWD(long letters) return word; } -void fPUTTXT(token_t word, long *state, long casemake) +void PUTTXT(token_t word, long *state, long casemake) /* 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 @@ -333,8 +334,8 @@ void fPUTTXT(token_t word, long *state, long casemake) return; byte=w/div; w=(w-byte*div)*64; - if (!(*state != 0 || byte != 63)) { - *state=63; + if (!(*state != 0 || byte != PERCENT)) { + *state=PERCENT; continue; } SHFTXT(LNPOSN,1); @@ -378,91 +379,6 @@ void TYPE0(void) return; } -/* Suspend/resume I/O routines (SAVWDS, SAVARR, SAVWRD) */ - -void fSAVWDS(long *W1, long *W2, long *W3, long *W4, - long *W5, long *W6, long *W7) -/* Write or read 7 variables. See SAVWRD. */ -{ - SAVWRD(0,(*W1)); - SAVWRD(0,(*W2)); - SAVWRD(0,(*W3)); - SAVWRD(0,(*W4)); - SAVWRD(0,(*W5)); - SAVWRD(0,(*W6)); - SAVWRD(0,(*W7)); -} - -void fSAVARR(long arr[], long n) -/* Write or read an array of n words. See SAVWRD. */ -{ - long i; - - for (i=1; i<=n; i++) { - SAVWRD(0,arr[i]); - } - return; -} - -void fSAVWRD(long op, long *pword) -/* If OP<0, start writing a file, using word to initialise encryption; save - * word in the file. If OP>0, start reading a file; read the file to find - * the value with which to decrypt the rest. In either case, if a file is - * already open, finish writing/reading it and don't start a new one. If OP=0, - * read/write a single word. Words are buffered in case that makes for more - * efficient disk use. We also compute a simple checksum to catch elementary - * poking within the saved file. When we finish reading/writing the file, - * we store zero into *PWORD if there's no checksum error, else nonzero. */ -{ - static long buf[250], cksum = 0, h1, hash = 0, n = 0, state = 0; - - if (op != 0) - { - long ifvar = state; - switch (ifvar<0 ? -1 : (ifvar>0 ? 1 : 0)) - { - case -1: - case 1: - if (n == 250)SAVEIO(1,state > 0,buf); - n=MOD(n,250)+1; - if (state <= 0) { - n--; buf[n]=cksum; n++; - SAVEIO(1,false,buf); - } - n--; *pword=buf[n]-cksum; n++; - SAVEIO(-1,state > 0,buf); - state=0; - break; - case 0: /* FIXME: Huh? should be impossible */ - state=op; - SAVEIO(0,state > 0,buf); - n=1; - if (state <= 0) { - hash=MOD(*pword,1048576L); - buf[0]=1234L*5678L-hash; - } - SAVEIO(1,true,buf); - hash=MOD(1234L*5678L-buf[0],1048576L); - cksum=buf[0]; - return; - } - } - if (state == 0) - return; - if (n == 250) - SAVEIO(1,state > 0,buf); - n=MOD(n,250)+1; - h1=MOD(hash*1093L+221573L,1048576L); - hash=MOD(h1*1093L+221573L,1048576L); - h1=MOD(h1,1234)*765432+MOD(hash,123); - n--; - if (state > 0) - *pword=buf[n]+h1; - buf[n]=*pword-h1; - n++; - cksum=MOD(cksum*13+*pword,1000000000L); -} - /* Data structure routines */ long VOCAB(long id, long init) @@ -521,12 +437,9 @@ void MOVE(long object, long where) long from; if (object > NOBJECTS) - goto L1; - from=game.place[object]; - goto L2; -L1: - from=game.fixed[object-NOBJECTS]; -L2: + from=game.fixed[object-NOBJECTS]; + else + from=game.place[object]; if (from > 0 && from <= 300) CARRY(object,from); DROP(object,where); @@ -558,11 +471,10 @@ void CARRY(long object, long where) return; } temp=game.atloc[where]; -L7: if (game.link[temp] == object) - goto L8; - temp=game.link[temp]; - goto L7; -L8: game.link[temp]=game.link[object]; + while (game.link[temp] != object) { + temp=game.link[temp]; + } + game.link[temp]=game.link[object]; } void DROP(long object, long where) @@ -570,16 +482,17 @@ void DROP(long object, long where) * game.holdng if the object was being toted. */ { if (object > NOBJECTS) - goto L1; - if (game.place[object] == -1) - game.holdng=game.holdng-1; - game.place[object]=where; - goto L2; -L1: game.fixed[object-NOBJECTS]=where; -L2: if (where <= 0) + game.fixed[object-NOBJECTS] = where; + else + { + if (game.place[object] == -1) + --game.holdng; + game.place[object] = where; + } + if (where <= 0) return; - game.link[object]=game.atloc[where]; - game.atloc[where]=object; + game.link[object] = game.atloc[where]; + game.atloc[where] = object; } long ATDWRF(long where) @@ -608,7 +521,7 @@ long ATDWRF(long where) long SETBIT(long bit) /* Returns 2**bit for use in constructing bit-masks. */ { - return(2 << bit); + return(1 << bit); } bool TSTBIT(long mask, int bit) @@ -697,11 +610,12 @@ void BUG(long num) exit(0); } -/* Machine dependent routines (MAPLIN, TYPE, MPINIT, SAVEIO) */ +/* Machine dependent routines (MAPLIN, TYPE, SAVEIO) */ -void MAPLIN(FILE *fp) +bool MAPLIN(FILE *fp) { long i, val; + bool eof; /* Read a line of input, from the specified input source, * translate the chars to integers in the range 0-126 and store @@ -728,18 +642,28 @@ void MAPLIN(FILE *fp) * and is not changed thereafter unless the routines on this page choose * to do so. */ - if (MAP2[1] == 0) - MPINIT(); - - if (!oldstyle && fp == stdin) + if (!oldstyle && !isatty(1)) fputs("> ", stdout); do { - IGNORE(fgets(rawbuf,sizeof(rawbuf)-1,fp)); + if (oldstyle) { + IGNORE(fgets(rawbuf,sizeof(rawbuf)-1,fp)); + eof = (feof(fp)); + } else { + char *cp = linenoise("> "); + eof = (cp == NULL); + if (!eof) { + strncpy(rawbuf, cp, sizeof(rawbuf)-1); + linenoiseHistoryAdd(rawbuf); + strncat(rawbuf, "\n", sizeof(rawbuf)-1); + linenoiseFree(cp); + } + } } while - (!feof(fp) && rawbuf[0] == '#'); - if (feof(fp)) { + (!eof && rawbuf[0] == '#'); + if (eof) { if (logfp && fp == stdin) fclose(logfp); + return false; } else { if (logfp && fp == stdin) IGNORE(fputs(rawbuf, logfp)); @@ -749,11 +673,12 @@ void MAPLIN(FILE *fp) LNLENG=0; for (i=1; i<=(long)sizeof(INLINE) && INLINE[i]!=0; i++) { val=INLINE[i]+1; - INLINE[i]=MAP1[val]; + INLINE[i]=ascii_to_advent[val]; if (INLINE[i] != 0) LNLENG=i; } LNPOSN=1; + return true; } } @@ -769,85 +694,14 @@ void TYPE(void) return; } - if (MAP2[1] == 0) - MPINIT(); for (i=1; i<=LNLENG; i++) { - INLINE[i]=MAP2[INLINE[i]+1]; + INLINE[i]=advent_to_ascii[INLINE[i]+1]; } INLINE[LNLENG+1]=0; printf("%s\n", INLINE+1); return; } -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; - } - val=0; - for (i=0; i<7; i++) { - first =RUNS[i][0]; - last = RUNS[i][1]; - for (j=first; j<=last; j++) { - j++; - if (MAP1[j] < 0) { - MAP1[j]=val; - ++val; - } - j--; - } - } - MAP1[128]=MAP1[10]; - /* For this version, tab (9) maps to space (32), so del (127) - * uses tab's value */ - MAP1[10]=MAP1[33]; - MAP1[11]=MAP1[33]; - - for (i=0; i<=126; i++) { - i++; val=MAP1[i]+1; i--; - MAP2[val] = i*('B'-'A'); - if (i >= 64) - MAP2[val]=(i-64)*('B'-'A')+'@'; - } -} - -void fSAVEIO(long op, long in, long arr[]) -/* If OP=0, ask for a file name and open a file. (If IN=true, the file is for - * input, else output.) If OP>0, read/write ARR from/into the previously-opened - * file. (ARR is a 250-integer array.) If OP<0, finish reading/writing the - * file. (Finishing writing can be a no-op if a "stop" statement does it - * automatically. Finishing reading can be a no-op as long as a subsequent - * SAVEIO(0,false,X) will still work.) */ -{ - static FILE *fp = NULL; - char name[50]; - - switch (op < 0 ? -1 : (op > 0 ? 1 : 0)) - { - case -1: - fclose(fp); - break; - case 0: - while (fp == NULL) { - printf("\nFile name: "); - IGNORE(fgets(name, sizeof(name), stdin)); - fp = fopen(name,(in ? READ_MODE : WRITE_MODE)); - if (fp == NULL) - printf("Can't open file %s, try again.\n", name); - } - break; - case 1: - if (in) - IGNORE(fread(arr,sizeof(long),250,fp)); - else - IGNORE(fwrite(arr,sizeof(long),250,fp)); - break; - } -} - void DATIME(long* d, long* t) { struct timeval tv;