fix #1073

[lyx.git] / src / mathed / math_iterator.C

diff --git a/src/mathed/math_iterator.C b/src/mathed/math_iterator.C
index 0ba7588063a374e79f995405c0ab3bf9871f2f81..eb73b1a3a38b310e8573728d91f5c815b97e4e3c 100644 (file)
--- a/src/mathed/math_iterator.C
+++ b/src/mathed/math_iterator.C
@@ -2,12 +2,13 @@
 #include <config.h>
 
 #include "math_iterator.h"
+#include "math_inset.h"
 #include "debug.h"
 #include "support/LAssert.h"
 
 
-//MathIterator::MathIterator()
-//{}
+MathIterator::MathIterator()
+{}
 
 
 MathIterator::MathIterator(MathInset * p)
@@ -16,151 +17,131 @@ MathIterator::MathIterator(MathInset * p)
 }
 
 
-//MathIterator::MathIterator(MathCursor::cursor_type const & c)
-//     : cursor_(c)
-//{}
-
-
-MathCursorPos const & MathIterator::position() const
-{
-       lyx::Assert(cursor_.size());
-       return cursor_.back();
-}
-
-
-MathCursorPos & MathIterator::position()
-{
-       lyx::Assert(cursor_.size());
-       return cursor_.back();
-}
-
-
-MathCursor::cursor_type const & MathIterator::cursor() const
-{
-       return cursor_;
-}
-
-
 MathInset const * MathIterator::par() const
 {
-       return position().par_;
+       return back().par_;
 }
 
 
 MathInset * MathIterator::par()
 {
-       return position().par_;
-}
-
-
-MathXArray const & MathIterator::xcell() const
-{
-       return par()->xcell(position().idx_);
+       return back().par_;
 }
 
 
 MathArray const & MathIterator::cell() const
 {
-       return par()->xcell(position().idx_).data_;
+       MathCursorPos const & top = back();
+       return top.par_->cell(top.idx_);
 }
 
 
-MathInset * MathIterator::nextInset() const
-{
-       if (position().pos_ == xcell().data_.size())
-               return 0;
-       return (xcell().begin() + position().pos_)->nucleus();
-}
-
 
 void MathIterator::push(MathInset * p)
 {
        //lyxerr << "push: " << p << endl;
-       cursor_.push_back(MathCursorPos(p));
+       push_back(MathCursorPos(p));
 }
 
 
 void MathIterator::pop()
 {
        //lyxerr << "pop: " << endl;
-       lyx::Assert(cursor_.size());
-       cursor_.pop_back();
+       lyx::Assert(size());
+       pop_back();
 }
 
 
 MathCursorPos const & MathIterator::operator*() const
 {
-       return position();
+       return back();
 }
 
 
 MathCursorPos const & MathIterator::operator->() const
 {
-       return position();
+       return back();
 }
 
 
 void MathIterator::goEnd()
 {
-       position().idx_ = par()->nargs() - 1;
-       position().pos_ = xcell().data_.size();
+       MathCursorPos & top = back();
+       top.idx_ = top.par_->nargs() - 1;
+       top.pos_ = cell().size();
 }
 
 
 void MathIterator::operator++()
 {
+       MathCursorPos & top = back();
+       MathArray     & ar  = top.par_->cell(top.idx_);
+
        // move into the current inset if possible
        // it is impossible for pos() == size()!
-       if (nextInset() && nextInset()->isActive()) {
-               push(nextInset());
+       MathInset * n = 0;
+       if (top.pos_ != ar.size())
+               n = (ar.begin() + top.pos_)->nucleus();
+       if (n && n->isActive()) {
+               push(n);
                return;
        }
 
-       // otherwise move on one cell position if possible
-       if (position().pos_ < xcell().data_.size()) {
+       // otherwise move on one cell back if possible
+       if (top.pos_ < ar.size()) {
                // pos() == size() is valid!
-               ++position().pos_;
+               ++top.pos_;
                return;
        }
 
-       // otherwise move on one cell if possible
-       if (position().idx_ + 1 < par()->nargs()) {
+       // otherwise try to move on one cell if possible
+       while (top.idx_ + 1 < top.par_->nargs()) {
                // idx() == nargs() is _not_ valid!
-               ++position().idx_;
-               position().pos_ = 0;
-               return;
+               ++top.idx_;
+               if (top.par_->validCell(top.idx_)) {
+                       top.pos_ = 0;
+                       return;
+               }
        }
 
-       // otherwise leave array, move on one position
+       // otherwise leave array, move on one back
        // this might yield pos() == size(), but that's a ok.
        pop();
-       ++position().pos_;
+       // it certainly invalidates top
+       ++back().pos_;
+}
+
+
+void MathIterator::jump(difference_type i)
+{
+       back().pos_ += i;
+       //lyx::Assert(back().pos_ >= 0);
+       lyx::Assert(back().pos_ <= cell().size());
+}
+
+
+bool MathIterator::normal() const
+{
+       return back().pos_ < cell().size();
 }
 
 
-void MathIterator::jump(int i)
+void MathIterator::shrink(size_type i)
 {
-       position().pos_ += i;
-       lyx::Assert(position().pos_ >= 0);
-       lyx::Assert(position().pos_ <= cell().size());
+       if (i < size())
+               erase(begin() + i, end());
 }
 
 
 bool operator==(MathIterator const & it, MathIterator const & jt)
 {
-       //lyxerr << "==: " << it.cursor().size() << " " << jt.cursor().size() << endl;
-       if (it.cursor().size() != jt.cursor().size())
-               return false;
-       return it.cursor() == jt.cursor();      
+       return MathIterator::base_type(it) == MathIterator::base_type(jt);
 }
 
 
 bool operator!=(MathIterator const & it, MathIterator const & jt)
 {
-       //lyxerr << "!=: " << it.cursor().size() << " " << jt.cursor().size() << endl;
-       if (it.cursor().size() != jt.cursor().size())
-               return true;
-       return it.cursor() != jt.cursor();      
+       return MathIterator::base_type(it) != MathIterator::base_type(jt);
 }