Removing trailing spaces.

[bsdgames-darwin.git] / battlestar / parse.c

diff --git a/battlestar/parse.c b/battlestar/parse.c
index 8d85e6c5eb2bf68a59314eff3f930853a7f8e413..4b4b3bc6244f55f2bfcaf390a03def28a6fa6e76 100644 (file)
--- a/battlestar/parse.c
+++ b/battlestar/parse.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.7 1999/02/10 01:36:50 hubertf Exp $        */
+/*     $NetBSD: parse.c,v 1.15 2005/07/01 06:04:54 jmc Exp $   */
 
 /*
  * Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,14 +34,24 @@
 #if 0
 static char sccsid[] = "@(#)parse.c    8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: parse.c,v 1.7 1999/02/10 01:36:50 hubertf Exp $");
+__RCSID("$NetBSD: parse.c,v 1.15 2005/07/01 06:04:54 jmc Exp $");
 #endif
 #endif                         /* not lint */
 
 #include "extern.h"
 
+#define HASHSIZE       256
+#define HASHMUL                81
+#define HASHMASK       (HASHSIZE - 1)
+
+static int hash(const char *);
+static void install(struct wlist *);
+static struct wlist *lookup(const char *);
+
+static struct wlist *hashtab[HASHSIZE];
+
 void
-wordinit()
+wordinit(void)
 {
        struct wlist *w;
 
@@ -53,9 +59,8 @@ wordinit()
                install(w);
 }
 
-int
-hash(s)
-       const char   *s;
+static int
+hash(const char *s)
 {
        int     hashval = 0;
 
@@ -67,9 +72,8 @@ hash(s)
        return hashval;
 }
 
-struct wlist *
-lookup(s)
-       const char   *s;
+static struct wlist *
+lookup(const char   *s)
 {
        struct wlist *wp;
 
@@ -79,9 +83,8 @@ lookup(s)
        return NULL;
 }
 
-void
-install(wp)
-       struct wlist *wp;
+static void
+install(struct wlist *wp)
 {
        int     hashval;
 
@@ -94,10 +97,11 @@ install(wp)
 }
 
 void
-parse()
+parse(void)
 {
        struct wlist *wp;
        int     n;
+       int     flag;
 
        wordnumber = 0;         /* for cypher */
        for (n = 0; n <= wordcount; n++) {
@@ -109,4 +113,75 @@ parse()
                        wordtype[n] = wp->article;
                }
        }
+       /* We never use adjectives for anything, so yank them all. */
+       for (n = 1; n < wordcount; n++)
+               if (wordtype[n] == ADJS) {
+                       int i;
+                       for (i = n + 1; i < wordcount; i++) {
+                               wordtype[i - 1] = wordtype[i];
+                               wordvalue[i - 1] = wordvalue[i];
+                               strcpy(words[i - 1], words[i]);
+                       }
+                       wordcount--;
+               }
+       /* Don't let a comma mean AND if followed by a verb. */
+       for (n = 0; n < wordcount; n++)
+               if (wordvalue[n] == AND && words[n][0] == ','
+                   && wordtype[n + 1] == VERB) {
+                       wordvalue[n] = -1;
+                       wordtype[n] = -1;
+               }
+       /* Trim "AND AND" which can happen naturally at the end of a
+        * comma-delimited list.
+        */
+       for (n = 1; n < wordcount; n++)
+               if (wordvalue[n - 1] == AND && wordvalue[n] == AND) {
+                       int i;
+                       for (i = n + 1; i < wordcount; i++) {
+                               wordtype[i - 1] = wordtype[i];
+                               wordvalue[i - 1] = wordvalue[i];
+                               strcpy(words[i - 1], words[i]);
+                       }
+                       wordcount--;
+               }
+
+       /* If there is a sequence (NOUN | OBJECT) AND EVERYTHING
+        * then move all the EVERYTHINGs to the beginning, since that's where
+        * they're expected.  We can't get rid of the NOUNs and OBJECTs in
+        * case they aren't in EVERYTHING (i.e. not here or nonexistent).
+        */
+       flag = 1;
+       while (flag) {
+               flag = 0;
+               for (n = 1; n < wordcount; n++)
+                       if ((wordtype[n - 1] == NOUNS || 
+                           wordtype[n - 1] == OBJECT) &&
+                           wordvalue[n] == AND && 
+                           wordvalue[n + 1] == EVERYTHING) {
+                               char tmpword[WORDLEN];
+                               wordvalue[n + 1] = wordvalue[n - 1];
+                               wordvalue[n - 1] = EVERYTHING;
+                               wordtype[n + 1] = wordtype[n - 1];
+                               wordtype[n - 1] = OBJECT;
+                               strcpy(tmpword, words[n - 1]);
+                               strcpy(words[n - 1], words[n + 1]);
+                               strcpy(words[n + 1], tmpword);
+                               flag = 1;
+               }
+               /* And trim EVERYTHING AND EVERYTHING. */
+               for (n = 1; n < wordcount; n++)
+                       if (wordvalue[n - 1] == EVERYTHING &&
+                           wordvalue[n] == AND && 
+                           wordvalue[n + 1] == EVERYTHING) {
+                               int i;
+                               for (i = n + 1; i < wordcount; i++) {
+                                       wordtype[i - 1] = wordtype[i + 1];
+                                       wordvalue[i - 1] = wordvalue[i + 1];
+                                       strcpy(words[i - 1], words[i + 1]);
+                               }
+                               wordcount--;
+                               wordcount--;
+                               flag = 1;
+                       }
+       }
 }