#include "support/convert.h"
#include "support/debug.h"
#include "support/docstring.h"
+#include "support/lassert.h"
#include "support/weighted_btree.h"
-#include <boost/assert.hpp>
+#include <map>
+
+using namespace std;
namespace lyx {
///
-WordList theGlobalWordList;
+typedef map<string, WordList *> GlobalWordList;
+GlobalWordList theGlobalWordList;
+
-WordList & theWordList()
+WordList * theWordList(string const & lang)
{
- return theGlobalWordList;
+ GlobalWordList::iterator it = theGlobalWordList.find(lang);
+ if (it != theGlobalWordList.end())
+ return it->second;
+ else
+ theGlobalWordList[lang] = new WordList;
+ return theGlobalWordList[lang];
}
-
+
+
+void WordList::cleanupWordLists()
+{
+ GlobalWordList::const_iterator it = theGlobalWordList.begin();
+ for (; it != theGlobalWordList.end(); ++it)
+ delete it->second;
+ theGlobalWordList.clear();
+}
+
+
///
struct WordList::Impl {
///
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();
}
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);
+ }
}
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);
}
}