Changeset 686912c for libcfa

Timestamp:

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

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

0f107e4, 2a301ff

Parents:

0b8c951d

Message:

third attempt at input manipulators for strings

Location:

libcfa/src

Files:

• collections/string.cfa (modified) (4 diffs)
• collections/string.hfa (modified) (2 diffs)
• iostream.cfa (modified) (3 diffs)
• iostream.hfa (modified) (2 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

libcfa/src/collections/string.hfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 29 18:28:04 2023
-// Update Count     : 47
+// Last Modified On : Thu Aug 31 11:47:27 2023
+// Update Count     : 49
 //
 
@@ -83 +83 @@
 ifstream & ?|?( ifstream & is, _Istream_str f );
 void ?|?( ifstream & is, _Istream_str t );
-void getline( ifstream & in, string & this, const char delimit = '\n' );
 
 // Concatenation

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 30 10:56:08 2023
-// Update Count     : 1541
+// Last Modified On : Thu Aug 31 11:27:56 2023
+// Update Count     : 1545
 //
 
@@ -962 +962 @@
 
 forall( istype & | basic_istream( istype ) ) {
-        void readstr( istype & is, _Istream_str_base f, char fmtstr[], char cstr[] ) {
-                int check = f.wd - 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
-
         istype & ?|?( istype & is, _Istream_Cstr f ) {
                 // skip
@@ -1013 +997 @@
                 } // if
 
-                readstr( is, f, fmtstr, f.s );
-                // int check = f.wd - 1;
-
-                // if ( ! f.flags.rwd ) f.s[check] = '\0';                      // insert sentinel
-                // len = fmt( is, fmtstr, f.s );
-                // //fprintf( stderr, "KK %s %zd %d %c %s\n", fmtstr, len, check, f.s[check], f.s );
-                // if ( ! f.flags.rwd && f.s[check] != '\0' )           // sentinel overwritten ?
-                //      throw (cstring_length){ &cstring_length_vt };
-
-                // if ( f.flags.delimit ) {                                             // getline ?
-                //      if ( len == 0 ) f.s[0] = '\0';                          // empty read => argument unchanged => set empty
-                //      if ( ! eof( is ) ) fmt( is, "%*c" );            // ignore delimiter
-                // } //if
+                int check = f.wd - 1;
+                if ( ! f.flags.rwd ) f.s[check] = '\0';                 // insert sentinel
+                len = fmt( is, fmtstr, f.s );
+                //fprintf( stderr, "KK %s %zd %d %c %s\n", fmtstr, len, check, f.s[check], f.s );
+
+                if ( ! f.flags.rwd && f.s[check] != '\0' )              // sentinel overwritten ?
+                        throw (cstring_length){ &cstring_length_vt };
+
+                if ( f.flags.delimit ) {                                                // getline ?
+                        if ( len == 0 ) f.s[0] = '\0';                          // empty read => argument unchanged => set empty
+                        if ( ! eof( is ) ) fmt( is, "%*c" );            // ignore delimiter
+                } //if
                 return is;
         } // ?|?

libcfa/src/iostream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 29 19:15:06 2023
-// Update Count     : 542
+// Last Modified On : Thu Aug 31 10:55:35 2023
+// Update Count     : 544
 //
 
@@ -446 +446 @@
 } // distribution
 forall( istype & | basic_istream( istype ) ) {
-        void readstr( istype & is, _Istream_str_base f, char fmtstr[], char cstr[] );
         istype & ?|?( istype & is, _Istream_Cstr f );
         ISTYPE_VOID( _Istream_Cstr );