Changes in libcfa/src/bits/queue.hfa [a5a67ab8:7c1144b]

File:

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

libcfa/src/bits/queue.hfa

@@ -28 +28 @@
 
                 T * succ( Queue(T) & q, T * n ) with( q ) {             // pre: *n in *q
-#ifdef __CFA_DEBUG__
+                        #ifdef __CFA_DEBUG__
                         if ( ! listed( n ) ) abort( "(Queue &)%p.succ( %p ) : Node is not on a list.", &q, n );
-#endif // __CFA_DEBUG__
-                        return (Next( n ) == n) ? 0p : Next( n );
+                        #endif // __CFA_DEBUG__
+                        return (Next( *n ) == n) ? 0p : Next( *n );
                 } // post: n == tail() & succ(n) == 0 | n != tail() & *succ(n) in *q
 
                 void addHead( Queue(T) & q, T & n ) with( q ) {
-#ifdef __CFA_DEBUG__
+                        #ifdef __CFA_DEBUG__
                         if ( listed( &n ) ) abort( "(Queue &)%p.addHead( %p ) : Node is already on another list.", &q, &n );
-#endif // __CFA_DEBUG__
+                        #endif // __CFA_DEBUG__
                         if ( last ) {
-                                Next( &n ) = &head( q );
+                                Next( n ) = &head( q );
                                 q.root = &n;
                         } else {
                                 root = last = &n;
-                                Next( &n ) = &n;                                                        // last node points to itself
+                                Next( n ) = &n;                                                 // last node points to itself
                         }
                 }
 
                 void addTail( Queue(T) & q, T & n ) with( q ) {
-#ifdef __CFA_DEBUG__
+                        #ifdef __CFA_DEBUG__
                         if ( listed( &n ) ) abort( "(Queue &)%p.addTail( %p ) : Node is already on another list.", &q, &n );
-#endif // __CFA_DEBUG__
-                        if ( last ) Next( last ) = &n;
+                        #endif // __CFA_DEBUG__
+                        if ( last ) Next( *last ) = &n;
                         else root = &n;
                         last = &n;
-                        Next( &n ) = &n;                                                                // last node points to itself
+                        Next( n ) = &n;                                                         // last node points to itself
                 }
 
@@ -64 +64 @@
                         T & t = head( q );
                         if ( root ) {
-                                root = Next( root );
+                                root = Next( *root );
                                 if ( &head( q ) == &t ) {
                                         root = last = 0p;                                       // only one element
                                 }
-                                Next( &t ) = 0p;
+                                Next( t ) = 0p;
                         }
                         return t;
@@ -78 +78 @@
 
                 void remove( Queue(T) & q, T & n ) with( q ) {  // O(n)
-#ifdef __CFA_DEBUG__
+                        #ifdef __CFA_DEBUG__
                         if ( ! listed( (Colable &)n ) ) abort( "(Queue &)%p.remove( %p ) : Node is not on a list.", &q, &n );
-#endif // __CFA_DEBUG__
-                        T * prev = 0p;
-                        T * curr = (T *)root;
+                        #endif // __CFA_DEBUG__
+                        T & prev = *0p;
+                        T & curr = *(T *)root;
                         for ( ;; ) {
-                                if ( &n == curr ) {                                             // found => remove
+                                if ( &n == &curr ) {                                            // found => remove
                                         if ( (T *)root == &n ) {
                                                 dropHead( q );
                                         } else if ( last == &n ) {
-                                                last = prev;
-                                                Next( last ) = last;
+                                                last = &prev;
+                                                Next( *last ) = last;
                                         } else {
                                                 Next( prev ) = Next( curr );
                                         }
-                                        Next( &n ) = 0p;
+                                        Next( n ) = 0p;
                                         break;
                                 }
-#ifdef __CFA_DEBUG__
                                 // not found => error
-                                if (curr == last) abort( "(Queue &)%p.remove( %p ) : Node is not in list.", &q, &n );
-#endif // __CFA_DEBUG__
-                                prev = curr;
-                                curr = Next( curr );
+                                #ifdef __CFA_DEBUG__
+                                if ( &curr == last ) abort( "(Queue &)%p.remove( %p ) : Node is not in list.", &q, &n );
+                                #endif // __CFA_DEBUG__
+                                &prev = &curr;
+                                &curr = Next( curr );
                         }
                 } // post: ! listed( n )
@@ -116 +116 @@
                                 root = from.root;
                         } else {                                                                        // "to" list not empty
-                                Next( last ) = &head( from );
+                                Next( *last ) = &head( from );
                         }
                         last = from.last;
@@ -125 +125 @@
                 // Node "n" must be in the "from" list.
                 void split( Queue(T) & q, Queue(T) & from, T & n ) with( q ) {
-#ifdef __CFA_DEBUG__
+                        #ifdef __CFA_DEBUG__
                         if ( ! listed( (Colable &)n ) ) abort( "(Queue &)%p.split( %p ) : Node is not on a list.", &q, &n );
-#endif // __CFA_DEBUG__
+                        #endif // __CFA_DEBUG__
                         Queue(T) to;
                         to.root = from.root;                                            // start of "to" list
                         to.last = &n;                                                           // end of "to" list
-                        from.root = Next( &n );                                         // start of "from" list
+                        from.root = Next( n );                                          // start of "from" list
                         if ( &n == &head( from ) ) {                            // last node in list ?
                                 from.root = from.last = 0p;                             // mark "from" list empty
                         } else {
-                                Next( &n ) = &n;                                                // fix end of "to" list
+                                Next( n ) = &n;                                                 // fix end of "to" list
                         }
                         transfer( q, to );
@@ -169 +169 @@
                         if ( curr ) {
                                 &tp = Curr( qi );
-                                T * n = Next( Curr( qi ) );
+                                T * n = Next( *Curr( qi ) );
                                 curr = (n == Curr( qi ) ) ? 0p : n;
                         } else &tp = 0p;
@@ -177 +177 @@
         } // distribution
 } // distribution
-
-// Local Variables: //
-// compile-command: "cfa queue.cfa" //
-// End: //