Changes in libcfa/src/bits/sequence.hfa [a5a67ab8:a78c3ff]

File:

• libcfa/src/bits/sequence.hfa (modified) (8 diffs)

libcfa/src/bits/sequence.hfa

@@ -2 +2 @@
 
 #include "collection.hfa"
+#include <stdlib.hfa>
+#include <stdio.h>
 
 struct Seqable {
@@ -48 +50 @@
                 T & tail( Sequence(T) & s ) with( s ) {
                         return root ? (T &)*Back( &head( s ) ) : *0p;
-                }       // post: empty() & tail() == 0 | !empty() & tail() in *s
+                }       // post: empty() & tail() == 0 | !empty() & tail() in *s\
 
                 // Return a pointer to the element after *n, or 0p if there isn't one.
-                T * succ( Sequence(T) & s, T * n ) with( s ) {  // pre: *n in *s
-#ifdef __CFA_DEBUG__
-                        if ( ! listed( n ) ) abort( "(Sequence &)%p.succ( %p ) : Node is not on a list.", &s, n );
-#endif // __CFA_DEBUG__
-                        return Next( n ) == &head( s ) ? 0p : Next( n );
-                } // post: n == tail() & succ(n) == 0 | n != tail() & *succ(n) in *s
+                T & succ( Sequence(T) & s, T & n ) with( s ) {  // pre: *n in *s
+#ifdef __CFA_DEBUG__
+                        if ( ! listed( &n ) ) abort( "(Sequence &)%p.succ( %p ) : Node is not on a list.", &s, &n );
+#endif // __CFA_DEBUG__
+                        return Next( &n ) == &head( s ) ? *0p : *Next( &n );
+                }       // post: n == tail() & succ(n) == 0 | n != tail() & *succ(n) in *s
 
                 // Return a pointer to the element before *n, or 0p if there isn't one.
-                T * pred( Sequence(T) & s, T * n ) with( s ) {  // pre: *n in *s
-#ifdef __CFA_DEBUG__
-                        if ( ! listed( n ) ) abort( "(Sequence &)%p.pred( %p ) : Node is not on a list.", &s, n );
-#endif // __CFA_DEBUG__
-                        return n == &head( s ) ? 0p : Back( n );
+                T & pred( Sequence(T) & s, T & n ) with( s ) {  // pre: *n in *s
+#ifdef __CFA_DEBUG__
+                        if ( ! listed( &n ) ) abort( "(Sequence &)%p.pred( %p ) : Node is not on a list.", &s, &n );
+#endif // __CFA_DEBUG__
+                        return &n == &head( s ) ? *0p : *Back( &n );
                 }       // post: n == head() & head(n) == 0 | n != head() & *pred(n) in *s
 
@@ -135 +137 @@
                         if ( &n == &head( s ) ) {
                                 if ( Next( &head( s ) ) == &head( s ) ) root = 0p;
-                                else root = Next( &head( s ) );
+                                else root = Next( &head(s ) );
                         } // if
                         Back( Next( &n ) ) = Back( &n );
@@ -225 +227 @@
                         curr = &head( s );
                 } // post: elts = null.
-
-                void ?{}( SeqIter(T) & si, Sequence(T) & s, T & start ) with( si ) {
-                        ((ColIter &) si){};
-                        seq = &s;
-                        curr = &start;
-                } // post: elts = null.
-
+                
                 void over( SeqIter(T) & si, Sequence(T) & s ) with( si ) {
                         seq = &s;
@@ -240 +236 @@
                         if ( curr ) {
                                 &tp = Curr( si );
-                                T * n = succ( *seq, Curr( si ) );
+                                T * n = &succ( *seq, *Curr( si ) );
                                 curr = n == &head( *seq ) ? 0p : n;
                         } else &tp = 0p;
@@ -265 +261 @@
                         curr = &tail( s );
                 } // post: elts = null.
-
-                void ?{}( SeqIterRev(T) & si, Sequence(T) & s, T & start ) with( si ) { 
-                        ((ColIter &) si){};
-                        seq = &s;
-                        curr = &start;
-                } // post: elts = null.
-
+                
                 void over( SeqIterRev(T) & si, Sequence(T) & s ) with( si ) {
                         seq = &s;
@@ -280 +270 @@
                         if ( curr ) {
                                 &tp = Curr( si );
-                                T * n = pred( *seq, Curr( si ) );
+                                T * n = &pred( *seq, *Curr( si ) );
                                 curr = n == &tail( *seq ) ? 0p : n;
                         } else &tp = 0p;
@@ -289 +279 @@
 
 // Local Variables: //
-// compile-command: "cfa sequence.hfa" //
+// compile-command: "make install" //
 // End: //