Changes in src/libcfa/iostream.c [53a6c2a:86f384b]

File:

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

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul  6 18:14:17 2017
-// Update Count     : 396
+// Last Modified On : Sun Jul  2 08:54:02 2017
+// Update Count     : 375
 //
 
@@ -18 +18 @@
 extern "C" {
 #include <stdio.h>
-#include <stdbool.h>                                                                    // true/false
 #include <string.h>                                                                             // strlen
 #include <float.h>                                                                              // DBL_DIG, LDBL_DIG
@@ -25 +24 @@
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype * os, char ch ) {
-        fmt( os, "%c", ch );
-        if ( ch == '\n' ) setNL( os, true );
+ostype * ?|?( ostype * os, char c ) {
+        fmt( os, "%c", c );
         sepOff( os );
         return os;
@@ -182 +180 @@
 
         // last character IS spacing or opening punctuation => turn off separator for next item
-        size_t len = strlen( cp );
-        ch = cp[len - 1];                                                                       // must make unsigned
+        unsigned int len = strlen( cp ), posn = len - 1;
+        ch = cp[posn];                                                                          // must make unsigned
         if ( sepPrt( os ) && mask[ ch ] != Open && mask[ ch ] != OpenClose ) {
                 sepOn( os );
@@ -189 +187 @@
                 sepOff( os );
         } // if
-        if ( ch == '\n' ) setNL( os, true );                            // check *AFTER* sepPrt call above as it resets NL flag
         return write( os, cp, len );
 } // ?|?
@@ -219 +216 @@
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * sep( ostype * os ) {
-        os | sepGet( os );
-        return os;
-} // sep
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * sepTuple( ostype * os ) {
-        os | sepGetTuple( os );
-        return os;
-} // sepTuple
-
-forall( dtype ostype | ostream( ostype ) )
 ostype * endl( ostype * os ) {
+        if ( lastSepOn( os ) ) fmt( os, "%s", sepGetCur( os ) );
         os | '\n';
-        setNL( os, true );
         flush( os );
         sepOff( os );                                                                           // prepare for next line