X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=message.cc;h=b95f9d7f4993d4bc94d9f7e7fa583aa0ae699e38;hp=5922cfccff1ae7464df8f78bf0d4da248c19b89f;hb=1726c5c814aecd924849a0b91c82d420af945827;hpb=c7482b4dce114b1c09cbac2f4ef6d0defdb23258

diff --git a/message.cc b/message.cc
index 5922cfcc..b95f9d7f 100644
--- a/message.cc
+++ b/message.cc
@@ -32,15 +32,6 @@ struct _notmuch_message {
     Xapian::Document doc;
 };
 
-typedef struct _notmuch_terms {
-    char prefix_char;
-    Xapian::TermIterator iterator;
-    Xapian::TermIterator iterator_end;
-} notmuch_terms_t;
-
-struct _notmuch_tags {
-    notmuch_terms_t terms;
-};
 
 /* "128 bits of thread-id ought to be enough for anybody" */
 #define NOTMUCH_THREAD_ID_BITS	 128
@@ -295,64 +286,43 @@ notmuch_message_get_filename (notmuch_message_t *message)
     return message->filename;
 }
 
-/* We end up having to call the destructors explicitly because we had
- * to use "placement new" in order to initialize C++ objects within a
- * block that we allocated with talloc. So C++ is making talloc
- * slightly less simple to use, (we wouldn't need
- * talloc_set_destructor at all otherwise).
- */
-static int
-_notmuch_terms_destructor (notmuch_terms_t *terms)
-{
-    terms->iterator.~TermIterator ();
-    terms->iterator_end.~TermIterator ();
-
-    return 0;
-}
-
-static notmuch_terms_t *
-_notmuch_terms_create (void *ctx,
-		       Xapian::Document doc,
-		       const char *prefix_name)
+notmuch_tags_t *
+notmuch_message_get_tags (notmuch_message_t *message)
 {
-    notmuch_terms_t *terms;
-    const char *prefix = _find_prefix (prefix_name);
+    const char *prefix = _find_prefix ("tag");
+    Xapian::TermIterator i, end;
+    notmuch_tags_t *tags;
+    std::string tag;
 
-    /* Currently, notmuch_terms_t is written with the assumption that
-     * any prefix its derivatives use will be only a single
-     * character. */
+    /* Currently this iteration is written with the assumption that
+     * "tag" has a single-character prefix. */
     assert (strlen (prefix) == 1);
 
-    terms = talloc (ctx, notmuch_terms_t);
-    if (unlikely (terms == NULL))
+    tags = _notmuch_tags_create (message);
+    if (unlikely (tags == NULL))
 	return NULL;
 
-    terms->prefix_char = *prefix;
-    new (&terms->iterator) Xapian::TermIterator;
-    new (&terms->iterator_end) Xapian::TermIterator;
+    i = message->doc.termlist_begin ();
+    end = message->doc.termlist_end ();
 
-    talloc_set_destructor (terms, _notmuch_terms_destructor);
+    i.skip_to (prefix);
 
-    terms->iterator = doc.termlist_begin ();
-    terms->iterator.skip_to (prefix);
-    terms->iterator_end = doc.termlist_end ();
+    while (1) {
+	tag = *i;
 
-    return terms;
-}
+	if (tag.empty () || tag[0] != *prefix)
+	    break;
 
-/* The assertion is to ensure that 'type' is a derivative of
- * notmuch_terms_t in that it contains a notmuch_terms_t as its first
- * member. We do this by name of 'terms' as opposed to type, because
- * that's as clever as I've been so far. */
-#define _notmuch_terms_create_type(ctx, doc, prefix_name, type) \
-    (COMPILE_TIME_ASSERT(offsetof(type, terms) == 0),		\
-     (type *) _notmuch_terms_create (ctx, doc, prefix_name))
+	_notmuch_tags_add_tag (tags, tag.c_str () + 1);
 
-notmuch_tags_t *
-notmuch_message_get_tags (notmuch_message_t *message)
-{
-    return _notmuch_terms_create_type (message, message->doc, "tag",
-				       notmuch_tags_t);
+	i++;
+    }
+
+    _notmuch_tags_sort (tags);
+
+    _notmuch_tags_reset (tags);
+
+    return tags;
 }
 
 void
@@ -525,60 +495,3 @@ notmuch_message_destroy (notmuch_message_t *message)
 {
     talloc_free (message);
 }
-
-static notmuch_bool_t
-_notmuch_terms_has_more (notmuch_terms_t *terms)
-{
-    std::string s;
-
-    if (terms->iterator == terms->iterator_end)
-	return FALSE;
-
-    s = *terms->iterator;
-    if (! s.empty () && s[0] == terms->prefix_char)
-	return TRUE;
-    else
-	return FALSE;
-}
-
-static const char *
-_notmuch_terms_get (notmuch_terms_t *terms)
-{
-    return talloc_strdup (terms, (*terms->iterator).c_str () + 1);
-}
-
-static void
-_notmuch_terms_advance (notmuch_terms_t *terms)
-{
-    terms->iterator++;
-}
-
-static void
-_notmuch_terms_destroy (notmuch_terms_t *terms)
-{
-    talloc_free (terms);
-}
-
-notmuch_bool_t
-notmuch_tags_has_more (notmuch_tags_t *tags)
-{
-    return _notmuch_terms_has_more (&tags->terms);
-}
-
-const char *
-notmuch_tags_get (notmuch_tags_t *tags)
-{
-    return _notmuch_terms_get (&tags->terms);
-}
-
-void
-notmuch_tags_advance (notmuch_tags_t *tags)
-{
-    return _notmuch_terms_advance (&tags->terms);
-}
-
-void
-notmuch_tags_destroy (notmuch_tags_t *tags)
-{
-    return _notmuch_terms_destroy (&tags->terms);
-}