diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2016-11-08 15:28:17 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2016-11-08 15:28:17 +0000 |
commit | 166e26365dfab6e9a571a95fad6bd1753eef4a78 (patch) | |
tree | e8e9fed29a1b86487de46b61c6be7310ff077516 /tag.c | |
parent | d8daf28b297263d3a9feeaf27a7095ebf4ebbd9b (diff) | |
download | mandoc-166e26365dfab6e9a571a95fad6bd1753eef4a78.tar.gz |
support more than one tag entry for the same search term;
general idea discussed with bcook@ during l2k16
Diffstat (limited to 'tag.c')
-rw-r--r-- | tag.c | 45 |
1 files changed, 38 insertions, 7 deletions
@@ -1,6 +1,6 @@ /* $Id$ */ /* - * Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2015, 2016 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -31,7 +31,9 @@ #include "tag.h" struct tag_entry { - size_t line; + size_t *lines; + size_t maxlines; + size_t nlines; int prio; char s[]; }; @@ -130,16 +132,42 @@ tag_put(const char *s, int prio, size_t line) if (tag_files.tfd <= 0 || strchr(s, ' ') != NULL) return; + slot = ohash_qlookup(&tag_data, s); entry = ohash_find(&tag_data, slot); + if (entry == NULL) { + + /* Build a new entry. */ + len = strlen(s) + 1; entry = mandoc_malloc(sizeof(*entry) + len); memcpy(entry->s, s, len); + entry->lines = NULL; + entry->maxlines = entry->nlines = 0; ohash_insert(&tag_data, slot, entry); - } else if (entry->prio <= prio) - return; - entry->line = line; + + } else { + + /* A better entry is already present, ignore the new one. */ + + if (entry->prio < prio) + return; + + /* The existing entry is worse, clear it. */ + + if (entry->prio > prio) + entry->nlines = 0; + } + + /* Remember the new line. */ + + if (entry->maxlines == entry->nlines) { + entry->maxlines += 4; + entry->lines = mandoc_reallocarray(entry->lines, + entry->maxlines, sizeof(*entry->lines)); + } + entry->lines[entry->nlines++] = line; entry->prio = prio; } @@ -152,6 +180,7 @@ tag_write(void) { FILE *stream; struct tag_entry *entry; + size_t i; unsigned int slot; if (tag_files.tfd <= 0) @@ -160,8 +189,10 @@ tag_write(void) entry = ohash_first(&tag_data, &slot); while (entry != NULL) { if (stream != NULL) - fprintf(stream, "%s %s %zu\n", - entry->s, tag_files.ofn, entry->line); + for (i = 0; i < entry->nlines; i++) + fprintf(stream, "%s %s %zu\n", + entry->s, tag_files.ofn, entry->lines[i]); + free(entry->lines); free(entry); entry = ohash_next(&tag_data, &slot); } |