#include "DocIterator.h"
-#include "debug.h"
#include "InsetList.h"
#include "Paragraph.h"
#include "Text.h"
#include "insets/InsetTabular.h"
+#include "support/debug.h"
+
#include <boost/assert.hpp>
-#include <boost/current_function.hpp>
-using std::endl;
+#include <ostream>
+using namespace std;
namespace lyx {
}
+LyXErr & operator<<(LyXErr & os, DocIterator const & it)
+{
+ os.stream() << it;
+ return os;
+}
+
+
Inset * DocIterator::nextInset() const
{
BOOST_ASSERT(!empty());
if (pos() == lastpos())
return 0;
if (pos() > lastpos()) {
- lyxerr << "Should not happen, but it does. " << endl;
+ LYXERR0("Should not happen, but it does. ");
return 0;
}
if (inMathed())
return nextAtom().nucleus();
- return paragraph().isInset(pos()) ? paragraph().getInset(pos()) : 0;
+ return paragraph().getInset(pos());
}
else
return prevAtom().nucleus();
}
- return paragraph().isInset(pos() - 1) ? paragraph().getInset(pos() - 1) : 0;
+ return paragraph().getInset(pos() - 1);
}
Paragraph & DocIterator::paragraph() const
{
if (!inTexted())
- lyxerr << *this << endl;
+ LYXERR0(*this);
BOOST_ASSERT(inTexted());
return top().paragraph();
}
}
-void DocIterator::forwardPos(bool ignorecollapsed)
+// This duplicates code above, but is in the critical path.
+// So please think twice before adding stuff
+void DocIterator::forwardPos()
{
- //this dog bites his tail
+ // this dog bites his tail
if (empty()) {
push_back(CursorSlice(*inset_));
return;
}
- Inset * const nextinset = nextInset();
- // jump over collapsables if they are collapsed
- // FIXME: the check for asInsetMath() shouldn't be necessary
- // but math insets do not return a sensible editable() state yet.
- if (ignorecollapsed && nextinset && (!nextinset->asInsetMath()
- && nextinset->editable() != Inset::HIGHLY_EDITABLE)) {
- ++top().pos();
- return;
- }
-
CursorSlice & tip = top();
//lyxerr << "XXX\n" << *this << endl;
if (tip.pos() != lastp) {
// this is impossible for pos() == size()
- if (inMathed()) {
+ if (inMathed())
n = (tip.cell().begin() + tip.pos())->nucleus();
- } else {
- if (paragraph().isInset(tip.pos()))
- n = paragraph().getInset(tip.pos());
- }
+ else
+ n = paragraph().getInset(tip.pos());
}
if (n && n->isActive()) {
}
+void DocIterator::forwardPosIgnoreCollapsed()
+{
+ Inset * const nextinset = nextInset();
+ // FIXME: the check for asInsetMath() shouldn't be necessary
+ // but math insets do not return a sensible editable() state yet.
+ if (nextinset && !nextinset->asInsetMath()
+ && nextinset->editable() != Inset::HIGHLY_EDITABLE) {
+ ++top().pos();
+ return;
+ }
+ forwardPos();
+}
+
+
void DocIterator::forwardPar()
{
forwardPos();
// move into an inset to the left if possible
Inset * n = 0;
- if (inMathed()) {
+ if (inMathed())
n = (top().cell().begin() + top().pos())->nucleus();
- } else {
- if (paragraph().isInset(top().pos()))
- n = paragraph().getInset(top().pos());
- }
+ else
+ n = paragraph().getInset(top().pos());
if (n && n->isActive()) {
push_back(CursorSlice(*n));
bool DocIterator::fixIfBroken()
{
+ if (empty())
+ return false;
+
// 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
if (&cs.inset() != inset) {
// the whole slice is wrong, chop off this as well
--i;
- LYXERR(Debug::DEBUG) << "fixIfBroken(): inset changed" << endl;
+ LYXERR(Debug::DEBUG, "fixIfBroken(): inset changed");
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;
+ LYXERR(Debug::DEBUG, "fixIfBroken(): idx fixed");
break;
} else if (cs.pit() > cs.lastpit()) {
cs.pit() = cs.lastpit();
cs.pos() = cs.lastpos();
- LYXERR(Debug::DEBUG) << "fixIfBroken(): pit fixed" << endl;
+ LYXERR(Debug::DEBUG, "fixIfBroken(): pit fixed");
break;
} else if (cs.pos() > cs.lastpos()) {
cs.pos() = cs.lastpos();
- LYXERR(Debug::DEBUG) << "fixIfBroken(): pos fixed" << endl;
+ LYXERR(Debug::DEBUG, "fixIfBroken(): pos fixed");
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 if (Inset * csInset = cs.paragraph().getInset(cs.pos()))
+ inset = csInset;
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;
+ LYXERR(Debug::DEBUG, "fixIfBroken(): cursor chopped at " << i);
resize(i + 1);
return true;
} else
}
-DocIterator::idx_type DocIterator::find(MathData const & cell) const
+int DocIterator::find(MathData const & cell) const
{
for (size_t l = 0; l != slices_.size(); ++l) {
if (slices_[l].asInsetMath() && &slices_[l].cell() == &cell)
}
-DocIterator::idx_type DocIterator::find(InsetMath const * inset) const
+int DocIterator::find(InsetMath const * inset) const
{
for (size_t l = 0; l != slices_.size(); ++l) {
if (slices_[l].asInsetMath() == inset)
}
-void DocIterator::cutOff(DocIterator::idx_type above, std::vector<CursorSlice> & cut)
+void DocIterator::cutOff(int above, vector<CursorSlice> & cut)
{
- cut = std::vector<CursorSlice>(slices_.begin() + above + 1, slices_.end());
+ cut = vector<CursorSlice>(slices_.begin() + above + 1, slices_.end());
slices_.resize(above + 1);
}
-void DocIterator::cutOff(DocIterator::idx_type above)
+void DocIterator::cutOff(int above)
{
slices_.resize(above + 1);
}
-void DocIterator::append(std::vector<CursorSlice> const & x)
+void DocIterator::append(vector<CursorSlice> const & x)
{
slices_.insert(slices_.end(), x.begin(), x.end());
}
}
-std::ostream & operator<<(std::ostream & os, DocIterator const & dit)
+ostream & operator<<(ostream & os, DocIterator const & dit)
{
for (size_t i = 0, n = dit.depth(); i != n; ++i)
os << " " << dit[i] << "\n";
}
-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);
-}
-
-
///////////////////////////////////////////////////////
StableDocIterator::StableDocIterator(DocIterator const & dit)
for (size_t i = 0, n = data_.size(); i != n; ++i) {
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\n"
- << " or when a Buffer has been concurently edited by two views"
+ LYXERR0(" Should not happen, but does e.g. after "
+ "C-n C-l C-z S-C-z\n"
+ << " or when a Buffer has been concurrently edited by two views"
<< '\n' << "dit: " << dit << '\n'
- << " lastpos: " << dit.lastpos() << endl;
+ << " lastpos: " << dit.lastpos());
dit.fixIfBroken();
break;
}
}
-std::ostream & operator<<(std::ostream & os, StableDocIterator const & dit)
+ostream & operator<<(ostream & os, StableDocIterator const & dit)
{
for (size_t i = 0, n = dit.data_.size(); i != n; ++i)
os << " " << dit.data_[i] << "\n";
projects / lyx.git / blobdiff