Keywords are now collected using a B-tree rather than an array with

heapsort. This makes the code much simpler for a start, but the main
reason is so that we can spot duplicate keywords as we go along
rather than having to wait until the end of input processing.

[originally from svn r1489]

1 files changed, 4 insertions, 3 deletions

diff --git a/main.c b/main.c
index 8202bca..a86399a 100644
--- a/main.c
+++ b/main.c
@@ -259,11 +259,12 @@ static void dbg_prtkws(keywordlist *kws) {
      */
 
     int i;
+    keyword *kw;
 
-    for (i = 0; i < kws->nkeywords; i++) {
+    for (i = 0; (kw = index234(kws->keys, i)) != NULL; i++) {
 	wchar_t *wp;
 	printf("keyword ");
-	wp = kws->keys[i]->key;
+	wp = kw->key;
 	while (*wp) {
 	    putchar('\"');
 	    for (; *wp; wp++)
@@ -273,7 +274,7 @@ static void dbg_prtkws(keywordlist *kws) {
 		printf(", ");
 	}
 	printf(" {\n");
-	dbg_prtwordlist(1, kws->keys[i]->text);
+	dbg_prtwordlist(1, kw->text);
 	printf("}\n");
     }
 }