X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=b71969e2918dcd32f7f695753b33bdb2d889d921;hp=46a3d6002348023ea30045a11aa494e024c5cf63;hb=85f8334e17b9e3118a73f2e9405e9db5f94ad648;hpb=58a8a761e25ee45d6c300f2c22993f160db86e11 diff --git a/misc.c b/misc.c index 46a3d60..b71969e 100644 --- a/misc.c +++ b/misc.c @@ -5,43 +5,11 @@ #include #include #include +#include #include "advent.h" -#include "linenoise/linenoise.h" #include "dungeon.h" -const char new_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', -}; - -const char new_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, -}; - char* xstrdup(const char* s) { char* ptr = strdup(s); @@ -69,10 +37,22 @@ void* xmalloc(size_t size) void packed_to_token(long packed, char token[6]) { + // 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]; + token[i] = advent_to_ascii[(int) advent]; } // Ensure the last character is \0. @@ -89,10 +69,31 @@ void packed_to_token(long packed, char token[6]) long token_to_packed(const char token[6]) { + 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); long packed = 0; for (size_t i = 0; i < t_len; ++i) { - char mapped = new_ascii_to_advent[(int) token[i]]; + char mapped = ascii_to_advent[(int) token[i]]; packed |= (mapped << (6 * i)); } return (packed); @@ -106,8 +107,8 @@ void tokenize(char* raw, long tokens[4]) // grab the first two words char* words[2]; - words[0] = (char*) xmalloc(strlen(raw)+1); - words[1] = (char*) xmalloc(strlen(raw)+1); + words[0] = (char*) xmalloc(strlen(raw) + 1); + words[1] = (char*) xmalloc(strlen(raw) + 1); int word_count = sscanf(raw, "%s%s", words[0], words[1]); // make space for substrings and zero it out @@ -152,7 +153,7 @@ void wordclear(token_t *v) *v = 0; } -/* I/O routines (speak, pspeak, rspeak, GETIN, YES) */ +/* I/O routines (speak, pspeak, rspeak, get_input, yes) */ void vspeak(const char* msg, va_list ap) { @@ -175,7 +176,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] != '%') { @@ -186,7 +189,10 @@ void vspeak(const char* msg, va_list ap) if (arg == -1) arg = 0; 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) { @@ -211,6 +217,14 @@ void vspeak(const char* msg, va_list ap) } } + /* Version specifier */ + if (msg[i] == 'V') { + strcpy(renderp, VERSION); + size_t len = strlen(VERSION); + renderp += len; + size -= len; + } + // All-lowercase specifier. if (msg[i] == 'L' || msg[i] == 'C') { packed_to_token(arg, renderp); /* unpack directly to destination */ @@ -281,7 +295,7 @@ void rspeak(vocab_t i, ...) va_end(ap); } -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); @@ -320,39 +334,27 @@ char* get_input() 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. + 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); + echo_input(logfp, "", input); return (input); } @@ -367,7 +369,7 @@ bool silent_yes() if (reply == NULL) { // LCOV_EXCL_START // Should be unreachable. Reply should never be NULL - linenoiseFree(reply); + free(reply); exit(EXIT_SUCCESS); // LCOV_EXCL_STOP } @@ -375,6 +377,8 @@ bool silent_yes() 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]); @@ -394,7 +398,6 @@ bool silent_yes() } else rspeak(PLEASE_ANSWER); } - linenoiseFree(reply); return (outcome); } @@ -413,7 +416,7 @@ bool yes(const char* question, const char* yes_response, const char* no_response if (reply == NULL) { // LCOV_EXCL_START // Should be unreachable. Reply should never be NULL - linenoiseFree(reply); + free(reply); exit(EXIT_SUCCESS); // LCOV_EXCL_STOP } @@ -421,6 +424,8 @@ bool yes(const char* question, const char* yes_response, const char* no_response 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]); @@ -441,8 +446,9 @@ bool yes(const char* question, const char* yes_response, const char* no_response break; } else rspeak(PLEASE_ANSWER); + } - linenoiseFree(reply); + return (outcome); } @@ -453,7 +459,7 @@ int get_motion_vocab_id(const char* word) { 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) + if (strcasecmp(word, motions[i].words.strs[j]) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !oldstyle)) return (i); } } @@ -479,7 +485,7 @@ int get_action_vocab_id(const char* word) { 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) + if (strcasecmp(word, actions[i].words.strs[j]) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !oldstyle)) return (i); } } @@ -505,6 +511,7 @@ long get_vocab_id(const char* word) { long ref_num; + /* FIXME: Magic numbers related to vocabulary */ ref_num = get_motion_vocab_id(word); if (ref_num != WORD_NOT_FOUND) return (ref_num + 0); // FIXME: replace with a proper hash @@ -626,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. */ @@ -645,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)