X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=63cabf7c07bb340dc831790c72e6fdf43d64f2c3;hp=340aa3de906dd860764a0934769ff011c519be28;hb=b27f767cc6658a4f7500054c75887d69c340c0f8;hpb=2fa530340d65c636fb297aee5df5805393f08d31 diff --git a/misc.c b/misc.c index 340aa3d..63cabf7 100644 --- a/misc.c +++ b/misc.c @@ -10,9 +10,9 @@ #include "advent.h" #include "dungeon.h" -static void* xmalloc(size_t size) +static void* xcalloc(size_t size) { - void* ptr = malloc(size); + void* ptr = calloc(size, 1); if (ptr == NULL) { // LCOV_EXCL_START // exclude from coverage analysis because we can't simulate an out of memory error in testing @@ -23,112 +23,6 @@ static void* xmalloc(size_t size) return (ptr); } -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] = advent_to_ascii[(int) 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; - } -} - -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) -{ - 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); - - /* (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]); - } -} - -/* Hide the fact that wods are corrently packed longs */ - -void wordclear(token_t *v) -{ - *v = 0; -} - /* I/O routines (speak, pspeak, rspeak, sspeak, get_input, yes) */ static void vspeak(const char* msg, bool blank, va_list ap) @@ -148,13 +42,13 @@ static void vspeak(const char* msg, bool blank, va_list ap) // Rendered string ssize_t size = 2000; /* msglen > 50 ? msglen*2 : 100; */ - char* rendered = xmalloc(size); + char* rendered = xcalloc(size); char* renderp = rendered; - // Handle format specifiers (including the custom %C, %L, %S) by + // Handle format specifiers (including the custom %S) by // adjusting the parameter accordingly, and replacing the // specifier with %s. - long previous_arg = 0; + bool pluralize = false; for (int i = 0; i < msglen; i++) { if (msg[i] != '%') { /* Ugh. Least obtrusive way to deal with artifacts "on the floor" @@ -169,25 +63,25 @@ static void vspeak(const char* msg, bool blank, va_list ap) size--; } } else { - long arg = va_arg(ap, long); - 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. if (msg[i] == 'd') { + long arg = va_arg(ap, long); int ret = snprintf(renderp, size, "%ld", arg); if (ret < size) { renderp += ret; size -= ret; } + pluralize = (arg != 1); } // Unmodified string specifier. if (msg[i] == 's') { - packed_to_token(arg, renderp); /* unpack directly to destination */ + char *arg = va_arg(ap, char *); + strncat(renderp, arg, size - 1); size_t len = strlen(renderp); renderp += len; size -= len; @@ -195,7 +89,8 @@ static void vspeak(const char* msg, bool blank, va_list ap) // Singular/plural specifier. if (msg[i] == 'S') { - if (previous_arg > 1) { // look at the *previous* parameter (which by necessity must be numeric) + // look at the *previous* numeric parameter + if (pluralize) { *renderp++ = 's'; size--; } @@ -208,8 +103,6 @@ static void vspeak(const char* msg, bool blank, va_list ap) renderp += len; size -= len; } - - previous_arg = arg; } } *renderp = 0; @@ -228,7 +121,7 @@ void speak(const char* msg, ...) va_end(ap); } -void sspeak(const long msg, ...) +void sspeak(const int msg, ...) { va_list ap; va_start(ap, msg); @@ -279,14 +172,14 @@ void rspeak(vocab_t i, ...) 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); + char* prompt_and_input = (char*) xcalloc(len); strcpy(prompt_and_input, input_prompt); strcat(prompt_and_input, input); fprintf(destination, "%s\n", prompt_and_input); free(prompt_and_input); } -int word_count(char* str) +static int word_count(char* str) { char delims[] = " \t"; int count = 0; @@ -307,7 +200,7 @@ int word_count(char* str) return (count); } -char* get_input() +static char* get_input(void) { // Set up the prompt char input_prompt[] = "> "; @@ -345,7 +238,7 @@ char* get_input() return (input); } -bool silent_yes() +bool silent_yes(void) { bool outcome = false; @@ -364,7 +257,7 @@ bool silent_yes() continue; } - char* firstword = (char*) xmalloc(strlen(reply) + 1); + char* firstword = (char*) xcalloc(strlen(reply) + 1); sscanf(reply, "%s", firstword); free(reply); @@ -418,7 +311,7 @@ bool yes(const char* question, const char* yes_response, const char* no_response continue; } - char* firstword = (char*) xmalloc(strlen(reply) + 1); + char* firstword = (char*) xcalloc(strlen(reply) + 1); sscanf(reply, "%s", firstword); free(reply); @@ -453,7 +346,7 @@ bool yes(const char* question, const char* yes_response, const char* no_response /* Data structure routines */ -int get_motion_vocab_id(const char* word) +static 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) { @@ -468,7 +361,7 @@ int get_motion_vocab_id(const char* word) return (WORD_NOT_FOUND); } -int get_object_vocab_id(const char* word) +static 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 @@ -481,7 +374,7 @@ int get_object_vocab_id(const char* word) return (WORD_NOT_FOUND); } -int get_action_vocab_id(const char* word) +static 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) { @@ -496,7 +389,7 @@ int get_action_vocab_id(const char* word) return (WORD_NOT_FOUND); } -int get_special_vocab_id(const char* word) +static 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) { @@ -509,7 +402,7 @@ int get_special_vocab_id(const char* word) return (WORD_NOT_FOUND); } -void get_vocab_metadata(const char* word, long* id, enum wordtype* type) +static void get_vocab_metadata(const char* word, vocab_t* id, enum wordtype* type) { /* Check for an empty string */ if (strncmp(word, "", sizeof("")) == 0) { @@ -518,7 +411,7 @@ void get_vocab_metadata(const char* word, long* id, enum wordtype* type) return; } - long ref_num; + vocab_t ref_num; ref_num = get_motion_vocab_id(word); if (ref_num != WORD_NOT_FOUND) { @@ -560,6 +453,70 @@ void get_vocab_metadata(const char* word, long* id, enum wordtype* type) return; } +static void tokenize(char* raw, struct command_t *cmd) +{ + 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); + + /* (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]); + } + + /* populate command with parsed vocab metadata */ + get_vocab_metadata(cmd->raw1, &(cmd->id1), &(cmd->type1)); + get_vocab_metadata(cmd->raw2, &(cmd->id2), &(cmd->type2)); +} + +bool get_command_input(struct command_t *command) +/* Get user input on stdin, parse and map to command */ +{ + char inputbuf[LINESIZE]; + char* input; + + for (;;) { + input = get_input(); + if (input == NULL) + return false; + if (word_count(input) > 2) { + rspeak(TWO_WORDS); + free(input); + continue; + } + if (strcmp(input, "") != 0) + break; + free(input); + } + + strncpy(inputbuf, input, LINESIZE - 1); + free(input); + + tokenize(inputbuf, command); + + return true; +} + void juggle(obj_t object) /* Juggle an object by picking it up and putting it down again, the purpose * being to get the object to the front of the chain of things at its loc. */ @@ -578,7 +535,7 @@ void move(obj_t object, loc_t where) * pick up objects which are not at any loc, since carry wants to * remove objects from game.atloc chains. */ { - long from; + loc_t from; if (object > NOBJECTS) from = game.fixed[object - NOBJECTS]; @@ -590,7 +547,7 @@ void move(obj_t object, loc_t where) drop(object, where); } -long put(obj_t object, loc_t where, long pval) +loc_t put(obj_t object, loc_t where, long pval) /* put() is the same as move(), except it returns a value used to set up the * negated game.prop values for the repository objects. */ {