anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Separate LabelCache from RefCache

Browse Source 
We only assign references to label _string_. Which inset this corresponds
to will be decided in context.
This commit is contained in:
Juergen Spitzmueller 2018-12-31 18:27:34 +01:00
parent 48c6d5de21
commit 5afacb144d
1 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/Buffer.cpp
View File

@ -148,7 +148,9 @@ struct LabelInfo {
bool active; bool active;
}; };
typedef vector<LabelInfo> RefCache; typedef vector<LabelInfo> LabelCache;
typedef map<docstring, Buffer::References> RefCache;
} // namespace } // namespace
@ -318,9 +320,11 @@ public:
/// was missing). /// was missing).
bool preview_error_; bool preview_error_;
/// Cache the label insets, their associated refs (with positions), /// Cache the references associated to a label and their positions
/// and whether the insets are active. /// in the buffer.
mutable RefCache ref_cache_; mutable RefCache ref_cache_;
/// Cache the label insets and their activity status.
mutable LabelCache label_cache_;
/// our Text that should be wrapped in an InsetText /// our Text that should be wrapped in an InsetText
InsetText * inset; InsetText * inset;
@ -3904,33 +3908,14 @@ Buffer::References & Buffer::getReferenceCache(docstring const & label)
if (d->parent()) if (d->parent())
return const_cast<Buffer *>(masterBuffer())->getReferenceCache(label); return const_cast<Buffer *>(masterBuffer())->getReferenceCache(label);
// In what follows, we look whether we find an active label RefCache::iterator it = d->ref_cache_.find(label);
// with the given string in the cache. If so, return its if (it != d->ref_cache_.end())
// references cache. If we only find an inactive one, return return it->second;
// that (the last we find, coincidentally). If we find nothing,
// return an empty references cache.
static LabelInfo linfo;
linfo.inset = nullptr;
linfo.references = References();
linfo.active = false;
bool have_inactive = false;
for (auto & rc : d->ref_cache_) {
if (rc.label == label) {
if (rc.active)
return rc.references;
else {
linfo = rc;
have_inactive = true;
}
}
}
if (!have_inactive) static References const dummy_refs = References();
// We found nothing, so insert the empty one to the cache it = d->ref_cache_.insert(
// for further processing make_pair(label, dummy_refs)).first;
d->ref_cache_.push_back(linfo); return it->second;
return linfo.references;
} }
@ -3954,14 +3939,14 @@ void Buffer::setInsetLabel(docstring const & label, InsetLabel const * il,
linfo.label = label; linfo.label = label;
linfo.inset = il; linfo.inset = il;
linfo.active = active; linfo.active = active;
masterBuffer()->d->ref_cache_.push_back(linfo); masterBuffer()->d->label_cache_.push_back(linfo);
} }
InsetLabel const * Buffer::insetLabel(docstring const & label, InsetLabel const * Buffer::insetLabel(docstring const & label,
bool const active) const bool const active) const
{ {
for (auto & rc : masterBuffer()->d->ref_cache_) { for (auto & rc : masterBuffer()->d->label_cache_) {
if (rc.label == label && (rc.active || !active)) if (rc.label == label && (rc.active || !active))
return rc.inset; return rc.inset;
} }
@ -3980,8 +3965,10 @@ bool Buffer::activeLabel(docstring const & label) const
void Buffer::clearReferenceCache() const void Buffer::clearReferenceCache() const
{ {
if (!d->parent()) if (!d->parent()) {
d->ref_cache_.clear(); d->ref_cache_.clear();
d->label_cache_.clear();
}
} }