Revert 82c7669381

[lyx.git] / src / CursorSlice.cpp

diff --git a/src/CursorSlice.cpp b/src/CursorSlice.cpp
index b4352e3ba4b64976d54448fb9d62bfc33b8dd184..ae3686fd1ebf9417fc965a46490cfc5f52e09bf2 100644 (file)
--- a/src/CursorSlice.cpp
+++ b/src/CursorSlice.cpp
@@ -25,6 +25,8 @@
 #include "mathed/InsetMath.h"
 #include "mathed/MathMacro.h"
 
+#include "support/ExceptionMessage.h"
+#include "support/gettext.h"
 #include "support/lassert.h"
 
 #include <ostream>
@@ -42,7 +44,7 @@ CursorSlice::CursorSlice()
 CursorSlice::CursorSlice(Inset & p)
        : inset_(&p), idx_(0), pit_(0), pos_(0)
 {
-       LASSERT(inset_, /**/);
+       LBUFERR(inset_);
 }
 
 
@@ -60,7 +62,7 @@ Paragraph & CursorSlice::paragraph() const
 
 pos_type CursorSlice::lastpos() const
 {
-       LASSERT(inset_, /**/);
+       LBUFERR(inset_);
        InsetMath const * math = inset_->asInsetMath();
        bool paramless_macro = math && math->asMacro() && !math->asMacro()->nargs();
        return math ? (paramless_macro ? 0 : cell().size()) 
@@ -78,15 +80,15 @@ pit_type CursorSlice::lastpit() const
 
 CursorSlice::row_type CursorSlice::row() const
 {
-       LASSERT(asInsetMath(), /**/);
-       return asInsetMath()->row(idx_);
+       LASSERT(inset_, return 0);
+       return inset_->row(idx_);
 }
 
 
 CursorSlice::col_type CursorSlice::col() const
 {
-       LASSERT(asInsetMath(), /**/);
-       return asInsetMath()->col(idx_);
+       LASSERT(inset_, return 0);
+       return inset_->col(idx_);
 }
 
 
@@ -110,7 +112,7 @@ void CursorSlice::forwardPos()
        // otherwise move on one cell
        //lyxerr << "... next idx" << endl;
 
-       LASSERT(idx_ < nargs(), /**/);
+       LASSERT(idx_ < nargs(), return);
 
        ++idx_;
        pit_ = 0;
@@ -120,7 +122,7 @@ void CursorSlice::forwardPos()
 
 void CursorSlice::forwardIdx()
 {
-       LASSERT(idx_ < nargs(), /**/);
+       LASSERT(idx_ < nargs(), return);
 
        ++idx_;
        pit_ = 0;
@@ -148,19 +150,31 @@ void CursorSlice::backwardPos()
                return;
        }
 
-       LASSERT(false, /**/);
+       LATTEST(false);
 }
 
 
-bool CursorSlice::at_end() const 
+bool CursorSlice::at_cell_end() const
 {
-       return idx_ == lastidx() && pit_ == lastpit() && pos_ == lastpos();
+       return pit_ == lastpit() && pos_ == lastpos();
+}
+
+
+bool CursorSlice::at_cell_begin() const
+{
+       return pit_ == 0 && pos_ == 0;
+}
+
+
+bool CursorSlice::at_end() const
+{
+       return idx_ == lastidx() && at_cell_end();
 }
 
 
 bool CursorSlice::at_begin() const
 {
-       return idx_ == 0 && pit_ == 0 && pos_ == 0;
+       return idx_ == 0 && at_cell_begin();
 }
 
 
@@ -187,7 +201,8 @@ bool operator<(CursorSlice const & p, CursorSlice const & q)
        if (p.inset_ != q.inset_) {
                LYXERR0("can't compare cursor and anchor in different insets\n"
                       << "p: " << p << '\n' << "q: " << q);
-               LASSERT(false, /**/);
+               // It should be safe to continue, just registering the error.
+               LASSERT(false, return false);
        }
        if (p.idx_ != q.idx_)
                return p.idx_ < q.idx_;