Changeset ef3ac46 for libcfa/src/iostream.hfa

Timestamp:

Apr 27, 2021, 10:07:25 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f451177

Parents:

8840228

Message:

move flush from basic_ostream to ostream, refactor istream into basic_istream and istream

File:

• libcfa/src/iostream.hfa (modified) (11 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 : Sun Apr 25 11:22:03 2021
-// Update Count     : 397
+// Last Modified On : Tue Apr 27 17:59:21 2021
+// Update Count     : 398
 //
 
@@ -49 +49 @@
         void ends( ostype & );                                                          // end of output statement
         int fmt( ostype &, const char format[], ... ) __attribute__(( format(printf, 2, 3) ));
-        int flush( ostype & );
 }; // basic_ostream
         
 trait ostream( ostype & | basic_ostream( ostype ) ) {
+        int flush( ostype & );
         bool fail( ostype & );                                                          // operation failed?
         void open( ostype &, const char name[], const char mode[] );
@@ -97 +97 @@
         ostype & ?|?( ostype &, unsigned long long int );
         void ?|?( ostype &, unsigned long long int );
-#if defined( __SIZEOF_INT128__ )
+        #if defined( __SIZEOF_INT128__ )
         ostype & ?|?( ostype &, int128 );
         void ?|?( ostype &, int128 );
         ostype & ?|?( ostype &, unsigned int128 );
         void ?|?( ostype &, unsigned int128 );
-#endif // __SIZEOF_INT128__
+        #endif // __SIZEOF_INT128__
 
         ostype & ?|?( ostype &, float );
@@ -121 +121 @@
         void ?|?( ostype &, const char [] );
         // ostype & ?|?( ostype &, const char16_t * );
-#if ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) // char32_t == wchar_t => ambiguous
+        #if ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) // char32_t == wchar_t => ambiguous
         // ostype & ?|?( ostype &, const char32_t * );
-#endif // ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 )
+        #endif // ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 )
         // ostype & ?|?( ostype &, const wchar_t * );
         ostype & ?|?( ostype &, const void * );
@@ -294 +294 @@
 
 
-trait istream( istype & ) {
+trait basic_istream( istype & ) {
+        bool getANL( istype & );                                                        // get scan newline (on/off)
         void nlOn( istype & );                                                          // read newline
         void nlOff( istype & );                                                         // scan newline
-        bool getANL( istype & );                                                        // get scan newline (on/off)
 
         void ends( istype & os );                                                       // end of output statement
+        int fmt( istype &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
+        istype & ungetc( istype &, char );
+        int eof( istype & );
+}; // basic_istream
+
+trait istream( istype & | basic_istream( istype ) ) {
         bool fail( istype & );
-        int eof( istype & );
         void open( istype & is, const char name[] );
         void close( istype & is );
         istype & read( istype &, char *, size_t );
-        istype & ungetc( istype &, char );
-        int fmt( istype &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
-        void acquire( istype & );
+        void acquire( istype & );                                                       // concurrent access
 }; // istream
 
@@ -314 +317 @@
 }; // readable
 
-forall( istype & | istream( istype ) ) {
+forall( istype & | basic_istream( istype ) ) {
         istype & ?|?( istype &, bool & );
         void ?|?( istype &, bool & );
@@ -341 +344 @@
         istype & ?|?( istype &, unsigned long long int & );
         void ?|?( istype &, unsigned long long int & );
-#if defined( __SIZEOF_INT128__ )
+        #if defined( __SIZEOF_INT128__ )
         istype & ?|?( istype &, int128 & );
         void ?|?( istype &, int128 & );
         istype & ?|?( istype &, unsigned int128 & );
         void ?|?( istype &, unsigned int128 & );
-#endif // __SIZEOF_INT128__
+        #endif // __SIZEOF_INT128__
 
         istype & ?|?( istype &, float & );
@@ -372 +375 @@
         istype & nlOn( istype & );
         istype & nlOff( istype & );
+} // distribution
+
+forall( istype & | istream( istype ) ) {
         istype & acquire( istype & );
 } // distribution
@@ -402 +408 @@
         _Istream_Cstr & wdi( unsigned int w, _Istream_Cstr & fmt ) { fmt.wd = w; return fmt; }
 } // distribution
-forall( istype & | istream( istype ) ) {
+forall( istype & | basic_istream( istype ) ) {
         istype & ?|?( istype & is, _Istream_Cstr f );
         void ?|?( istype & is, _Istream_Cstr f );
@@ -415 +421 @@
         _Istream_Char & ignore( _Istream_Char & fmt ) { fmt.ignore = true; return fmt; }
 } // distribution
-forall( istype & | istream( istype ) ) {
+forall( istype & | basic_istream( istype ) ) {
         istype & ?|?( istype & is, _Istream_Char f );
         void ?|?( istype & is, _Istream_Char f );
@@ -434 +440 @@
         _Istream_Manip(T) & wdi( unsigned int w, _Istream_Manip(T) & fmt ) { fmt.wd = w; return fmt; } \
 } /* distribution */ \
-forall( istype & | istream( istype ) ) { \
+forall( istype & | basic_istream( istype ) ) { \
         istype & ?|?( istype & is, _Istream_Manip(T) f ); \
         void ?|?( istype & is, _Istream_Manip(T) f ); \