Changes in libcfa/src/iostream.hfa [200fcb3:58b6d1b]

File:

• libcfa/src/iostream.hfa (modified) (8 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 : Tue Dec 11 22:01:31 2018
-// Update Count     : 213
+// Last Modified On : Sun Jul  1 12:12:22 2018
+// Update Count     : 155
 //
 
@@ -20 +20 @@
 trait ostream( dtype ostype ) {
         // private
-        bool sepPrt( ostype & );                                                        // return separator state (on/off)
+        _Bool sepPrt( ostype & );                                                       // return separator state (on/off)
         void sepReset( ostype & );                                                      // set separator state to default state
-        void sepReset( ostype &, bool );                                        // set separator and default state
+        void sepReset( ostype &, _Bool );                                       // set separator and default state
         const char * sepGetCur( ostype & );                                     // get current separator string
         void sepSetCur( ostype &, const char * );                       // set current separator string
-        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
+        _Bool getNL( ostype & );                                                        // check newline
+        void setNL( ostype &, _Bool );                                          // saw newline
         // 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
-        void nlOn( ostype & );                                                          // turn auto-newline state on
-        void nlOff( ostype & );                                                         // turn auto-newline 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
 
         const char * sepGet( ostype & );                                        // get separator string
@@ -62 +57 @@
 
 forall( dtype ostype | ostream( ostype ) ) {
-        ostype & ?|?( ostype &, bool );
-        void & ?|?( ostype &, bool );
+        ostype & ?|?( 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
@@ -111 +87 @@
         // ostype & ?|?( ostype &, const wchar_t * );
         ostype & ?|?( ostype &, const void * );
-        void & ?|?( ostype &, const void * );
 
         // manipulators
         ostype & ?|?( ostype &, ostype & (*)( ostype & ) );
-        void ?|?( ostype &, ostype & (*)( ostype & ) );
-        ostype & nl( ostype & );
-        ostype & nonl( ostype & );
+        ostype & endl( ostype & );
         ostype & sep( ostype & );
         ostype & sepTuple( ostype & );
@@ -124 +97 @@
         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 );
-        void ?|?( ostype & os, T arg, Params rest );
-} // distribution
+forall( dtype ostype, otype T, ttype Params | writeable( T, ostype ) | { ostype & ?|?( ostype &, Params ); } )
+ostype & ?|?( ostype & os, T arg, Params rest );
 
 // 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 );
-        void write_reverse( iterator_type begin, iterator_type end, ostype & os );
-} // distribution
+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 );
 
 //---------------------------------------
@@ -157 +127 @@
 
 forall( dtype istype | istream( istype ) ) {
-        istype & ?|?( istype &, bool & );
+        istype & ?|?( istype &, _Bool & );
 
         istype & ?|?( istype &, char & );
@@ -182 +152 @@
         // manipulators
         istype & ?|?( istype &, istype & (*)( istype & ) );
-        istype & nl( istype & is );
+        istype & endl( istype & is );
 } // distribution
 
@@ -194 +164 @@
 
 
-#include <time_t.hfa>                                                                   // Duration (constructors) / Time (constructors)
+#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
+forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype & os, Duration dur );
+forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype & os, Time time );
+
 
 // Local Variables: //