X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=a2626b4d3f02ae66ea69ed4dbf99c4c1939debe0;hp=61d80d888b56246fa6b480f3679057a15ce4bb6f;hb=c35cf999660d640bcf839792fa280855cf45c31b;hpb=50435465a62d630e4b61fbec38270321211c4907 diff --git a/misc.c b/misc.c index 61d80d8..a2626b4 100644 --- a/misc.c +++ b/misc.c @@ -5,25 +5,12 @@ #include #include #include +#include #include "advent.h" -#include "database.h" -#include "linenoise/linenoise.h" -#include "newdb.h" +#include "dungeon.h" -char* xstrdup(const char* s) -{ - char* ptr = strdup(s); - if (ptr == NULL) { - // LCOV_EXCL_START - // exclude from coverage analysis because we can't simulate an out of memory error in testing - fprintf(stderr, "Out of memory!\n"); - exit(EXIT_FAILURE); - } - return(ptr); -} - -void* xmalloc(size_t size) +static void* xmalloc(size_t size) { void* ptr = malloc(size); if (ptr == NULL) { @@ -31,17 +18,29 @@ void* xmalloc(size_t size) // exclude from coverage analysis because we can't simulate an out of memory error in testing fprintf(stderr, "Out of memory!\n"); exit(EXIT_FAILURE); - // LCOV_EXCL_STOP + // LCOV_EXCL_STOP } return (ptr); } -void packed_to_token(long packed, char token[6]) +void packed_to_token(long packed, char token[TOKLEN + 1]) { + // The advent->ascii mapping. + const char advent_to_ascii[] = { + ' ', '!', '"', '#', '$', '%', '&', '\'', + '(', ')', '*', '+', ',', '-', '.', '/', + '0', '1', '2', '3', '4', '5', '6', '7', + '8', '9', ':', ';', '<', '=', '>', '?', + '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', + 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', + 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', + 'X', 'Y', 'Z', '\0', '\0', '\0', '\0', '\0', + }; + // Unpack and map back to ASCII. for (int i = 0; i < 5; ++i) { - char advent = (packed >> i * 6) & 63; - token[i] = new_advent_to_ascii[(int) advent]; + char advent = (packed >> i * 6) & 63; + token[i] = advent_to_ascii[(int) advent]; } // Ensure the last character is \0. @@ -49,60 +48,82 @@ void packed_to_token(long packed, char token[6]) // Replace trailing whitespace with \0. for (int i = 4; i >= 0; --i) { - if (token[i] == ' ' || token[i] == '\t') + if (token[i] == ' ' || + token[i] == '\t') token[i] = '\0'; else break; } } -long token_to_packed(const char token[6]) +long token_to_packed(const char token[]) +{ + const char ascii_to_advent[] = { + 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, + + 0, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 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, 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, 63, + + 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, + }; + + size_t t_len = strlen(token); + if (t_len > TOKLEN) + t_len = TOKLEN; + long packed = 0; + for (size_t i = 0; i < t_len; ++i) { + char mapped = ascii_to_advent[(int) toupper(token[i])]; + packed |= (mapped << (6 * i)); + } + return (packed); +} + +void tokenize(char* raw, struct command_t *cmd) { - size_t t_len = strlen(token); - long packed = 0; - for (size_t i = 0; i < t_len; ++i) - { - char mapped = new_ascii_to_advent[(int) token[i]]; - packed |= (mapped << (6 * i)); + memset(cmd, '\0', sizeof(struct command_t)); + + /* Bound prefix on the %s would be needed to prevent buffer + * overflow. but we shortstop this more simply by making each + * raw-input buffer as long as the enrire inout buffer. */ + sscanf(raw, "%s%s", cmd->raw1, cmd->raw2); + + // pack the substrings + cmd->wd1 = token_to_packed(cmd->raw1); + cmd->wd2 = token_to_packed(cmd->raw2); + + /* (ESR) In oldstyle mode, simulate the uppercasing and truncating + * effect on raw tokens of packing them into sixbit characters, 5 + * to a 32-bit word. This is something the FORTRAN version did + * becuse archaic FORTRAN had no string types. Don Wood's + * mechanical translation of 2.5 to C retained the packing and + * thus this misfeature. + * + * It's philosophically questionable whether this is the right + * thing to do even in oldstyle mode. On one hand, the text + * mangling was not authorial intent, but a result of limitations + * in their tools. On the other, not simulating this misbehavior + * goes against the goal of making oldstyle as accurate as + * possible an emulation of the original UI. + */ + if (settings.oldstyle) { + cmd->raw1[TOKLEN + TOKLEN] = cmd->raw2[TOKLEN + TOKLEN] = '\0'; + for (size_t i = 0; i < strlen(cmd->raw1); i++) + cmd->raw1[i] = toupper(cmd->raw1[i]); + for (size_t i = 0; i < strlen(cmd->raw2); i++) + cmd->raw2[i] = toupper(cmd->raw2[i]); } - return(packed); -} - -void tokenize(char* raw, long tokens[4]) -{ - // set each token to 0 - for (int i = 0; i < 4; ++i) - tokens[i] = 0; - - // grab the first two words - char* words[2]; - words[0] = (char*) xmalloc(strlen(raw)); - words[1] = (char*) xmalloc(strlen(raw)); - int word_count = sscanf(raw, "%s%s", words[0], words[1]); - - // make space for substrings and zero it out - char chunk_data[][6] = { - {"\0\0\0\0\0"}, - {"\0\0\0\0\0"}, - {"\0\0\0\0\0"}, - {"\0\0\0\0\0"}, - }; - - // break the words into up to 4 5-char substrings - sscanf(words[0], "%5s%5s", chunk_data[0], chunk_data[1]); - if (word_count == 2) - sscanf(words[1], "%5s%5s", chunk_data[2], chunk_data[3]); - free(words[0]); - free(words[1]); - - // uppercase all the substrings - for (int i = 0; i < 4; ++i) - for (unsigned int j = 0; j < strlen(chunk_data[i]); ++j) - chunk_data[i][j] = (char) toupper(chunk_data[i][j]); - - // pack the substrings - for (int i = 0; i < 4; ++i) - tokens[i] = token_to_packed(chunk_data[i]); } /* Hide the fact that wods are corrently packed longs */ @@ -122,9 +143,9 @@ void wordclear(token_t *v) *v = 0; } -/* I/O routines (speak, pspeak, rspeak, GETIN, YES) */ +/* I/O routines (speak, pspeak, rspeak, sspeak, get_input, yes) */ -void vspeak(const char* msg, va_list ap) +void vspeak(const char* msg, bool blank, va_list ap) { // Do nothing if we got a null pointer. if (msg == NULL) @@ -134,8 +155,7 @@ void vspeak(const char* msg, va_list ap) if (strlen(msg) == 0) return; - // Print a newline if the global game.blklin says to. - if (game.blklin == true) + if (blank == true) printf("\n"); int msglen = strlen(msg); @@ -145,7 +165,9 @@ void vspeak(const char* msg, va_list ap) char* rendered = xmalloc(size); char* renderp = rendered; - // Handle format specifiers (including the custom %C, %L, %S) by adjusting the parameter accordingly, and replacing the specifier with %s. + // Handle format specifiers (including the custom %C, %L, %S) by + // adjusting the parameter accordingly, and replacing the + // specifier with %s. long previous_arg = 0; for (int i = 0; i < msglen; i++) { if (msg[i] != '%') { @@ -153,10 +175,13 @@ void vspeak(const char* msg, va_list ap) size--; } else { long arg = va_arg(ap, long); - if (arg == -1) - arg = 0; + if (arg == -1) + arg = 0; // LCOV_EXCL_LINE - don't think we can get here. i++; - // 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. + // 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] == 'd') { int ret = snprintf(renderp, size, "%ld", arg); if (ret < size) { @@ -181,15 +206,10 @@ void vspeak(const char* msg, va_list ap) } } - // All-lowercase specifier. - if (msg[i] == 'L' || msg[i] == 'C') { - packed_to_token(arg, renderp); /* unpack directly to destination */ - int len = strlen(renderp); - for (int j = 0; j < len; ++j) { - renderp[j] = tolower(renderp[j]); - } - if (msg[i] == 'C') // First char uppercase, rest lowercase. - renderp[0] = toupper(renderp[0]); + /* Version specifier */ + if (msg[i] == 'V') { + strcpy(renderp, VERSION); + size_t len = strlen(VERSION); renderp += len; size -= len; } @@ -209,11 +229,21 @@ void speak(const char* msg, ...) { va_list ap; va_start(ap, msg); - vspeak(msg, ap); + vspeak(msg, true, ap); + va_end(ap); +} + +void sspeak(const long msg, ...) +{ + va_list ap; + va_start(ap, msg); + fputc('\n', stdout); + vprintf(arbitrary_messages[msg], ap); + fputc('\n', stdout); va_end(ap); } -void pspeak(vocab_t msg, enum speaktype mode, int skip, ...) +void pspeak(vocab_t msg, enum speaktype mode, int skip, bool blank, ...) /* Find the skip+1st message from msg and print it. Modes are: * feel = for inventory, what you can touch * look = the long description for the state the object is in @@ -221,23 +251,23 @@ void pspeak(vocab_t msg, enum speaktype mode, int skip, ...) * study = text on the object. */ { va_list ap; - va_start(ap, skip); + va_start(ap, blank); switch (mode) { case touch: - vspeak(objects[msg].inventory, ap); - break; - case look: - vspeak(objects[msg].descriptions[skip], ap); - break; + vspeak(objects[msg].inventory, blank, ap); + break; + case look: + vspeak(objects[msg].descriptions[skip], blank, ap); + break; case hear: - vspeak(objects[msg].sounds[skip], ap); - break; + vspeak(objects[msg].sounds[skip], blank, ap); + break; case study: - vspeak(objects[msg].texts[skip], ap); - break; + vspeak(objects[msg].texts[skip], blank, ap); + break; case change: - vspeak(objects[msg].changes[skip], ap); - break; + vspeak(objects[msg].changes[skip], blank, ap); + break; } va_end(ap); } @@ -247,47 +277,11 @@ void rspeak(vocab_t i, ...) { va_list ap; va_start(ap, i); - vspeak(arbitrary_messages[i], ap); + vspeak(arbitrary_messages[i], true, ap); va_end(ap); } -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 - * blanks, and return it in WORD1. Chars 6 thru 10 are returned in WORD1X, in - * case we need to print out the whole word in an error message. Any number of - * blanks may follow the word. If a second word appears, it is returned in - * WORD2 (chars 6 thru 10 in WORD2X), else WORD2 is -1. */ -{ - long junk; - - for (;;) { - if (game.blklin) - fputc('\n', stdout);; - if (!MAPLIN(input)) - return false; - *pword1 = GETTXT(true, true, true); - if (game.blklin && *pword1 < 0) - continue; - *pword1x = GETTXT(false, true, true); - do { - junk = GETTXT(false, true, true); - } while - (junk > 0); - *pword2 = GETTXT(true, true, true); - *pword2x = GETTXT(false, true, true); - do { - junk = GETTXT(false, true, true); - } while - (junk > 0); - if (GETTXT(true, true, true) <= 0) - return true; - rspeak(TWO_WORDS); - } -} - -void echo_input(FILE* destination, char* input_prompt, char* input) +void echo_input(FILE* destination, const char* input_prompt, const char* input) { size_t len = strlen(input_prompt) + strlen(input) + 1; char* prompt_and_input = (char*) xmalloc(len); @@ -297,112 +291,105 @@ void echo_input(FILE* destination, char* input_prompt, char* input) free(prompt_and_input); } -int word_count(char* s) +int word_count(char* str) { - char* copy = xstrdup(s); - char delims[] = " \t"; - int count = 0; - char* word; + char delims[] = " \t"; + int count = 0; + int inblanks = true; - word = strtok(copy, delims); - while(word != NULL) - { - word = strtok(NULL, delims); - ++count; - } - free(copy); - return(count); + for (char *s = str; *s; s++) + if (inblanks) { + if (strchr(delims, *s) == 0) { + ++count; + inblanks = false; + } + } else { + if (strchr(delims, *s) != 0) { + inblanks = true; + } + } + + return (count); } char* get_input() { // Set up the prompt char input_prompt[] = "> "; - if (!prompt) + if (!settings.prompt) input_prompt[0] = '\0'; - // Print a blank line if game.blklin tells us to. - if (game.blklin == true) - printf("\n"); + // Print a blank line + printf("\n"); char* input; while (true) { - if (editline) - input = linenoise(input_prompt); - else { - input = NULL; - size_t n = 0; - if (isatty(0)) - // LCOV_EXCL_START - // Should be unreachable in tests, as they will use a non-interactive shell. - printf("%s", input_prompt); - // LCOV_EXCL_STOP - ssize_t numread = getline(&input, &n, stdin); - if (numread == -1) // Got EOF; return with it. - return(NULL); - } + input = readline(input_prompt); if (input == NULL) // Got EOF; return with it. - return(input); - else if (input[0] == '#') // Ignore comments. + return (input); + else if (input[0] == '#') { // Ignore comments. + free(input); continue; - else // We have a 'normal' line; leave the loop. + } else // We have a 'normal' line; leave the loop. break; } // Strip trailing newlines from the input input[strcspn(input, "\n")] = 0; - linenoiseHistoryAdd(input); + add_history(input); if (!isatty(0)) echo_input(stdout, input_prompt, input); - if (logfp) - echo_input(logfp, input_prompt, input); + if (settings.logfp) + echo_input(settings.logfp, "", input); return (input); } bool silent_yes() { - char* reply; - bool outcome; - - for (;;) { - reply = get_input(); - if (reply == NULL) { - // LCOV_EXCL_START - // Should be unreachable. Reply should never be NULL - linenoiseFree(reply); - exit(EXIT_SUCCESS); - // LCOV_EXCL_STOP - } + bool outcome; + + for (;;) { + char* reply = get_input(); + if (reply == NULL) { + // LCOV_EXCL_START + // Should be unreachable. Reply should never be NULL + free(reply); + exit(EXIT_SUCCESS); + // LCOV_EXCL_STOP + } + + char* firstword = (char*) xmalloc(strlen(reply) + 1); + sscanf(reply, "%s", firstword); - char* firstword = (char*) xmalloc(strlen(reply)+1); - sscanf(reply, "%s", firstword); + free(reply); - for (int i = 0; i < (int)strlen(firstword); ++i) - firstword[i] = tolower(firstword[i]); + for (int i = 0; i < (int)strlen(firstword); ++i) + firstword[i] = tolower(firstword[i]); - int yes = strncmp("yes", firstword, sizeof("yes") - 1); - int y = strncmp("y", firstword, sizeof("y") - 1); - int no = strncmp("no", firstword, sizeof("no") - 1); - int n = strncmp("n", firstword, sizeof("n") - 1); + int yes = strncmp("yes", firstword, sizeof("yes") - 1); + int y = strncmp("y", firstword, sizeof("y") - 1); + int no = strncmp("no", firstword, sizeof("no") - 1); + int n = strncmp("n", firstword, sizeof("n") - 1); - free(firstword); + free(firstword); - if (yes == 0 || y == 0) { - outcome = true; - break; - } else if (no == 0 || n == 0) { - outcome = false; - break; - } else - rspeak(PLEASE_ANSWER); - } - linenoiseFree(reply); - return (outcome); + if (yes == 0 || + y == 0) { + outcome = true; + break; + } else if (no == 0 || + n == 0) { + outcome = false; + break; + } else + rspeak(PLEASE_ANSWER); + } + return (outcome); } @@ -410,24 +397,25 @@ bool yes(const char* question, const char* yes_response, const char* no_response /* Print message X, wait for yes/no answer. If yes, print Y and return true; * if no, print Z and return false. */ { - char* reply; bool outcome; for (;;) { speak(question); - reply = get_input(); + char* reply = get_input(); if (reply == NULL) { // LCOV_EXCL_START // Should be unreachable. Reply should never be NULL - linenoiseFree(reply); + free(reply); exit(EXIT_SUCCESS); - // LCOV_EXCL_STOP + // LCOV_EXCL_STOP } - char* firstword = (char*) xmalloc(strlen(reply)+1); + char* firstword = (char*) xmalloc(strlen(reply) + 1); sscanf(reply, "%s", firstword); + free(reply); + for (int i = 0; i < (int)strlen(firstword); ++i) firstword[i] = tolower(firstword[i]); @@ -438,210 +426,113 @@ bool yes(const char* question, const char* yes_response, const char* no_response free(firstword); - if (yes == 0 || y == 0) { - speak(yes_response); + if (yes == 0 || + y == 0) { + speak(yes_response); outcome = true; break; - } else if (no == 0 || n == 0) { + } else if (no == 0 || + n == 0) { speak(no_response); outcome = false; break; } else rspeak(PLEASE_ANSWER); - } - linenoiseFree(reply); - return (outcome); -} - -/* Line-parsing routines (GETTXT, MAKEWD, PUTTXT, SHFTXT) */ - -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 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; - } - - 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 < ascii_to_advent['%']) { - splitting = -1; - if (upper && current >= ascii_to_advent['a']) - current = current - 26; - text = text + current; - ++LNPOSN; - continue; - } - if (splitting != LNPOSN) { - text = text + ascii_to_advent['%']; - splitting = LNPOSN; - continue; - } - text = text + current - ascii_to_advent['%']; - splitting = -1; - ++LNPOSN; } - return text; -} - -token_t MAKEWD(long letters) -/* 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. */ -{ - long i = 1, word = 0; - - for (long k = letters; k != 0; k = k / 100) { - word = word + i * (MOD(k, 50) + 10); - i = i * 64; - if (MOD(k, 100) > 50)word = word + i * 5; - } - i = 64L * 64L * 64L * 64L * 64L / i; - word = word * i; - return word; + return (outcome); } /* Data structure routines */ -long vocab(long id, long init) -/* 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 - * up a keyword variable, and not finding it constitutes a bug. It also means - * that only KTAB values which taken over 1000 equal INIT may be considered. - * (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. */ -{ - long lexeme; - - for (long i = 1; i <= TABSIZ; i++) { - if (KTAB[i] == -1) { - lexeme = -1; - if (init < 0) - return (lexeme); - BUG(REQUIRED_VOCABULARY_WORD_NOT_FOUND); // LCOV_EXCL_LINE - } - if (init >= 0 && KTAB[i] / 1000 != init) - continue; - if (ATAB[i] == id) { - lexeme = KTAB[i]; - if (init >= 0) - lexeme = MOD(lexeme, 1000); - return (lexeme); - } - } - BUG(RAN_OFF_END_OF_VOCABULARY_TABLE); // LCOV_EXCL_LINE -} - int get_motion_vocab_id(const char* word) // Return the first motion number that has 'word' as one of its words. { - for (int i = 0; i < NMOTIONS; ++i) - { - for (int j = 0; j < motions[i].words.n; ++j) - { - if (strcasecmp(word, motions[i].words.strs[j]) == 0) - return(i); - } + for (int i = 0; i < NMOTIONS; ++i) { + for (int j = 0; j < motions[i].words.n; ++j) { + if (strcasecmp(word, motions[i].words.strs[j]) == 0 && (strlen(word) > 1 || + strchr(ignore, word[0]) == NULL || + !settings.oldstyle)) + return (i); + } } - // If execution reaches here, we didn't find the word. - return(WORD_NOT_FOUND); + // If execution reaches here, we didn't find the word. + return (WORD_NOT_FOUND); } int get_object_vocab_id(const char* word) // Return the first object number that has 'word' as one of its words. { - for (int i = 0; i < NOBJECTS + 1; ++i) // FIXME: the + 1 should go when 1-indexing for objects is removed - { - for (int j = 0; j < objects[i].words.n; ++j) - { - if (strcasecmp(word, objects[i].words.strs[j]) == 0) - return(i); - } + for (int i = 0; i < NOBJECTS + 1; ++i) { // FIXME: the + 1 should go when 1-indexing for objects is removed + for (int j = 0; j < objects[i].words.n; ++j) { + if (strcasecmp(word, objects[i].words.strs[j]) == 0) + return (i); + } } - // If execution reaches here, we didn't find the word. - return(WORD_NOT_FOUND); + // If execution reaches here, we didn't find the word. + return (WORD_NOT_FOUND); } int get_action_vocab_id(const char* word) // Return the first motion number that has 'word' as one of its words. { - for (int i = 0; i < NACTIONS; ++i) - { - for (int j = 0; j < actions[i].words.n; ++j) - { - if (strcasecmp(word, actions[i].words.strs[j]) == 0) - return(i); - } + for (int i = 0; i < NACTIONS; ++i) { + for (int j = 0; j < actions[i].words.n; ++j) { + if (strcasecmp(word, actions[i].words.strs[j]) == 0 && (strlen(word) > 1 || + strchr(ignore, word[0]) == NULL || + !settings.oldstyle)) + return (i); + } } - // If execution reaches here, we didn't find the word. - return(WORD_NOT_FOUND); + // If execution reaches here, we didn't find the word. + return (WORD_NOT_FOUND); } int get_special_vocab_id(const char* word) // Return the first special number that has 'word' as one of its words. { - for (int i = 0; i < NSPECIALS; ++i) - { - for (int j = 0; j < specials[i].words.n; ++j) - { - if (strcasecmp(word, specials[i].words.strs[j]) == 0) - return(i); - } + for (int i = 0; i < NSPECIALS; ++i) { + for (int j = 0; j < specials[i].words.n; ++j) { + if (strcasecmp(word, specials[i].words.strs[j]) == 0) + return (i); + } } - // If execution reaches here, we didn't find the word. - return(WORD_NOT_FOUND); + // If execution reaches here, we didn't find the word. + return (WORD_NOT_FOUND); } long get_vocab_id(const char* word) // Search the vocab categories in order for the supplied word. { - long ref_num; - - ref_num = get_motion_vocab_id(word); - if (ref_num != WORD_NOT_FOUND) - return(ref_num + 0); // FIXME: replace with a proper hash + /* Check for an empty string */ + if (strncmp(word, "", sizeof("")) == 0) + return (WORD_EMPTY); - ref_num = get_object_vocab_id(word); - if (ref_num != WORD_NOT_FOUND) - return(ref_num + 1000); // FIXME: replace with a proper hash + long ref_num; - ref_num = get_action_vocab_id(word); - if (ref_num != WORD_NOT_FOUND) - return(ref_num + 2000); // FIXME: replace with a proper hash + /* FIXME: Magic numbers related to vocabulary */ + ref_num = get_motion_vocab_id(word); + if (ref_num != WORD_NOT_FOUND) + return MOTION_WORD(ref_num); - ref_num = get_special_vocab_id(word); - if (ref_num != WORD_NOT_FOUND) - return(ref_num + 3000); // FIXME: replace with a proper hash + ref_num = get_object_vocab_id(word); + if (ref_num != WORD_NOT_FOUND) + return OBJECT_WORD(ref_num); - // Check for the reservoir magic word. - if (strcasecmp(word, game.zzword) == 0) - return(PART + 2000); // FIXME: replace with a proper hash + ref_num = get_action_vocab_id(word); + if (ref_num != WORD_NOT_FOUND) + return ACTION_WORD(ref_num); - return(WORD_NOT_FOUND); + ref_num = get_special_vocab_id(word); + if (ref_num != WORD_NOT_FOUND) + return SPECIAL_WORD(ref_num); + + // Check for the reservoir magic word. + if (strcasecmp(word, game.zzword) == 0) + return ACTION_WORD(PART); + + return (WORD_NOT_FOUND); } void juggle(long object) @@ -742,8 +633,8 @@ long atdwrf(long where) return (at); } -/* Utility routines (SETBIT, TSTBIT, set_seed, get_next_lcg_value, - * randrange, RNDVOC) */ +/* Utility routines (setbit, tstbit, set_seed, get_next_lcg_value, + * randrange) */ long setbit(long bit) /* Returns 2**bit for use in constructing bit-masks. */ @@ -761,6 +652,9 @@ void set_seed(long seedval) /* Set the LCG seed */ { game.lcg_x = (unsigned long) seedval % game.lcg_m; + + // once seed is set, we need to generate the Z`ZZZ word + make_zzword(game.zzword); } unsigned long get_next_lcg_value(void) @@ -777,145 +671,13 @@ long randrange(long range) return range * get_next_lcg_value() / game.lcg_m; } -long rndvoc(long second, long force) -/* Searches the vocabulary ATAB 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 = force; - - if (rnd == 0) { - for (int i = 1; i <= 5; i++) { - long j = 11 + randrange(26); - if (i == 2) - j = second; - rnd = rnd * 64 + j; - } - } - - long div = 64L * 64L * 64L; - for (int i = 1; i <= TABSIZ; i++) { - if (MOD(ATAB[i] / div, 64L) == second) { - ATAB[i] = rnd; - break; - } - } - - return rnd; -} - -void make_zzword(char zzword[6]) -{ - for (int i = 0; i < 5; ++i) - { - zzword[i] = 'A' + randrange(26); - } - zzword[1] = '\''; // force second char to apostrophe - zzword[5] = '\0'; -} - -/* Machine dependent routines (MAPLIN, SAVEIO) */ - -bool MAPLIN(FILE *fp) +void make_zzword(char zzword[TOKLEN + 1]) { - bool eof; - - /* Read a line of input, from the specified input source. - * This logic is complicated partly because it has to serve - * several cases with different requirements and partly because - * of a quirk in linenoise(). - * - * The quirk shows up when you paste a test log from the clipboard - * to the program's command prompt. While fgets (as expected) - * consumes it a line at a time, linenoise() returns the first - * line and discards the rest. Thus, there needs to be an - * editline (-s) option to fall back to fgets while still - * prompting. Note that linenoise does behave properly when - * fed redirected stdin. - * - * The logging is a bit of a mess because there are two distinct cases - * in which you want to echo commands. One is when shipping them to - * a log under the -l option, in which case you want to suppress - * prompt generation (so test logs are unadorned command sequences). - * On the other hand, if you redirected stdin and are feeding the program - * a logfile, you *do* want prompt generation - it makes checkfiles - * easier to read when the commands are marked by a preceding prompt. - */ - do { - if (!editline) { - if (prompt) - fputs("> ", stdout); - 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) - strlen(rawbuf) - 1); - linenoiseFree(cp); - } - } - } while - (!eof && rawbuf[0] == '#'); - if (eof) { - if (logfp && fp == stdin) - fclose(logfp); - return false; - } else { - FILE *efp = NULL; - if (logfp && fp == stdin) - efp = logfp; - else if (!isatty(0)) - efp = stdout; - if (efp != NULL) { - if (prompt && efp == stdout) - fputs("> ", efp); - IGNORE(fputs(rawbuf, efp)); - } - strcpy(INLINE + 1, rawbuf); - /* translate the chars to integers in the range 0-126 and store - * them in the common array "INLINE". Integer values are as follows: - * 0 = space [ASCII CODE 40 octal, 32 decimal] - * 1-2 = !" [ASCII 41-42 octal, 33-34 decimal] - * 3-10 = '()*+,-. [ASCII 47-56 octal, 39-46 decimal] - * 11-36 = upper-case letters - * 37-62 = lower-case letters - * 63 = percent (%) [ASCII 45 octal, 37 decimal] - * 64-73 = digits, 0 through 9 - * Remaining characters can be translated any way that is convenient; - * The above mappings are required so that certain special - * characters are known to fit in 6 bits and/or can be easily spotted. - * Array elements beyond the end of the line should be filled with 0, - * and LNLENG should be set to the index of the last character. - * - * If the data file uses a character other than space (e.g., tab) to - * separate numbers, that character should also translate to 0. - * - * This procedure may use the map1,map2 arrays to maintain - * static data for he mapping. MAP2(1) is set to 0 when the - * program starts and is not changed thereafter unless the - * routines in this module choose to do so. */ - LNLENG = 0; - for (long i = 1; i <= (long)sizeof(INLINE) && INLINE[i] != 0; i++) { - long val = INLINE[i]; - INLINE[i] = ascii_to_advent[val]; - if (INLINE[i] != 0) - LNLENG = i; - } - LNPOSN = 1; - return true; + for (int i = 0; i < 5; ++i) { + zzword[i] = 'A' + randrange(26); } -} - -void datime(long* d, long* t) -{ - struct timeval tv; - gettimeofday(&tv, NULL); - *d = (long) tv.tv_sec; - *t = (long) tv.tv_usec; + zzword[1] = '\''; // force second char to apostrophe + zzword[5] = '\0'; } // LCOV_EXCL_START