* Licence details can be found in the file COPYING.
*
* \author André Pönitz
+ * \author Alfredo Braunstein
*
* Full author contact details are available in file CREDITS.
*/
#include <boost/assert.hpp>
#include <boost/current_function.hpp>
+using std::endl;
-namespace lyx {
-using std::endl;
+namespace lyx {
// We could be able to get rid of this if only every BufferView were
return;
}
- // otherwise move on one position if possible
- if (tip.pos() < lastp) {
- //lyxerr << "... next pos" << endl;
- ++tip.pos();
- return;
- }
- //lyxerr << "... no next pos" << endl;
-
- // otherwise move on one paragraph if possible
- if (tip.pit() < lastpit()) {
- //lyxerr << "... next par" << endl;
- ++tip.pit();
- tip.pos() = 0;
- return;
- }
- //lyxerr << "... no next pit" << endl;
-
- // otherwise try to move on one cell if possible
- if (tip.idx() < lastidx()) {
- //lyxerr << "... next idx" << endl;
- ++tip.idx();
- tip.pit() = 0;
- tip.pos() = 0;
+ if (!tip.at_end()) {
+ tip.forwardPos();
return;
}
- //lyxerr << "... no next idx" << endl;
-
// otherwise leave inset and jump over inset as a whole
pop_back();
- // 'top' is invalid now...
- if (!empty())
- ++top().pos();
-}
-
-
-void DocIterator::forwardPosNoDescend()
-{
- CursorSlice & tip = top();
- pos_type const lastp = lastpos();
-
- // move on one position if possible
- if (tip.pos() < lastp) {
- //lyxerr << "... next pos" << endl;
- ++tip.pos();
- return;
- }
- //lyxerr << "... no next pos" << endl;
-
- // otherwise move on one paragraph if possible
- if (tip.pit() < lastpit()) {
- //lyxerr << "... next par" << endl;
- ++tip.pit();
- tip.pos() = 0;
- return;
- }
- //lyxerr << "... no next pit" << endl;
-
- // otherwise try to move on one cell if possible
- if (tip.idx() < lastidx()) {
- //lyxerr << "... next idx" << endl;
- ++tip.idx();
- tip.pit() = 0;
- tip.pos() = 0;
- return;
- }
- //lyxerr << "... no next idx" << endl;
-
- // otherwise leave inset and jump over inset as a whole
- pop_back();
- // 'top' is invalid now...
+ // 'tip' is invalid now...
if (!empty())
++top().pos();
}
}
+void DocIterator::forwardIdx()
+{
+ CursorSlice & tip = top();
+
+ //prevent endless loops
+ BOOST_ASSERT(tip.idx() < tip.nargs());
+ ++tip.idx();
+ tip.pit() = 0;
+ tip.pos() = 0;
+}
+
+
void DocIterator::forwardChar()
{
forwardPos();
return;
}
- CursorSlice & tip = top();
-
- if (tip.pos() != 0) {
- --tip.pos();
- } else if (tip.pit() != 0) {
- --tip.pit();
- tip.pos() = lastpos();
- return;
- } else if (tip.idx() != 0) {
- --tip.idx();
- tip.pit() = lastpit();
- tip.pos() = lastpos();
- return;
- } else {
+ if (top().at_begin()) {
pop_back();
return;
}
+ top().backwardPos();
+
// move into an inset to the left if possible
Inset * n = 0;
if (inMathed()) {
- n = (tip.cell().begin() + tip.pos())->nucleus();
+ n = (top().cell().begin() + top().pos())->nucleus();
} else {
- if (paragraph().isInset(tip.pos()))
- n = paragraph().getInset(tip.pos());
+ if (paragraph().isInset(top().pos()))
+ n = paragraph().getInset(top().pos());
}
if (n && n->isActive()) {
}
+bool DocIterator::fixIfBroken()
+{
+ // Go through the slice stack from the bottom.
+ // Check that all coordinates (idx, pit, pos) are correct and
+ // that the inset is the one which is claimed to be there
+ Inset * inset = &slices_[0].inset();
+ size_t i = 0;
+ size_t n = slices_.size();
+ for (; i != n; ++i) {
+ CursorSlice & cs = slices_[i];
+ if (&cs.inset() != inset) {
+ // the whole slice is wrong, chop off this as well
+ --i;
+ LYXERR(Debug::DEBUG) << "fixIfBroken(): inset changed" << endl;
+ break;
+ } else if (cs.idx() > cs.lastidx()) {
+ cs.idx() = cs.lastidx();
+ cs.pit() = cs.lastpit();
+ cs.pos() = cs.lastpos();
+ LYXERR(Debug::DEBUG) << "fixIfBroken(): idx fixed" << endl;
+ break;
+ } else if (cs.pit() > cs.lastpit()) {
+ cs.pit() = cs.lastpit();
+ cs.pos() = cs.lastpos();
+ LYXERR(Debug::DEBUG) << "fixIfBroken(): pit fixed" << endl;
+ break;
+ } else if (cs.pos() > cs.lastpos()) {
+ cs.pos() = cs.lastpos();
+ LYXERR(Debug::DEBUG) << "fixIfBroken(): pos fixed" << endl;
+ break;
+ } else if (i != n - 1 && cs.pos() != cs.lastpos()) {
+ // get inset which is supposed to be in the next slice
+ if (cs.inset().inMathed())
+ inset = (cs.cell().begin() + cs.pos())->nucleus();
+ else if (cs.paragraph().isInset(cs.pos()))
+ inset = cs.paragraph().getInset(cs.pos());
+ else {
+ // there are slices left, so there must be another inset
+ break;
+ }
+ }
+ }
+
+ // Did we make it through the whole slice stack? Otherwise there
+ // was a problem at slice i, and we have to chop off above
+ if (i < n) {
+ LYXERR(Debug::DEBUG) << "fixIfBroken(): cursor chopped at " << i << endl;
+ resize(i + 1);
+ return true;
+ } else
+ return false;
+}
+
+
std::ostream & operator<<(std::ostream & os, DocIterator const & dit)
{
for (size_t i = 0, n = dit.depth(); i != n; ++i)
}
+bool operator<(DocIterator const & p, DocIterator const & q)
+{
+ size_t depth = std::min(p.depth(), q.depth());
+ for (size_t i = 0 ; i < depth ; ++i) {
+ if (p[i] != q[i])
+ return p[i] < q[i];
+ }
+ return p.depth() < q.depth();
+}
+
+
+bool operator>(DocIterator const & p, DocIterator const & q)
+{
+ return q < p;
+}
+
+
+bool operator<=(DocIterator const & p, DocIterator const & q)
+{
+ return !(q < p);
+}
+
///////////////////////////////////////////////////////
if (inset == 0) {
// FIXME
lyxerr << BOOST_CURRENT_FUNCTION
- << " Should not happen, but does e.g. after C-n C-l C-z S-C-z"
+ << " Should not happen, but does e.g. after C-n C-l C-z S-C-z\n"
+ << " or when a Buffer has been concurently edited by two views"
<< '\n' << "dit: " << dit << '\n'
<< " lastpos: " << dit.lastpos() << endl;
- //break;
- BOOST_ASSERT(false);
+ dit.fixIfBroken();
+ break;
}
dit.push_back(data_[i]);
dit.top().inset_ = inset;
+ if (dit.fixIfBroken())
+ break;
if (i + 1 != n)
inset = dit.nextInset();
}
projects / lyx.git / blobdiff