Changeset 686912c for libcfa/src/collections/string.cfa

Timestamp:

Aug 31, 2023, 1:25:38 PM (10 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

0f107e4, 2a301ff

Parents:

0b8c951d

Message:

third attempt at input manipulators for strings

File:

• libcfa/src/collections/string.cfa (modified) (4 diffs)

libcfa/src/collections/string.cfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 29 18:32:34 2023
-// Update Count     : 153
+// Last Modified On : Thu Aug 31 13:20:41 2023
+// Update Count     : 161
 //
 
@@ -127 +127 @@
         } // if
 
+        // .---------------,
+        // | | | | |...|0|0| check and guard
+        // `---------------'
         enum { gwd = 128 + 2, wd = gwd - 1 };                           // guarded and unguarded width
         char cstr[gwd];                                                                         // read in chunks
-        bool cont = false;;
+        bool cont = false;
 
         if ( f.wd == -1 ) f.wd = wd;
-        const char * scanset = f.scanset;;
-        if ( f.flags.delimit ) scanset = f.delimit;                     // getline ?
-
-        size_t len = 0;
-        if ( scanset ) len = strlen( scanset );
-        char fmtstr[len + 16];
-        int start = 1;
-        fmtstr[0] = '%';
-        if ( f.flags.ignore ) { fmtstr[1] = '*'; start += 1; }
-        if ( f.wd != -1 ) { start += sprintf( &fmtstr[start], "%d", f.wd ); }
-
-        if ( ! scanset ) {
-                // %s, %*s, %ws, %*ws
-                fmtstr[start] = 's'; fmtstr[start + 1] = '\0';
-                // printf( "cstr %s\n", fmtstr );
-        } else {
-                // incl %[xxx],  %*[xxx],  %w[xxx],  %*w[xxx]
-                // excl %[^xxx], %*[^xxx], %w[^xxx], %*w[^xxx]
-                fmtstr[start] = '['; start += 1;
-                if ( f.flags.inex ) { fmtstr[start] = '^'; start += 1; }
-                strcpy( &fmtstr[start], scanset );                              // copy includes '\0'
-                len += start;
-                fmtstr[len] = ']'; fmtstr[len + 1] = '\0';
-                // printf( "incl/excl %s\n", fmtstr );
-        } // if
+        _Istream_Cstr cfmt = { cstr, (_Istream_str_base)f };
 
         cstr[wd] = '\0';                                                                        // guard null terminate string
         try {
-                readstr( is, f, fmtstr, cstr );
+                is | cfmt;
         } catch( cstring_length * ) {
                 cont = true;
@@ -169 +148 @@
                 cont = false;
                 try {
-                        readstr( is, f, fmtstr, cstr );
+                        is | cfmt;
                 } catch( cstring_length * ) {
                         cont = true;                                                            // continue not allowed
@@ -183 +162 @@
 }
 
-// void getline( ifstream & in, string & str, const char delimit = '\n' ) {
-//      // .---------------,
-//      // | | | | |...|0|0| check and guard
-//      // `---------------'
-//      enum { gwd = 128 + 2, wd = gwd - 1 };                           // guarded and unguarded width
-//      char cstr[gwd];                                                                         // read in chunks
-//      bool cont = false;;
-
-//      cstr[wd] = '\0';                                                                        // guard null terminate string
-//      try {
-//              in | getline( wdi( wd, cstr ), delimit );               // must have room for string terminator
-//              if ( eof( in  ) ) return;                                               // do not change argument
-//      } catch( cstring_length * ) {
-//              cont = true;
-//      } finally {
-//              str = cstr;                                                                             // ok to initialize string
-//      } // try
-//      for ( ; cont; )  {                                                                      // overflow read ?
-//              cont = false;
-//              try {
-//                      in | getline( wdi( wd, cstr ), delimit );       // must have room for string terminator
-//                      if ( eof( in  ) ) return;
-//              } catch( cstring_length * ) {
-//                      cont = true;                                                            // continue not allowed
-//              } finally {
-//                      str += cstr;                                                            // build string chunk at a time
-//              } // try
-//      } // for
-// }
-
 ////////////////////////////////////////////////////////
 // Slicing