Changeset 38de914 for libcfa/src/containers

Timestamp:

Aug 30, 2023, 11:20:14 AM (16 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

55b060d

Parents:

7e1dbd7

Message:

second attempt at input manipulators for strings

Location:

libcfa/src/containers

Files:

• string.cfa (modified) (3 diffs)
• string.hfa (modified) (2 diffs)

libcfa/src/containers/string.cfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 28 19:00:45 2023
-// Update Count     : 146
+// Last Modified On : Tue Aug 29 18:32:34 2023
+// Update Count     : 153
 //
 
@@ -118 +118 @@
 }
 
-static void readstr( ifstream & is, _Istream_str f, char fmtstr[], char cstr[] ) {
-        int check = f.rwd - 1;
-
-        if ( ! f.flags.rwd ) cstr[check] = '\0';                        // insert sentinel
-        int len = fmt( is, fmtstr, cstr );
-        // fprintf( stderr, "KK %s %zd %d %c %s\n", fmtstr, len, check, cstr[check], cstr );
-
-        if ( ! f.flags.rwd && cstr[check] != '\0' )                     // sentinel overwritten ?
-                throw (cstring_length){ &cstring_length_vt };
-
-        if ( f.flags.delimit ) {                                                        // getline ?
-                if ( len == 0 ) cstr[0] = '\0';                                 // empty read => argument unchanged => set empty
-                if ( ! eof( is ) ) fmt( is, "%*c" );                    // ignore delimiter
-        } //if
-} // readstr
-
 ifstream & ?|?( ifstream & is, _Istream_str f ) {
         // skip, same as for char *
         if ( ! &f.s ) {
                 // fprintf( stderr,  "skip %s %d\n", f.scanset, f.wd );
-                if ( f.rwd == -1 ) fmt( is, f.scanset, "" ); // no input arguments
-                else for ( f.rwd ) fmt( is, "%*c" );
+                if ( f.wd == -1 ) fmt( is, f.scanset, "" ); // no input arguments
+                else for ( f.wd ) fmt( is, "%*c" );
                 return is;
         } // if
 
-        enum { gwd = 16 + 2, wd = gwd - 1 };                            // guarded and unguarded width
+        enum { gwd = 128 + 2, wd = gwd - 1 };                           // guarded and unguarded width
         char cstr[gwd];                                                                         // read in chunks
         bool cont = false;;
 
-        if ( f.rwd == -1 ) f.rwd = wd;
+        if ( f.wd == -1 ) f.wd = wd;
         const char * scanset = f.scanset;;
         if ( f.flags.delimit ) scanset = f.delimit;                     // getline ?
@@ -157 +141 @@
         fmtstr[0] = '%';
         if ( f.flags.ignore ) { fmtstr[1] = '*'; start += 1; }
-        if ( f.rwd != -1 ) { start += sprintf( &fmtstr[start], "%d", f.rwd ); }
+        if ( f.wd != -1 ) { start += sprintf( &fmtstr[start], "%d", f.wd ); }
 
         if ( ! scanset ) {

libcfa/src/containers/string.hfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 28 18:32:59 2023
-// Update Count     : 40
+// Last Modified On : Tue Aug 29 18:28:04 2023
+// Update Count     : 47
 //
 
@@ -58 +58 @@
 void ?|?( ifstream & in, string & this );
 
-
 struct _Istream_str {
         string & s;
-        union {
-                const char * scanset;
-                char delimit[2];
-        };
-        int rwd;                                                                                        // read width
-        union {
-                unsigned char all;
-                struct {
-                        unsigned char ignore:1;                                         // do not change input argument
-                        unsigned char inex:1;                                           // include/exclude characters in scanset
-                        unsigned char delimit:1;                                        // delimit character
-                        unsigned char rwd:1;                                            // read width
-                } flags;
-        };
+        inline _Istream_str_base;
 }; // _Istream_str
 
 static inline {
         // read width does not include null terminator
-        _Istream_str wdi( unsigned int rwd, string & s ) { return (_Istream_str)@{ s, {0p}, rwd, {.flags.rwd : true} }; }
-        _Istream_str skip( const char scanset[] ) { return (_Istream_str)@{ *0p, {scanset}, -1, {.all : 0} }; }
-        _Istream_str skip( unsigned int wd ) { return (_Istream_str)@{ *0p, {0p}, wd, {.all : 0} }; }
+        _Istream_str wdi( unsigned int rwd, string & s ) { return (_Istream_str)@{ s, {{0p}, rwd, {.flags.rwd : true}} }; }
+        _Istream_str skip( const char scanset[] ) { return (_Istream_str)@{ *0p, {{scanset}, -1, {.all : 0}} }; }
+        _Istream_str skip( unsigned int wd ) { return (_Istream_str)@{ *0p, {{0p}, wd, {.all : 0}} }; }
         _Istream_str getline( string & s, const char delimit = '\n' ) {
-                return (_Istream_str)@{ s, {.delimit : { delimit, '\0' } }, -1, {.flags.delimit : true, .flags.inex : true} };
+                return (_Istream_str)@{ s, {{.delimit : { delimit, '\0' } }, -1, {.flags.delimit : true, .flags.inex : true}} };
         }
         _Istream_str & getline( _Istream_str & fmt, const char delimit = '\n' ) {
                 fmt.delimit[0] = delimit; fmt.delimit[1] = '\0'; fmt.flags.delimit = true; fmt.flags.inex = true; return fmt;
         }
-        _Istream_str incl( const char scanset[], string & s ) { return (_Istream_str)@{ s, {scanset}, -1, {.flags.inex : false} }; }
+        _Istream_str incl( const char scanset[], string & s ) { return (_Istream_str)@{ s, {{scanset}, -1, {.flags.inex : false}} }; }
         _Istream_str & incl( const char scanset[], _Istream_str & fmt ) { fmt.scanset = scanset; fmt.flags.inex = false; return fmt; }
-        _Istream_str excl( const char scanset[], string & s ) { return (_Istream_str)@{ s, {scanset}, -1, {.flags.inex : true} }; }
+        _Istream_str excl( const char scanset[], string & s ) { return (_Istream_str)@{ s, {{scanset}, -1, {.flags.inex : true}} }; }
         _Istream_str & excl( const char scanset[], _Istream_str & fmt ) { fmt.scanset = scanset; fmt.flags.inex = true; return fmt; }
-        _Istream_str ignore( string & s ) { return (_Istream_str)@{ s, {0p}, -1, {.flags.ignore : true} }; }
+        _Istream_str ignore( string & s ) { return (_Istream_str)@{ s, {{0p}, -1, {.flags.ignore : true}} }; }
         _Istream_str & ignore( _Istream_str & fmt ) { fmt.flags.ignore = true; return fmt; }
 } // distribution