X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FWordList.cpp;h=27d7b31d001c84ec40fa889f022100734195f095;hb=62af7ee772f16f154225d2d0b65d77f4376b6001;hp=5d4debf1e9df4173fcf1ea747e0f342e172b3c6f;hpb=1669c17c0fdc20ca12d0d2d30bad364b17a31e3d;p=lyx.git diff --git a/src/WordList.cpp b/src/WordList.cpp index 5d4debf1e9..27d7b31d00 100644 --- a/src/WordList.cpp +++ b/src/WordList.cpp @@ -15,20 +15,39 @@ #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 +#include + +#include + +using namespace std; namespace lyx { /// -WordList theGlobalWordList; +typedef map> 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 theGlobalWordList; -WordList & theWordList() + +WordList & theWordList(string const & lang) { - return theGlobalWordList; + 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()); } - + + /// struct WordList::Impl { /// @@ -40,9 +59,8 @@ struct WordList::Impl { }; -WordList::WordList() +WordList::WordList() : d(make_unique()) { - d = new Impl; d->c_ = 0; #if 0 @@ -53,23 +71,22 @@ WordList::WordList() } -WordList::~WordList() -{ - delete d; -} - - docstring const & WordList::word(size_t idx) const { Impl::Words::const_iterator it = d->words_.find_summed_weight(idx); - BOOST_ASSERT(it != d->words_.end()); - return it->first; + 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(); } size_t WordList::size() const { - return d->words_.size(); + return d->words_.summed_weight(); } @@ -78,8 +95,10 @@ void WordList::insert(docstring const & w) Impl::Words::iterator it = d->words_.find(w); if (it == d->words_.end()) d->words_.insert(w, size_t(1), 1); - else + else { it.data()++; + d->words_.change_weight(it, 1); + } } @@ -88,8 +107,12 @@ void WordList::remove(docstring const & w) Impl::Words::iterator it = d->words_.find(w); if (it != d->words_.end()) { it.data()--; - if (it.data() == 0) - d->words_.erase(w); + 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); } }