X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferList.cpp;h=3865c72c8eaf13cf9b7b004e33dd21d7145b7913;hb=1e519d1115f41f71c253cb9e2fbb7803e9a583a9;hp=61d62206a3f3e35e740c74f2cf25022e331d2370;hpb=570f96bc6e9af6c488234c7f261b320844f97dc0;p=lyx.git diff --git a/src/BufferList.cpp b/src/BufferList.cpp index 61d62206a3..3865c72c8e 100644 --- a/src/BufferList.cpp +++ b/src/BufferList.cpp @@ -32,12 +32,10 @@ #include "support/Package.h" #include "support/lassert.h" -#include #include -#include - -using boost::bind; +#include +#include using namespace std; using namespace lyx::support; @@ -53,10 +51,8 @@ BufferList::BufferList() BufferList::~BufferList() { - BufferStorage::iterator it = binternal.begin(); - BufferStorage::iterator end = binternal.end(); - for (; it != end; ++it) - delete (*it); + for (Buffer * buf : binternal) + delete buf; } @@ -92,23 +88,52 @@ BufferList::const_iterator BufferList::end() const void BufferList::release(Buffer * buf) { - LASSERT(buf, /**/); + // We may leak here, but we probably do not need to + // shut down. + LASSERT(buf, return); BufferStorage::iterator const it = find(bstore.begin(), bstore.end(), buf); if (it != bstore.end()) { + Buffer const * parent = buf->parent(); Buffer * tmp = (*it); - LASSERT(tmp, /**/); bstore.erase(it); + LASSERT(tmp, return); delete tmp; + if (parent) + // If this was a child, update the parent's buffer + // to avoid crashes due to dangling pointers (bug 9979) + parent->updateBuffer(); } } -Buffer * BufferList::newBuffer(string const & s, bool const ronly) +Buffer * BufferList::newInternalBuffer(string const & s) { - auto_ptr tmpbuf; + Buffer * const buf = createNewBuffer(s); + if (buf) { + buf->setInternal(true); + binternal.push_back(buf); + } + return buf; +} + + +Buffer * BufferList::newBuffer(string const & s) +{ + Buffer * const buf = createNewBuffer(s); + if (buf) { + LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size()); + bstore.push_back(buf); + } + return buf; +} + + +Buffer * BufferList::createNewBuffer(string const & s) +{ + unique_ptr tmpbuf; try { - tmpbuf.reset(new Buffer(s, ronly)); + tmpbuf = make_unique(s); } catch (ExceptionMessage const & message) { if (message.type_ == ErrorException) { Alert::error(message.title_, message.details_); @@ -119,12 +144,6 @@ Buffer * BufferList::newBuffer(string const & s, bool const ronly) } } tmpbuf->params().useClassDefaults(); - if (tmpbuf->isInternal()) { - binternal.push_back(tmpbuf.get()); - } else { - LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size()); - bstore.push_back(tmpbuf.get()); - } return tmpbuf.release(); } @@ -136,13 +155,11 @@ void BufferList::closeAll() } -FileNameList const & BufferList::fileNames() const +FileNameList BufferList::fileNames() const { - static FileNameList nvec; - nvec.clear(); - transform(bstore.begin(), bstore.end(), - back_inserter(nvec), - boost::bind(&Buffer::fileName, _1)); + FileNameList nvec; + for (Buffer const * buf : bstore) + nvec.push_back(buf->fileName()); return nvec; } @@ -173,13 +190,14 @@ Buffer * BufferList::getBuffer(unsigned int choice) Buffer * BufferList::next(Buffer const * buf) const { - LASSERT(buf, /**/); + // Something is wrong, but we can probably survive it. + LASSERT(buf, return 0); if (bstore.empty()) return 0; - BufferStorage::const_iterator it = find(bstore.begin(), - bstore.end(), buf); - LASSERT(it != bstore.end(), /**/); + BufferStorage::const_iterator it = + find(bstore.begin(), bstore.end(), buf); + LASSERT(it != bstore.end(), return 0); ++it; Buffer * nextbuf = (it == bstore.end()) ? bstore.front() : *it; return nextbuf; @@ -188,13 +206,14 @@ Buffer * BufferList::next(Buffer const * buf) const Buffer * BufferList::previous(Buffer const * buf) const { - LASSERT(buf, /**/); + // Something is wrong, but we can probably survive it. + LASSERT(buf, return 0); if (bstore.empty()) return 0; - BufferStorage::const_iterator it = find(bstore.begin(), - bstore.end(), buf); - LASSERT(it != bstore.end(), /**/); + BufferStorage::const_iterator it = + find(bstore.begin(), bstore.end(), buf); + LASSERT(it != bstore.end(), return 0); Buffer * previousbuf = (it == bstore.begin()) ? bstore.back() : *(it - 1); return previousbuf; @@ -202,16 +221,16 @@ Buffer * BufferList::previous(Buffer const * buf) const void BufferList::updateIncludedTeXfiles(string const & masterTmpDir, - OutputParams const & runparams) + OutputParams const & runparams_in) { - BufferStorage::iterator it = bstore.begin(); - BufferStorage::iterator end = bstore.end(); - for (; it != end; ++it) { - if (!(*it)->isDepClean(masterTmpDir)) { - string writefile = addName(masterTmpDir, (*it)->latexName()); - (*it)->makeLaTeXFile(FileName(writefile), masterTmpDir, - runparams, false); - (*it)->markDepClean(masterTmpDir); + OutputParams runparams = runparams_in; + runparams.is_child = true; + for (Buffer * buf : bstore) { + if (!buf->isDepClean(masterTmpDir)) { + string writefile = addName(masterTmpDir, buf->latexName()); + buf->makeLaTeXFile(FileName(writefile), masterTmpDir, + runparams, Buffer::OnlyBody); + buf->markDepClean(masterTmpDir); } } } @@ -219,10 +238,15 @@ void BufferList::updateIncludedTeXfiles(string const & masterTmpDir, void BufferList::emergencyWriteAll() { - BufferStorage::const_iterator it = bstore.begin(); - BufferStorage::const_iterator const en = bstore.end(); - for (; it != en; ++it) - (*it)->emergencyWrite(); + for (Buffer * buf : bstore) + buf->emergencyWrite(); +} + + +void BufferList::invalidateConverterCache() const +{ + for (Buffer const * buf : bstore) + buf->params().invalidateConverterCache(); } @@ -234,56 +258,81 @@ bool BufferList::exists(FileName const & fname) const bool BufferList::isLoaded(Buffer const * b) const { + if (!b) + return false; BufferStorage::const_iterator cit = find(bstore.begin(), bstore.end(), b); return cit != bstore.end(); } -namespace { -struct equivalent_to : public binary_function +bool BufferList::isInternal(Buffer const * b) const { - bool operator()(FileName const & x, FileName const & y) const - { return equivalent(x, y); } -}; + if (!b) + return false; + BufferStorage::const_iterator cit = + find(binternal.begin(), binternal.end(), b); + return cit != binternal.end(); +} + + +bool BufferList::isOthersChild(Buffer * parent, Buffer * child) const +{ + LASSERT(parent, return false); + LASSERT(child, return false); + LASSERT(parent->isChild(child), return false); + + // Does child document have a different parent? + Buffer const * parent_ = child->parent(); + if (parent_ && parent_ != parent) + return true; + + for(Buffer const * buf : bstore) + if (buf != parent && buf->isChild(child)) + return true; + return false; } -Buffer * BufferList::getBuffer(support::FileName const & fname) const +Buffer * BufferList::getBuffer(support::FileName const & fname, bool internal) const { // 1) cheap test, using string comparison of file names - BufferStorage::const_iterator it = find_if(bstore.begin(), bstore.end(), - bind(equal_to(), bind(&Buffer::fileName, _1), fname)); - if (it != bstore.end()) - return *it; + for (Buffer * b : bstore) + if (b->fileName() == fname) + return b; // 2) possibly expensive test, using equivalence test of file names - it = find_if(bstore.begin(), bstore.end(), - bind(equivalent_to(), bind(&Buffer::fileName, _1), fname)); - return it != bstore.end() ? (*it) : 0; + for (Buffer * b : bstore) + if (equivalent(b->fileName(), fname)) + return b; + if (internal) { + // 1) cheap test, using string comparison of file names + for (Buffer * b : binternal) + if (b->fileName() == fname) + return b; + // 2) possibly expensive test, using equivalence test of file names + for (Buffer * b : binternal) + if (equivalent(b->fileName(), fname)) + return b; + } + return 0; } Buffer * BufferList::getBufferFromTmp(string const & s) { - BufferStorage::iterator it = bstore.begin(); - BufferStorage::iterator end = bstore.end(); - for (; it < end; ++it) { - if (prefixIs(s, (*it)->temppath())) { + for (Buffer * buf : bstore) { + if (prefixIs(s, buf->temppath())) { // check whether the filename matches the master - string const master_name = changeExtension(onlyFilename( - (*it)->absFileName()), ".tex"); + string const master_name = buf->latexName(); if (suffixIs(s, master_name)) - return *it; + return buf; // if not, try with the children - vector clist = (*it)->getChildren(); - vector::const_iterator cit = clist.begin(); - vector::const_iterator cend = clist.end(); - for (; cit < cend; ++cit) { + for (Buffer * child : buf->getDescendents()) { string const mangled_child_name = DocFileName( - changeExtension((*cit)->absFileName(), - ".tex")).mangledFilename(); + changeExtension(child->absFileName(), + ".tex")).mangledFileName(); if (suffixIs(s, mangled_child_name)) - return *cit; + return child; } } } @@ -291,18 +340,23 @@ Buffer * BufferList::getBufferFromTmp(string const & s) } -void BufferList::setCurrentAuthor(docstring const & name, docstring const & email) +void BufferList::recordCurrentAuthor(Author const & author) +{ + for (Buffer * buf : bstore) + buf->params().authors().recordCurrentAuthor(author); +} + + +void BufferList::updatePreviews() { - BufferStorage::iterator it = bstore.begin(); - BufferStorage::iterator end = bstore.end(); - for (; it != end; ++it) - (*it)->params().authors().record(0, Author(name, email)); + for (Buffer * buf : bstore) + buf->updatePreviews(); } int BufferList::bufferNum(FileName const & fname) const { - FileNameList const & buffers = fileNames(); + FileNameList const buffers(fileNames()); FileNameList::const_iterator cit = find(buffers.begin(), buffers.end(), fname); if (cit == buffers.end()) @@ -311,41 +365,12 @@ int BufferList::bufferNum(FileName const & fname) const } -bool BufferList::releaseChild(Buffer * parent, Buffer * child) -{ - LASSERT(parent, return false); - LASSERT(child, return false); - LASSERT(parent->isChild(child), return false); - - // Child document has a different parent, don't close it. - Buffer const * parent_ = child->parent(); - if (parent_ && parent_ != parent) - return false; - - BufferStorage::iterator it = bstore.begin(); - BufferStorage::iterator end = bstore.end(); - for (; it != end; ++it) { - Buffer * buf = *it; - if (buf != parent && buf->isChild(child)) { - child->setParent(0); - return false; - } - } - release(child); - return true; -} - - void BufferList::changed(bool update_metrics) const { - BufferStorage::const_iterator it = bstore.begin(); - BufferStorage::const_iterator end = bstore.end(); - for (; it != end; ++it) - (*it)->changed(update_metrics); - it = binternal.begin(); - end = binternal.end(); - for (; it != end; ++it) - (*it)->changed(update_metrics); + for (Buffer const * buf : bstore) + buf->changed(update_metrics); + for (Buffer const * buf : binternal) + buf->changed(update_metrics); }