Changeset 7b84d3e for libcfa/src/iostream.hfa

Timestamp:

Oct 23, 2023, 11:58:10 AM (7 months ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

edc4813

Parents:

2ad5e1d5 (diff), abb04a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/iostream.hfa (modified) (10 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 Oct  8 12:02:55 2023
-// Update Count     : 568
+// Last Modified On : Wed Oct 18 21:21:20 2023
+// Update Count     : 583
 //
 
@@ -306 +306 @@
 // *********************************** istream ***********************************
 
-#define ISTYPE_VOID( T ) void ?|?( istype &, T )
-#define ISTYPE_VOID_IMPL( T ) \
-        void ?|?( istype & is, T t ) { \
-                (istype &)(is | t); ends( is ); \
-        } // ?|?
-
 forall( istype & )
 trait basic_istream {
@@ -320 +314 @@
         void nlOn( istype & );                                                          // read newline
         void nlOff( istype & );                                                         // scan newline
-        void ends( istype & os );                                                       // end of output statement
         int fmt( istype &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
         istype & ungetc( istype &, char );
         bool eof( istype & );
+        void clear( istype & );
 }; // basic_istream
 
@@ -329 +323 @@
 trait istream {
         bool fail( istype & );
-        void clear( istype & );
+        void open( istype & is, const char name[], const char mode[] );
         void open( istype & is, const char name[] );
         void close( istype & is );
@@ -342 +336 @@
 forall( istype & | basic_istream( istype ) ) {
         istype & ?|?( istype &, bool & );
-        ISTYPE_VOID( bool & );
 
         istype & ?|?( istype &, char & );
-        ISTYPE_VOID( char & );
         istype & ?|?( istype &, signed char & );
-        ISTYPE_VOID( signed char & );
         istype & ?|?( istype &, unsigned char & );
-        ISTYPE_VOID( unsigned char & );
 
         istype & ?|?( istype &, short int & );
-        ISTYPE_VOID( short int & );
         istype & ?|?( istype &, unsigned short int & );
-        ISTYPE_VOID( unsigned short int & );
         istype & ?|?( istype &, int & );
-        ISTYPE_VOID( int & );
         istype & ?|?( istype &, unsigned int & );
-        ISTYPE_VOID( unsigned int & );
         istype & ?|?( istype &, long int & );
-        ISTYPE_VOID( long int & );
         istype & ?|?( istype &, unsigned long int & );
-        ISTYPE_VOID( unsigned long int & );
         istype & ?|?( istype &, long long int & );
-        ISTYPE_VOID( long long int & );
         istype & ?|?( istype &, unsigned long long int & );
-        ISTYPE_VOID( unsigned long long int & );
         #if defined( __SIZEOF_INT128__ )
         istype & ?|?( istype &, int128 & );
-        ISTYPE_VOID( int128 & );
         istype & ?|?( istype &, unsigned int128 & );
-        ISTYPE_VOID( unsigned int128 & );
         #endif // __SIZEOF_INT128__
 
         istype & ?|?( istype &, float & );
-        ISTYPE_VOID( float & );
         istype & ?|?( istype &, double & );
-        ISTYPE_VOID( double & );
         istype & ?|?( istype &, long double & );
-        ISTYPE_VOID( long double & );
 
         istype & ?|?( istype &, float _Complex & );
-        ISTYPE_VOID( float _Complex & );
         istype & ?|?( istype &, double _Complex & );
-        ISTYPE_VOID( double _Complex & );
         istype & ?|?( istype &, long double _Complex & );
-        ISTYPE_VOID( long double _Complex & );
 
         istype & ?|?( istype &, const char [] );
-        ISTYPE_VOID( const char [] );
 
         // manipulators
         istype & ?|?( istype &, istype & (*)( istype & ) );
-        ISTYPE_VOID( istype & (*)( istype & ) );
         istype & nl( istype & is );
         istype & nlOn( istype & );
@@ -402 +374 @@
 
 ExceptionDecl( cstring_length );
+ExceptionDecl( missing_data );
 
 // *********************************** manipulators ***********************************
 
+// skip does not compose with other C string manipulators.
 struct _Istream_Cskip {
         const char * scanset;
@@ -416 +390 @@
 forall( istype & | basic_istream( istype ) ) {
         istype & ?|?( istype & is, _Istream_Cskip f );
-        ISTYPE_VOID( _Istream_Cskip );
 }
 
@@ -458 +431 @@
 forall( istype & | basic_istream( istype ) ) {
         istype & ?|?( istype & is, _Istream_Cstr f );
-        ISTYPE_VOID( _Istream_Cstr );
 }
 
@@ -471 +443 @@
 forall( istype & | basic_istream( istype ) ) {
         istype & ?|?( istype & is, _Istream_Char f );
-        ISTYPE_VOID( _Istream_Char );
 }
 
@@ -490 +461 @@
 forall( istype & | basic_istream( istype ) ) { \
         istype & ?|?( istype & is, _Istream_Manip(T) f ); \
-        ISTYPE_VOID( _Istream_Manip(T) ); \
 } // ?|?