Changeset 3d0560d for libcfa/src/bits/sequence.hfa

Timestamp:

Dec 2, 2020, 12:31:42 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

833ba13

Parents:

4f0c520

Message:

clean up all new collections and fix sequence iterator bug

File:

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

libcfa/src/bits/sequence.hfa

@@ -116 +116 @@
 
                 // Insert *n into the sequence after *aft, or at the beginning if aft == 0.
-                void insertAft( Sequence(T) & s, T *aft, T *n ) with( s ) {     // pre: !n->listed() & *aft in *s
+                void insertAft( Sequence(T) & s, T * aft, T * n ) with( s ) {   // pre: !n->listed() & *aft in *s
 #ifdef __CFA_DEBUG__
                         if ( listed( n ) ) abort( "(Sequence &)%p.insertAft( %p, %p ) : Node is already on another list.", &s, aft, n );
@@ -145 +145 @@
                 
                 // pre: n->listed() & *n in *s
-                void remove( Sequence(T) & s, T *n ) with( s ) { // O(1)
+                void remove( Sequence(T) & s, T * n ) with( s ) { // O(1)
 #ifdef __CFA_DEBUG__
                         if ( ! listed( n ) ) abort( "(Sequence &)%p.remove( %p ) : Node is not on a list.", &s, n );
@@ -159 +159 @@
 
                 // Add an element to the head of the sequence.
-                void addHead( Sequence(T) & s, T *n ) {                 // pre: !n->listed(); post: n->listed() & head() == n
+                void addHead( Sequence(T) & s, T * n ) {                // pre: !n->listed(); post: n->listed() & head() == n
                         insertAft( s, 0, n );
                 }
                 // Add an element to the tail of the sequence.
-                void addTail( Sequence(T) & s, T *n ) {                 // pre: !n->listed(); post: n->listed() & head() == n
+                void addTail( Sequence(T) & s, T * n ) {                // pre: !n->listed(); post: n->listed() & head() == n
                         insertBef( s, n, 0 );
                 }
                 // Add an element to the tail of the sequence.
-                void add( Sequence(T) & s, T *n ) {                             // pre: !n->listed(); post: n->listed() & head() == n
+                void add( Sequence(T) & s, T * n ) {                    // pre: !n->listed(); post: n->listed() & head() == n
                         addTail( s, n );
                 }
@@ -244 +244 @@
                         ((ColIter &) si){};
                         seq = &s;
+                        curr = head( s );
                 } // post: elts = null.
                 
@@ -251 +252 @@
                 } // post: elts = {e in s}.
 
-                bool ?>>?( SeqIter(T) & si, T *& tp ) with( si ) {
+                bool ?>>?( SeqIter(T) & si, T && tp ) with( si ) {
                         if ( curr ) {
-                                tp = Curr( si );
-                                T *n = succ( *seq, Curr( si ) );
+                                &tp = Curr( si );
+                                T * n = succ( *seq, Curr( si ) );
                                 curr = n == head( *seq ) ? 0p : n;
-                        } else tp = 0p;
-                        return tp != 0p;
+                        } else &tp = 0p;
+                        return &tp != 0p;
                 }
         } // distribution
@@ -282 +283 @@
                         ((ColIter &) si){};
                         seq = &s;
+                        curr = tail( s );
                 } // post: elts = null.
                 
@@ -289 +291 @@
                 } // post: elts = {e in s}.
 
-                bool ?>>?( SeqIterRev(T) & si, T *&tp ) with( si ) {
+                bool ?>>?( SeqIterRev(T) & si, T && tp ) with( si ) {
                         if ( curr ) {
-                                tp = Curr( si );
-                                T *n = pred( *seq, Curr( si ) );
+                                &tp = Curr( si );
+                                T * n = pred( *seq, Curr( si ) );
                                 curr = n == tail( *seq ) ? 0p : n;
-                        } else tp = 0p;
-                        return tp != 0p;
+                        } else &tp = 0p;
+                        return &tp != 0p;
                 }
         } // distribution