Changes in libcfa/src/iostream.hfa [467c8b7:fd54fef]

File:

• libcfa/src/iostream.hfa (modified) (18 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 Jan 16 11:24:48 2021
-// Update Count     : 351
+// Last Modified On : Tue Aug 11 22:16:14 2020
+// Update Count     : 350
 //
 
@@ -22 +22 @@
 
 
-trait ostream( dtype ostype ) {
+trait ostream( ostype & ) {
         // private
         bool $sepPrt( ostype & );                                                       // get separator state (on/off)
@@ -41 +41 @@
         void nlOn( ostype & );                                                          // turn auto-newline state on
         void nlOff( ostype & );                                                         // turn auto-newline state off
-        void acquire( ostype & );                                                       // acquire mutex lock
 
         const char * sepGet( ostype & );                                        // get separator string
@@ -57 +56 @@
 }; // ostream
 
-// trait writeable( otype T ) {
-//      forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype &, T );
+// trait writeable( T ) {
+//      forall( ostype & | ostream( ostype ) ) ostype & ?|?( ostype &, T );
 // }; // writeable
 
-trait writeable( otype T, dtype ostype | ostream( ostype ) ) {
+trait writeable( T, ostype & | ostream( ostype ) ) {
         ostype & ?|?( ostype &, T );
 }; // writeable
@@ -67 +66 @@
 // implement writable for intrinsic types
 
-forall( dtype ostype | ostream( ostype ) ) {
+forall( ostype & | ostream( ostype ) ) {
         ostype & ?|?( ostype &, bool );
         void ?|?( ostype &, bool );
@@ -138 +137 @@
         ostype & nlOn( ostype & );
         ostype & nlOff( ostype & );
-        ostype & acquire( ostype & );
 } // distribution
 
 // tuples
-forall( dtype ostype, otype T, ttype Params | writeable( T, ostype ) | { ostype & ?|?( ostype &, Params ); } ) {
+forall( ostype &, T, Params... | writeable( T, ostype ) | { ostype & ?|?( ostype &, Params ); } ) {
         ostype & ?|?( ostype & os, T arg, Params rest );
         void ?|?( ostype & os, T arg, Params rest );
@@ -148 +146 @@
 
 // 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 ) ) {
+forall( ostype &, elt_type | writeable( elt_type, ostype ), 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 );
@@ -155 +153 @@
 // *********************************** manipulators ***********************************
 
-forall( otype T )
+forall( T )
 struct _Ostream_Manip {
         T val;                                                                                          // polymorphic base-type
@@ -195 +193 @@
         _Ostream_Manip(T) & sign( _Ostream_Manip(T) & fmt ) { fmt.flags.sign = true; return fmt; } \
 } /* distribution */ \
-forall( dtype ostype | ostream( ostype ) ) { \
+forall( ostype & | ostream( ostype ) ) { \
         ostype & ?|?( ostype & os, _Ostream_Manip(T) f ); \
         void ?|?( ostype & os, _Ostream_Manip(T) f ); \
@@ -236 +234 @@
         _Ostream_Manip(T) & nodp( _Ostream_Manip(T) & fmt ) { fmt.flags.nobsdp = true; return fmt; } \
 } /* distribution */ \
-forall( dtype ostype | ostream( ostype ) ) { \
+forall( ostype & | ostream( ostype ) ) { \
         ostype & ?|?( ostype & os, _Ostream_Manip(T) f ); \
         void ?|?( ostype & os, _Ostream_Manip(T) f ); \
@@ -256 +254 @@
         _Ostream_Manip(char) & nobase( _Ostream_Manip(char) & fmt ) { fmt.flags.nobsdp = true; return fmt; }
 } // distribution
-forall( dtype ostype | ostream( ostype ) ) {
+forall( ostype & | ostream( ostype ) ) {
         ostype & ?|?( ostype & os, _Ostream_Manip(char) f );
         void ?|?( ostype & os, _Ostream_Manip(char) f );
@@ -274 +272 @@
         _Ostream_Manip(const char *) & nobase( _Ostream_Manip(const char *) & fmt ) { fmt.flags.nobsdp = true; return fmt; }
 } // distribution
-forall( dtype ostype | ostream( ostype ) ) {
+forall( ostype & | ostream( ostype ) ) {
         ostype & ?|?( ostype & os, _Ostream_Manip(const char *) f );
         void ?|?( ostype & os, _Ostream_Manip(const char *) f );
@@ -283 +281 @@
 
 
-trait istream( dtype istype ) {
+trait istream( istype & ) {
         void nlOn( istype & );                                                          // read newline
         void nlOff( istype & );                                                         // scan newline
@@ -296 +294 @@
 }; // istream
 
-trait readable( otype T ) {
-        forall( dtype istype | istream( istype ) ) istype & ?|?( istype &, T );
+trait readable( T ) {
+        forall( istype & | istream( istype ) ) istype & ?|?( istype &, T );
 }; // readable
 
-forall( dtype istype | istream( istype ) ) {
+forall( istype & | istream( istype ) ) {
         istype & ?|?( istype &, bool & );
 
@@ -365 +363 @@
         _Istream_Cstr & wdi( unsigned int w, _Istream_Cstr & fmt ) { fmt.wd = w; return fmt; }
 } // distribution
-forall( dtype istype | istream( istype ) ) istype & ?|?( istype & is, _Istream_Cstr f );
+forall( istype & | istream( istype ) ) istype & ?|?( istype & is, _Istream_Cstr f );
 
 struct _Istream_Char {
@@ -375 +373 @@
         _Istream_Char & ignore( _Istream_Char & fmt ) { fmt.ignore = true; return fmt; }
 } // distribution
-forall( dtype istype | istream( istype ) ) istype & ?|?( istype & is, _Istream_Char f );
-
-forall( dtype T | sized( T ) )
+forall( istype & | istream( istype ) ) istype & ?|?( istype & is, _Istream_Char f );
+
+forall( T & | sized( T ) )
 struct _Istream_Manip {
         T & val;                                                                                        // polymorphic base-type
@@ -391 +389 @@
         _Istream_Manip(T) & wdi( unsigned int w, _Istream_Manip(T) & fmt ) { fmt.wd = w; return fmt; } \
 } /* distribution */ \
-forall( dtype istype | istream( istype ) ) { \
+forall( istype & | istream( istype ) ) { \
         istype & ?|?( istype & is, _Istream_Manip(T) f ); \
 } // ?|?
@@ -420 +418 @@
 #include <time_t.hfa>                                                                   // Duration (constructors) / Time (constructors)
 
-forall( dtype ostype | ostream( ostype ) ) {
+forall( ostype & | ostream( ostype ) ) {
         ostype & ?|?( ostype & os, Duration dur );
         void ?|?( ostype & os, Duration dur );