improve c++ api, introduce ability to describe a dictionary (language tag, provider, ...)

git-svn-id: svn+ssh://svn.abisource.com/svnroot/enchant/trunk@20803 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6

2 files changed, 29 insertions, 8 deletions

diff --git a/tests/test-enchant.c b/tests/test-enchant.c
index 513ad91..320edc5 100644
--- a/tests/test-enchant.c
+++ b/tests/test-enchant.c
@@ -34,15 +34,25 @@
 #include "enchant.h"
 
 static void
-enumerate_dicts (const char * name,
-		 const char * desc,
-		 const char * file,
+enumerate_dicts (const char * const name,
+		 const char * const desc,
+		 const char * const file,
 		 void * ud)
 {
 	printf ("%s: '%s' (%s)\n", name, desc, file);
 }
 
 static void
+describe_dict (const char * const lang,
+	       const char * const name,
+	       const char * const desc,
+	       const char * const file,
+	       void * ud)
+{
+	printf ("%s: %s '%s' (%s)\n", lang, name, desc, file);
+}
+
+static void
 run_dict_tests (EnchantDict * dict)
 {
 	char **suggs;
@@ -111,6 +121,7 @@ main (int argc, char **argv)
 		} 
 	else 
 		{
+			enchant_dict_describe (dict, describe_dict, NULL);
 			run_dict_tests (dict);
 			
 			enchant_broker_describe (broker, enumerate_dicts, NULL);
diff --git a/tests/test-enchantxx.cpp b/tests/test-enchantxx.cpp
index 74618b1..33ad5db 100644
--- a/tests/test-enchantxx.cpp
+++ b/tests/test-enchantxx.cpp
@@ -28,7 +28,6 @@
  * do so, delete this exception statement from your version.
  */
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -38,15 +37,25 @@
 using namespace enchant;
 
 static void
-enumerate_dicts (const char * name,
-		 const char * desc,
-		 const char * file,
+enumerate_dicts (const char * const name,
+		 const char * const desc,
+		 const char * const file,
 		 void * ud)
 {
 	printf ("%s: '%s' (%s)\n", name, desc, file);
 }
 
 static void
+describe_dict (const char * const lang,
+	       const char * const name,
+	       const char * const desc,
+	       const char * const file,
+	       void * ud)
+{
+	printf ("%s: %s '%s' (%s)\n", lang, name, desc, file);
+}
+
+static void
 run_dict_tests (Dict * dict)
 {
 	std::vector<std::string> suggs;
@@ -101,9 +110,10 @@ main (int argc, char **argv)
 	
 	try {
 		dict = broker->request_dict ("en_US");
+		dict->describe (describe_dict);
 		run_dict_tests (dict);
 		
-		broker->describe (enumerate_dicts, NULL);
+		broker->describe (enumerate_dicts);
 		delete dict;
 	} catch (...) {
 		fprintf (stderr, "Couldn't create dictionary for en_US\n");