Changes in src/libcfa/iostream.c [b63e376:4040425]

File:

• src/libcfa/iostream.c (modified) (2 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 : Mon Mar  7 13:51:23 2016
-// Update Count     : 227
+// Last Modified On : Wed Mar  2 18:06:35 2016
+// Update Count     : 208
 //
 
@@ -133 +133 @@
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype *os, const char *cp ) {
-        enum { Open = 1, Close, OpenClose };
-        static const char mask[256] = {
-                // opening delimiters
-                ['('] : Open, ['['] : Open, ['{'] : Open,
-                ['$'] : Open, [L'£'] : Open, [L'¥'] : Open, [L'¢'] : Open, [L'¿'] : Open, [L'«'] : Open,
-                // closing delimiters
-                [','] : Close, ['.'] : Close, [':'] : Close, [';'] : Close, ['!'] : Close, ['?'] : Close,
-                [')'] : Close, [']'] : Close, ['}'] : Close,
-                ['%'] : Close, [L'»'] : Close,
-                // opening-closing delimiters
-                ['\''] : OpenClose, ['`'] : OpenClose, ['"'] : OpenClose,
-        }; // mask
-
         int len = strlen( cp );
         // null string => no separator
   if ( len == 0 ) { sepOff( os ); return os; }
-        // first character NOT spacing or closing punctuation => add left separator
-        if ( sepPrt( os ) && isspace( cp[0] ) == 0 && mask[ cp[0] ] != Close && mask[ cp[0] ] != OpenClose ) {
+        // first character NOT spacing or special punctuation => add left separator
+        if ( sepPrt( os ) && isspace( cp[0] ) == 0 && cp[0] != '.' && cp[0] != ',' ) {
                 prtfmt( os, "%s", sepGet( os ) );
         } // if
-        // last character IS spacing or opening punctuation => turn off separator for next item
+        // last character is spacing or special punctuation => turn off separator for next item
         unsigned int posn = len - 1;
-        if ( isspace( cp[posn] ) || mask[ cp[posn] ] == Open || mask[ cp[posn] ] == OpenClose ) {
+        if ( isspace( cp[posn] ) || cp[posn] == ':' || cp[posn] == '$' ) {
                 sepOff( os );
         } else {