Changes in src/tests/io.c [53a6c2a:86f384b]

File:

• src/tests/io.c (modified) (6 diffs)

src/tests/io.c

@@ -10 +10 @@
 // Created On       : Wed Mar  2 16:56:02 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul  6 23:26:12 2017
-// Update Count     : 78
+// Last Modified On : Sun Jul  2 09:40:58 2017
+// Update Count     : 68
 // 
 
@@ -104 +104 @@
 
         sout | "tuples" | endl;
-        [int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 4, [ 5, 6 ] ];
+        [int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 3, [ 4, 5 ] ];
         sout | t1 | t2 | endl;                                                          // print tuple
         sout | endl;
@@ -110 +110 @@
         sout | "toggle separator" | endl;
         sout | f | "" | d | "" | ld | endl                                      // floating point without separator
-                | sepDisable | fc | dc | ldc | endl                             // complex without separator
-                | fc | sepOn | dc | ldc | endl                                  // local separator add
-                | sepEnable | fc | dc | ldc | endl                              // complex with separator
-                | fc | sepOff | dc | ldc | endl                                 // local separator removal
-                | s1 | sepOff | s2 | endl                                               // local separator removal
-                | s1 | "" | s2 | endl;                                                  // local separator removal
+                | sepDisable | fc | dc | ldc | sepEnable | endl // complex without separator
+                | sepOn | s1 | sepOff | s2 | endl                               // local separator removal
+                | s1 | "" | s2 | endl;                                                  // C string without separator
         sout | endl;
 
         sout | "change separator" | endl;
-        sout | "from \"" | sep | "\"";
+        sout | "from \" " | sepGet( sout ) | "\"";
         sepSet( sout, ", $" );                                                          // change separator, maximum of 15 characters
-        sout | " to \"" | sep | "\"" | endl;
+        sout | "to \" " | sepGet( sout ) | "\"" | endl;
         sout | f | d | ld | endl
                 | fc | dc | ldc | endl
@@ -127 +124 @@
                 | t1 | t2 | endl;                                                               // print tuple
         sout | endl;
-        sout | "from \"" | sep | "\" ";
+        sout | "from \"" | sepGet( sout ) | "\"";
         sepSet( sout, " " );                                                            // restore separator
-        sout | "to \"" | sep | "\"" | endl;
+        sout | "to \"" | sepGet( sout ) | "\"" | endl;
         sout | f | d | ld | endl
                 | fc | dc | ldc | endl
@@ -136 +133 @@
         sout | endl;
 
-        sout | "check sepOn/sepOff" | endl;
-        sout | sepOn | 1 | 2 | 3 | sepOn | endl;                        // no separator at start/end of line
+        sout | sepOn | 1 | 2 | 3 | sepOn | endl;                        // separator at start/end of line
         sout | 1 | sepOff | 2 | 3 | endl;                                       // locally turn off implicit separator
-        sout | sepOn | sepOn | 1 | 2 | 3 | sepOn | sepOff | sepOn | '\n'; // no separator at start/end of line
-        sout | 1 | 2 | 3 | "\n\n" | sepOn;                                      // no separator at start of next line
+        sout | sepOn | 1 | 2 | 3 | sepOn | sepOff | endl;       // separator at start of line
+        sout | 1 | 2 | 3 | endl | sepOn;                                        // separator at start of next line
         sout | 1 | 2 | 3 | endl;
         sout | endl;
 
-        sout | "check enable/disable" | endl;
         sout | sepDisable | 1 | 2 | 3 | endl;                           // globally turn off implicit separation
         sout | 1 | sepOn | 2 | 3 | endl;                                        // locally turn on implicit separator
@@ -154 +149 @@
         sout | endl;
 
-//      sout | fmt( d, "%8.3f" ) || endl;
-//      sout | endl;
-
         sepSetTuple( sout, " " );                                                       // set tuple separator from ", " to " "
-        sout | t1 | t2 | " \"" | sep | "\"" | endl;
+        sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"" | endl;
         sepSetTuple( sout, ", " );                                                      // reset tuple separator to ", "
-        sout | t1 | t2 | " \"" | sep | "\"" | endl;
+        sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"" | endl;
         sout | t1 | t2 | endl;                                                          // print tuple
         sout | endl;