X-Git-Url: https://git.cworth.org/git?p=wordgame;a=blobdiff_plain;f=dict.c;h=a842fa9dbda1863f6e936957c2a61d31d1e05ada;hp=cef51d4a08e1fb6163618aff084c623eef8b5ce9;hb=a46e558ad8d3243c76a9a6cafb6100be4f3f2dae;hpb=54a35ad5a96cc57816a9e05ab9d1e1513c202894

diff --git a/dict.c b/dict.c
index cef51d4..a842fa9 100644
--- a/dict.c
+++ b/dict.c
@@ -16,16 +16,12 @@
  * 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;
@@ -213,12 +209,14 @@ trie_count (trie_t		*trie,
 }
 
 static int
-trie_print (trie_t		*trie,
-	    string_t		*string,
-	    trie_predicate_t	 predicate,
-	    int			 length,
-	    int			 min_length,
-	    int			 max_length)
+trie_for_each (trie_t		*trie,
+	       string_t		*string,
+	       trie_predicate_t	 predicate,
+	       int		 length,
+	       int		 min_length,
+	       int		 max_length,
+	       dict_action_t	 action,
+	       void		*closure)
 {
     char c;
     int i;
@@ -227,7 +225,8 @@ trie_print (trie_t		*trie,
     if (length >= min_length && (predicate) (trie))
     {
 	count = 1;
-	printf ("%s ", string->s);
+
+	action (closure, string->s, &trie->flags);
     }
 
     if (length == max_length)
@@ -241,8 +240,9 @@ trie_print (trie_t		*trie,
 	c = TRIE_INDEX_TO_CHAR (i);
 
 	string_append_char (string, c);
-	count += trie_print (trie->next[i], string, predicate,
-			     length + 1, min_length, max_length);
+	count += trie_for_each (trie->next[i], string, predicate,
+				length + 1, min_length, max_length,
+				action, closure);
 	string_chop (string);
     }
 
@@ -375,16 +375,20 @@ dict_count (dict_t			*dict,
 }
 
 int
-dict_print (dict_t *dict)
+dict_for_each_if (dict_t			*dict,
+		  dict_action_t			 action,
+		  void				*closure,
+		  dict_entry_predicate_t	 predicate)
+
 {
     int count;
     string_t string;
 
     string_init (&string);
 
-    dict_entry_predicate = NULL;
-    count = trie_print (dict, &string, dict_predicate,
-			0, 0, -1);
+    dict_entry_predicate = predicate;
+    count = trie_for_each (dict, &string, dict_predicate,
+			   0, 0, -1, action, closure);
 
     string_fini (&string);
 
@@ -392,26 +396,18 @@ dict_print (dict_t *dict)
 }
 
 int
-dict_print_if (dict_t			*dict,
-	       dict_entry_predicate_t	 predicate)
+dict_for_each (dict_t		*dict,
+	       dict_action_t	 action,
+	       void		*closure)
 {
-    int count;
-    string_t string;
-
-    string_init (&string);
-
-    dict_entry_predicate = predicate;
-    count = trie_print (dict, &string, dict_predicate,
-			0, 0, -1);
-
-    string_fini (&string);
-
-    return count;
+    return dict_for_each_if (dict, action, closure, NULL);
 }
 
 int
-dict_print_by_length_if (dict_t			*dict,
-			 dict_entry_predicate_t	 predicate)
+dict_for_each_by_length_if (dict_t			*dict,
+			    dict_action_t		 action,
+			    void			*closure,
+			    dict_entry_predicate_t	 predicate)
 {
     int length, total, words, count = 0;
     string_t string;
@@ -424,12 +420,11 @@ dict_print_by_length_if (dict_t			*dict,
 
     length = 1;
     do {
-	words = trie_print (dict, &string, dict_predicate,
-			    0, length, length);
-	if (words) {
-	    printf ("\n");
+	words = trie_for_each (dict, &string, dict_predicate,
+			       0, length, length,
+			       action, closure);
+	if (words)
 	    count += words;
-	}
 	length++;
     } while (count < total);
 
@@ -437,3 +432,67 @@ dict_print_by_length_if (dict_t			*dict,
     
     return count;
 }
+
+int
+dict_for_each_by_length (dict_t		*dict,
+			 dict_action_t	 action,
+			 void		*closure)
+{
+    return dict_for_each_by_length_if (dict, action, closure, NULL);
+}
+
+static void
+dict_action_print (void *closure, char *word, dict_entry_t *entry)
+{
+    int *length_of_last = closure;
+    int length = strlen (word);
+
+    if (length == *length_of_last)
+	printf(" ");
+    else if (*length_of_last)
+	printf("\n");
+
+    printf ("%s", word);
+
+    *length_of_last = length;
+}
+
+int
+dict_print (dict_t *dict)
+{
+    int length_of_last = 0;
+
+    return dict_for_each (dict,
+			  dict_action_print, &length_of_last);
+}
+
+int
+dict_print_by_length (dict_t *dict)
+{
+    int length_of_last = 0;
+
+    return dict_for_each_by_length (dict,
+				    dict_action_print, &length_of_last);
+}
+
+int
+dict_print_if (dict_t			*dict,
+	       dict_entry_predicate_t	 predicate)
+{
+    int length_of_last = 0;
+
+    return dict_for_each_if (dict,
+			     dict_action_print, &length_of_last,
+			     predicate);
+}
+
+int
+dict_print_by_length_if (dict_t			*dict,
+			 dict_entry_predicate_t	 predicate)
+{
+    int length_of_last = 0;
+
+    return dict_for_each_by_length_if (dict,
+				       dict_action_print, &length_of_last,
+				       predicate);
+}