Changeset 3f91792 for libcfa/src/bits/queue.hfa

Timestamp:

Dec 8, 2020, 1:01:05 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

8e58264

Parents:

33a129a (diff), c9e0991 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/bits/queue.hfa (modified) (6 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__
+                        #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
-                                if (curr == last) abort( "(Queue &)%p.remove( %p ) : Node is not in list.", &q, &n );
-#endif // __CFA_DEBUG__
+                                #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 );
@@ -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: //