Changeset 2b4daf2 for tests/collections/stack.cfa

Timestamp:

Jan 7, 2021, 5:06:22 PM (5 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:

5ad381b

Parents:

42f6e07 (diff), 58fe85a (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:

• tests/collections/stack.cfa (moved) (moved from tests/stack.cfa ) (9 diffs)

tests/collections/stack.cfa

@@ -14 +14 @@
                 i = p;
         }
+        Fred *& Next( Fred * n ) {
+                return (Fred *)Next( (Colable *)n );
+        }
 
         Stack(Fred) fred;
-        StackIter(Fred) fredIter = { fred };
+        StackIter(Fred) inter = { fred };
         Fred & f;
 
         sout | nlOff;                                                                           // turn off auto newline
 
-        for ( ; fredIter >> f; ) {                                                      // empty list
+        for ( ; inter | f; ) {                                                  // empty list
                 sout | f.i | ' ';
         }
@@ -30 +33 @@
         }
 
-        for ( StackIter(Fred) iter = { fred }; iter >> f; ) {
+        for ( StackIter(Fred) iter = { fred }; iter | f; ) {
                 sout | f.i | ' ';
         }
         sout | nl;
+
+        sout | head( fred ).i | nl;
         
         for ( i; 9 ) {
@@ -39 +44 @@
         }
 
-        for ( over( fredIter, fred ); fredIter >> f; ) {
+        for ( over( inter, fred ); inter | f; ) {
                 sout | f.i | ' ';
         }
@@ -47 +52 @@
                 push( fred, *new( 2 * i + 1 ) );
         }
-        for ( over( fredIter, fred ); fredIter >> f; ) {
+        for ( over( inter, fred ); inter | f; ) {
                 sout | f.i | ' ';
         }
         sout | nl;
 
-        for ( over( fredIter, fred ); fredIter >> f; ) {
+        for ( over( inter, fred ); inter | f; ) {
                 delete( &f );
         }
@@ -65 +70 @@
         void ?{}( Mary & mary, int p ) with( mary ) {
                 ((Fred &)mary){ p };
-                j = i = p;
+                j = p;
+        }
+
+        Mary *& Next( Mary * n ) {
+                return (Mary *)Next( (Fred *)n );
         }
 
@@ -72 +81 @@
         Mary & m;
 
-        for ( ; maryIter >> m; ) {                                                      // empty list
+        for ( ; maryIter | m; ) {                                                       // empty list
                 sout | m.i | m.j | ' ';
         }
@@ -81 +90 @@
         }
 
-        for ( StackIter(Mary) iter = { mary }; iter >> m; ) {
+        for ( StackIter(Mary) iter = { mary }; iter | m; ) {
                 sout | m.i | m.j | ' ';
         }
@@ -90 +99 @@
         }
 
-        for ( over( maryIter, mary ); maryIter >> m; ) {
+        for ( over( maryIter, mary ); maryIter | m; ) {
                 sout | m.i | m.j | ' ';
         }
@@ -98 +107 @@
                 push( mary, *new( 2 * i + 1 ) );
         }
-        for ( over( maryIter, mary ); maryIter >> m; ) {
+        for ( over( maryIter, mary ); maryIter | m; ) {
                 sout | m.i | m.j | ' ';
         }
         sout | nl;
 
-        for ( over( maryIter, mary ); maryIter >> m; ) {
+        for ( over( maryIter, mary ); maryIter | m; ) {
                 delete( &m );
         }