Changeset 38de914 for libcfa/src/iostream.cfa

Timestamp:

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

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

55b060d

Parents:

7e1dbd7

Message:

second attempt at input manipulators for strings

File:

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

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 28 13:36:16 2023
-// Update Count     : 1527
+// Last Modified On : Wed Aug 30 10:56:08 2023
+// Update Count     : 1541
 //
 
@@ -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
@@ -971 +987 @@
                 } // if
 
-                int check = f.wd - 1;
-                const char * scanset = f.scanset;;
+                const char * scanset = f.scanset;
                 if ( f.flags.delimit ) scanset = f.delimit;             // getline ?
-
-                // getline
-                // if ( f.flags.delimit ) {
-                //      enum { size = 32 };
-                //      char fmtstr[size];
-                //      snprintf( fmtstr, size, "%%%d[^%c]s", f.wd, f.delimit );
-                //      if ( ! f.flags.rwd ) f.s[check] = '\0';         // insert sentinel
-                //      int len = fmt( is, fmtstr, f.s );                       // read upto delimiter
-                //      if ( ! f.flags.rwd && f.s[check] != '\0' )      // sentinel overwritten ?
-                //              throw (cstring_length){ &cstring_length_vt };
-                //      if ( len == 0 ) f.s[0] = '\0';                          // empty read => argument unchanged => set empty
-                //      // fprintf( stderr, "getline %s %s %d %d %d '%c'\n", fmtstr, f.s, len, f.wd, check, f.s[check] );
-                //      if ( ! eof( is ) ) fmt( is, "%*c" );            // ignore delimiter
-                //      return is;
-                // } // if
 
                 size_t len = 0;
@@ -1013 +1013 @@
                 } // if
 
-                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
+                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
                 return is;
         } // ?|?