From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: support more than one tag entry for the same search term;
Date: Tue, 8 Nov 2016 10:28:47 -0500 (EST) [thread overview]
Message-ID: <5480321634945350298.enqueue@fantadrom.bsd.lv> (raw)
Log Message:
-----------
support more than one tag entry for the same search term;
general idea discussed with bcook@ during l2k16
Modified Files:
--------------
mdocml:
tag.c
Revision Data
-------------
Index: tag.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/tag.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -Ltag.c -Ltag.c -u -p -r1.13 -r1.14
--- tag.c
+++ tag.c
@@ -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
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);
}
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2016-11-08 15:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5480321634945350298.enqueue@fantadrom.bsd.lv \
--to=schwarze@mdocml.bsd.lv \
--cc=source@mdocml.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).