Changeset e56cfdb0 for src/examples/iterator.c

Timestamp:

Nov 19, 2015, 6:06:12 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

05587c2

Parents:

d2ded3e7

Message:

allow nested routines to use type variables in containing scope, fix missing adapters, generalized iostream write

File:

• src/examples/iterator.c (modified) (1 diff)

src/examples/iterator.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:41:41 2015
-// Update Count     : 3
+// Last Modified On : Thu Nov 19 17:54:37 2015
+// Update Count     : 24
 //
 
 #include "iterator.h"
 
-/// forall( type iterator_type, type elt_type | iterator( iterator_type, elt_type ) )
-/// void
-/// for_each( iterator_type begin, iterator_type end, void (*func)( elt_type ) )
-/// {
-///   iterator_type i;
-///   for ( i = begin; i != end; ++i ) {
-///      func( *i );
-///   }
-/// }
-
-forall( type elt_type | writeable( elt_type ),
-                type iterator_type | iterator( iterator_type, elt_type ),
-                dtype os_type | ostream( os_type ) )
-void write_all( iterator_type begin, iterator_type end, os_type *os ) {
-        iterator_type i;
-        for ( i = begin; i != end; ++i ) {
-                os << *i << ' ';
+forall( type iterator_type, type elt_type | iterator( iterator_type, elt_type ) )
+void for_each( iterator_type begin, iterator_type end, void (*func)( elt_type ) ) {
+        for ( iterator_type i = begin; i != end; ++i ) {
+                func( *i );
         }
 }
 
-forall( type elt_type | writeable( elt_type ),
-                type iterator_type | iterator( iterator_type, elt_type ),
-                dtype os_type | ostream( os_type ) )
-void write_reverse( iterator_type begin, iterator_type end, os_type *os ) {
-        iterator_type i; // "= end;" does not work
-        i = end;
-        do {
+forall( type iterator_type, type elt_type | iterator( iterator_type, elt_type ) )
+void for_each_reverse( iterator_type begin, iterator_type end, void (*func)( elt_type ) ) {
+        for ( iterator_type i = end; i != begin; ) {
                 --i;
-                os << *i << ' ';
-        } while ( i != begin );
+                func( *i );
+        }
 }