Changes in libcfa/src/bits/queue.hfa [5e82d56:636d3715]

File:

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

libcfa/src/bits/queue.hfa

@@ -14 +14 @@
                         return (T *)head( (Collection &)q );
                 } // post: empty() & head() == 0 | !empty() & head() in *q
-
-                bool empty( Queue(T) & q ) with( q ) {                  // 0 <=> *q contains no elements
-                        return empty( (Collection &)q );
-                }
-
-                bool listed( T * n ) {
-                        return Next( (Colable *)n ) != 0;
-                }
-
-                T *& Next( T * n ) {
-                        return (T *)Next( (Colable *)n );
-                }
-
-                T * Root( Queue(T) & q ) with( q ) {
-                        return (T *)root;
-                }
 
                 void ?{}( Queue(T) &, const Queue(T) & ) = void; // no copy
@@ -55 +39 @@
 #endif // __CFA_DEBUG__
                         if ( last ) {
-                                Next( n ) = Root( q );
+                                Next( n ) = head( q );
                                 q.root = n;
                         } else {
@@ -81 +65 @@
                         if ( root ) {
                                 root = Next( root );
-                                if ( Root( q ) == t ) {
+                                if ( head( q ) == t ) {
                                         root = last = 0p;                                       // only one element
                                 }
@@ -132 +116 @@
                                 root = from.root;
                         } else {                                                                        // "to" list not empty
-                                Next( last ) = Root( from );
+                                Next( last ) = head( from );
                         }
                         last = from.last;
@@ -148 +132 @@
                         to.last = n;                                                            // end of "to" list
                         from.root = Next( n );                                          // start of "from" list
-                        if ( n == Root( from ) ) {                                      // last node in list ?
+                        if ( n == head( from ) ) {                                      // last node in list ?
                                 from.root = from.last = 0p;                             // mark "from" list empty
                         } else {
@@ -164 +148 @@
 
         inline {
-                // wrappers to make ColIter have T
-                T * Curr( QueueIter(T) & qi ) with( qi ) {
-                        return (T *)curr;
-                }
-
                 void ?{}( QueueIter(T) & qi ) with( qi ) {
                         ((ColIter &)qi){};
@@ -187 +166 @@
                 } // post: curr = {e in q}
 
-                bool ?>>?( QueueIter(T) & qi, T *& tp ) with( qi ) {
+                bool ?>>?( QueueIter(T) & qi, T && tp ) with( qi ) {
                         if ( curr ) {
-                                tp = Curr( qi );
+                                &tp = Curr( qi );
                                 T * n = Next( Curr( qi ) );
                                 curr = (n == Curr( qi ) ) ? 0p : n;
-                        } else tp = 0p;
-                        return tp != 0p;
+                        } else &tp = 0p;
+                        return &tp != 0p;
                 }
                 // post: elts == null & !operator>>(tp) | elts != null & *tp' in elts & elts' == elts - *tp & operator>>(tp)