fix #1073

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

diff --git a/src/mathed/math_iterator.h b/src/mathed/math_iterator.h
index e351080906326e0f94aaa3c00ae2bfd347899d96..5c76edc6db9be0ae7fd77e61f71770078a8e5a53 100644 (file)
--- a/src/mathed/math_iterator.h
+++ b/src/mathed/math_iterator.h
@@ -1,49 +1,62 @@
+// -*- C++ -*-
 #ifndef MATH_ITERATOR_H
 #define MATH_ITERATOR_H
 
-#include "math_cursor.h"
 
-// this helper struct is used for traversing math insets
+#include "math_pos.h"
+#include <vector>
 
-class MathIterator {
+// this is used for traversing math insets
+
+class MathIterator : private std::vector<MathCursorPos> {
 public:
-       /// default constructor, used for end of range
-       //MathIterator();
-       /// start with given formula
-       explicit MathIterator(MathAtom & t);
-       /// start with given position
-       explicit MathIterator(MathCursor::cursor_type const & cursor);
+       // re-use inherited stuff
+       typedef std::vector<MathCursorPos> base_type;
+       using base_type::clear;
+       using base_type::size;
+       using base_type::push_back;
+       using base_type::pop_back;
+       using base_type::back;
+       using base_type::begin;
+       using base_type::end;
+       using base_type::erase;
+       using base_type::operator[];
+       using base_type::size_type;
+       using base_type::difference_type;
+       using base_type::const_iterator;
+       friend bool operator!=(MathIterator const &, MathIterator const &);
+       friend bool operator==(MathIterator const &, MathIterator const &);
+
+       /// default constructor
+       MathIterator();
+       /// start with given inset
+       explicit MathIterator(MathInset * p);
        ///
        MathCursorPos const & operator*() const;
        ///
        MathCursorPos const & operator->() const;
-       ///
+       /// move on one step
        void operator++();
-       /// read access to top most item
-       MathCursorPos const & position() const;
-       /// write access to top most item
-       MathCursorPos & position();
-       /// read access to full path
-       MathCursor::cursor_type const & cursor() const;
+       /// move on several steps
+       void jump(difference_type);
        /// read access to top most inset
-       MathAtom const & par() const;
+       MathInset const * par() const;
        /// read access to top most inset
-       MathAtom & par();
+       MathInset * par();
        /// helper for iend
        void goEnd();
-       
+       /// read access to top most item
+       MathArray const & cell() const;
+       /// is this a non-end position
+       bool normal() const;
+       /// shrinks to at most i levels
+       void shrink(size_type i);
+
 private:
-       /// write access to top most item
-       MathXArray const & xcell() const;
-       /// write access to top most item
-       MathAtom * nextInset() const;
        /// own level down
-       void push(MathAtom &);
+       void push(MathInset *);
        /// own level up
        void pop();
-
-       /// current position
-       MathCursor::cursor_type cursor_;
 };
 
 ///
@@ -52,8 +65,8 @@ bool operator==(MathIterator const &, MathIterator const &);
 bool operator!=(MathIterator const &, MathIterator const &);
 
 ///
-MathIterator ibegin(MathAtom & p);
+MathIterator ibegin(MathInset * p);
 ///
-MathIterator iend(MathAtom & p);
+MathIterator iend(MathInset * p);
 
 #endif