X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferList.cpp;h=b99f4592ccda0768947da35753d0fbcc0cac3f97;hb=38c2cde0d8695ac5287bae218c4a33a2acf18ef8;hp=c253282b795c029ea244769362d4fee5d9e6ca5c;hpb=358745d0e36c35d906c99e3d41f467bf499ce0ca;p=lyx.git diff --git a/src/BufferList.cpp b/src/BufferList.cpp index c253282b79..b99f4592cc 100644 --- a/src/BufferList.cpp +++ b/src/BufferList.cpp @@ -32,10 +32,8 @@ #include "support/Package.h" #include "support/lassert.h" -#include "support/bind.h" #include -#include #include #include @@ -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; } @@ -98,10 +94,15 @@ void BufferList::release(Buffer * buf) BufferStorage::iterator const it = find(bstore.begin(), bstore.end(), buf); if (it != bstore.end()) { + Buffer const * parent = buf->parent(); Buffer * tmp = (*it); 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(); } } @@ -130,16 +131,16 @@ Buffer * BufferList::newBuffer(string const & s) Buffer * BufferList::createNewBuffer(string const & s) { - auto_ptr tmpbuf; + unique_ptr tmpbuf; try { - tmpbuf.reset(new Buffer(s)); + tmpbuf = make_unique(s); } catch (ExceptionMessage const & message) { if (message.type_ == ErrorException) { Alert::error(message.title_, message.details_); exit(1); } else if (message.type_ == WarningException) { Alert::warning(message.title_, message.details_); - return 0; + return nullptr; } } tmpbuf->params().useClassDefaults(); @@ -157,12 +158,8 @@ void BufferList::closeAll() FileNameList BufferList::fileNames() const { FileNameList nvec; - BufferStorage::const_iterator it = bstore.begin(); - BufferStorage::const_iterator end = bstore.end(); - for (; it != end; ++it) { - Buffer * buf = *it; + for (Buffer const * buf : bstore) nvec.push_back(buf->fileName()); - } return nvec; } @@ -170,7 +167,7 @@ FileNameList BufferList::fileNames() const Buffer * BufferList::first() { if (bstore.empty()) - return 0; + return nullptr; return bstore.front(); } @@ -178,7 +175,7 @@ Buffer * BufferList::first() Buffer * BufferList::last() { if (bstore.empty()) - return 0; + return nullptr; return bstore.back(); } @@ -186,7 +183,7 @@ Buffer * BufferList::last() Buffer * BufferList::getBuffer(unsigned int choice) { if (choice >= bstore.size()) - return 0; + return nullptr; return bstore[choice]; } @@ -194,13 +191,13 @@ Buffer * BufferList::getBuffer(unsigned int choice) Buffer * BufferList::next(Buffer const * buf) const { // Something is wrong, but we can probably survive it. - LASSERT(buf, return 0); + LASSERT(buf, return nullptr); if (bstore.empty()) - return 0; - BufferStorage::const_iterator it = + return nullptr; + BufferStorage::const_iterator it = find(bstore.begin(), bstore.end(), buf); - LASSERT(it != bstore.end(), return 0); + LASSERT(it != bstore.end(), return nullptr); ++it; Buffer * nextbuf = (it == bstore.end()) ? bstore.front() : *it; return nextbuf; @@ -210,13 +207,13 @@ Buffer * BufferList::next(Buffer const * buf) const Buffer * BufferList::previous(Buffer const * buf) const { // Something is wrong, but we can probably survive it. - LASSERT(buf, return 0); + LASSERT(buf, return nullptr); if (bstore.empty()) - return 0; - BufferStorage::const_iterator it = + return nullptr; + BufferStorage::const_iterator it = find(bstore.begin(), bstore.end(), buf); - LASSERT(it != bstore.end(), return 0); + LASSERT(it != bstore.end(), return nullptr); Buffer * previousbuf = (it == bstore.begin()) ? bstore.back() : *(it - 1); return previousbuf; @@ -228,36 +225,38 @@ void BufferList::updateIncludedTeXfiles(string const & masterTmpDir, { OutputParams runparams = runparams_in; runparams.is_child = true; - 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, + for (Buffer * buf : bstore) { + if (!buf->isDepClean(masterTmpDir)) { + string writefile = addName(masterTmpDir, buf->latexName()); + buf->makeLaTeXFile(FileName(writefile), masterTmpDir, runparams, Buffer::OnlyBody); - (*it)->markDepClean(masterTmpDir); + buf->markDepClean(masterTmpDir); } } - runparams.is_child = false; } 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(); } bool BufferList::exists(FileName const & fname) const { - return getBuffer(fname) != 0; + return getBuffer(fname) != nullptr; } - bool BufferList::isLoaded(Buffer const * b) const +bool BufferList::isLoaded(Buffer const * b) const { if (!b) return false; @@ -267,80 +266,92 @@ bool BufferList::exists(FileName const & fname) const } -namespace { +bool BufferList::isInternal(Buffer const * b) const +{ + if (!b) + return false; + BufferStorage::const_iterator cit = + find(binternal.begin(), binternal.end(), b); + return cit != binternal.end(); +} + -struct equivalent_to : public binary_function +bool BufferList::isOthersChild(Buffer * parent, Buffer * child) const { - bool operator()(FileName const & x, FileName const & y) const - { return equivalent(x, y); } -}; + 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, bool internal) const { // 1) cheap test, using string comparison of file names - BufferStorage::const_iterator it = find_if(bstore.begin(), bstore.end(), - lyx::bind(equal_to(), lyx::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(), - lyx::bind(equivalent_to(), lyx::bind(&Buffer::fileName, _1), fname)); - if (it != bstore.end()) - return *it; - + for (Buffer * b : bstore) + if (equivalent(b->fileName(), fname)) + return b; if (internal) { // 1) cheap test, using string comparison of file names - BufferStorage::const_iterator it = find_if(binternal.begin(), binternal.end(), - lyx::bind(equal_to(), lyx::bind(&Buffer::fileName, _1), fname)); - if (it != binternal.end()) - return *it; + for (Buffer * b : binternal) + if (b->fileName() == fname) + return b; // 2) possibly expensive test, using equivalence test of file names - it = find_if(binternal.begin(), binternal.end(), - lyx::bind(equivalent_to(), lyx::bind(&Buffer::fileName, _1), fname)); - if (it != binternal.end()) - return *it; + for (Buffer * b : binternal) + if (equivalent(b->fileName(), fname)) + return b; } - - return 0; + return nullptr; } -Buffer * BufferList::getBufferFromTmp(string const & s) +Buffer * BufferList::getBufferFromTmp(string const & s, bool realpath) { - BufferStorage::iterator it = bstore.begin(); - BufferStorage::iterator end = bstore.end(); - for (; it < end; ++it) { - if (prefixIs(s, (*it)->temppath())) { + for (Buffer * buf : bstore) { + string const temppath = realpath ? FileName(buf->temppath()).realPath() : buf->temppath(); + if (prefixIs(s, temppath)) { // check whether the filename matches the master - string const master_name = (*it)->latexName(); + string const master_name = buf->latexName(); if (suffixIs(s, master_name)) - return *it; + return buf; // if not, try with the children - ListOfBuffers clist = (*it)->getDescendents(); - ListOfBuffers::const_iterator cit = clist.begin(); - ListOfBuffers::const_iterator cend = clist.end(); - for (; cit != cend; ++cit) { + for (Buffer * child : buf->getDescendants()) { string const mangled_child_name = DocFileName( - changeExtension((*cit)->absFileName(), + changeExtension(child->absFileName(), ".tex")).mangledFileName(); if (suffixIs(s, mangled_child_name)) - return *cit; + return child; } } } - return 0; + return nullptr; } void BufferList::recordCurrentAuthor(Author const & author) { - BufferStorage::iterator it = bstore.begin(); - BufferStorage::iterator end = bstore.end(); - for (; it != end; ++it) - (*it)->params().authors().recordCurrentAuthor(author); + for (Buffer * buf : bstore) + buf->params().authors().recordCurrentAuthor(author); +} + + +void BufferList::updatePreviews() +{ + for (Buffer * buf : bstore) + buf->updatePreviews(); } @@ -355,41 +366,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); }