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

File:

• tests/collections/sequence.cfa (modified) (10 diffs)

tests/collections/sequence.cfa

@@ -14 +14 @@
                 i = p;
         }
+
         Fred *& Back( Fred * n ) {
                 return (Fred *)Back( (Seqable *)n );
         }
+
         Fred *& Next( Fred * n ) {
                 return (Fred *)Next( (Colable *)n );
@@ -36 +38 @@
         }
 
-        sout | head( fred ).i | tail( fred ).i | nl;
-
         for ( SeqIter(Fred) iter = { fred }; iter >> f; ) {
                 sout | f.i | ' ';
@@ -55 +55 @@
                 addTail( fred, *new( 2 * i + 1 ) );
         }
-
-        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 ) {
+        for ( over( fredIter, fred ); fredIter >> f; ) {
+                sout | f.i | ' ';
+        }
+        sout | nl;
+
+        for ( i; 9 ) {
                 delete( &dropTail( fred ) );
         }
@@ -85 +69 @@
 
         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 ) {
-                addHead( fred, *new( i ) );                                             // reverse oder
-                if ( i == 5 ) {
-                        &middle = &head( fred );
+                delete( &f );
+        }
+
+        Sequence(Fred) fred0;
+        Fred * middle;
+        for ( i; 10 ) {
+                if( i == 5) {
+                        middle = new( i );
+                        addHead( fred0, *middle );
+                        continue;
                 }
-        }
-        for ( SeqIterRev(Fred) iter = { fred }; iter >> f; ) {
-                sout | f.i | ' ';
-        }
-        sout | nl;
-
-        head = new( -1 );
-        insertBef( fred, *head, head( fred ) );
-        insertAft( fred, *head, 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; ) {
+                addHead( fred0, *new( i ) );
+        }
+
+        for ( SeqIterRev(Fred) iter = { fred0 }; iter >> f; ) {
+                sout | f.i | ' ';
+        }
+        sout | nl;
+
+        Fred * front = new( -1 );
+        insertBef( fred0, *front, tail(fred0));
+        insertAft( fred0, *front, *new( -2 ) );
+        remove( fred0, *front );
+        delete( front );
+
+        sout | head(fred0).i | nl;
+        Fred & end = dropTail( fred );
+        delete( &end );
+
+        for ( over( fredIter, fred0 ); fredIter >> f; ) {
                 sout | f.i | ' ';
         }
@@ -126 +105 @@
         Sequence(Fred) fred2;
 
-        split( fred2, fred, middle );
-
-        for ( over( fredIter, fred ); fredIter >> f; ) {
+        split( fred2, fred0, *middle);
+
+        for ( over( fredIter, fred0 ); fredIter >> f; ) {
                 sout | f.i | ' ';
         }
@@ -138 +117 @@
         sout | nl;
 
-        transfer( fred, fred2 );
-
-        for ( over( fredIter, fred ); fredIter >> f; ) {
-                sout | f.i | ' ';
-        }
-        sout | nl;
-
-        for ( over( fredIter, fred ); fredIter >> f; ) {
+        transfer( fred0, fred2);
+
+        for ( over( fredIter, fred0 ); fredIter >> f; ) {
+                sout | f.i | ' ';
+        }
+        sout | nl;
+
+        for ( over( fredIter, fred0 ); fredIter >> f; ) {
                 delete( &f );
         }
@@ -160 +139 @@
                 j = p;
         }
+
         Mary *& Back( Mary * n ) {
                 return (Mary *)Back( (Fred *)n );
         }
+
         Mary *& Next( Mary * n ) {
                 return (Mary *)Next( (Fred *)n );
@@ -168 +149 @@
 
         Sequence(Mary) mary;
+        Sequence(Mary) baz;
         SeqIter(Mary) maryIter = { mary };
         Mary & m;
@@ -178 +160 @@
         for ( i; 10 ) {
                 add( mary, *new( 2 * i ) );
-        }
-
-        sout | head( mary ).i | tail( mary ).i | nl;
+                add( baz, *new( 2 * i ) );
+        }
 
         for ( SeqIter(Mary) iter = { mary }; iter >> m; ) {
@@ -199 +180 @@
                 addTail( mary, *new( 2 * i + 1 ) );
         }
-
-        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 ( SeqIter(Mary) iter = { mary }; iter >> m; ) {
-                sout | m.i | m.j | ' ';
-        }
-        sout | nl;
-
-        Sequence(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; ) {
+                sout | m.i | m.j | ' ';
+        }
+        sout | nl;
+
+        for ( i; 9 ) {
+                delete( &dropTail( mary ) );
+        }
+        for ( over( maryIter, mary ); maryIter >> m; ) {
+                sout | m.i | m.j | ' ';
+        }
+        sout | nl;
+
+        transfer( mary, baz );
+
+        for ( over( maryIter, baz ); maryIter >> m; ) {
+                sout | m.i | m.j | ' ';
+        }
+        sout | "empty" | nl;
+
+        for ( over( maryIter, mary ); maryIter >> m; ) {
+                sout | m.i | m.j | ' ';
+        }
+        sout | nl;
+
         for ( over( maryIter, mary ); maryIter >> m; ) {
                 delete( &m );