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

File:

• src/libcfa/iostream.c (modified) (16 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 : Sat Apr 30 14:00:53 2016
-// Update Count     : 302
+// Last Modified On : Wed Apr  6 16:13:29 2016
+// Update Count     : 278
 //
 
@@ -34 +34 @@
 ostype * ?|?( ostype *os, short int si ) {
         if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        sepReset( os );
         prtfmt( os, "%hd", si );
         return os;
@@ -41 +42 @@
 ostype * ?|?( ostype *os, unsigned short int usi ) {
         if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        sepReset( os );
         prtfmt( os, "%hu", usi );
         return os;
@@ -48 +50 @@
 ostype * ?|?( ostype *os, int i ) {
         if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        sepReset( os );
         prtfmt( os, "%d", i );
         return os;
@@ -55 +58 @@
 ostype * ?|?( ostype *os, unsigned int ui ) {
         if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        sepReset( os );
         prtfmt( os, "%u", ui );
         return os;
@@ -62 +66 @@
 ostype * ?|?( ostype *os, long int li ) {
         if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        sepReset( os );
         prtfmt( os, "%ld", li );
         return os;
@@ -69 +74 @@
 ostype * ?|?( ostype *os, unsigned long int uli ) {
         if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        sepReset( os );
         prtfmt( os, "%lu", uli );
         return os;
@@ -76 +82 @@
 ostype * ?|?( ostype *os, long long int lli ) {
         if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        sepReset( os );
         prtfmt( os, "%lld", lli );
         return os;
@@ -83 +90 @@
 ostype * ?|?( ostype *os, unsigned long long int ulli ) {
         if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        sepReset( os );
         prtfmt( os, "%llu", ulli );
         return os;
@@ -90 +98 @@
 ostype * ?|?( ostype *os, float f ) {
         if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        sepReset( os );
         prtfmt( os, "%g", f );
         return os;
@@ -97 +106 @@
 ostype * ?|?( ostype *os, double d ) {
         if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        sepReset( os );
         prtfmt( os, "%.*lg", DBL_DIG, d );
         return os;
@@ -104 +114 @@
 ostype * ?|?( ostype *os, long double ld ) {
         if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        sepReset( os );
         prtfmt( os, "%.*Lg", LDBL_DIG, ld );
         return os;
@@ -144 +155 @@
                 // opening delimiters
                 ['('] : Open, ['['] : Open, ['{'] : Open,
-                ['$'] : Open, [(unsigned char)'£'] : Open, [(unsigned char)'¥'] : Open,
-                [(unsigned char)'¡'] : Open, [(unsigned char)'¿'] : Open, [(unsigned char)'«'] : Open,
+                ['$'] : Open, [(unsigned char)'£'] : Open, [(unsigned char)'¥'] : Open, [(unsigned char)'¿'] : Open, [(unsigned char)'«'] : Open,
                 // closing delimiters
                 [','] : Close, ['.'] : Close, [':'] : Close, [';'] : Close, ['!'] : Close, ['?'] : Close,
@@ -152 +162 @@
                 // opening-closing delimiters
                 ['\''] : OpenClose, ['`'] : OpenClose, ['"'] : OpenClose,
-                [' '] : OpenClose, ['\f'] : OpenClose, ['\n'] : OpenClose, ['\r'] : OpenClose, ['\t'] : OpenClose, ['\v'] : OpenClose, // isspace
+                ['\f'] : OpenClose, ['\n'] : OpenClose, ['\r'] : OpenClose, ['\t'] : OpenClose, ['\v'] : OpenClose, // isspace
         }; // mask
 
-  if ( cp[0] == '\0' ) { sepOff( os ); return os; }             // null string => no separator
-
+        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
@@ -162 +173 @@
                 prtfmt( os, "%s", sepGet( os ) );
         } // if
-
-        // if string starts line, must reset to determine open state because separator is off
-        sepReset( os );                                                                         // reset separator
-
         // last character IS spacing or opening punctuation => turn off separator for next item
-        unsigned int len = strlen( cp ), posn = len - 1;
+        unsigned int posn = len - 1;
         ch = cp[posn];                                                                          // must make unsigned
-        if ( sepPrt( os ) && mask[ ch ] != Open && mask[ ch ] != OpenClose ) {
+        if ( mask[ ch ] == Open || mask[ ch ] == OpenClose ) {
+                sepOff( os );
+        } else {
                 sepOn( os );
-        } else {
-                sepOff( os );
         } // if
         return write( os, cp, len );
@@ -180 +187 @@
 ostype * ?|?( ostype *os, const void *p ) {
         if ( sepPrt( os ) ) prtfmt( os, "%s", sepGet( os ) );
+        sepReset( os );
         prtfmt( os, "%p", p );
         return os;
 } // ?|?
+
 
 forall( dtype ostype | ostream( ostype ) )