Changeset 1de50a9 for libcfa/src/bits/queue.hfa

Timestamp:

Dec 3, 2020, 8:58:29 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:

032fd93

Parents:

cf2257f (diff), 7b2a786 (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) (5 diffs)

libcfa/src/bits/queue.hfa

@@ -27 +27 @@
                 }
 
-                T & succ( Queue(T) & q, T & n ) with( q ) {             // pre: *n in *q
+                T * succ( Queue(T) & q, T * n ) with( q ) {             // pre: *n in *q
 #ifdef __CFA_DEBUG__
-                        if ( ! listed( &n ) ) abort( "(Queue &)%p.succ( %p ) : Node is not on a list.", &q, &n );
+                        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 );
+                        return (Next( n ) == n) ? 0p : Next( n );
                 } // post: n == tail() & succ(n) == 0 | n != tail() & *succ(n) in *q
 
@@ -62 +62 @@
 
                 T & dropHead( Queue(T) & q ) with( q ) {
-                        T * t = &head( q );
+                        T & t = head( q );
                         if ( root ) {
                                 root = Next( root );
-                                if ( &head( q ) == t ) {
+                                if ( &head( q ) == &t ) {
                                         root = last = 0p;                                       // only one element
                                 }
-                                Next( t ) = 0p;
+                                Next( &t ) = 0p;
                         }
-                        return *t;
+                        return t;
                 }
 
@@ -81 +81 @@
                         if ( ! listed( (Colable &)n ) ) abort( "(Queue &)%p.remove( %p ) : Node is not on a list.", &q, &n );
 #endif // __CFA_DEBUG__
-                        T * prev = 0;
+                        T * prev = 0p;
                         T * curr = (T *)root;
                         for ( ;; ) {
-                                if (&n == curr) {                                               // found => remove
-                                        if ((T *)root == &n) {
+                                if ( &n == curr ) {                                             // found => remove
+                                        if ( (T *)root == &n ) {
                                                 dropHead( q );
-                                        } else if (last == &n) {
+                                        } else if ( last == &n ) {
                                                 last = prev;
                                                 Next( last ) = last;
@@ -132 +132 @@
                         to.last = &n;                                                           // end of "to" list
                         from.root = Next( &n );                                         // start of "from" list
-                        if ( &n == &head( from ) ) {                                    // last node in 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 );
@@ -179 +179 @@
 
 // Local Variables: //
-// compile-command: "make install" //
+// compile-command: "cfa queue.cfa" //
 // End: //