Changeset cb91437 for src

Timestamp:

Mar 22, 2017, 5:39:46 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:

22854f8, 37f9860

Parents:

87d13cd

Message:

additions to tuple separator for sout

Location:

src

Files:

• libcfa/fstream.c (modified) (3 diffs)
• libcfa/iostream.c (modified) (3 diffs)
• tests/.expect/io.txt (modified) (1 diff)
• tests/io.c (modified) (2 diffs)

src/libcfa/fstream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 21 20:56:10 2017
-// Update Count     : 215
+// Last Modified On : Wed Mar 22 16:17:21 2017
+// Update Count     : 221
 //
 
@@ -25 +25 @@
 #include <complex.h>                                                                    // creal, cimag
 }
+#include "assert"
 
 #define IO_MSG "I/O error: "
@@ -37 +38 @@
 void sepSetCur( ofstream * os, const char * sepCur ) { os->sepCur = sepCur; }
 
-const char * sepGet( ofstream * os ) { return &(os->separator[0]); }
+const char * sepGet( ofstream * os ) { return os->separator; }
 
 void sepSet( ofstream * os, const char * s ) {
-        strncpy( &(os->separator[0]), s, separateSize - 1 );
+        assert( s );
+        strncpy( os->separator, s, separateSize - 1 );
         os->separator[separateSize - 1] = '\0';
 } // sepSet
 
-const char * sepGetTuple( ofstream * os ) { return &(os->tupleSeparator[0]); }
+const char * sepGetTuple( ofstream * os ) { return os->tupleSeparator; }
 
 void sepSetTuple( ofstream * os, const char * s ) {
-        strncpy( &(os->tupleSeparator[0]), s, separateSize - 1 );
+        assert( s );
+        strncpy( os->tupleSeparator, s, separateSize - 1 );
         os->tupleSeparator[separateSize - 1] = '\0';
 } // sepSet

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 21 22:05:57 2017
-// Update Count     : 348
+// Last Modified On : Wed Mar 22 17:21:23 2017
+// Update Count     : 358
 //
 
@@ -157 +157 @@
                 // opening delimiters, no space after
                 ['('] : Open, ['['] : 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, no space before
@@ -201 +201 @@
 forall( dtype ostype, otype T, ttype Params | ostream( ostype ) | writeable( T ) | { ostype * ?|?( ostype *, Params ); } )
 ostype * ?|?( ostype * os, T arg, Params rest ) {
+        forall( ttype Params ) ostype * prtTuple( ostype * os, T arg, Params rest ) {
+                os | arg;                                                                               // print first argument
+                os | rest;                                                                              // print remaining arguments
+                return os;
+        } // prtTuple
         sepSetCur( os, sepGetTuple( os ) );                                     // switch to tuple separator
-        os | arg;                                                                                       // print first argument
-        os | rest;                                                                                      // print remaining arguments
+        prtTuple( os, arg, rest );                                                      // recursively print tuple
         sepSetCur( os, sepGet( os ) );                                          // switch to regular separator
+        return os;
 } // ?|?
 

src/tests/.expect/io.txt

@@ -25 +25 @@
 27 25   27 25
 27
-Segmentation fault (core dumped)
+3, 4, a, 7.2
+3, 4, a, 7.2
+3 4 a 7.2
+ 3 4 a 7.234a7.2 3 4 a 7.2
+3-4-a-7.2^3^4-3-4-a-7.2

src/tests/io.c

@@ -10 +10 @@
 // Created On       : Wed Mar  2 16:56:02 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 21 21:24:50 2017
-// Update Count     : 47
+// Last Modified On : Tue Mar 21 22:36:06 2017
+// Update Count     : 48
 // 
 
@@ -108 +108 @@
 
         [int, int, const char *, double] t = { 3, 4, "a", 7.2 };
-        sout | [ 3, 4, 'a', 7.2 ] | endl;
+        sout | [ 3, 4, "a", 7.2 ] | endl;
         sout | t | endl;
         sepSetTuple( sout, " " );