Changeset d395012 for src

Timestamp:

Jul 1, 2017, 5:24:03 PM (7 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:

86f384b

Parents:

b0f7a43

Message:

support separator at end of line

Location:

src

Files:

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

src/libcfa/fstream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 15 18:11:09 2017
-// Update Count     : 104
+// Last Modified On : Sat Jul  1 16:37:53 2017
+// Update Count     : 112
 //
 
@@ -24 +24 @@
         _Bool sepDefault;
         _Bool sepOnOff;
+        _Bool lastSepOn;
         const char * sepCur;
         char separator[separateSize];
@@ -35 +36 @@
 const char * sepGetCur( ofstream * );
 void sepSetCur( ofstream *, const char * );
+_Bool lastSepOn( ofstream * );
 
 // public

src/libcfa/fstream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 15 18:11:11 2017
-// Update Count     : 234
+// Last Modified On : Sat Jul  1 16:37:54 2017
+// Update Count     : 242
 //
 
@@ -33 +33 @@
         this->sepDefault = sepDefault;
         this->sepOnOff = sepOnOff;
+        this->lastSepOn = false;
         sepSet( this, separator );
         sepSetCur( this, sepGet( this ) );
@@ -39 +40 @@
 
 // private
-_Bool sepPrt( ofstream * os ) { return os->sepOnOff; }
+_Bool lastSepOn( ofstream * os ) { return os->lastSepOn; }
+_Bool sepPrt( ofstream * os ) { os->lastSepOn = false; return os->sepOnOff; }
 void sepReset( ofstream * os ) { os->sepOnOff = os->sepDefault; }
 void sepReset( ofstream * os, _Bool reset ) { os->sepDefault = reset; os->sepOnOff = os->sepDefault; }
@@ -46 +48 @@
 
 // public
-void sepOn( ofstream * os ) { os->sepOnOff = 1; }
-void sepOff( ofstream * os ) { os->sepOnOff = 0; }
+void sepOn( ofstream * os ) { os->lastSepOn = true; os->sepOnOff = true; }
+void sepOff( ofstream * os ) { os->lastSepOn = false; os->sepOnOff = 0; }
 
 _Bool sepDisable( ofstream *os ) {
         _Bool temp = os->sepDefault;
         os->sepDefault = false;
+        os->lastSepOn = false;
         sepReset( os );
         return temp;
@@ -92 +95 @@
                 exit( EXIT_FAILURE );
         } // if
-        ?{}( os, file, 1, 0, " ", ", " );
+        ?{}( os, file, true, false, " ", ", " );
 } // open
 
@@ -132 +135 @@
 } // fmt
 
-static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), 1, 0, " ", ", " };
+static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), true, false, " ", ", " };
 ofstream *sout = &soutFile;
-static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), 1, 0, " ", ", " };
+static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), true, false, " ", ", " };
 ofstream *serr = &serrFile;
 

src/libcfa/iostream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 15 18:08:44 2017
-// Update Count     : 105
+// Last Modified On : Sat Jul  1 16:37:52 2017
+// Update Count     : 108
 //
 
@@ -31 +31 @@
         _Bool sepDisable( ostype * );                                           // set default state to off, and return previous state
         _Bool sepEnable( ostype * );                                            // set default state to on, and return previous state
+        _Bool lastSepOn( ostype * );                                            // last manipulator is setOn (context sensitive)
 
         const char * sepGet( ostype * );                                        // get separator string

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 May  8 18:24:23 2017
-// Update Count     : 369
+// Last Modified On : Sat Jul  1 16:37:51 2017
+// Update Count     : 374
 //
 
@@ -217 +217 @@
 forall( dtype ostype | ostream( ostype ) )
 ostype * endl( ostype * os ) {
+        if ( lastSepOn( os ) ) fmt( os, "%s", sepGetCur( os ) );
         os | '\n';
         flush( os );

src/tests/.expect/io.txt

@@ -5 +5 @@
 
 x (1 x [2 x {3 x =4 x $5 x £6 x ¥7 x ¡8 x ¿9 x «10
-1, x 2. x 3; x 4! x 5? x 6% x 7¢ x 8» x 9) x 10] x 11} x
+1, x 2. x 3; x 4! x 5? x 6% x 7¢ x 8» x 9) x 10] x 11} x 
 x`1`x'2'x"3"x:4:x 5 x   6       x
 7
@@ -14 +14 @@
 x
 10
-x
+x 
 x ( 1 ) x 2 , x 3 :x: 4
 A 
@@ -23 +23 @@
 1.11.21.3
 1.1+2.3i1.1-2.3i1.1-2.3i
- abcxyz
-abcxyz
+ abcxyz 
+abcxyz 
 
 1.1, $1.2, $1.3
 1.1+2.3i, $1.1-2.3i, $1.1-2.3i
-abc, $xyz
+abc, $xyz, $
 
 1, 2, 3, 4
+
 1, $2, $3 ", $"
 1 2 3 " "
+
+ 1 2 3 
+12 3
  1 2 3
-12 3
+1 2 3
+ 1 2 3
+
 123
 1 23
 1 2 3
+123
+1 2 3
+123 
+1 2 3
+
 1 2 3 4 " "
 1, 2, 3, 4 ", "
 1, 2, 3, 4
+
 3, 4, a, 7.2
 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 : Thu Jun  8 09:52:10 2017
-// Update Count     : 51
+// Last Modified On : Sat Jul  1 16:21:07 2017
+// Update Count     : 58
 // 
 
@@ -108 +108 @@
         [int, int] t1 = [1, 2], t2 = [3, 4];
         sout | t1 | t2 | endl;                                                          // print tuple
+        sout | endl;
 
         sepSet( sout, " " );
@@ -114 +115 @@
         sepSet( sout, " " );                                                            // reset separator to " "
         sout | 1 | 2 | 3 | " \"" | sepGet( sout ) | "\"" | endl;
+        sout | endl;
 
-        sout | sepOn | 1 | 2 | 3 | sepOn | endl;                        // separator at start 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 | 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 | sepDisable | 1 | 2 | 3 | endl;                           // globally turn off implicit separation
         sout | 1 | sepOn | 2 | 3 | endl;                                        // locally turn on implicit separator
-        sout | sepEnable | 1 | 2 | 3 | endl;                            // globally turn on implicit separation
+        sout | sepEnable | 1 | 2 | 3 | endl | sepDisable;       // globally turn on/off implicit separation
+        sout | 1 | 2 | 3 | endl | sepEnable;                            // globally turn on implicit separation
+        sout | 1 | 2 | 3 | sepOn | sepDisable | endl;           // ignore seperate at end of line
+        sout | 1 | 2 | 3 | sepOn | sepEnable | endl;            // separator at end of line
+        sout | 1 | 2 | 3 | endl;
+        sout | endl;
 
         sepSetTuple( sout, " " );                                                       // set tuple separator from ", " to " "
@@ -126 +137 @@
         sepSetTuple( sout, ", " );                                                      // reset tuple separator to ", "
         sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"" | endl;
-
         sout | t1 | t2 | endl;                                                          // print tuple
+        sout | endl;
 
         [int, int, const char *, double] t3 = { 3, 4, "a", 7.2 };