Increase the window size a bit

[wordgame] / dict.h

diff --git a/dict.h b/dict.h
index 6152c724e303c8d4177a44ea0cb024c8c9a2e69e..9fcb3790d3e8d44daf9b359457ff13981f965e78 100644 (file)
--- a/dict.h
+++ b/dict.h
@@ -1,7 +1,7 @@
 /*
  * Copyright © 2006 Carl Worth
  *
- * This program is free software; you can redistribute it and\/or modify
+ * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
@@ -68,8 +68,11 @@ typedef bool_t
 (*dict_entry_predicate_t) (dict_entry_t entry);
 
 int
-dict_count (dict_t                     *dict,
-           dict_entry_predicate_t      predicate);
+dict_count_if (dict_t                  *dict,
+              dict_entry_predicate_t   predicate);
+
+int
+dict_count (dict_t *dict);
 
 /* Querying a dictionary entry. The dict interface uses 1 bit.
  * All of the remaining bits are available for application use.
@@ -83,18 +86,26 @@ int
 dict_print (dict_t *dict);
 
 int
-dict_print_by_length (dict_t *dict);
+dict_print_of_length (dict_t   *dict,
+                     int        min_length,
+                     int        max_length);
 
 int
 dict_print_if (dict_t                  *dict,
               dict_entry_predicate_t    predicate);
 
+int
+dict_print_of_length_if (dict_t                        *dict,
+                        int                     min_length,
+                        int                     max_length,
+                        dict_entry_predicate_t  predicate);
+
 int
 dict_print_by_length_if (dict_t                        *dict,
                         dict_entry_predicate_t  predicate);
 
 /* More general callback-based iteration of all entries */
-typedef void (* dict_action_t) (void *closure, char *word);
+typedef void (* dict_action_t) (void *closure, char *word, dict_entry_t *entry);
 
 int
 dict_for_each (dict_t          *dict,
@@ -102,9 +113,11 @@ dict_for_each (dict_t              *dict,
               void             *closure);
 
 int
-dict_for_each_by_length (dict_t                *dict,
+dict_for_each_of_length (dict_t                *dict,
                         dict_action_t   action,
-                        void           *closure);
+                        void           *closure,
+                        int             min_length,
+                        int             max_length);
 
 int
 dict_for_each_if (dict_t                       *dict,
@@ -113,9 +126,11 @@ dict_for_each_if (dict_t                   *dict,
                  dict_entry_predicate_t         predicate);
 
 int
-dict_for_each_by_length_if (dict_t                     *dict,
+dict_for_each_of_length_if (dict_t                     *dict,
                            dict_action_t                action,
                            void                        *closure,
+                           int                          min_length,
+                           int                          max_length,
                            dict_entry_predicate_t       predicate);
 
 /* Character-by-character perusal of the dictionary */