Changeset b3f9a0cb for src/libcfa/iostream.c

Timestamp:

Apr 4, 2016, 1:18:17 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

afc1045

Parents:

89173242 (diff), 3cfe27f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

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 : Wed Mar  2 18:06:35 2016
-// Update Count     : 208
+// Last Modified On : Mon Mar  7 13:51:23 2016
+// Update Count     : 227
 //
 
@@ -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 special punctuation => add left separator
-        if ( sepPrt( os ) && isspace( cp[0] ) == 0 && cp[0] != '.' && cp[0] != ',' ) {
+        // 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 ) {
                 prtfmt( os, "%s", sepGet( os ) );
         } // if
-        // last character is spacing or special punctuation => turn off separator for next item
+        // last character IS spacing or opening punctuation => turn off separator for next item
         unsigned int posn = len - 1;
-        if ( isspace( cp[posn] ) || cp[posn] == ':' || cp[posn] == '$' ) {
+        if ( isspace( cp[posn] ) || mask[ cp[posn] ] == Open || mask[ cp[posn] ] == OpenClose ) {
                 sepOff( os );
         } else {