Changes in tests/collections/queue.cfa [de2f969:62a7cc0]

File:

• tests/collections/queue.cfa (modified) (7 diffs)

tests/collections/queue.cfa

@@ -33 +33 @@
         }
 
-        sout | head(fred).i | nl;
-        sout | tail(fred).i | nl;
+        sout | head( fred ).i | tail( fred ).i | nl;
 
         for ( QueueIter(Fred) iter = { fred }; iter >> f; ) {
@@ -54 +53 @@
         }
 
-        Fred * front = new( -1 );
-        addHead( fred, *front );
-        sout | succ( fred, front )->i | nl;
-        remove( fred, *front );
-        delete( front );
-
-        Fred & end = dropTail( fred );
-        delete( &end );
-
-        for ( over( fredIter, fred ); fredIter >> f; ) {
-                sout | f.i | ' ';
-        }
-        sout | nl;
-
-        for ( over( fredIter, fred ); fredIter >> f; ) {
-                delete( &f );
-        }
-
-        Queue(Fred) fred0;
-        Fred * middle;
-        for ( i; 10 ) {
-                if( i == 5) {
-                        middle = new( i );
-                        add( fred0, *middle );
-                        continue;
+        Fred * head = new( -1 ), tail = { -2 };
+        addHead( fred, *head );
+        addTail( fred, tail );
+
+        sout | head( fred ).i | succ( fred, head )->i | tail( fred ).i | nl;
+        for ( over( fredIter, fred ); fredIter >> f; ) {
+                sout | f.i | ' ';
+        }
+        sout | nl;
+
+        remove( fred, *head );
+        remove( fred, tail );
+        delete( head );
+        delete( &dropTail( fred ) );
+
+        for ( over( fredIter, fred ); fredIter >> f; ) {
+                sout | f.i | ' ';
+        }
+        sout | nl;
+
+        for ( i; 5 ) {
+                delete( &dropTail( fred ) );
+        }
+        for ( over( fredIter, fred ); fredIter >> f; ) {
+                sout | f.i | ' ';
+        }
+        sout | nl;
+
+        for ( over( fredIter, fred ); fredIter >> f; ) {
+                delete( &remove( fred, f ) );
+        }
+        for ( over( fredIter, fred ); fredIter >> f; ) {
+                sout | f.i | ' ';
+        }
+        sout | "empty" | nl;
+
+        Fred & middle;
+        for ( i; 10 ) {
+                add( fred, *new( i ) );
+                if ( i == 4 ) {
+                        &middle = &tail( fred );
                 }
-                add( fred0, *new( i ) );
-        }
-
-        for ( QueueIter(Fred) iter = { fred0 }; iter >> f; ) {
+        }
+        for ( QueueIter(Fred) iter = { fred }; iter >> f; ) {
                 sout | f.i | ' ';
         }
@@ -90 +103 @@
         Queue(Fred) fred2;
 
-        split( fred2, fred0, *middle);
-
-        for ( over( fredIter, fred0 ); fredIter >> f; ) {
+        split( fred2, fred, middle );
+
+        for ( over( fredIter, fred ); fredIter >> f; ) {
                 sout | f.i | ' ';
         }
@@ -102 +115 @@
         sout | nl;
 
-        transfer( fred0, fred2);
-
-        for ( over( fredIter, fred0 ); fredIter >> f; ) {
-                sout | f.i | ' ';
-        }
-        sout | nl;
-
-        for ( over( fredIter, fred0 ); fredIter >> f; ) {
+        transfer( fred, fred2 );
+
+        for ( over( fredIter, fred ); fredIter >> f; ) {
+                sout | f.i | ' ';
+        }
+        sout | nl;
+
+        for ( over( fredIter, fred ); fredIter >> f; ) {
                 delete( &f );
         }
@@ -122 +135 @@
         void ?{}( Mary & mary, int p ) with( mary ) {
                 ((Fred &)mary){ p };
-                j = i = p;
-        }
-
+                j = p;
+        }
         Mary *& Next( Mary * n ) {
                 return (Mary *)Next( (Fred *)n );
@@ -142 +154 @@
         }
 
+        sout | head( mary ).i | tail( mary ).i | nl;
+
         for ( QueueIter(Mary) iter = { mary }; iter >> m; ) {
                 sout | m.i | m.j | ' ';
@@ -159 +173 @@
                 add( mary, *new( 2 * i + 1 ) );
         }
-        for ( over( maryIter, mary ); maryIter >> m; ) {
-                sout | m.i | m.j | ' ';
-        }
-        sout | nl;
-
+
+        Mary * head = new( -1 ), tail = { -1 };
+        addHead( mary, *head );
+        addTail( mary, tail );
+        sout | head( mary ).i | succ( mary, head )->i | tail( mary ).i | nl;
+        remove( mary, *head );
+        remove( mary, tail );
+        delete( (Mary *)head );
+        delete( &dropTail( mary ) );
+
+        for ( over( maryIter, mary ); maryIter >> m; ) {
+                sout | m.i | m.j | ' ';
+        }
+        sout | nl;
+
+        for ( over( maryIter, mary ); maryIter >> m; ) {
+                delete( &remove( mary, m ) );
+        }
+
+        Mary & middle;
+        for ( i; 10 ) {
+                add( mary, *new( i ) );
+                if ( i == 4 ) {
+                        &middle = &tail( mary );
+                }
+        }
+        for ( QueueIter(Mary) iter = { mary }; iter >> m; ) {
+                sout | m.i | m.j | ' ';
+        }
+        sout | nl;
+
+        Queue(Mary) mary2;
+
+        split( mary2, mary, middle );
+
+        for ( over( maryIter, mary ); maryIter >> m; ) {
+                sout | m.i | m.j | ' ';
+        }
+        sout | nl;
+        for ( over( maryIter, mary2 ); maryIter >> m; ) {
+                sout | m.i | m.j | ' ';
+        }
+        sout | nl;
+
+        transfer( mary, mary2 );
+
+        for ( over( maryIter, mary ); maryIter >> m; ) {
+                sout | m.i | m.j | ' ';
+        }
+        sout | nl;
         for ( over( maryIter, mary ); maryIter >> m; ) {
                 delete( &m );