Changeset ae0c1c3 for libcfa/src/iostream.cfa

Timestamp:

Apr 25, 2025, 7:08:53 PM (9 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

7d02d35, ecfa58be

Parents:

65bd3c2

Message:

Rewrote the iostream traits to have a single assertion each, a table containing function pointers. This is just an experiment right now. It seems that it does cause significant speed up of assertion resolution, but for some reason also seems to add a flat overhead that mostly eats up that saving.

File:

• libcfa/src/iostream.cfa (modified) (60 diffs)

libcfa/src/iostream.cfa

@@ -42 +42 @@
 
 forall( ostype & | basic_ostream( ostype ) ) {
-        ostype & ?|?( ostype & os, bool b ) {
+        ostype & ?|?( ostype & os, bool b ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 fmt( os, "%s", b ? "true" : "false" );
@@ -49 +49 @@
         OSTYPE_VOID_IMPL( os, bool )
 
-        ostype & ?|?( ostype & os, char c ) {
+        ostype & ?|?( ostype & os, char c ) with ( basic_ostream_table ) {
                 fmt( os, "%c", c );
                 if ( c == '\n' ) setNL$( os, true );
@@ -56 +56 @@
         OSTYPE_VOID_IMPL( os, char )
 
-        ostype & ?|?( ostype & os, signed char sc ) {
+        ostype & ?|?( ostype & os, signed char sc ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 fmt( os, "%'hhd", sc );
@@ -63 +63 @@
         OSTYPE_VOID_IMPL( os, signed char )
 
-        ostype & ?|?( ostype & os, unsigned char usc ) {
+        ostype & ?|?( ostype & os, unsigned char usc ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 fmt( os, "%'hhu", usc );
@@ -70 +70 @@
         OSTYPE_VOID_IMPL( os, unsigned char )
 
-        ostype & ?|?( ostype & os, short int si ) {
+        ostype & ?|?( ostype & os, short int si ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 fmt( os, "%'hd", si );
@@ -77 +77 @@
         OSTYPE_VOID_IMPL( os, short int )
 
-        ostype & ?|?( ostype & os, unsigned short int usi ) {
+        ostype & ?|?( ostype & os, unsigned short int usi ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 fmt( os, "%'hu", usi );
@@ -84 +84 @@
         OSTYPE_VOID_IMPL( os, unsigned short int )
 
-        ostype & ?|?( ostype & os, int i ) {
+        ostype & ?|?( ostype & os, int i ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 fmt( os, "%'d", i );
@@ -91 +91 @@
         OSTYPE_VOID_IMPL( os, int )
 
-        ostype & ?|?( ostype & os, unsigned int ui ) {
+        ostype & ?|?( ostype & os, unsigned int ui ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 fmt( os, "%'u", ui );
@@ -98 +98 @@
         OSTYPE_VOID_IMPL( os, unsigned int )
 
-        ostype & ?|?( ostype & os, long int li ) {
+        ostype & ?|?( ostype & os, long int li ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 fmt( os, "%'ld", li );
@@ -105 +105 @@
         OSTYPE_VOID_IMPL( os, long int )
 
-        ostype & ?|?( ostype & os, unsigned long int uli ) {
+        ostype & ?|?( ostype & os, unsigned long int uli ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 fmt( os, "%'lu", uli );
@@ -112 +112 @@
         OSTYPE_VOID_IMPL( os, unsigned long int )
 
-        ostype & ?|?( ostype & os, long long int lli ) {
+        ostype & ?|?( ostype & os, long long int lli ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 fmt( os, "%'lld", lli );
@@ -119 +119 @@
         OSTYPE_VOID_IMPL( os, long long int )
 
-        ostype & ?|?( ostype & os, unsigned long long int ulli ) {
+        ostype & ?|?( ostype & os, unsigned long long int ulli ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 fmt( os, "%'llu", ulli );
@@ -130 +130 @@
         #define P10_UINT64 10_000_000_000_000_000_000_ULL       // 19 zeroes
 
-        static inline void base10_128( ostype & os, unsigned int128 val ) {
+        static inline void base10_128( ostype & os, unsigned int128 val ) with ( basic_ostream_table ) {
                 #if defined(__GNUC__) && __GNUC_PREREQ(7,0)             // gcc version >= 7
                 if ( val > P10_UINT64 ) {
@@ -143 +143 @@
         } // base10_128
 
-        static inline void base10_128( ostype & os, int128 val ) {
+        static inline void base10_128( ostype & os, int128 val ) with ( basic_ostream_table ) {
                 if ( val < 0 ) {
                         fmt( os, "-" );                                                         // leading negative sign
@@ -151 +151 @@
         } // base10_128
 
-        ostype & ?|?( ostype & os, int128 llli ) {
+        ostype & ?|?( ostype & os, int128 llli ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 base10_128( os, llli );
@@ -158 +158 @@
         OSTYPE_VOID_IMPL( os, int128 )
 
-        ostype & ?|?( ostype & os, unsigned int128 ullli ) {
+        ostype & ?|?( ostype & os, unsigned int128 ullli ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 base10_128( os, ullli );
@@ -181 +181 @@
                 }
 
-        ostype & ?|?( ostype & os, float f ) {
+        ostype & ?|?( ostype & os, float f ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 PRINT_WITH_DP( os, "%'g", f );
@@ -188 +188 @@
         OSTYPE_VOID_IMPL( os, float )
 
-        ostype & ?|?( ostype & os, double d ) {
+        ostype & ?|?( ostype & os, double d ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 PRINT_WITH_DP( os, "%'.*lg", d, DBL_DIG );
@@ -195 +195 @@
         OSTYPE_VOID_IMPL( os, double )
 
-        ostype & ?|?( ostype & os, long double ld ) {
+        ostype & ?|?( ostype & os, long double ld ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 PRINT_WITH_DP( os, "%'.*Lg", ld, LDBL_DIG );
@@ -202 +202 @@
         OSTYPE_VOID_IMPL( os, long double )
 
-        ostype & ?|?( ostype & os, float _Complex fc ) {
+        ostype & ?|?( ostype & os, float _Complex fc ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
 //              os | crealf( fc ) | nonl;
@@ -212 +212 @@
         OSTYPE_VOID_IMPL( os, float _Complex )
 
-        ostype & ?|?( ostype & os, double _Complex dc ) {
+        ostype & ?|?( ostype & os, double _Complex dc ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
 //              os | creal( dc ) | nonl;
@@ -222 +222 @@
         OSTYPE_VOID_IMPL( os, double _Complex )
 
-        ostype & ?|?( ostype & os, long double _Complex ldc ) {
+        ostype & ?|?( ostype & os, long double _Complex ldc ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
 //              os | creall( ldc ) || nonl;
@@ -232 +232 @@
         OSTYPE_VOID_IMPL( os, long double _Complex )
 
-        ostype & ?|?( ostype & os, const char s[] ) {
+        ostype & ?|?( ostype & os, const char s[] ) with ( basic_ostream_table ) {
                 enum { Open = 1, Close, OpenClose };
                 static const unsigned char mask[256] @= {               // 256 covers all Latin-1 characters
@@ -295 +295 @@
 //      } // ?|?
 
-        ostype & ?|?( ostype & os, const void * p ) {
+        ostype & ?|?( ostype & os, const void * p ) with ( basic_ostream_table ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
                 fmt( os, "%p", p );
@@ -306 +306 @@
                 return manip( os );
         } // ?|?
-        void ?|?( ostype & os, ostype & (* manip)( ostype & ) ) {
+        void ?|?( ostype & os, ostype & (* manip)( ostype & ) ) with ( basic_ostream_table ) {
                 manip( os );
                 if ( getPrt$( os ) ) ends( os );                                // something printed ?
@@ -312 +312 @@
         } // ?|?
 
-        ostype & nl( ostype & os ) {
+        ostype & nl( ostype & os ) with ( basic_ostream_table ) {
                 (ostype &)(os | '\n');
                 setPrt$( os, false );                                                   // turn off
@@ -319 +319 @@
         } // nl
 
-        ostype & nonl( ostype & os ) {
+        ostype & nonl( ostype & os ) with ( basic_ostream_table ) {
                 setPrt$( os, false );                                                   // turn off
                 return os;
         } // nonl
 
-        ostype & nlOn( ostype & os ) {
+        ostype & nlOn( ostype & os ) with ( basic_ostream_table ) {
                 nlOn( os );                                                                             // call void returning
                 return os;
         } // nlOn
 
-        ostype & nlOff( ostype & os ) {
+        ostype & nlOff( ostype & os ) with ( basic_ostream_table ) {
                 nlOff( os );                                                                    // call void returning
                 return os;
         } // nlOff
 
-        ostype & sepVal( ostype & os ) {
+        ostype & sepVal( ostype & os ) with ( basic_ostream_table ) {
                 return (ostype &)(os | sepGet( os ));
         } // sepVal
 
-        ostype & sepTupleVal( ostype & os ) {
+        ostype & sepTupleVal( ostype & os ) with ( basic_ostream_table ) {
                 return os | sepGetTuple( os );
         } // sepTupleVal
 
-        ostype & sep( ostype & os ) {
+        ostype & sep( ostype & os ) with ( basic_ostream_table ) {
                 sep( os );                                                                              // call void returning
                 return os;
         } // sep
 
-        ostype & nosep( ostype & os ) {
+        ostype & nosep( ostype & os ) with ( basic_ostream_table ) {
                 nosep( os );                                                                    // call void returning
                 return os;
         } // nosep
 
-        ostype & sepOn( ostype & os ) {
+        ostype & sepOn( ostype & os ) with ( basic_ostream_table ) {
                 sepOn( os );                                                                    // call void returning
                 return os;
         } // sepOn
 
-        ostype & sepOff( ostype & os ) {
+        ostype & sepOff( ostype & os ) with ( basic_ostream_table ) {
                 sepOff( os );                                                                   // call void returning
                 return os;
@@ -365 +365 @@
 // tuples
 forall( ostype &, T, Params... | writeable( T, ostype ) | { ostype & ?|?( ostype &, Params ); } ) {
-        ostype & ?|?( ostype & os, T arg, Params rest ) {
+        ostype & ?|?( ostype & os, T arg, Params rest ) with ( basic_ostream_table ) {
                 (ostype &)(os | arg);                                                   // print first argument
                 sepSetCur$( os, sepGetTuple( os ) );                    // switch to tuple separator
@@ -372 +372 @@
                 return os;
         } // ?|?
-        void ?|?( ostype & os, T arg, Params rest ) {
+        void ?|?( ostype & os, T arg, Params rest ) with ( basic_ostream_table ) {
                 // (ostype &)(?|?( os, arg, rest )); ends( os );
                 (ostype &)(os | arg);                                                   // print first argument
@@ -405 +405 @@
 #define INTEGRAL_FMT_IMPL( T, IFMTNP, IFMTP ) \
 forall( ostype & | basic_ostream( ostype ) ) { \
-        ostype & ?|?( ostype & os, _Ostream_Manip(T) f ) { \
+        ostype & ?|?( ostype & os, _Ostream_Manip(T) f ) with ( basic_ostream_table ) { \
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) ); \
 \
@@ -653 +653 @@
         } /* eng */ \
 \
-        ostype & ?|?( ostype & os, _Ostream_Manip(T) f ) { \
+        ostype & ?|?( ostype & os, _Ostream_Manip(T) f ) with ( basic_ostream_table ) { \
                 enum { size = 48 }; \
                 char buf[size]; \
@@ -692 +692 @@
 
 forall( ostype & | basic_ostream( ostype ) ) {
-        ostype & ?|?( ostype & os, _Ostream_Manip(char) f ) {
+        ostype & ?|?( ostype & os, _Ostream_Manip(char) f ) with ( basic_ostream_table ) {
                 if ( f.base != 'c' ) {                                                  // bespoke binary/octal/hex format
                         _Ostream_Manip(unsigned char) fmtuc @= { f.val, f.wd, f.pc, f.base, {'\0'} };
@@ -724 +724 @@
 
 forall( ostype & | basic_ostream( ostype ) ) {
-        ostype & ?|?( ostype & os, _Ostream_Manip(const char *) f ) {
+        ostype & ?|?( ostype & os, _Ostream_Manip(const char *) f ) with ( basic_ostream_table ) {
                 if ( ! f.val ) return os;                                               // null pointer ?
 
@@ -776 +776 @@
 
 forall( istype & | basic_istream( istype ) ) {
-        istype & ?|?( istype & is, bool & b ) {
+        istype & ?|?( istype & is, bool & b ) with ( basic_istream_table ) {
                 int len = -1;                                                                   // len not set if no match
                 fmt( is, " " );                                                                 // remove leading whitespace
@@ -792 +792 @@
         } // ?|?
 
-        istype & ?|?( istype & is, char & c ) {
+        istype & ?|?( istype & is, char & c ) with ( basic_istream_table ) {
                 char temp;
                 for () {
@@ -804 +804 @@
         } // ?|?
 
-        istype & ?|?( istype & is, signed char & sc ) {
+        istype & ?|?( istype & is, signed char & sc ) with ( basic_istream_table ) {
                 int args = fmt( is, "%hhi", &sc );                              // can be multiple characters (100)
                 if ( ! eof( is ) && args != 1 ) throwResume ExceptionInst( missing_data );
@@ -811 +811 @@
         } // ?|?
 
-        istype & ?|?( istype & is, unsigned char & usc ) {
+        istype & ?|?( istype & is, unsigned char & usc ) with ( basic_istream_table ) {
                 int args = fmt( is, "%hhi", &usc );                             // can be multiple characters (-100)
                 if ( ! eof( is ) && args != 1 ) throwResume ExceptionInst( missing_data );
@@ -818 +818 @@
         } // ?|?
 
-        istype & ?|?( istype & is, short int & si ) {
+        istype & ?|?( istype & is, short int & si ) with ( basic_istream_table ) {
                 int args = fmt( is, "%hi", &si );                               // can be called with EOF on
                 if ( ! eof( is ) && args != 1 ) throwResume ExceptionInst( missing_data );
@@ -825 +825 @@
         } // ?|?
 
-        istype & ?|?( istype & is, unsigned short int & usi ) {
+        istype & ?|?( istype & is, unsigned short int & usi ) with ( basic_istream_table ) {
                 int args = fmt( is, "%hi", &usi );                              // can be called with EOF on
                 if ( ! eof( is ) && args != 1 ) throwResume ExceptionInst( missing_data );
@@ -832 +832 @@
         } // ?|?
 
-        istype & ?|?( istype & is, int & i ) {
+        istype & ?|?( istype & is, int & i ) with ( basic_istream_table ) {
                 int args = fmt( is, "%i", &i );                                 // can be called with EOF on
                 if ( ! eof( is ) && args != 1 ) throwResume ExceptionInst( missing_data );
@@ -839 +839 @@
         } // ?|?
 
-        istype & ?|?( istype & is, unsigned int & ui ) {
+        istype & ?|?( istype & is, unsigned int & ui ) with ( basic_istream_table ) {
                 int args = fmt( is, "%i", &ui );                                // can be called with EOF on
                 if ( ! eof( is ) && args != 1 ) throwResume ExceptionInst( missing_data );
@@ -846 +846 @@
         } // ?|?
 
-        istype & ?|?( istype & is, long int & li ) {
+        istype & ?|?( istype & is, long int & li ) with ( basic_istream_table ) {
                 int args = fmt( is, "%li", &li );                               // can be called with EOF on
                 if ( ! eof( is ) && args != 1 ) throwResume ExceptionInst( missing_data );
@@ -853 +853 @@
         } // ?|?
 
-        istype & ?|?( istype & is, unsigned long int & ulli ) {
+        istype & ?|?( istype & is, unsigned long int & ulli ) with ( basic_istream_table ) {
                 int args = fmt( is, "%li", &ulli );                             // can be called with EOF on
                 if ( ! eof( is ) && args != 1 ) throwResume ExceptionInst( missing_data );
@@ -860 +860 @@
         } // ?|?
 
-        istype & ?|?( istype & is, long long int & lli ) {
+        istype & ?|?( istype & is, long long int & lli ) with ( basic_istream_table ) {
                 int args = fmt( is, "%lli", &lli );                             // can be called with EOF on
                 if ( ! eof( is ) && args != 1 ) throwResume ExceptionInst( missing_data );
@@ -867 +867 @@
         } // ?|?
 
-        istype & ?|?( istype & is, unsigned long long int & ulli ) {
+        istype & ?|?( istype & is, unsigned long long int & ulli ) with ( basic_istream_table ) {
                 int args = fmt( is, "%lli", &ulli );                    // can be called with EOF on
                 if ( ! eof( is ) && args != 1 ) throwResume ExceptionInst( missing_data );
@@ -879 +879 @@
         } // ?|?
 
-        istype & ?|?( istype & is, unsigned int128 & ullli ) {
+        istype & ?|?( istype & is, unsigned int128 & ullli ) with ( basic_istream_table ) {
                 char s[40];
                 bool sign = false;
@@ -896 +896 @@
         #endif // __SIZEOF_INT128__
 
-        istype & ?|?( istype & is, float & f ) {
+        istype & ?|?( istype & is, float & f ) with ( basic_istream_table ) {
                 int args = fmt( is, "%f", &f );                                 // can be called with EOF on
                 if ( ! eof( is ) && args != 1 ) throwResume ExceptionInst( missing_data );
@@ -903 +903 @@
         } // ?|?
 
-        istype & ?|?( istype & is, double & d ) {
+        istype & ?|?( istype & is, double & d ) with ( basic_istream_table ) {
                 int args = fmt( is, "%lf", &d );                                // can be called with EOF on
                 if ( ! eof( is ) && args != 1 ) throwResume ExceptionInst( missing_data );
@@ -910 +910 @@
         } // ?|?
 
-        istype & ?|?( istype & is, long double & ld ) {
+        istype & ?|?( istype & is, long double & ld ) with ( basic_istream_table ) {
                 int args = fmt( is, "%Lf", &ld );                               // can be called with EOF on
                 if ( ! eof( is ) && args != 1 ) throwResume ExceptionInst( missing_data );
@@ -917 +917 @@
         } // ?|?
 
-        istype & ?|?( istype & is, float _Complex & fc ) {
+        istype & ?|?( istype & is, float _Complex & fc ) with ( basic_istream_table ) {
                 float re, im;
                 int args = fmt( is, "%f%fi", &re, &im );                // can be called with EOF on
@@ -926 +926 @@
         } // ?|?
 
-        istype & ?|?( istype & is, double _Complex & dc ) {
+        istype & ?|?( istype & is, double _Complex & dc ) with ( basic_istream_table ) {
                 double re, im;
                 int args = fmt( is, "%lf%lfi", &re, &im );              // can be called with EOF on
@@ -935 +935 @@
         } // ?|?
 
-        istype & ?|?( istype & is, long double _Complex & ldc ) {
+        istype & ?|?( istype & is, long double _Complex & ldc ) with ( basic_istream_table ) {
                 long double re, im;
                 int args = fmt( is, "%Lf%Lfi", &re, &im );              // can be called with EOF on
@@ -944 +944 @@
         } // ?|?
 
-        istype & ?|?( istype & is, const char fmt[] ) {         // match text
+        istype & ?|?( istype & is, const char fmt[] ) with ( basic_istream_table ) {            // match text
                 size_t len = strlen( fmt );
                 char fmtstr[len + 16];
@@ -966 +966 @@
         } // ?|?
 
-        istype & nl( istype & is ) {
+        istype & nl( istype & is ) with ( basic_istream_table ) {
                 fmt( is, "%*[^\n]" );                                                   // ignore characters to newline
                 if ( ! eof( is ) ) fmt( is, "%*c" );                    // read newline
@@ -972 +972 @@
         } // nl
 
-        istype & nlOn( istype & is ) {
+        istype & nlOn( istype & is ) with ( basic_istream_table ) {
                 nlOn( is );                                                                             // call void returning
                 return is;
         } // nlOn
 
-        istype & nlOff( istype & is ) {
+        istype & nlOff( istype & is ) with ( basic_istream_table ) {
                 nlOff( is );                                                                    // call void returning
                 return is;
@@ -986 +986 @@
 
 forall( istype & | basic_istream( istype ) ) {
-        istype & ?|?( istype & is, _Istream_Cskip f ) {
+        istype & ?|?( istype & is, _Istream_Cskip f ) with ( basic_istream_table ) {
                 if ( eof( is ) ) throwResume ExceptionInst( end_of_file );
                 if ( f.scanset ) {
@@ -1006 +1006 @@
         }
 
-        istype & ?|?( istype & is, _Istream_Cquote f ) with( f.cstr ) {
+        istype & ?|?( istype & is, _Istream_Cquote f ) with( basic_istream_table, f.cstr ) {
                 if ( eof( is ) ) throwResume ExceptionInst( end_of_file );
                 int args;
@@ -1031 +1031 @@
         }
 
-        istype & ?|?( istype & is, _Istream_Cstr f ) with( f.cstr ) {
+        istype & ?|?( istype & is, _Istream_Cstr f ) with( basic_istream_table, f.cstr ) {
+                assert(eof);
                 if ( eof( is ) ) throwResume ExceptionInst( end_of_file );
                 const char * scanset;
@@ -1139 +1140 @@
 #define INPUT_FMT_IMPL( T, CODE ) \
 forall( istype & | basic_istream( istype ) ) { \
-        istype & ?|?( istype & is, _Istream_Manip(T) f ) { \
+        istype & ?|?( istype & is, _Istream_Manip(T) f ) with ( basic_istream_table ) { \
                 enum { size = 16 }; \
                 char fmtstr[size]; \
@@ -1203 +1204 @@
 
 forall( istype & | istream( istype ), E | CfaEnum( E ) | Serial( E ) )
-istype & ?|?( istype & is, E & e ) {
+istype & ?|?( istype & is, E & e ) with ( basic_istream_table ) {
 //      if ( eof( is ) ) throwResume ExceptionInst( end_of_file );