Changes in src/libcfa/iostream.c [53ba273:6ba0659]

File:

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

src/libcfa/iostream.c

@@ -7 +7 @@
 // iostream.c -- 
 //
-// 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 : Wed Apr  6 16:13:29 2016
-// Update Count     : 278
+// Last Modified On : Wed Feb 17 14:19:56 2016
+// Update Count     : 76
 //
 
@@ -21 +21 @@
 #include <float.h>                                                                              // DBL_DIG, LDBL_DIG
 #include <complex.h>                                                                    // creal, cimag
-#include <ctype.h>                                                                              // isspace, ispunct
 }
 
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype *os, char c ) {
-        prtfmt( os, "%c", c );
-        sepOff( os );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype *os, short int si ) {
-        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
-        sepReset( os );
-        prtfmt( os, "%hd", si );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype *os, unsigned short int usi ) {
-        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
-        sepReset( os );
-        prtfmt( os, "%hu", usi );
-        return os;
+        return write( os, &c, 1 );
 } // ?|?
 
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype *os, int i ) {
-        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
-        sepReset( os );
-        prtfmt( os, "%d", i );
-        return os;
+        char buffer[32];
+        return write( os, buffer, sprintf( buffer, "%d", i ) );
 } // ?|?
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype *os, unsigned int ui ) {
-        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
-        sepReset( os );
-        prtfmt( os, "%u", ui );
-        return os;
+ostype * ?|?( ostype *os, unsigned int i ) {
+        char buffer[32];
+        return write( os, buffer, sprintf( buffer, "%u", i ) );
 } // ?|?
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype *os, long int li ) {
-        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
-        sepReset( os );
-        prtfmt( os, "%ld", li );
-        return os;
+ostype * ?|?( ostype *os, long int i ) {
+        char buffer[32];
+        return write( os, buffer, sprintf( buffer, "%ld", i ) );
 } // ?|?
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype *os, unsigned long int uli ) {
-        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
-        sepReset( os );
-        prtfmt( os, "%lu", uli );
-        return os;
+ostype * ?|?( ostype *os, long long int i ) {
+        char buffer[32];
+        return write( os, buffer, sprintf( buffer, "%lld", i ) );
 } // ?|?
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype *os, long long int lli ) {
-        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
-        sepReset( os );
-        prtfmt( os, "%lld", lli );
-        return os;
+ostype * ?|?( ostype *os, unsigned long int i ) {
+        char buffer[32];
+        return write( os, buffer, sprintf( buffer, "%lu", i ) );
 } // ?|?
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype *os, unsigned long long int ulli ) {
-        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
-        sepReset( os );
-        prtfmt( os, "%llu", ulli );
-        return os;
+ostype * ?|?( ostype *os, unsigned long long int i ) {
+        char buffer[32];
+        return write( os, buffer, sprintf( buffer, "%llu", i ) );
 } // ?|?
 
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype *os, float f ) {
-        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
-        sepReset( os );
-        prtfmt( os, "%g", f );
-        return os;
+        char buffer[32];
+        return write( os, buffer, sprintf( buffer, "%g", f ) );
 } // ?|?
 
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype *os, double d ) {
-        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
-        sepReset( os );
-        prtfmt( os, "%.*lg", DBL_DIG, d );
-        return os;
+        char buffer[32];
+        return write( os, buffer, sprintf( buffer, "%.*lg", DBL_DIG, d ) );
 } // ?|?
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype *os, long double ld ) {
-        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
-        sepReset( os );
-        prtfmt( os, "%.*Lg", LDBL_DIG, ld );
-        return os;
+ostype * ?|?( ostype *os, long double d ) {
+        char buffer[32];
+        return write( os, buffer, sprintf( buffer, "%.*Lg", LDBL_DIG, d ) );
 } // ?|?
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype *os, float _Complex fc ) {
-        os | crealf( fc );
-        _Bool temp = sepDisable( os );                                          // disable separators within complex value
-        if ( cimagf( fc ) >= 0 ) os | '+';                                      // negative value prints '-'
-        os | cimagf( fc ) | 'i';
-        sepReset( os, temp );                                                           // reset separator
-        return os;
+ostype * ?|?( ostype *os, float _Complex c ) {
+        return os | crealf( c ) | (cimagf( c ) < 0 ? "" : "+") | cimagf( c ) | 'i';
 } // ?|?
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype *os, double _Complex dc ) {
-        os | creal( dc );
-        _Bool temp = sepDisable( os );                                          // disable separators within complex value
-        if ( cimag( dc ) >= 0 ) os | '+';                                       // negative value prints '-'
-        os | cimag( dc ) | 'i';
-        sepReset( os, temp );                                                           // reset separator
-        return os;
+ostype * ?|?( ostype *os, double _Complex c ) {
+        return os | creal( c ) | (cimag( c ) < 0 ? "" : "+") | cimag( c ) | 'i';
 } // ?|?
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype *os, long double _Complex ldc ) {
-        os | creall( ldc );
-        _Bool temp = sepDisable( os );                                          // disable separators within complex value
-        if ( cimagl( ldc ) >= 0 ) os | '+';                                     // negative value prints '-'
-        os | cimagl( ldc ) | 'i';
-        sepReset( os, temp );                                                           // reset separator
-        return os;
+ostype * ?|?( ostype *os, long double _Complex c ) {
+        return os | creall( c ) | (cimagl( c ) < 0 ? "" : "+") | cimagl( c ) | 'i';
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, const void *p ) {
+        char buffer[32];
+        return write( os, buffer, sprintf( buffer, "%p", p ) );
 } // ?|?
 
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype *os, const char *cp ) {
-        enum { Open = 1, Close, OpenClose };
-        static const unsigned char mask[256] = {
-                // opening delimiters
-                ['('] : Open, ['['] : Open, ['{'] : Open,
-                ['$'] : Open, [(unsigned char)'£'] : Open, [(unsigned char)'¥'] : Open, [(unsigned char)'¿'] : Open, [(unsigned char)'«'] : Open,
-                // closing delimiters
-                [','] : Close, ['.'] : Close, [':'] : Close, [';'] : Close, ['!'] : Close, ['?'] : Close,
-                [')'] : Close, [']'] : Close, ['}'] : Close,
-                ['%'] : Close, [(unsigned char)'¢'] : Close, [(unsigned char)'»'] : Close,
-                // opening-closing delimiters
-                ['\''] : OpenClose, ['`'] : OpenClose, ['"'] : OpenClose,
-                ['\f'] : OpenClose, ['\n'] : OpenClose, ['\r'] : OpenClose, ['\t'] : OpenClose, ['\v'] : OpenClose, // isspace
-        }; // mask
-
-        int len = strlen( cp );
-        // null string => no separator
-  if ( len == 0 ) { sepOff( os ); return os; }
-        // first character IS NOT spacing or closing punctuation => add left separator
-        unsigned char ch = cp[0];                                                       // must make unsigned
-        if ( sepPrt( os ) && mask[ ch ] != Close && mask[ ch ] != OpenClose ) {
-                prtfmt( os, "%s", sepGet( os ) );
-        } // if
-        // last character IS spacing or opening punctuation => turn off separator for next item
-        unsigned int posn = len - 1;
-        ch = cp[posn];                                                                          // must make unsigned
-        if ( mask[ ch ] == Open || mask[ ch ] == OpenClose ) {
-                sepOff( os );
-        } else {
-                sepOn( os );
-        } // if
-        return write( os, cp, len );
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype *os, const void *p ) {
-        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
-        sepReset( os );
-        prtfmt( os, "%p", p );
-        return os;
+        return write( os, cp, strlen( cp ) );
 } // ?|?
 
 
-forall( dtype ostype | ostream( ostype ) ) 
-ostype * ?|?( ostype *os, ostype * (* manip)( ostype * ) ) {
-        return manip( os );
-} // ?|?
+forall( dtype ostype, dtype retostype | ostream( ostype ) | ostream( retostype ) ) 
+retostype * ?|?( ostype *os, retostype * (*manip)(ostype*) ) {
+  return manip( os );
+}
 
 forall( dtype ostype | ostream( ostype ) ) 
 ostype * endl( ostype * os ) {
-        os | '\n';
+        os | "\n";
         flush( os );
-        sepOff( os );
         return os;
 } // endl
 
-forall( dtype ostype | ostream( ostype ) ) 
-ostype * sepOn( ostype * os ) {
-        sepOn( os );
-        return os;
-} // sepOn
-
-forall( dtype ostype | ostream( ostype ) ) 
-ostype * sepOff( ostype * os ) {
-        sepOff( os );
-        return os;
-} // sepOff
-
-forall( dtype ostype | ostream( ostype ) ) 
-ostype * sepEnable( ostype * os ) {
-        sepEnable( os );
-        return os;
-} // sepEnable
-
-forall( dtype ostype | ostream( ostype ) ) 
-ostype * sepDisable( ostype * os ) {
-        sepDisable( os );
-        return os;
-} // sepDisable
-
 //---------------------------------------
 
-forall( otype elttype | writeable( elttype ), otype iteratortype | iterator( iteratortype, elttype ), dtype ostype | ostream( ostype ) )
-void write( iteratortype begin, iteratortype end, ostype *os ) {
-        void print( elttype i ) { os | i; }
+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 ) {
+        void print( elt_type i ) { os | i | ' '; }
         for_each( begin, end, print );
 } // ?|?
 
-forall( otype elttype | writeable( elttype ), otype iteratortype | iterator( iteratortype, elttype ), dtype ostype | ostream( ostype ) )
-void write_reverse( iteratortype begin, iteratortype end, ostype *os ) {
-        void print( elttype i ) { os | 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 ) {
+        void print( elt_type i ) { os | i | ' '; }
         for_each_reverse( begin, end, print );
 } // ?|?
@@ -247 +140 @@
 
 forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, char * c ) {
-        scanfmt( is, "%c", c );
-        return is;
+istype * ?|?( istype *is, char *cp ) {
+        return read( is, cp, 1 );
 } // ?|?
 
 forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, short int * si ) {
-        scanfmt( is, "%hd", si );
-        return is;
+istype * ?|?( istype *is, int *ip ) {
+        return get( is, ip );
 } // ?|?
-
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, unsigned short int * usi ) {
-        scanfmt( is, "%hu", usi );
-        return is;
-} // ?|?
-
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, int * i ) {
-        scanfmt( is, "%d", i );
-        return is;
-} // ?|?
-
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, unsigned int * ui ) {
-        scanfmt( is, "%u", ui );
-        return is;
-} // ?|?
-
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, long int * li ) {
-        scanfmt( is, "%ld", li );
-        return is;
-} // ?|?
-
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, unsigned long int * ulli ) {
-        scanfmt( is, "%lu", ulli );
-        return is;
-} // ?|?
-
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, long long int * lli ) {
-        scanfmt( is, "%lld", lli );
-        return is;
-} // ?|?
-
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, unsigned long long int * ulli ) {
-        scanfmt( is, "%llu", ulli );
-        return is;
-} // ?|?
-
-
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, float * f ) {
-        scanfmt( is, "%f", f );
-        return is;
-} // ?|?
-
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, double * d ) {
-        scanfmt( is, "%lf", d );
-        return is;
-} // ?|?
-
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, long double * ld ) {
-        scanfmt( is, "%Lf", ld );
-        return is;
-} // ?|?
-
-
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, float _Complex * fc ) {
-        float re, im;
-        scanfmt( is, "%g%gi", &re, &im );
-        *fc = re + im * _Complex_I;
-        return is;
-} // ?|?
-
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, double _Complex * dc ) {
-        double re, im;
-        scanfmt( is, "%lf%lfi", &re, &im );
-        *dc = re + im * _Complex_I;
-        return is;
-} // ?|?
-
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, long double _Complex * ldc ) {
-        long double re, im;
-        scanfmt( is, "%Lf%Lfi", &re, &im );
-        *ldc = re + im * _Complex_I;
-        return is;
-} // ?|?
-
-_Istream_cstrUC cstr( char * s ) { _Istream_cstrUC s = { s }; return s; }
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, _Istream_cstrUC cstr ) {
-        scanfmt( is, "%s", cstr.s );
-        return is;
-} // cstr
-
-_Istream_cstrC cstr( char * s, int size ) { _Istream_cstrC s = { s, size }; return s; }
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype * is, _Istream_cstrC cstr ) {
-        char buf[16];
-        sprintf( buf, "%%%ds", cstr.size );
-        scanfmt( is, buf, cstr.s );
-        return is;
-} // cstr
 
 // Local Variables: //