X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=dict.c;h=a9202934035d35346f0ac75905f4baa130fff9ed;hb=ea2a992111737eccb174f26f71ab5357597d5147;hp=c364cb8110f066c9fbc71f65317fbb526778da84;hpb=2d604d8b8a380f7f3028c234282bfdcf12f95dad;p=wordgame

diff --git a/dict.c b/dict.c
index c364cb8..a920293 100644
--- a/dict.c
+++ b/dict.c
@@ -16,17 +16,25 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
  */
 
-/* Portably, schmortability. I want ease of programming. */
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
+#include "dict.h"
+
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
 
-#include "dict.h"
+typedef struct _string {
+    size_t size;
+    char *s;
+    size_t len;
+} string_t;
 
-void *
+typedef bool_t
+(*trie_predicate_t) (trie_t *trie);
+
+#define TRIE_CHAR_TO_INDEX(c)	(tolower (c) - 'a')
+#define TRIE_INDEX_TO_CHAR(i)	(i + 'a')
+
+static void *
 xmalloc (size_t size)
 {
     void *res;
@@ -40,7 +48,7 @@ xmalloc (size_t size)
     return res;
 }
 
-void *
+static void *
 xrealloc (void *ptr, size_t size)
 {
     void *res;
@@ -54,15 +62,17 @@ xrealloc (void *ptr, size_t size)
     return res;
 }
 
-void
+static void
 chomp (char *s)
 {
     int len = strlen (s);
+    if (len == 0)
+	return;
     if (s[len - 1] == '\n')
 	s[len - 1] = '\0';
 }
 
-void
+static void
 string_init (string_t *string)
 {
     string->size = 0;
@@ -70,7 +80,7 @@ string_init (string_t *string)
     string->len = 0;
 }
 
-void
+static void
 string_fini (string_t *string)
 {
     string->size = 0;
@@ -79,7 +89,7 @@ string_fini (string_t *string)
     string->len = 0;
 }
 
-void
+static void
 string_append_char (string_t *string, char c)
 {
     if (string->size == 0) {
@@ -98,7 +108,7 @@ string_append_char (string_t *string, char c)
     string->s[string->len] = '\0';
 }
 
-void
+static void
 string_chop (string_t *string)
 {
     if (string->len == 0)
@@ -129,7 +139,7 @@ trie_fini (trie_t *trie)
 	    trie_destroy (trie->next[i]);
 }
 
-trie_t *
+static trie_t *
 trie_create (void)
 {
     trie_t *trie;
@@ -149,26 +159,24 @@ trie_destroy (trie_t *trie)
     free (trie);
 }
 
-void
+static trie_t *
 trie_add (trie_t	*trie,
 	  const char	*word_chunk)
 {
     char c = word_chunk[0];
     int i;
 
-    if (c == '\0') {
-	trie->flags |= TRIE_FLAGS_IS_WORD;
-	return;
-    }
+    if (c == '\0')
+	return trie;
 
     i = TRIE_CHAR_TO_INDEX (c);
     if (trie->next[i] == NULL)
 	trie->next[i] = trie_create ();
 
-    trie_add (trie->next[i], word_chunk + 1);
+    return trie_add (trie->next[i], word_chunk + 1);
 }
 
-trie_t *
+static trie_t *
 trie_find (trie_t	*trie,
 	   const char	*word_chunk)
 {
@@ -180,7 +188,7 @@ trie_find (trie_t	*trie,
     return trie;
 }
 
-int
+static int
 trie_count (trie_t		*trie,
 	    trie_predicate_t	 predicate)
 {
@@ -200,7 +208,7 @@ trie_count (trie_t		*trie,
     return count;
 }
 
-int
+static int
 trie_print (trie_t		*trie,
 	    string_t		*string,
 	    trie_predicate_t	 predicate,
@@ -253,7 +261,10 @@ void
 dict_add_word (dict_t		*dict,
 	       const char	*word)
 {
-    trie_add (dict, word);
+    trie_t *trie;
+
+    trie = trie_add (dict, word);
+    trie->flags |= DICT_ENTRY_FLAG_IS_WORD;
 }
 
 void