Changeset a3a76ea

Timestamp:

Dec 27, 2020, 5:55:50 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

62a7cc0

Parents:

83c7e3c

Message:

modify routines to return added/removed node to allow cascading calls

Location:

libcfa/src/bits

Files:

• queue.hfa (modified) (5 diffs)
• sequence.hfa (modified) (4 diffs)
• stack.hfa (modified) (2 diffs)

libcfa/src/bits/queue.hfa

@@ -34 +34 @@
                 } // post: n == tail() & succ(n) == 0 | n != tail() & *succ(n) in *q
 
-                void addHead( Queue(T) & q, T & n ) with( q ) {
+                T & addHead( Queue(T) & q, T & n ) with( q ) {
                         #ifdef __CFA_DEBUG__
                         if ( listed( &n ) ) abort( "(Queue &)%p.addHead( %p ) : Node is already on another list.", &q, &n );
@@ -45 +45 @@
                                 Next( &n ) = &n;                                                // last node points to itself
                         }
+                        return n;
                 }
 
-                void addTail( Queue(T) & q, T & n ) with( q ) {
+                T & addTail( Queue(T) & q, T & n ) with( q ) {
                         #ifdef __CFA_DEBUG__
                         if ( listed( &n ) ) abort( "(Queue &)%p.addTail( %p ) : Node is already on another list.", &q, &n );
@@ -55 +56 @@
                         last = &n;
                         Next( &n ) = &n;                                                        // last node points to itself
+                        return n;
                 }
 
-                void add( Queue(T) & q, T & n ) with( q ) {
-                        addTail( q, n );
+                T & add( Queue(T) & q, T & n ) with( q ) {
+                        return addTail( q, n );
                 }
 
@@ -77 +79 @@
                 }
 
-                void remove( Queue(T) & q, T & n ) with( q ) {  // O(n)
+                T & remove( Queue(T) & q, T & n ) with( q ) {   // O(n)
                         #ifdef __CFA_DEBUG__
                         if ( ! listed( (Colable &)n ) ) abort( "(Queue &)%p.remove( %p ) : Node is not on a list.", &q, &n );
@@ -103 +105 @@
                                 curr = Next( curr );
                         }
+                        return n;
                 } // post: ! listed( n )
 

libcfa/src/bits/sequence.hfa

@@ -77 +77 @@
 
                 // Insert *n into the sequence before *bef, or at the end if bef == 0.
-                void insertBef( Sequence(T) & s, T & n, T & bef ) with( s ) { // pre: !n->listed() & *bef in *s
+                T & insertBef( Sequence(T) & s, T & n, T & bef ) with( s ) { // pre: !n->listed() & *bef in *s
                         #ifdef __CFA_DEBUG__
                         if ( listed( &n ) ) abort( "(Sequence &)%p.insertBef( %p, %p ) : Node is already on another list.", &s, n, &bef );
@@ -105 +105 @@
                                 Next( Back( &n ) ) = &n;
                         } // if
+                        return n;
                 }       // post: n->listed() & *n in *s & succ(n) == bef
 
 
                 // Insert *n into the sequence after *aft, or at the beginning if aft == 0.
-                void insertAft( Sequence(T) & s, T & aft, T & n ) with( s ) {   // pre: !n->listed() & *aft in *s
+                T & insertAft( Sequence(T) & s, T & aft, T & n ) with( s ) {    // pre: !n->listed() & *aft in *s
                         #ifdef __CFA_DEBUG__
                         if ( listed( &n ) ) abort( "(Sequence &)%p.insertAft( %p, %p ) : Node is already on another list.", &s, &aft, &n );
@@ -135 +136 @@
                                 Next( &aft ) = &n;
                         } // if
+                        return n;
                 }         // post: n->listed() & *n in *s & succ(n) == bef
                 
                 // pre: n->listed() & *n in *s
-                void remove( Sequence(T) & s, T & n ) with( s ) { // O(1)
+                T & remove( Sequence(T) & s, T & n ) with( s ) { // O(1)
                         #ifdef __CFA_DEBUG__
                         if ( ! listed( &n ) ) abort( "(Sequence &)%p.remove( %p ) : Node is not on a list.", &s, &n );
@@ -149 +151 @@
                         Next( Back( &n ) ) = Next( &n );
                         Next( &n ) = Back( &n ) = 0p;
+                        return n;
                 }                                                       // post: !n->listed().
 
                 // Add an element to the head of the sequence.
-                void addHead( Sequence(T) & s, T & n ) {                // pre: !n->listed(); post: n->listed() & head() == n
-                        insertAft( s, *0p, n );
+                T & addHead( Sequence(T) & s, T & n ) {                 // pre: !n->listed(); post: n->listed() & head() == n
+                        return insertAft( s, *0p, n );
                 }
                 // Add an element to the tail of the sequence.
-                void addTail( Sequence(T) & s, T & n ) {                // pre: !n->listed(); post: n->listed() & head() == n
-                        insertBef( s, n, *0p );
+                T & addTail( Sequence(T) & s, T & n ) {                 // pre: !n->listed(); post: n->listed() & head() == n
+                        return insertBef( s, n, *0p );
                 }
                 // Add an element to the tail of the sequence.
-                void add( Sequence(T) & s, T & n ) {                    // pre: !n->listed(); post: n->listed() & head() == n
-                        addTail( s, n );
+                T & add( Sequence(T) & s, T & n ) {                             // pre: !n->listed(); post: n->listed() & head() == n
+                        return addTail( s, n );
                 }
                 // Remove and return the head element in the sequence.

libcfa/src/bits/stack.hfa

@@ -25 +25 @@
                 }
 
-                void addHead( Stack(T) & s, T & n ) with( s ) {
+                T & addHead( Stack(T) & s, T & n ) with( s ) {
                         #ifdef __CFA_DEBUG__
                         if ( listed( (Colable &)(n) ) ) abort( "(Stack &)%p.addHead( %p ) : Node is already on another list.", &s, n );
@@ -31 +31 @@
                         Next( &n ) = &head( s ) ? &head( s ) : &n;
                         root = &n;
+                        return n;
                 }
 
-                void add( Stack(T) & s, T & n ) with( s ) {
-                        addHead( s, n );
+                T & add( Stack(T) & s, T & n ) with( s ) {
+                        return addHead( s, n );
                 }
 
-                void push( Stack(T) & s, T & n ) with( s ) {
-                        addHead( s, n );
+                T & push( Stack(T) & s, T & n ) with( s ) {
+                        return addHead( s, n );
                 }