Changes in libcfa/src/bits/stack_example.cfa [3d0560d:5e82d56]

File:

• libcfa/src/bits/stack_example.cfa (modified) (2 diffs)

libcfa/src/bits/stack_example.cfa

@@ -17 +17 @@
         Stack(Fred) fred;
         StackIter(Fred) fredIter = { fred };
-        Fred & f;
+        Fred * f;
+        int i;
 
         sout | nlOff;                                                                           // turn off auto newline
 
         for ( ; fredIter >> f; ) {                                                      // empty list
-                sout | f.i | ' ';
+                sout | f->i | ' ';
         }
         sout | "empty" | nl;
         
-        for ( i; 10 ) {
+        for ( i = 0; i < 10; i += 1 ) {
                 push( fred, new( 2 * i ) );
         }
 
-        for ( StackIter(Fred) iter = { fred }; iter >> f; ) {
-                sout | f.i | ' ';
+        for ( over( fredIter, fred ); fredIter >> f; ) {
+                sout | f->i | ' ';
         }
         sout | nl;
         
-        for ( i; 9 ) {
+        for ( i = 0; i < 9; i += 1 ) {
                 delete( pop( fred ) );
         }
 
         for ( over( fredIter, fred ); fredIter >> f; ) {
-                sout | f.i | ' ';
+                sout | f->i | ' ';
         }
         sout | nl;
         
-        for ( i; 10 ) {
+        for ( i = 0; i < 10; i += 1 ) {
                 push( fred, new( 2 * i + 1 ) );
         }
         for ( over( fredIter, fred ); fredIter >> f; ) {
-                sout | f.i | ' ';
+                sout | f->i | ' ';
         }
         sout | nl;
 
         for ( over( fredIter, fred ); fredIter >> f; ) {
-                delete( &f );
+                delete( f );
         }
 
@@ -70 +71 @@
         Stack(Mary) mary;
         StackIter(Mary) maryIter = { mary };
-        Mary & m;
+        Mary * m;
 
         for ( ; maryIter >> m; ) {                                                      // empty list
-                sout | m.i | m.j | ' ';
+                sout | m->i | m->j | ' ';
         }
         sout | "empty" | nl;
         
-        for ( i; 10 ) {
+        for ( i = 0; i < 10; i += 1 ) {
                 push( mary, new( 2 * i ) );
         }
 
-        for ( StackIter(Mary) iter = { mary }; iter >> m; ) {
-                sout | m.i | m.j | ' ';
+        for ( over( maryIter, mary ); maryIter >> m; ) {
+                sout | m->i | m->j | ' ';
         }
         sout | nl;
         
-        for ( i; 9 ) {
+        for ( i = 0; i < 9; i += 1 ) {
                 delete( pop( mary ) );
         }
 
         for ( over( maryIter, mary ); maryIter >> m; ) {
-                sout | m.i | m.j | ' ';
+                sout | m->i | m->j | ' ';
         }
         sout | nl;
         
-        for ( i; 10 ) {
+        for ( i = 0; i < 10; i += 1 ) {
                 push( mary, new( 2 * i + 1 ) );
         }
         for ( over( maryIter, mary ); maryIter >> m; ) {
-                sout | m.i | m.j | ' ';
+                sout | m->i | m->j | ' ';
         }
         sout | nl;
 
         for ( over( maryIter, mary ); maryIter >> m; ) {
-                delete( &m );
+                delete( m );
         }
 }