#include <stdio.h>
#include <string.h>
#include <sys/time.h>
+
#include "advent.h"
-#include "funcs.h"
#include "database.h"
+#include "linenoise/linenoise.h"
/* hack to ignore GCC Unused Result */
#define IGNORE(r) do{if (r){}}while(0)
#define PERCENT 63 /* partly hide the packed encoding */
+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 msg)
LNPOSN=1;
state=0;
for (i = msg; i <= nxt; i++) {
- PUTTXT(LINES[i],state,2);
+ PUTTXT(LINES[i],&state,2);
}
LNPOSN=0;
-L30:
++LNPOSN;
-L32:
- if (LNPOSN > LNLENG)
- goto L40;
- if (INLINE[LNPOSN] != PERCENT)
- goto L30;
- 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);
- goto L395;
- }
- if (prmtyp == 30) {
- SHFTXT(LNPOSN+2,-2);
- state=0;
- casemake=2;
- for (;;) {
- if (PARMS[nparms] < 0)
- goto L395;
- if (PARMS[nparms+1] < 0)
+ 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;
- PUTTXT(PARMS[nparms],state,casemake);
- nparms=nparms+1;
+ 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;
}
- }
- if (prmtyp == 12) {
- prmtyp=PARMS[nparms];
SHFTXT(LNPOSN+2,prmtyp-2);
- if (prmtyp != 0) {
- for (i=1; i<=prmtyp; i++) {
- INLINE[LNPOSN]=0;
- LNPOSN=LNPOSN+1;
+ 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;
}
- goto L395;
- }
- 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;
- goto L32;
- }
- prmtyp=prmtyp-64;
- if (prmtyp < 1 || prmtyp > 9)
- goto L30;
- 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;
}
- LNPOSN += prmtyp;
-L395:
- ++nparms;
- goto L32;
-L40:
if (blank)
TYPE0();
blank=false;
}
}
-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
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;
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
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)
exit(0);
}
-/* Machine dependent routines (MAPLIN, TYPE, MPINIT, SAVEIO) */
+/* Machine dependent routines (MAPLIN, TYPE, SAVEIO) */
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)
fputs("> ", stdout);
do {
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;
}
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
* 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];
+ static FILE *fp = NULL;
+ char* name;
switch (op < 0 ? -1 : (op > 0 ? 1 : 0))
{
break;
case 0:
while (fp == NULL) {
- printf("\nFile name: ");
- IGNORE(fgets(name, sizeof(name), stdin));
+ name = linenoise("File name: ");
fp = fopen(name,(in ? READ_MODE : WRITE_MODE));
if (fp == NULL)
printf("Can't open file %s, try again.\n", name);
}
+ linenoiseFree(name);
break;
case 1:
if (in)