Module Name:	basesrc
Committed By:	jsm
Date:		Thu Sep 21 17:44:35 UTC 2000

Modified Files:
	basesrc/games/battlestar: battlestar.c cypher.c extern.h getcom.c
	    globals.c parse.c words.c

Log Message:
Various improvements to parsing in battlestar, mostly from OpenBSD.

Define a constant WORDLEN.  Always use this constant and NWORD where
appropriate.

Use NWORD - 1 in battlestar.c to avoid off-by-one error.

Increment wordnumber after the INVEN verb to allow it to be followed
by a comma and other actions.

Avoid overflowing elements of the words array if input words are too
long.

Parse "," as AND except when followed by a verb, to allow such
constructions as "take foo, bar, and baz".  Trim AND AND which may
occur from the ", and" in such a list.

Avoid crashes from EVERYTHING in the wrong place by moving it to the
start of OBJECT AND EVERYTHING and NOUNS AND EVERYTHING sequences, and
trimming EVERYTHING AND EVERYTHING.


To generate a diff of this commit:
cvs rdiff -r1.11 -r1.12 basesrc/games/battlestar/battlestar.c
cvs rdiff -r1.14 -r1.15 basesrc/games/battlestar/cypher.c
cvs rdiff -r1.20 -r1.21 basesrc/games/battlestar/extern.h
cvs rdiff -r1.8 -r1.9 basesrc/games/battlestar/getcom.c \
    basesrc/games/battlestar/words.c
cvs rdiff -r1.12 -r1.13 basesrc/games/battlestar/globals.c
cvs rdiff -r1.7 -r1.8 basesrc/games/battlestar/parse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.