Changes in src/libcfa/iostream [3849857:6ba0659]

File:

• src/libcfa/iostream (modified) (3 diffs)

src/libcfa/iostream

@@ -7 +7 @@
 // iostream -- 
 //
-// Author           : Peter A. Buhr
+// Author           : Richard C. Bilson
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Apr 10 23:00:12 2016
-// Update Count     : 92
+// Last Modified On : Wed Feb 17 14:04:24 2016
+// Update Count     : 32
 //
 
-#ifndef __IOSTREAM_H__
-#define __IOSTREAM_H__
+#ifndef IOSTREAM_H
+#define IOSTREAM_H
 
 #include "iterator"
 
-trait ostream( dtype ostype ) {
-        _Bool sepPrt( ostype * );                                                       // return separator state (on/off)
-        void sepOn( ostype * );                                                         // turn separator state on
-        void sepOff( ostype * );                                                        // turn separator state off
-        void sepReset( ostype * );                                                      // set separator state to default state
-        void sepReset( ostype *, _Bool );                                       // set separator and default state
-        void sepSet( ostype *, const char * );                          // set separator to string (15 character maximum)
-        const char * sepGet( ostype * );                                        // get separator string 
-        _Bool sepDisable( ostype * );                                           // set default state to off, and return previous state
-        _Bool sepEnable( ostype * );                                            // set default state to on, and return previous state
+typedef unsigned long streamsize_type;
 
+context ostream( dtype ostype ) {
         int fail( ostype * );
         int flush( ostype * );
-        void open( ostype * os, const char * name, const char * mode );
-        void close( ostype * os );
-        ostype * write( ostype *, const char *, unsigned long int );
-        int prtfmt( ostype *, const char fmt[], ... );
+        ostype * write( ostype *, const char *, streamsize_type );
 };
-
-trait writeable( otype T ) {
+context writeable( type T ) {
         forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, T );
 };
@@ -45 +33 @@
 
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, char );
-
-forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, short int );
-forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned short int );
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, int );
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned int );
@@ -54 +39 @@
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned long int );
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned long long int );
-
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, float ); // FIX ME: should not be required
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, double );
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, long double );
-
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, float _Complex );
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, double _Complex );
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, long double _Complex );
-
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, const char * );
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, const void * );
 
-forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, ostype * (*)( ostype * ) );
+forall( dtype ostype, dtype retostype | ostream( ostype ) | ostream( retostype ) ) retostype * ?|?( ostype *os, retostype * (* manip)(ostype*) );
 forall( dtype ostype | ostream( ostype ) ) ostype * endl( ostype * );
-forall( dtype ostype | ostream( ostype ) ) ostype * sepOn( ostype * );
-forall( dtype ostype | ostream( ostype ) ) ostype * sepOff( ostype * );
-forall( dtype ostype | ostream( ostype ) ) ostype * sepDisable( ostype * );
-forall( dtype ostype | ostream( ostype ) ) ostype * sepEnable( ostype * );
 
 // writes the range [begin, end) to the given stream
-forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) )
+forall( type elt_type | writeable( elt_type ), type iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) )
 void write( iterator_type begin, iterator_type end, os_type *os );
 
-forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) )
+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 );
 
 //---------------------------------------
 
-trait istream( dtype istype ) {
+context istream( dtype istype ) {
         int fail( istype * );
         int eof( istype * );
-        void open( istype * is, const char * name, const char * mode );
-        void close( istype * is );
-        istype * read( istype *, char *, unsigned long int );
+        istype * get( istype *, int * );
+        istype * read( istype *, char *, streamsize_type );
         istype * ungetc( istype *, char );
-        int scanfmt( istype *, const char fmt[], ... );
 };
 
-trait readable( otype T ) {
+context readable( type T ) {
         forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, T );
 };
 
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, char * );
+forall( dtype istype | istream( istype ) )
+istype * ?|?( istype *, char * );
 
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, short int * );
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, unsigned short int * );
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, int * );
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, unsigned int * );
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, long int * );
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, long long int * );
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, unsigned long int * );
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, unsigned long long int * );
+forall( dtype istype | istream( istype ) )
+istype * ?|?( istype *, int * );
 
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, float * );
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, double * );
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, long double * );
-
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, float _Complex * );
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, double _Complex * );
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, long double _Complex * );
-
-struct _Istream_cstrUC { char * s; };
-_Istream_cstrUC cstr( char * );
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, _Istream_cstrUC );
-
-struct _Istream_cstrC { char * s; int size; };
-_Istream_cstrC cstr( char *, int size );
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, _Istream_cstrC );
-
-#endif // __IOSTREAM_H__
+#endif // IOSTREAM_H
 
 // Local Variables: //