Begin to wean grid.c away from trie and toward dict.

[wordgame] / grid.c

diff --git a/grid.c b/grid.c
index b9c307bafd50e7a2e49c8b4653802de8a5ec6686..9b0ffbe7eeb30896af40c006dae551373463a70d 100644 (file)
--- a/grid.c
+++ b/grid.c
@@ -39,7 +39,7 @@ typedef struct _board {
     char letters[4][4];
 
     /* Private, transient state used by enumerate */
-    trie_t *result_trie;
+    dict_t *results;
 } board_t;
 
 int
@@ -129,7 +129,7 @@ board_enumerate (board_t    *board,
     }
 
     if (dict_trie->flags & TRIE_FLAGS_IS_WORD)
-       trie_add (board->result_trie, word->s);
+       dict_add_word (board->results, word->s);
 
     for (dy = -1; dy <= 1; dy++)
        for (dx = -1; dx <= 1; dx++)
@@ -143,19 +143,19 @@ board_enumerate (board_t  *board,
 }
 
 void
-board_solve (board_t *board, dict_t *dict, trie_t *solution)
+board_solve (board_t *board, dict_t *dict, dict_t *solution)
 {
     int x, y;
     int16_t seen = 0;
     string_t word;
 
-    board->result_trie = solution;
+    board->results = solution;
 
     string_init (&word);
 
     for (y = 0; y < 4; y++)
        for (x = 0; x < 4; x++)
-           board_enumerate (board, x, y, seen, &word, dict->trie);
+           board_enumerate (board, x, y, seen, &word, dict);
 
     string_fini (&word);
 }
@@ -164,9 +164,8 @@ board_solve (board_t *board, dict_t *dict, trie_t *solution)
 int
 main (void)
 {
-    dict_t dict;
+    dict_t dict, solution;
     board_t board;
-    trie_t *solution;
     struct timeval tv, tv_stop;
     int remaining, minutes, seconds;
     int found, missed;
@@ -176,11 +175,12 @@ main (void)
     gettimeofday (&tv, NULL);
     srand (tv.tv_sec ^ tv.tv_usec);
 
-    dict_init (&dict, "words.txt");
+    dict_init (&dict);
+    dict_add_words_from_file (&dict, "words.txt");
     board_init (&board);
 
-    solution = trie_create ();
-    board_solve (&board, &dict, solution);
+    dict_init (&solution);
+    board_solve (&board, &dict, &solution);
 
     board_print (&board);
 
@@ -199,14 +199,14 @@ main (void)
            board_print (&board);
        } else {
            trie_t *t;
-           t = trie_find (solution, response);
+           t = trie_find (&solution, response);
            if (t && (t->flags & TRIE_FLAGS_IS_WORD)) {
                if (t->flags & TRIE_FLAGS_SEEN)
                    printf ("(repeat)\n");
                else
                    t->flags |= TRIE_FLAGS_SEEN;
            } else {
-               t = trie_find (dict.trie, response);
+               t = trie_find (&dict, response);
                if (t && (t->flags & TRIE_FLAGS_IS_WORD))
                    printf ("(a good word, but it's not in the puzzle)\n");
                else
@@ -221,13 +221,13 @@ main (void)
 
     printf ("\nWords you found:\n");
     string_init (&word);
-    found = trie_print_seen (solution, &word);
+    found = trie_print_seen (&solution, &word);
     string_fini (&word);
     printf ("\n");
 
     printf ("\nWords you missed:\n");
     string_init (&word);
-    missed = trie_print_unseen (solution, &word);
+    missed = trie_print_unseen (&solution, &word);
     string_fini (&word);
     printf ("\n");