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

File:

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

libcfa/src/bits/queue.hfa

@@ -1 +1 @@
 #pragma once
 
-#include "bits/collection.hfa"
+#include "collection.hfa"
 
 forall( dtype T ) {
@@ -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__
+#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 );
@@ -43 +43 @@
                         } 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__
+#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
                 }
 
@@ -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__
+#endif // __CFA_DEBUG__
                         T * prev = 0p;
                         T * curr = (T *)root;
@@ -96 +96 @@
                                         break;
                                 }
+#ifdef __CFA_DEBUG__
                                 // not found => error
-                                #ifdef __CFA_DEBUG__
-                                if ( curr == last ) abort( "(Queue &)%p.remove( %p ) : Node is not in list.", &q, &n );
-                                #endif // __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 );
@@ -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
@@ -177 +177 @@
         } // distribution
 } // distribution
+
+// Local Variables: //
+// compile-command: "cfa queue.cfa" //
+// End: //