archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify tokenization code.

Browse source
This commit is contained in:
Eric S. Raymond 2017-07-03 17:13:28 -04:00
parent 393010ec41
commit 4b51b06b73
2 changed files with 7 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
advent.h
View file

@ -192,7 +192,7 @@ extern struct settings_t settings;
extern char* xstrdup(const char* s); extern char* xstrdup(const char* s);
extern void* xmalloc(size_t size); extern void* xmalloc(size_t size);
extern void packed_to_token(long, char token[]); extern void packed_to_token(long, char token[]);
extern long token_to_packed(const char token[TOKLEN+1]); extern long token_to_packed(const char token[]);
extern void tokenize(char*, struct command_t *); extern void tokenize(char*, struct command_t *);
extern void vspeak(const char*, bool, va_list); extern void vspeak(const char*, bool, va_list);
extern bool wordeq(token_t, token_t); extern bool wordeq(token_t, token_t);

28
misc.c
View file

@ -68,7 +68,7 @@ void packed_to_token(long packed, char token[TOKLEN+1])
} }
} }
long token_to_packed(const char token[TOKLEN+1]) long token_to_packed(const char token[])
{ {
const char ascii_to_advent[] = { const char ascii_to_advent[] = {
63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
@ -92,9 +92,11 @@ long token_to_packed(const char token[TOKLEN+1])
}; };
size_t t_len = strlen(token); size_t t_len = strlen(token);
if (t_len > TOKLEN)
t_len = TOKLEN;
long packed = 0; long packed = 0;
for (size_t i = 0; i < t_len; ++i) { for (size_t i = 0; i < t_len; ++i) {
char mapped = ascii_to_advent[(int) token[i]]; char mapped = ascii_to_advent[(int) toupper(token[i])];
packed |= (mapped << (6 * i)); packed |= (mapped << (6 * i));
} }
return (packed); return (packed);
@ -107,27 +109,9 @@ void tokenize(char* raw, struct command_t *cmd)
/* FIXME: put a bound prefix on the %s to prevent buffer overflow */ /* FIXME: put a bound prefix on the %s to prevent buffer overflow */
int word_count = sscanf(raw, "%s%s", cmd->raw1, cmd->raw2); int word_count = sscanf(raw, "%s%s", cmd->raw1, cmd->raw2);
// make space for substrings and zero it out
char chunk_data[][TOKLEN+1] = {
{"\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(cmd->raw1, "%5s%5s", chunk_data[0], chunk_data[1]);
if (word_count == 2)
sscanf(cmd->raw2, "%5s%5s", chunk_data[2], chunk_data[3]);
// 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 // pack the substrings
cmd->wd1 = token_to_packed(chunk_data[0]); cmd->wd1 = token_to_packed(cmd->raw1);
cmd->wd2 = token_to_packed(chunk_data[2]); cmd->wd2 = token_to_packed(cmd->raw2);
} }
/* Hide the fact that wods are corrently packed longs */ /* Hide the fact that wods are corrently packed longs */