X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FWordList.cpp;h=27d7b31d001c84ec40fa889f022100734195f095;hb=801d7dc9f42baf331642606a6641606779985439;hp=1423f83c9d145a64eab67177ab80b9728aee5284;hpb=9a5aba0877d2baa5aeb9c419a2e0c880b24cb4ef;p=lyx.git

diff --git a/src/WordList.cpp b/src/WordList.cpp
index 1423f83c9d..27d7b31d00 100644
--- a/src/WordList.cpp
+++ b/src/WordList.cpp
@@ -10,36 +10,57 @@
 
 #include <config.h>
 
-#include <boost/assert.hpp>
+#include "WordList.h"
 
-#include <support/convert.h>
-#include <support/debug.h>
-#include <support/docstring.h>
-#include <support/weighted_btree.h>
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/docstring.h"
+#include "support/lassert.h"
+#include "support/unique_ptr.h"
+#include "support/weighted_btree.h"
 
-#include <WordList.h>
+#include <QThreadStorage>
 
-#include <algorithm>
 #include <map>
-#include <iostream>
-#include <set>
+
+using namespace std;
 
 namespace lyx {
 
+///
+typedef map<string, unique_ptr<WordList>> GlobalWordList;
+// Each thread uses its own word list, but only the one of the GUI thread is
+// used to do real work. The others are only neded to prevent simultanous
+// write access e.g. from a cloned buffer and a true document buffer.
+QThreadStorage<GlobalWordList *> theGlobalWordList;
+
+
+WordList & theWordList(string const & lang)
+{
+	if (!theGlobalWordList.hasLocalData())
+		theGlobalWordList.setLocalData(new GlobalWordList);
+	GlobalWordList & globalWordList = *theGlobalWordList.localData();
+	GlobalWordList::iterator it = globalWordList.find(lang);
+	if (it != globalWordList.end())
+		return *it->second;
+	else
+		return *(globalWordList[lang] = make_unique<WordList>());
+}
+
+
 ///
 struct WordList::Impl {
 	///
 	size_t c_;
 	///
-	typedef stx::weighted_btree<docstring, size_t> Words;
+	typedef stx::weighted_btree<docstring, size_t, int> Words;
 	///
 	Words words_;
 };
 
 
-WordList::WordList()
+WordList::WordList() : d(make_unique<Impl>())
 {
-	d = new Impl;
 	d->c_ = 0;
 
 #if 0
@@ -50,31 +71,49 @@ WordList::WordList()
 }
 
 
-WordList::~WordList()
+docstring const & WordList::word(size_t idx) const
 {
-	delete d;
+	Impl::Words::const_iterator it = d->words_.find_summed_weight(idx);
+	LASSERT(it != d->words_.end(), { static docstring dummy; return dummy; });
+
+	// We use the key() method here, and not something like it->first
+	// because the btree only returns (iterator-) temporary value pairs.
+	// If we returned the first component of those here, we get an
+	// invalid reference and therefore strange crashes.
+	return it.key();
 }
 
 
-docstring const & WordList::word(size_t idx) const
+size_t WordList::size() const
 {
-	Impl::Words::const_iterator it
-	= d->words_.find_summed_weight(idx);
-	BOOST_ASSERT(it != d->words_.end());
-	return it->first;
+	return d->words_.summed_weight();
 }
 
 
-size_t WordList::size() const
+void WordList::insert(docstring const & w)
 {
-	return d->words_.size();
+	Impl::Words::iterator it = d->words_.find(w);
+	if (it == d->words_.end())
+		d->words_.insert(w, size_t(1), 1);
+	else {
+		it.data()++;
+		d->words_.change_weight(it, 1);
+	}
 }
 
 
-void WordList::insert(docstring const & w)
+void WordList::remove(docstring const & w)
 {
-	d->words_.insert(w, size_t(1), stx::Void());
+	Impl::Words::iterator it = d->words_.find(w);
+	if (it != d->words_.end()) {
+		it.data()--;
+		d->words_.change_weight(it, 0);
+		// We will not erase here, but instead we just leave it
+		// in the btree with weight 0. This avoid too much
+		// reorganisation of the tree all the time.
+		//if (it.data() == 0)
+		//	d->words_.erase(w);
+	}
 }
 
-	
-} // namespace lyx
\ No newline at end of file
+} // namespace lyx