Changeset c443d1d

Timestamp:

Mar 6, 2017, 8:50:16 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

2988eeb

Parents:

8191203

Message:

iosteam can now print tuples, added = as opening delimiter for printing strings

Location:

src

Files:

• examples/rational.cc (deleted)
• libcfa/iostream (modified) (2 diffs)
• libcfa/iostream.c (modified) (3 diffs)

src/libcfa/iostream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb 24 21:09:09 2017
-// Update Count     : 94
+// Last Modified On : Mon Mar  6 17:48:01 2017
+// Update Count     : 97
 //
 
@@ -68 +68 @@
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, const void * );
 
+// tuples
+forall( dtype ostype, otype T, ttype Params | ostream( ostype ) | writeable( T ) | { ostype * ?|?( ostype *, Params ); } ) ostype * ?|?( ostype * os, T arg, Params rest );
+
+// manipulators
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, ostype * (*)( ostype * ) );
-// manipulators
 forall( dtype ostype | ostream( ostype ) ) ostype * endl( ostype * );
 forall( dtype ostype | ostream( ostype ) ) ostype * sepOn( ostype * );

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb 24 21:09:59 2017
-// Update Count     : 307
+// Last Modified On : Mon Mar  6 17:48:05 2017
+// Update Count     : 312
 //
 
@@ -155 +155 @@
         enum { Open = 1, Close, OpenClose };
         static const unsigned char mask[256] = {
-                // opening delimiters
+                // opening delimiters, no space after
                 ['('] : 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
+                // closing delimiters, no space before
                 [','] : Close, ['.'] : Close, [':'] : Close, [';'] : Close, ['!'] : Close, ['?'] : Close,
                 [')'] : Close, [']'] : Close, ['}'] : Close,
                 ['%'] : Close, [(unsigned char)'¢'] : Close, [(unsigned char)'»'] : Close,
-                // opening-closing delimiters
+                // opening-closing delimiters, no space before or after
                 ['\''] : OpenClose, ['`'] : OpenClose, ['"'] : OpenClose,
                 [' '] : OpenClose, ['\f'] : OpenClose, ['\n'] : OpenClose, ['\r'] : OpenClose, ['\t'] : OpenClose, ['\v'] : OpenClose, // isspace
@@ -198 +198 @@
 
 
+// tuples
+forall( dtype ostype, otype T, ttype Params | ostream( ostype ) | writeable( T ) | { ostype * ?|?( ostype *, Params ); } )
+ostype * ?|?( ostype * os, T arg, Params rest ) {
+        os | arg | ", ";
+        os | rest;
+} // ?|?
+
+
+// manipulators
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype * os, ostype * (* manip)( ostype * ) ) {