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

No more packing in the parser.

Browse source 
As a side effect, ill-formed input consisting of "_\n" gives
a slighty better error message.
This commit is contained in:
Eric S. Raymond 2017-07-20 10:15:39 -04:00
parent 78ba0fac6a
commit 2fa530340d
3 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
main.c
View file

@ -1012,10 +1012,8 @@ static bool get_command_input(struct command_t *command)
tokenize(inputbuf, command);
packed_to_token(command->wd1, word1);
packed_to_token(command->wd2, word2);
get_vocab_metadata(word1, &(command->id1), &(command->type1));
get_vocab_metadata(word2, &(command->id2), &(command->type2));
get_vocab_metadata(command->raw1, &(command->id1), &(command->type1));
get_vocab_metadata(command->raw2, &(command->id2), &(command->type2));
return true;
}
@ -1135,14 +1133,12 @@ Lclearobj:
command.id2 = POUR;
command.type2 = ACTION;
strncpy(command.raw2, "POUR", LINESIZE - 1);
command.wd2 = token_to_packed("POUR");
}
}
if (command.id1 == CAGE && command.id2 == BIRD && HERE(CAGE) && HERE(BIRD)) {
command.id1 = CARRY;
command.type1 = ACTION;
strncpy(command.raw2, "CATCH", LINESIZE - 1);
command.wd1 = token_to_packed("CATCH");
}
}
@ -1195,7 +1191,6 @@ Lookup:
command.id1 = command.id2;
command.type1 = command.type2;
strncpy(command.raw1, command.raw2, LINESIZE - 1);
command.wd1 = command.wd2;
command.id2 = WORD_EMPTY;
command.type2 = NO_WORD_TYPE;
command.raw2[0] = '\0';

4
misc.c
View file

@ -99,10 +99,6 @@ void tokenize(char* raw, struct command_t *cmd)
* 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

12
tests/illformed.chk
View file

@ -106,9 +106,7 @@ full description of a place unless you explicitly ask me to.
> _
I don't know how to apply that word here.
You're in front of building.
Sorry, I don't know the word "_".
> back
@ -259,9 +257,7 @@ There is a bottle of water here.
> out
You are standing at the end of a road before a small brick building.
Around you is a forest. A small stream flows out of the building and
down a gully.
You're in front of building.
> stream
@ -282,7 +278,9 @@ Blasting requires dynamite.
> building
You're in front of building.
You are standing at the end of a road before a small brick building.
Around you is a forest. A small stream flows out of the building and
down a gully.
> cave