Changeset 200fcb3 for libcfa/src/iostream.hfa

Timestamp:

Dec 12, 2018, 9:16:12 AM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

5ebb1368

Parents:

3d99498

Message:

add auto newline to sout, change endl to nl

File:

• libcfa/src/iostream.hfa (modified) (7 diffs)

libcfa/src/iostream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug 11 08:22:49 2018
-// Update Count     : 156
+// Last Modified On : Tue Dec 11 22:01:31 2018
+// Update Count     : 213
 //
 
@@ -25 +25 @@
         const char * sepGetCur( ostype & );                                     // get current separator string
         void sepSetCur( ostype &, const char * );                       // set current separator string
-        bool getNL( ostype & );                                                 // check newline
+        bool getNL( ostype & );                                                         // check newline
         void setNL( ostype &, bool );                                           // saw newline
+        bool getANL( ostype & );                                                        // check auto newline
+        bool getNonl( ostype & );                                                       // check nonnl manipulator
+        void setNonl( ostype &, bool );                                         // set nonnl manipulator
         // public
         void sepOn( ostype & );                                                         // turn separator state on
         void sepOff( ostype & );                                                        // turn separator state off
         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 sepEnable( ostype & );                                                     // set default state to on, and return previous state
+        void nlOn( ostype & );                                                          // turn auto-newline state on
+        void nlOff( ostype & );                                                         // turn auto-newline state off
 
         const char * sepGet( ostype & );                                        // get separator string
@@ -58 +63 @@
 forall( dtype ostype | ostream( ostype ) ) {
         ostype & ?|?( ostype &, bool );
+        void & ?|?( ostype &, bool );
 
         ostype & ?|?( ostype &, char );
+        void & ?|?( ostype &, char );
         ostype & ?|?( ostype &, signed char );
+        void & ?|?( ostype &, signed char );
         ostype & ?|?( ostype &, unsigned char );
+        void & ?|?( ostype &, unsigned char );
 
         ostype & ?|?( ostype &, short int );
+        void & ?|?( ostype &, short int );
         ostype & ?|?( ostype &, unsigned short int );
+        void & ?|?( ostype &, unsigned short int );
         ostype & ?|?( ostype &, int );
+        void & ?|?( ostype &, int );
         ostype & ?|?( ostype &, unsigned int );
+        void & ?|?( ostype &, unsigned int );
         ostype & ?|?( ostype &, long int );
+        void & ?|?( ostype &, long int );
         ostype & ?|?( ostype &, long long int );
+        void & ?|?( ostype &, long long int );
         ostype & ?|?( ostype &, unsigned long int );
+        void & ?|?( ostype &, unsigned long int );
         ostype & ?|?( ostype &, unsigned long long int );
+        void & ?|?( ostype &, unsigned long long int );
 
         ostype & ?|?( ostype &, float ); // FIX ME: should not be required
+        void & ?|?( ostype &, float ); // FIX ME: should not be required
         ostype & ?|?( ostype &, double );
+        void & ?|?( ostype &, double );
         ostype & ?|?( ostype &, long double );
+        void & ?|?( ostype &, long double );
 
         ostype & ?|?( ostype &, float _Complex );
+        void & ?|?( ostype &, float _Complex );
         ostype & ?|?( ostype &, double _Complex );
+        void & ?|?( ostype &, double _Complex );
         ostype & ?|?( ostype &, long double _Complex );
+        void & ?|?( ostype &, long double _Complex );
 
         ostype & ?|?( ostype &, const char * );
+        void & ?|?( ostype &, const char * );
         // ostype & ?|?( ostype &, const char16_t * );
 #if ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) // char32_t == wchar_t => ambiguous
@@ -87 +111 @@
         // ostype & ?|?( ostype &, const wchar_t * );
         ostype & ?|?( ostype &, const void * );
+        void & ?|?( ostype &, const void * );
 
         // manipulators
         ostype & ?|?( ostype &, ostype & (*)( ostype & ) );
-        ostype & endl( ostype & );
+        void ?|?( ostype &, ostype & (*)( ostype & ) );
+        ostype & nl( ostype & );
+        ostype & nonl( ostype & );
         ostype & sep( ostype & );
         ostype & sepTuple( ostype & );
@@ -97 +124 @@
         ostype & sepDisable( ostype & );
         ostype & sepEnable( ostype & );
+        ostype & nlOn( ostype & );
+        ostype & nlOff( ostype & );
 } // distribution
 
 // tuples
-forall( dtype ostype, otype T, ttype Params | writeable( T, ostype ) | { ostype & ?|?( ostype &, Params ); } )
-ostype & ?|?( ostype & os, T arg, Params rest );
+forall( dtype ostype, otype T, ttype Params | writeable( T, ostype ) | { ostype & ?|?( ostype &, Params ); } ) {
+        ostype & ?|?( ostype & os, T arg, Params rest );
+        void ?|?( ostype & os, T arg, Params rest );
+} // distribution
 
 // writes the range [begin, end) to the given stream
-forall( dtype ostype, otype elt_type | writeable( elt_type, ostype ), otype iterator_type | iterator( iterator_type, elt_type ) )
-void write( iterator_type begin, iterator_type end, ostype & os );
-
-forall( dtype ostype, otype elt_type | writeable( elt_type, ostype ), otype iterator_type | iterator( iterator_type, elt_type ) )
-void write_reverse( iterator_type begin, iterator_type end, ostype & os );
+forall( dtype ostype, otype elt_type | writeable( elt_type, ostype ), otype iterator_type | iterator( iterator_type, elt_type ) ) {
+        void write( iterator_type begin, iterator_type end, ostype & os );
+        void write_reverse( iterator_type begin, iterator_type end, ostype & os );
+} // distribution
 
 //---------------------------------------
@@ -152 +182 @@
         // manipulators
         istype & ?|?( istype &, istype & (*)( istype & ) );
-        istype & endl( istype & is );
+        istype & nl( istype & is );
 } // distribution
 
@@ -164 +194 @@
 
 
-#include <time_t.hfa>                                                                           // Duration (constructors) / Time (constructors)
-
-forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype & os, Duration dur );
-forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype & os, Time time );
-
+#include <time_t.hfa>                                                                   // Duration (constructors) / Time (constructors)
+
+forall( dtype ostype | ostream( ostype ) ) {
+        ostype & ?|?( ostype & os, Duration dur );
+        void ?|?( ostype & os, Duration dur );
+        ostype & ?|?( ostype & os, Time time );
+        void ?|?( ostype & os, Time time );
+} // distribution
 
 // Local Variables: //