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

File:

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

tests/collections/sequence.cfa

@@ -22 +22 @@
 
         Sequence(Fred) fred;
-        SeqIter(Fred) fredIter = { fred };
+        SeqIter(Fred) iter = { fred };
         Fred & f;
 
         sout | nlOff;                                                                           // turn off auto newline
 
-        for ( ; fredIter >> f; ) {                                                      // empty list
+        for ( ; iter | f; ) {                                                   // empty list
                 sout | f.i | ' ';
         }
@@ -38 +38 @@
         sout | head( fred ).i | tail( fred ).i | nl;
 
-        for ( SeqIter(Fred) iter = { fred }; iter >> f; ) {
+        for ( SeqIter(Fred) iter = { fred }; iter | f; ) {
                 sout | f.i | ' ';
         }
@@ -47 +47 @@
         }
 
-        for ( over( fredIter, fred ); fredIter >> f; ) {
+        for ( over( iter, fred ); iter | f; ) {
                 sout | f.i | ' ';
         }
@@ -61 +61 @@
 
         sout | head( fred ).i | succ( fred, head )->i | tail( fred ).i | nl;
-        for ( over( fredIter, fred ); fredIter >> f; ) {
+
+        for ( over( iter, fred ); iter | f; ) {
                 sout | f.i | ' ';
         }
@@ -71 +72 @@
         delete( &dropTail( fred ) );
 
-        for ( over( fredIter, fred ); fredIter >> f; ) {
+        for ( over( iter, fred ); iter | f; ) {
                 sout | f.i | ' ';
         }
@@ -79 +80 @@
                 delete( &dropTail( fred ) );
         }
-        for ( over( fredIter, fred ); fredIter >> f; ) {
-                sout | f.i | ' ';
-        }
-        sout | nl;
-
-        for ( over( fredIter, fred ); fredIter >> f; ) {
+        for ( over( iter, fred ); iter | f; ) {
+                sout | f.i | ' ';
+        }
+        sout | nl;
+
+        for ( over( iter, fred ); iter | f; ) {
                 delete( &remove( fred, f ) );
         }
-        for ( over( fredIter, fred ); fredIter >> f; ) {
+        for ( over( iter, fred ); iter | f; ) {
                 sout | f.i | ' ';
         }
@@ -94 +95 @@
         Fred & middle;
         for ( i; 10 ) {
-                addHead( fred, *new( i ) );                                             // reverse oder
+                addHead( fred, *new( i ) );                                             // reverse order
                 if ( i == 5 ) {
                         &middle = &head( fred );
                 }
         }
-        for ( SeqIterRev(Fred) iter = { fred }; iter >> f; ) {
+        for ( SeqIterRev(Fred) riter = { fred }; riter | f; ) {
                 sout | f.i | ' ';
         }
@@ -109 +110 @@
 
         sout | head( fred ).i | succ( fred, head )->i | tail( fred ).i | nl;
-        for ( over( fredIter, fred ); fredIter >> f; ) {
+        for ( over( iter, fred ); iter | f; ) {
                 sout | f.i | ' ';
         }
@@ -119 +120 @@
         delete( &dropTail( fred ) );
 
-        for ( over( fredIter, fred ); fredIter >> f; ) {
+        for ( over( iter, fred ); iter | f; ) {
                 sout | f.i | ' ';
         }
@@ -128 +129 @@
         split( fred2, fred, middle );
 
-        for ( over( fredIter, fred ); fredIter >> f; ) {
-                sout | f.i | ' ';
-        }
-        sout | nl;
-
-        for ( over( fredIter, fred2 ); fredIter >> f; ) {
+        for ( over( iter, fred ); iter | f; ) {
+                sout | f.i | ' ';
+        }
+        sout | nl;
+
+        for ( over( iter, fred2 ); iter | f; ) {
                 sout | f.i | ' ';
         }
@@ -140 +141 @@
         transfer( fred, fred2 );
 
-        for ( over( fredIter, fred ); fredIter >> f; ) {
-                sout | f.i | ' ';
-        }
-        sout | nl;
-
-        for ( over( fredIter, fred ); fredIter >> f; ) {
+        for ( over( iter, fred ); iter | f; ) {
+                sout | f.i | ' ';
+        }
+        sout | nl;
+
+        for ( over( iter, fred ); iter | f; ) {
                 delete( &f );
         }
@@ -168 +169 @@
 
         Sequence(Mary) mary;
-        SeqIter(Mary) maryIter = { mary };
+        SeqIter(Mary) iter = { mary };
         Mary & m;
 
-        for ( ; maryIter >> m; ) {                                                      // empty list
+        for ( ; iter | m; ) {                                                   // empty list
                 sout | m.i | m.j | ' ';
         }
@@ -182 +183 @@
         sout | head( mary ).i | tail( mary ).i | nl;
 
-        for ( SeqIter(Mary) iter = { mary }; iter >> m; ) {
+        for ( SeqIter(Mary) iter = { mary }; iter | m; ) {
                 sout | m.i | m.j | ' ';
         }
@@ -191 +192 @@
         }
 
-        for ( over( maryIter, mary ); maryIter >> m; ) {
+        for ( over( iter, mary ); iter | m; ) {
                 sout | m.i | m.j | ' ';
         }
@@ -200 +201 @@
         }
 
-        Mary * head = new( -1 ), tail = { -1 };
+        Mary * head = new( -1 ), tail = { -2 };
         addHead( mary, *head );
         addTail( mary, tail );
+
         sout | head( mary ).i | succ( mary, head )->i | tail( mary ).i | nl;
+
+        for ( over( iter, mary ); iter | m; ) {
+                sout | m.i | m.j | ' ';
+        }
+        sout | nl;
+
         remove( mary, *head );
         remove( mary, tail );
@@ -209 +217 @@
         delete( &dropTail( mary ) );
 
-        for ( over( maryIter, mary ); maryIter >> m; ) {
-                sout | m.i | m.j | ' ';
-        }
-        sout | nl;
-
-        for ( over( maryIter, mary ); maryIter >> m; ) {
+        for ( over( iter, mary ); iter | m; ) {
+                sout | m.i | m.j | ' ';
+        }
+        sout | nl;
+
+        for ( i; 5 ) {
+                delete( &dropTail( mary ) );
+        }
+        for ( over( iter, mary ); iter | m; ) {
+                sout | m.i | m.j | ' ';
+        }
+        sout | nl;
+
+        for ( over( iter, mary ); iter | m; ) {
                 delete( &remove( mary, m ) );
         }
+        for ( over( iter, mary ); iter | m; ) {
+                sout | m.i | m.j | ' ';
+        }
+        sout | "empty" | nl;
 
         Mary & middle;
@@ -225 +245 @@
                 }
         }
-        for ( SeqIter(Mary) iter = { mary }; iter >> m; ) {
+        for ( SeqIter(Mary) iter = { mary }; iter | m; ) {
                 sout | m.i | m.j | ' ';
         }
@@ -234 +254 @@
         split( mary2, mary, middle );
 
-        for ( over( maryIter, mary ); maryIter >> m; ) {
-                sout | m.i | m.j | ' ';
-        }
-        sout | nl;
-        for ( over( maryIter, mary2 ); maryIter >> m; ) {
+        for ( over( iter, mary ); iter | m; ) {
+                sout | m.i | m.j | ' ';
+        }
+        sout | nl;
+        for ( over( iter, mary2 ); iter | m; ) {
                 sout | m.i | m.j | ' ';
         }
@@ -245 +265 @@
         transfer( mary, mary2 );
 
-        for ( over( maryIter, mary ); maryIter >> m; ) {
-                sout | m.i | m.j | ' ';
-        }
-        sout | nl;
-        for ( over( maryIter, mary ); maryIter >> m; ) {
+        for ( over( iter, mary ); iter | m; ) {
+                sout | m.i | m.j | ' ';
+        }
+        sout | nl;
+
+        for ( over( iter, mary ); iter | m; ) {
                 delete( &m );
         }