From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Sat, 19 Jun 2004 15:04:07 +0000 (+0000)
Subject: Add a batch of assertions to ensure no more index terms fail to have
X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/commitdiff_plain/1b7bf71527db15176bb109ad097d4796068521c1

Add a batch of assertions to ensure no more index terms fail to have
their anchors generated. Index bugs of this type can be terribly
subtle and go unnoticed for ages; I'm lucky Jacob spotted the first
one of the type, but I'm now going to be careful to avoid any
further ones.


git-svn-id: svn://svn.tartarus.org/sgt/halibut@4293 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/bk_html.c b/bk_html.c
index bb98eb8..c58ecf1 100644
--- a/bk_html.c
+++ b/bk_html.c
@@ -136,6 +136,7 @@ typedef struct {
 typedef struct {
     htmlsect *section;
     char *fragment;
+    int generated, referenced;
 } htmlindexref;
 
 typedef struct {
@@ -621,6 +622,7 @@ void html_backend(paragraph *sourceform, keywordlist *keywords,
 		    indextag *tag;
 		    int i;
 
+		    hr->referenced = hr->generated = FALSE;
 		    hr->section = lastsect;
 		    {
 			char buf[40];
@@ -1223,6 +1225,7 @@ void html_backend(paragraph *sourceform, keywordlist *keywords,
 
 				html_href(&ho, f, hr->section->file,
 					  hr->fragment);
+				hr->referenced = TRUE;
 				if (p && p->kwtext)
 				    html_words(&ho, p->kwtext, MARKUP|LINKS,
 					       f, keywords, &conf);
@@ -1314,6 +1317,23 @@ void html_backend(paragraph *sourceform, keywordlist *keywords,
     }
 
     /*
+     * Go through and check that no index fragments were referenced
+     * without being generated, or indeed vice versa.
+     * 
+     * (When I actually get round to freeing everything, this can
+     * probably be the freeing loop as well.)
+     */
+    for (p = sourceform; p; p = p->next) {
+	word *w;
+	for (w = p->words; w; w = w->next)
+	    if (w->type == word_IndexRef) {
+		htmlindexref *hr = (htmlindexref *)w->private_data;
+
+		assert(!hr->referenced == !hr->generated);
+	    }
+    }
+
+    /*
      * FIXME: Free all the working data.
      */
 }
@@ -1471,6 +1491,7 @@ static void html_words(htmloutput *ho, word *words, int flags,
 	    element_open(ho, "a");
 	    element_attr(ho, "name", hr->fragment);
 	    element_close(ho, "a");
+	    hr->generated = TRUE;
 	}
 	break;
       case word_Normal: