release: 0.0.20

[lilypond.git] / flower / pcursor.hh

diff --git a/flower/pcursor.hh b/flower/pcursor.hh
index c9cc53411f8d69135fbc19eb5425281023d33612..a6b99c9097526d771aa099289d1e0ec8541b850b 100644 (file)
--- a/flower/pcursor.hh
+++ b/flower/pcursor.hh
@@ -11,21 +11,33 @@
 
 /// cursor to go with PointerList
 template<class T>
-struct PCursor : public Cursor<void *> {
+struct PCursor : private Cursor<void *> {
+    friend class IPointerList<T>;
 
-    /// make cursor with #no# items back
-    PCursor<T> operator -( int no) const {
-       return PCursor<T> (Cursor<void*>::operator-(no));
+    /// delete contents
+    void junk();
+public:
+    Cursor<void*>::ok;
+    Cursor<void*>::del;
+    Cursor<void*>::backspace;
+    T get() {
+       T p = ptr();
+       Cursor<void*>::del();
+       return p;
     }
-    int operator -(PCursor<T> op) const {
-       return Cursor<void*>::operator-(op);
-    }
-    /// make cursor with #no# items further
-    PCursor<T> operator +( int no) const {
-       return PCursor<T> (Cursor<void*>::operator+(no));
+    T get_prev() {
+       (*this)--;
+       return get();
     }
     
-    PCursor(const PointerList<T> & l) : Cursor<void*> (l) {}
+    PointerList<T> &list() { return (PointerList<T>&)Cursor<void*>::list(); }
+    PCursor<T> operator++(int) { return Cursor<void*>::operator++(0);}
+    PCursor<T> operator--(int) { return Cursor<void*>::operator--(0); }
+    PCursor<T> operator+=(int i) { return Cursor<void*>::operator+=(i);}
+    PCursor<T> operator-=(int i) { return Cursor<void*>::operator-=(i); }    
+    PCursor<T> operator -(int no) const { return Cursor<void*>::operator-(no);}
+    int operator -(PCursor<T> op) const { return Cursor<void*>::operator-(op);}
+    PCursor<T> operator +( int no) const {return Cursor<void*>::operator+(no);}    PCursor(const PointerList<T> & l) : Cursor<void*> (l) {}
 
     PCursor( const Cursor<void*>& cursor ) : Cursor<void*>(cursor) { }
     void* vptr() const { return  * ((Cursor<void*> &) *this); }
@@ -36,11 +48,10 @@ struct PCursor : public Cursor<void *> {
     operator T() { return ptr(); }
     T operator *() { return ptr(); }
     void add(const T& p ) { Cursor<void*>::add((void*) p); }
-    void insert(const T& p ) { Cursor<void*>::insert((void*) p);}
-
-private:
-//    Cursor<void*>::operator void*;
-    // sigh
+    void insert(const T& p ) { Cursor<void*>::insert((void*) p);}    
+    static int compare(PCursor<T> a,PCursor<T>b) {
+       return Cursor<void*>::compare(a,b);
+    }
 };
 /**
   don't create PointerList<void*>'s.
@@ -49,13 +60,8 @@ private:
  */
 
 
-template<class T>
-inline  int pcursor_compare(PCursor<T> a,PCursor<T>b)
-{
-    return cursor_compare(Cursor<void*>(a),Cursor<void*> (b));
-}
 
 #include "compare.hh"
-template_instantiate_compare(PCursor<T>, pcursor_compare, template<class T>);
+template_instantiate_compare(PCursor<T>, PCursor<T>::compare, template<class T>);
 
 #endif