X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=tags.cc;fp=tags.cc;h=a921c606c300760d290cc95195937e0b17bda1a3;hp=4fc06c0616f80259a027b948cb79211e7e38e084;hb=789495919aaaba47040faded49276b217068c6af;hpb=2affed0851d85a08f6b0700f7128f97cae6b6024

diff --git a/tags.cc b/tags.cc
index 4fc06c06..a921c606 100644
--- a/tags.cc
+++ b/tags.cc
@@ -23,6 +23,29 @@
 
 #include <xapian.h>
 
+typedef struct _notmuch_terms {
+    char prefix_char;
+    Xapian::TermIterator iterator;
+    Xapian::TermIterator iterator_end;
+} notmuch_terms_t;
+
+struct _notmuch_tags {
+    notmuch_terms_t terms;
+};
+
+notmuch_terms_t *
+_notmuch_terms_create (void *ctx,
+		       Xapian::Document doc,
+		       const char *prefix_name);
+
+/* 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))
+
 /* 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
@@ -101,6 +124,14 @@ _notmuch_terms_destroy (notmuch_terms_t *terms)
     talloc_free (terms);
 }
 
+notmuch_tags_t *
+_notmuch_tags_create_terms (void *ctx,
+			    Xapian::Document doc,
+			    const char *prefix_name)
+{
+    return _notmuch_terms_create_type (ctx, doc, prefix_name, notmuch_tags_t);
+}
+
 notmuch_bool_t
 notmuch_tags_has_more (notmuch_tags_t *tags)
 {