Changes in / [37f9860:c4187df]

Location:

src

Files:

• libcfa/fstream (modified) (6 diffs)
• libcfa/fstream.c (modified) (7 diffs)
• libcfa/iostream (modified) (4 diffs)
• libcfa/iostream.c (modified) (27 diffs)
• tests/.expect/io.txt (modified) (2 diffs)
• tests/io.c (modified) (5 diffs)

src/libcfa/fstream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 21 15:57:24 2017
-// Update Count     : 102
+// Last Modified On : Tue Mar  7 14:48:08 2017
+// Update Count     : 91
 //
 
@@ -21 +21 @@
 enum { separateSize = 16 };
 struct ofstream {
-        void * file;
+        void *file;
         _Bool sepDefault;
         _Bool sepOnOff;
-        const char * sepCur;
         char separator[separateSize];
-        char tupleSeparator[separateSize];
 }; // ofstream
 
@@ -34 +32 @@
 void sepReset( ofstream * );
 void sepReset( ofstream *, _Bool );
-const char * sepGetCur( ofstream * );
-void sepSetCur( ofstream *, const char * );
 const char * sepGet( ofstream * );
 void sepSet( ofstream *, const char * );
-const char * sepGetTuple( ofstream * );
-void sepSetTuple( ofstream *, const char * );
 _Bool sepDisable( ofstream * );
 _Bool sepEnable( ofstream * );
@@ -48 +42 @@
 void close( ofstream * );
 ofstream * write( ofstream *, const char * data, unsigned long int size );
-int fmt( ofstream *, const char fmt[], ... );
-
-void ?{}( ofstream * );
+int prtfmt( ofstream *, const char fmt[], ... );
 
 extern ofstream * sout, * serr;
@@ -56 +48 @@
 // implement context istream
 struct ifstream {
-        void * file;
+        void *file;
 }; // ifstream
 
@@ -65 +57 @@
 ifstream * read( ifstream * is, char * data, unsigned long int size );
 ifstream * ungetc( ifstream * is, char c );
-int fmt( ifstream *, const char fmt[], ... );
+int scanfmt( ifstream *, const char fmt[], ... );
 
-extern ifstream * sin;
+extern ifstream *sin;
 
 #endif // __FSTREAM_H__

src/libcfa/fstream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 22 16:17:21 2017
-// Update Count     : 221
+// Last Modified On : Tue Mar  7 14:48:09 2017
+// Update Count     : 192
 //
 
@@ -25 +25 @@
 #include <complex.h>                                                                    // creal, cimag
 }
-#include "assert"
 
 #define IO_MSG "I/O error: "
@@ -34 +33 @@
 void sepReset( ofstream * os ) { os->sepOnOff = os->sepDefault; }
 void sepReset( ofstream * os, _Bool reset ) { os->sepDefault = reset; os->sepOnOff = os->sepDefault; }
-
-const char * sepGetCur( ofstream * os ) { return os->sepCur; }
-void sepSetCur( ofstream * os, const char * sepCur ) { os->sepCur = sepCur; }
-
-const char * sepGet( ofstream * os ) { return os->separator; }
+const char * sepGet( ofstream * os ) { return &(os->separator[0]); }
 
 void sepSet( ofstream * os, const char * s ) {
-        assert( s );
-        strncpy( os->separator, s, separateSize - 1 );
+        strncpy( &(os->separator[0]), s, separateSize - 1 );
         os->separator[separateSize - 1] = '\0';
-} // sepSet
-
-const char * sepGetTuple( ofstream * os ) { return os->tupleSeparator; }
-
-void sepSetTuple( ofstream * os, const char * s ) {
-        assert( s );
-        strncpy( os->tupleSeparator, s, separateSize - 1 );
-        os->tupleSeparator[separateSize - 1] = '\0';
 } // sepSet
 
@@ -109 +95 @@
 } // write
 
-int fmt( ofstream * os, const char format[], ... ) {
+int prtfmt( ofstream * os, const char fmt[], ... ) {
         va_list args;
-        va_start( args, format );
-        int len = vfprintf( (FILE *)(os->file), format, args );
+        va_start( args, fmt );
+        int len = vfprintf( (FILE *)(os->file), fmt, args );
         if ( len == EOF ) {
                 if ( ferror( (FILE *)(os->file) ) ) {
@@ -123 +109 @@
         sepReset( os );                                                                         // reset separator
         return len;
-} // fmt
+} // prtfmt
 
-void ?{}( ofstream * this, void * file, _Bool sepDefault, _Bool sepOnOff, const char * separator, const char * tupleSeparator ) {
-        this->file = file;
-        this->sepDefault = sepDefault;
-        this->sepOnOff = sepOnOff;
-        sepSet( this, separator );
-        sepSetCur( this, sepGet( this ) );
-        sepSetTuple( this, tupleSeparator );
-}
 
-static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), 1, 0, " ", ", " };
+static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), 1, 0, { ' ', '\0' } };
 ofstream *sout = &soutFile;
-static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), 1, 0, " ", ", " };
+static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), 1, 0, { ' ', '\0' } };
 ofstream *serr = &serrFile;
 
@@ -195 +173 @@
 } // ungetc
 
-int fmt( ifstream * is, const char format[], ... ) {
+int scanfmt( ifstream * is, const char fmt[], ... ) {
         va_list args;
 
-        va_start( args, format );
-        int len = vfscanf( (FILE *)(is->file), format, args );
+        va_start( args, fmt );
+        int len = vfscanf( (FILE *)(is->file), fmt, args );
         if ( len == EOF ) {
                 if ( ferror( (FILE *)(is->file) ) ) {
@@ -208 +186 @@
         va_end( args );
         return len;
-} // fmt
+} // prtfmt
 
 

src/libcfa/iostream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 21 15:57:29 2017
-// Update Count     : 104
+// Last Modified On : Mon Mar  6 20:51:35 2017
+// Update Count     : 98
 //
 
@@ -25 +25 @@
         void sepReset( ostype * );                                                      // set separator state to default state
         void sepReset( ostype *, _Bool );                                       // set separator and default state
-        const char * sepGetCur( ostype * );                                     // get current separator string
-        void sepSetCur( ostype *, const char * );                       // set current separator string
+        void sepSet( ostype *, const char * );                          // set separator to string (15 character maximum)
         const char * sepGet( ostype * );                                        // get separator string
-        void sepSet( ostype *, const char * );                          // set separator to string (15 character maximum)
-        const char * sepGetTuple( ostype * );                           // get tuple separator string
-        void sepSetTuple( ostype *, const char * );                     // set tuple separator to string (15 character maximum)
         _Bool sepDisable( ostype * );                                           // set default state to off, and return previous state
         _Bool sepEnable( ostype * );                                            // set default state to on, and return previous state
@@ -39 +35 @@
         void close( ostype * os );
         ostype * write( ostype *, const char *, unsigned long int );
-        int fmt( ostype *, const char fmt[], ... );
+        int prtfmt( ostype *, const char fmt[], ... );
 };
 
@@ -99 +95 @@
         istype * read( istype *, char *, unsigned long int );
         istype * ungetc( istype *, char );
-        int fmt( istype *, const char fmt[], ... );
+        int scanfmt( istype *, const char fmt[], ... );
 };
 

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 22 17:21:23 2017
-// Update Count     : 358
+// Last Modified On : Mon Mar  6 20:52:02 2017
+// Update Count     : 313
 //
 
@@ -24 +24 @@
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, char c ) {
-        fmt( os, "%c", c );
-        sepOff( os );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, signed char c ) {
-        fmt( os, "%hhd", c );
-        sepOff( os );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, unsigned char c ) {
-        fmt( os, "%hhu", c );
-        sepOff( os );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, short int si ) {
-        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-        fmt( os, "%hd", si );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, unsigned short int usi ) {
-        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-        fmt( os, "%hu", usi );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, int i ) {
-        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-        fmt( os, "%d", i );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, unsigned int ui ) {
-        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-        fmt( os, "%u", ui );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, long int li ) {
-        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-        fmt( os, "%ld", li );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, unsigned long int uli ) {
-        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-        fmt( os, "%lu", uli );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, long long int lli ) {
-        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-        fmt( os, "%lld", lli );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, unsigned long long int ulli ) {
-        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-        fmt( os, "%llu", ulli );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, float f ) {
-        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-        fmt( os, "%g", f );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, double d ) {
-        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-        fmt( os, "%.*lg", DBL_DIG, d );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, long double ld ) {
-        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-        fmt( os, "%.*Lg", LDBL_DIG, ld );
-        return os;
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, float _Complex fc ) {
+ostype * ?|?( ostype *os, char c ) {
+        prtfmt( os, "%c", c );
+        sepOff( os );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, signed char c ) {
+        prtfmt( os, "%hhd", c );
+        sepOff( os );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, unsigned char c ) {
+        prtfmt( os, "%hhu", c );
+        sepOff( os );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, short int si ) {
+        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( 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 ) );
+        prtfmt( os, "%hu", usi );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, int i ) {
+        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        prtfmt( os, "%d", i );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, unsigned int ui ) {
+        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        prtfmt( os, "%u", ui );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, long int li ) {
+        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        prtfmt( os, "%ld", li );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, unsigned long int uli ) {
+        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        prtfmt( os, "%lu", uli );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, long long int lli ) {
+        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        prtfmt( os, "%lld", lli );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, unsigned long long int ulli ) {
+        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        prtfmt( os, "%llu", ulli );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, float f ) {
+        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        prtfmt( os, "%g", f );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, double d ) {
+        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        prtfmt( os, "%.*lg", DBL_DIG, d );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, long double ld ) {
+        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        prtfmt( os, "%.*Lg", LDBL_DIG, ld );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, float _Complex fc ) {
         os | crealf( fc );
         _Bool temp = sepDisable( os );                                          // disable separators within complex value
@@ -132 +132 @@
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, double _Complex dc ) {
+ostype * ?|?( ostype *os, double _Complex dc ) {
         os | creal( dc );
         _Bool temp = sepDisable( os );                                          // disable separators within complex value
@@ -142 +142 @@
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, long double _Complex ldc ) {
+ostype * ?|?( ostype *os, long double _Complex ldc ) {
         os | creall( ldc );
         _Bool temp = sepDisable( os );                                          // disable separators within complex value
@@ -152 +152 @@
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, const char * cp ) {
+ostype * ?|?( ostype *os, const char *cp ) {
         enum { Open = 1, Close, OpenClose };
         static const unsigned char mask[256] = {
                 // opening delimiters, no space after
                 ['('] : Open, ['['] : Open, ['{'] : Open,
-                ['='] : Open, ['$'] : Open, [(unsigned char)'£'] : Open, [(unsigned char)'¥'] : Open,
+                ['$'] : Open, ['='] : Open, [(unsigned char)'£'] : Open, [(unsigned char)'¥'] : Open,
                 [(unsigned char)'¡'] : Open, [(unsigned char)'¿'] : Open, [(unsigned char)'«'] : Open,
                 // closing delimiters, no space before
                 [','] : Close, ['.'] : Close, [':'] : Close, [';'] : Close, ['!'] : Close, ['?'] : Close,
+                [')'] : Close, [']'] : Close, ['}'] : Close,
                 ['%'] : Close, [(unsigned char)'¢'] : Close, [(unsigned char)'»'] : Close,
-                [')'] : Close, [']'] : Close, ['}'] : Close,
                 // opening-closing delimiters, no space before or after
                 ['\''] : OpenClose, ['`'] : OpenClose, ['"'] : OpenClose,
@@ -173 +173 @@
         unsigned char ch = cp[0];                                                       // must make unsigned
         if ( sepPrt( os ) && mask[ ch ] != Close && mask[ ch ] != OpenClose ) {
-                fmt( os, "%s", sepGetCur( os ) );
+                prtfmt( os, "%s", sepGet( os ) );
         } // if
 
@@ -191 +191 @@
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, const void * p ) {
-        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-        fmt( os, "%p", p );
+ostype * ?|?( ostype *os, const void *p ) {
+        if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        prtfmt( os, "%p", p );
         return os;
 } // ?|?
@@ -201 +201 @@
 forall( dtype ostype, otype T, ttype Params | ostream( ostype ) | writeable( T ) | { ostype * ?|?( ostype *, Params ); } )
 ostype * ?|?( ostype * os, T arg, Params rest ) {
-        forall( ttype Params ) ostype * prtTuple( ostype * os, T arg, Params rest ) {
-                os | arg;                                                                               // print first argument
-                os | rest;                                                                              // print remaining arguments
-                return os;
-        } // prtTuple
-        sepSetCur( os, sepGetTuple( os ) );                                     // switch to tuple separator
-        prtTuple( os, arg, rest );                                                      // recursively print tuple
-        sepSetCur( os, sepGet( os ) );                                          // switch to regular separator
+        os | arg | ", ";
+        os | rest;
         return os;
 } // ?|?
@@ -254 +248 @@
 
 forall( otype elttype | writeable( elttype ), otype iteratortype | iterator( iteratortype, elttype ), dtype ostype | ostream( ostype ) )
-void write( iteratortype begin, iteratortype end, ostype * os ) {
+void write( iteratortype begin, iteratortype end, ostype *os ) {
         void print( elttype i ) { os | i; }
         for_each( begin, end, print );
@@ -260 +254 @@
 
 forall( otype elttype | writeable( elttype ), otype iteratortype | iterator( iteratortype, elttype ), dtype ostype | ostream( ostype ) )
-void write_reverse( iteratortype begin, iteratortype end, ostype * os ) {
+void write_reverse( iteratortype begin, iteratortype end, ostype *os ) {
         void print( elttype i ) { os | i; }
         for_each_reverse( begin, end, print );
@@ -269 +263 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, char * c ) {
-        fmt( is, "%c", c );
+        scanfmt( is, "%c", c );
         return is;
 } // ?|?
@@ -275 +269 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, short int * si ) {
-        fmt( is, "%hd", si );
+        scanfmt( is, "%hd", si );
         return is;
 } // ?|?
@@ -281 +275 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, unsigned short int * usi ) {
-        fmt( is, "%hu", usi );
+        scanfmt( is, "%hu", usi );
         return is;
 } // ?|?
@@ -287 +281 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, int * i ) {
-        fmt( is, "%d", i );
+        scanfmt( is, "%d", i );
         return is;
 } // ?|?
@@ -293 +287 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, unsigned int * ui ) {
-        fmt( is, "%u", ui );
+        scanfmt( is, "%u", ui );
         return is;
 } // ?|?
@@ -299 +293 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, long int * li ) {
-        fmt( is, "%ld", li );
+        scanfmt( is, "%ld", li );
         return is;
 } // ?|?
@@ -305 +299 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, unsigned long int * ulli ) {
-        fmt( is, "%lu", ulli );
+        scanfmt( is, "%lu", ulli );
         return is;
 } // ?|?
@@ -311 +305 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, long long int * lli ) {
-        fmt( is, "%lld", lli );
+        scanfmt( is, "%lld", lli );
         return is;
 } // ?|?
@@ -317 +311 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, unsigned long long int * ulli ) {
-        fmt( is, "%llu", ulli );
+        scanfmt( is, "%llu", ulli );
         return is;
 } // ?|?
@@ -324 +318 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, float * f ) {
-        fmt( is, "%f", f );
+        scanfmt( is, "%f", f );
         return is;
 } // ?|?
@@ -330 +324 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, double * d ) {
-        fmt( is, "%lf", d );
+        scanfmt( is, "%lf", d );
         return is;
 } // ?|?
@@ -336 +330 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, long double * ld ) {
-        fmt( is, "%Lf", ld );
+        scanfmt( is, "%Lf", ld );
         return is;
 } // ?|?
@@ -344 +338 @@
 istype * ?|?( istype * is, float _Complex * fc ) {
         float re, im;
-        fmt( is, "%g%gi", &re, &im );
+        scanfmt( is, "%g%gi", &re, &im );
         *fc = re + im * _Complex_I;
         return is;
@@ -352 +346 @@
 istype * ?|?( istype * is, double _Complex * dc ) {
         double re, im;
-        fmt( is, "%lf%lfi", &re, &im );
+        scanfmt( is, "%lf%lfi", &re, &im );
         *dc = re + im * _Complex_I;
         return is;
@@ -360 +354 @@
 istype * ?|?( istype * is, long double _Complex * ldc ) {
         long double re, im;
-        fmt( is, "%Lf%Lfi", &re, &im );
+        scanfmt( is, "%Lf%Lfi", &re, &im );
         *ldc = re + im * _Complex_I;
         return is;
@@ -368 +362 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, _Istream_cstrUC cstr ) {
-        fmt( is, "%s", cstr.s );
+        scanfmt( is, "%s", cstr.s );
         return is;
 } // cstr
@@ -377 +371 @@
         char buf[16];
         sprintf( buf, "%%%ds", cstr.size );
-        fmt( is, buf, cstr.s );
+        scanfmt( is, buf, cstr.s );
         return is;
 } // cstr

src/tests/.expect/io.txt

@@ -18 +18 @@
 abc, $xyz
 
-v(27 v[27 v{27 $27 =27 £27 ¥27 ¡27 ¿27 «27
-25, 25. 25: 25; 25! 25? 25% 25¢ 25» 25) 25] 25}
+v(27 v[27 v{27 $27 £27 ¥27 ¡27 ¿27 «27
+25, 25. 25: 25; 25! 25? 25) 25] 25} 25% 25¢ 25»
 25'27 25`27 25"27 25 27 25
 27 25
@@ -25 +25 @@
 27 25   27 25
 27
-3, 4, a, 7.2
-3, 4, a, 7.2
-3 4 a 7.2
- 3 4 a 7.234a7.2 3 4 a 7.2
-3-4-a-7.2^3^4-3-4-a-7.2

src/tests/io.c

@@ -10 +10 @@
 // Created On       : Wed Mar  2 16:56:02 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 21 22:36:06 2017
-// Update Count     : 48
+// Last Modified On : Tue Jul  5 18:29:23 2016
+// Update Count     : 31
 // 
 
@@ -62 +62 @@
 
         sepSet( sout, ", $" );                                                                          // change separator, maximum of 15 characters
-        sout | f | d | ld | endl
-                 | fc | dc | ldc | endl
+        sout | f | d | ld | endl                                                                        // floating point without separator
+                 | fc | dc | ldc | endl                                                                 // complex without separator
                  | s1 | s2 | endl;
         sout | endl;
@@ -74 +74 @@
                 | "v{" | 27
                 | "$" | 27
-                | "=" | 27
                 | "£" | 27
                 | "¥" | 27
@@ -88 +87 @@
                 | 25 | "!"
                 | 25 | "?"
+                | 25 | ")"
+                | 25 | "]"
+                | 25 | "}"
                 | 25 | "%"
                 | 25 | "¢"
                 | 25 | "»"
-                | 25 | ")"
-                | 25 | "]"
-                | 25 | "}"
                 | endl
                 // opening-closing delimiters
@@ -106 +105 @@
                 | 25 | "\v" | 27
                 | endl;
-
-        [int, int, const char *, double] t = { 3, 4, "a", 7.2 };
-        sout | [ 3, 4, "a", 7.2 ] | endl;
-        sout | t | endl;
-        sepSetTuple( sout, " " );
-        sout | t | endl;
-        sout | sepOn | t | sepDisable | t | sepEnable | t | endl;
-        sepSet( sout, "^" );
-        sepSetTuple( sout, "-" );
-        sout | t | 3 | 4 | t | endl;
 }