Unshadowed k2 into k3 in main.c
Reindented everything
This commit is contained in:
NHOrus
parent
5f44fccf4d
commit
bf2fa227f0
7 changed files with 323 additions and 342 deletions
375
misc.c
375
misc.c
|
|
@ -11,47 +11,47 @@
|
|||
#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',
|
||||
' ', '!', '"', '#', '$', '%', '&', '\'',
|
||||
'(', ')', '*', '+', ',', '-', '.', '/',
|
||||
'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,
|
||||
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,
|
||||
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,
|
||||
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);
|
||||
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);
|
||||
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)
|
||||
|
|
@ -62,7 +62,7 @@ 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);
|
||||
}
|
||||
|
|
@ -71,7 +71,7 @@ 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;
|
||||
char advent = (packed >> i * 6) & 63;
|
||||
token[i] = new_advent_to_ascii[(int) advent];
|
||||
}
|
||||
|
||||
|
|
@ -89,51 +89,50 @@ void packed_to_token(long packed, char token[6])
|
|||
|
||||
long token_to_packed(const char token[6])
|
||||
{
|
||||
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));
|
||||
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));
|
||||
}
|
||||
return(packed);
|
||||
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]);
|
||||
// set each token to 0
|
||||
for (int i = 0; i < 4; ++i)
|
||||
tokens[i] = 0;
|
||||
|
||||
// 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"},
|
||||
};
|
||||
// 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]);
|
||||
|
||||
// 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]);
|
||||
// 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"},
|
||||
};
|
||||
|
||||
// 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]);
|
||||
// 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]);
|
||||
|
||||
// pack the substrings
|
||||
for (int i = 0; i < 4; ++i)
|
||||
tokens[i] = token_to_packed(chunk_data[i]);
|
||||
// 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 */
|
||||
|
|
@ -184,8 +183,8 @@ 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;
|
||||
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') {
|
||||
|
|
@ -256,19 +255,19 @@ void pspeak(vocab_t msg, enum speaktype mode, int skip, ...)
|
|||
switch (mode) {
|
||||
case touch:
|
||||
vspeak(objects[msg].inventory, ap);
|
||||
break;
|
||||
case look:
|
||||
break;
|
||||
case look:
|
||||
vspeak(objects[msg].descriptions[skip], ap);
|
||||
break;
|
||||
break;
|
||||
case hear:
|
||||
vspeak(objects[msg].sounds[skip], ap);
|
||||
break;
|
||||
break;
|
||||
case study:
|
||||
vspeak(objects[msg].texts[skip], ap);
|
||||
break;
|
||||
break;
|
||||
case change:
|
||||
vspeak(objects[msg].changes[skip], ap);
|
||||
break;
|
||||
break;
|
||||
}
|
||||
va_end(ap);
|
||||
}
|
||||
|
|
@ -294,19 +293,18 @@ void echo_input(FILE* destination, char* input_prompt, char* input)
|
|||
|
||||
int word_count(char* s)
|
||||
{
|
||||
char* copy = xstrdup(s);
|
||||
char delims[] = " \t";
|
||||
int count = 0;
|
||||
char* word;
|
||||
char* copy = xstrdup(s);
|
||||
char delims[] = " \t";
|
||||
int count = 0;
|
||||
char* word;
|
||||
|
||||
word = strtok(copy, delims);
|
||||
while(word != NULL)
|
||||
{
|
||||
word = strtok(NULL, delims);
|
||||
++count;
|
||||
word = strtok(copy, delims);
|
||||
while (word != NULL) {
|
||||
word = strtok(NULL, delims);
|
||||
++count;
|
||||
}
|
||||
free(copy);
|
||||
return(count);
|
||||
free(copy);
|
||||
return (count);
|
||||
}
|
||||
|
||||
char* get_input()
|
||||
|
|
@ -328,17 +326,17 @@ char* get_input()
|
|||
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.
|
||||
// LCOV_EXCL_START
|
||||
// Should be unreachable in tests, as they will use a non-interactive shell.
|
||||
printf("%s", input_prompt);
|
||||
// LCOV_EXCL_STOP
|
||||
// LCOV_EXCL_STOP
|
||||
ssize_t numread = getline(&input, &n, stdin);
|
||||
if (numread == -1) // Got EOF; return with it.
|
||||
return(NULL);
|
||||
if (numread == -1) // Got EOF; return with it.
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
if (input == NULL) // Got EOF; return with it.
|
||||
return(input);
|
||||
return (input);
|
||||
else if (input[0] == '#') // Ignore comments.
|
||||
continue;
|
||||
else // We have a 'normal' line; leave the loop.
|
||||
|
|
@ -361,43 +359,43 @@ char* get_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
|
||||
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
|
||||
}
|
||||
|
||||
char* firstword = (char*) xmalloc(strlen(reply) + 1);
|
||||
sscanf(reply, "%s", firstword);
|
||||
|
||||
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);
|
||||
|
||||
free(firstword);
|
||||
|
||||
if (yes == 0 || y == 0) {
|
||||
outcome = true;
|
||||
break;
|
||||
} else if (no == 0 || n == 0) {
|
||||
outcome = false;
|
||||
break;
|
||||
} else
|
||||
rspeak(PLEASE_ANSWER);
|
||||
}
|
||||
|
||||
char* firstword = (char*) xmalloc(strlen(reply)+1);
|
||||
sscanf(reply, "%s", firstword);
|
||||
|
||||
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);
|
||||
|
||||
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);
|
||||
linenoiseFree(reply);
|
||||
return (outcome);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -417,10 +415,10 @@ bool yes(const char* question, const char* yes_response, const char* no_response
|
|||
// Should be unreachable. Reply should never be NULL
|
||||
linenoiseFree(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);
|
||||
|
||||
for (int i = 0; i < (int)strlen(firstword); ++i)
|
||||
|
|
@ -434,7 +432,7 @@ bool yes(const char* question, const char* yes_response, const char* no_response
|
|||
free(firstword);
|
||||
|
||||
if (yes == 0 || y == 0) {
|
||||
speak(yes_response);
|
||||
speak(yes_response);
|
||||
outcome = true;
|
||||
break;
|
||||
} else if (no == 0 || n == 0) {
|
||||
|
|
@ -453,89 +451,81 @@ bool yes(const char* question, const char* yes_response, const char* no_response
|
|||
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)
|
||||
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)
|
||||
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
|
||||
long ref_num;
|
||||
|
||||
ref_num = get_object_vocab_id(word);
|
||||
if (ref_num != WORD_NOT_FOUND)
|
||||
return(ref_num + 1000); // FIXME: replace with a proper hash
|
||||
ref_num = get_motion_vocab_id(word);
|
||||
if (ref_num != WORD_NOT_FOUND)
|
||||
return (ref_num + 0); // FIXME: replace with a proper hash
|
||||
|
||||
ref_num = get_action_vocab_id(word);
|
||||
if (ref_num != WORD_NOT_FOUND)
|
||||
return(ref_num + 2000); // FIXME: replace with a proper hash
|
||||
ref_num = get_object_vocab_id(word);
|
||||
if (ref_num != WORD_NOT_FOUND)
|
||||
return (ref_num + 1000); // FIXME: replace with a proper hash
|
||||
|
||||
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_action_vocab_id(word);
|
||||
if (ref_num != WORD_NOT_FOUND)
|
||||
return (ref_num + 2000); // FIXME: replace with a proper hash
|
||||
|
||||
// Check for the reservoir magic word.
|
||||
if (strcasecmp(word, game.zzword) == 0)
|
||||
return(PART + 2000); // FIXME: replace with a proper hash
|
||||
ref_num = get_special_vocab_id(word);
|
||||
if (ref_num != WORD_NOT_FOUND)
|
||||
return (ref_num + 3000); // FIXME: replace with a proper hash
|
||||
|
||||
return(WORD_NOT_FOUND);
|
||||
// Check for the reservoir magic word.
|
||||
if (strcasecmp(word, game.zzword) == 0)
|
||||
return (PART + 2000); // FIXME: replace with a proper hash
|
||||
|
||||
return (WORD_NOT_FOUND);
|
||||
}
|
||||
|
||||
void juggle(long object)
|
||||
|
|
@ -673,12 +663,11 @@ long randrange(long range)
|
|||
|
||||
void make_zzword(char zzword[6])
|
||||
{
|
||||
for (int i = 0; i < 5; ++i)
|
||||
{
|
||||
zzword[i] = 'A' + randrange(26);
|
||||
for (int i = 0; i < 5; ++i) {
|
||||
zzword[i] = 'A' + randrange(26);
|
||||
}
|
||||
zzword[1] = '\''; // force second char to apostrophe
|
||||
zzword[5] = '\0';
|
||||
zzword[1] = '\''; // force second char to apostrophe
|
||||
zzword[5] = '\0';
|
||||
}
|
||||
|
||||
void datime(long* d, long* t)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue