X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=d89b4058fbcfd003329b3a470b8fed765b7ba93e;hb=a044f10411cac5c530a19a66b7252110d5d1ca0f;hp=501b86b001a83556c8ca6609a34311e8457ee8b9;hpb=5de9c7132d616bcf1ef348a243ac2eb057b63424;p=open-adventure.git diff --git a/misc.c b/misc.c index 501b86b..d89b405 100644 --- a/misc.c +++ b/misc.c @@ -23,12 +23,24 @@ void* xmalloc(size_t size) void packed_to_token(long packed, char token[6]) { + // Unpack and map back to ASCII. for (int i = 0; i < 5; ++i) { char advent = (packed >> i * 6) & 63; - token[i] = advent_to_ascii[advent]; + token[4 - i] = advent_to_ascii[advent]; } + + // Ensure the last character is \0. token[5] = '\0'; + + // Replace trailing whitespace with \0. + for (int i = 4; i >= 0; --i) + { + if (token[i] == ' ' || token[i] == '\t') + token[i] = '\0'; + else + break; + } } /* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */ @@ -51,135 +63,77 @@ void newspeak(char* msg) char* copy = (char*) xmalloc(strlen(msg) + 1); strncpy(copy, msg, strlen(msg) + 1); - // Staging area for parameters. - char parameters[2000][5]; + // Staging area for stringified parameters. + char parameters[5][100]; // FIXME: to be replaced with dynamic allocation // Handle format specifiers (including the custom %C, %L, %S) by adjusting the parameter accordingly, and replacing the specifier with %s. - int param_index = 0; + int pi = 0; // parameter index for (int i = 0; i < strlen(msg); ++i) { if (msg[i] == '%') { - ++param_index; + ++pi; - // Integer specifier. In order to accommodate the fact that PARMS can have both legitimate integers *and* packed tokens, stringify these. Future work may eliminate the need for this. + // Integer specifier. In order to accommodate the fact that PARMS can have both legitimate integers *and* packed tokens, stringify everything. Future work may eliminate the need for this. if (msg[i + 1] == 'd') { copy[i + 1] = 's'; - sprintf(parameters[param_index], "%d", PARMS[param_index]); + sprintf(parameters[pi], "%ld", PARMS[pi]); } - } - } - - // Render the final string. - char rendered[2000]; - sprintf(&rendered, copy, parameters[1], parameters[2], parameters[3], parameters[4]); - - // Print the message. - printf("%s\n", rendered); -} -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, nxt, neg, nparms, param, prmtyp, state; - - if (msg == 0) - return; - blank=game.blklin; - nparms=1; - do { - nxt=labs(LINES[msg])-1; - ++msg; - 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] != ascii_to_advent['%']) { - ++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, 65-73 (1-9) = - * number using that many characters. */ - if (prmtyp == ascii_to_advent['!']) - return; - if (prmtyp == ascii_to_advent['S']) { - SHFTXT(LNPOSN+2,-1); - INLINE[LNPOSN] = ascii_to_advent['s']; - if (PARMS[nparms] == 1) - SHFTXT(LNPOSN+1,-1); - ++nparms; - continue; + // Unmodified string specifier. + if (msg[i + 1] == 's') + { + packed_to_token(PARMS[pi], parameters[pi]); } - if (prmtyp == ascii_to_advent['W'] || prmtyp == ascii_to_advent['L'] || prmtyp == ascii_to_advent['U'] || prmtyp == ascii_to_advent['C']) { - SHFTXT(LNPOSN+2,-2); - state = 0; - casemake = -1; - if (prmtyp == ascii_to_advent['U']) - casemake=1; - if (prmtyp == ascii_to_advent['W']) - casemake=0; - i = LNPOSN; - PUTTXT(PARMS[nparms],&state,casemake); - PUTTXT(PARMS[nparms+1],&state,casemake); - if (prmtyp == ascii_to_advent['C'] && INLINE[i] >= ascii_to_advent['a'] && INLINE[i] <= ascii_to_advent['z']) - { - // Convert to uppercase. - // Round-trip to ASCII and back so that this code doesn't break when the mapping changes. - // This can be simplified when mapping goes away. - char this = advent_to_ascii[INLINE[i]]; - char uc_this = toupper(this); - INLINE[i] = ascii_to_advent[uc_this]; - } - nparms += 2; - continue; + + // Singular/plural specifier. + if (msg[i + 1] == 'S') + { + copy[i + 1] = 's'; + if (PARMS[pi - 1] > 1) // look at the *previous* parameter (which by necessity must be numeric) + { + sprintf(parameters[pi], "%s", "s"); + } + else + { + sprintf(parameters[pi], "%s", ""); + } } - prmtyp=prmtyp-64; - if (prmtyp < ascii_to_advent['!'] || prmtyp > ascii_to_advent['-']) { - ++LNPOSN; - continue; + // All-lowercase specifier. + if (msg[i + 1] == 'L') + { + copy[i + 1] = 's'; + packed_to_token(PARMS[pi], parameters[pi]); + for (int i = 0; i < strlen(parameters[pi]); ++i) + { + parameters[pi][i] = tolower(parameters[pi][i]); + } } - 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; + + // First char uppercase, rest lowercase. + if (msg[i + 1] == 'C') + { + copy[i + 1] = 's'; + packed_to_token(PARMS[pi], parameters[pi]); + for (int i = 0; i < strlen(parameters[pi]); ++i) + { + parameters[pi][i] = tolower(parameters[pi][i]); } - param=param/10; + parameters[pi][0] = toupper(parameters[pi][0]); } - LNPOSN += prmtyp; - ++nparms; - continue; - } + } + } - if (blank) - TYPE0(); - blank=false; - TYPE(); - msg = nxt + 1; - } while - (LINES[msg] >= 0); + // Render the final string. + char rendered[2000]; // FIXME: to be replaced with dynamic allocation + sprintf((char *)&rendered, copy, parameters[1], parameters[2], parameters[3], parameters[4]); // FIXME: to be replaced with vsprintf() + + // Print the message. + printf("%s\n", rendered); + + free(copy); } void PSPEAK(vocab_t msg,int skip) @@ -676,14 +630,14 @@ bool MAPLIN(FILE *fp) * and is not changed thereafter unless the routines on this page choose * to do so. */ - if (!oldstyle && !isatty(1)) + if (prompt) fputs("> ", stdout); do { - if (oldstyle) { + if (!editline) { IGNORE(fgets(rawbuf,sizeof(rawbuf)-1,fp)); eof = (feof(fp)); } else { - char *cp = linenoise("> "); + char *cp = linenoise(prompt ? "> ": ""); eof = (cp == NULL); if (!eof) { strncpy(rawbuf, cp, sizeof(rawbuf)-1); @@ -744,7 +698,4 @@ void DATIME(long* d, long* t) *t = (long) tv.tv_usec; } -long MOD(long n, long m) -{ - return(n%m); -} +/* end */