Changeset 34c6e1e6 for libcfa/src/collections/string.cfa

Timestamp:

Sep 2, 2023, 3:01:05 PM (9 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

389fbf5

Parents:

0f107e4

Message:

add string output manipulators, third attempt at input manipulators for strings

File:

• libcfa/src/collections/string.cfa (modified) (5 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 : Thu Aug 31 13:20:41 2023
-// Update Count     : 161
+// Last Modified On : Sat Sep  2 12:05:57 2023
+// Update Count     : 206
 //
 
@@ -110 +110 @@
 }
 
+ofstream & ?|?( ofstream & os, _Ostream_Manip(string) f ) {
+        size_t len = size( f.val );
+        char cstr[len + 1];                                                                     // room for null terminator
+        for ( i; len ) cstr[i] = f.val[i];                                      // copy string
+        cstr[len] = '\0';                                                                       // terminate
+        _Ostream_Manip(const char *) cf @= { cstr, f.wd, f.pc, f.base, {f.all} };
+        os | cf | nonl;
+        return os;
+} // ?|?
+
+void ?|?( ofstream & os, _Ostream_Manip(string) f ) {
+        (ofstream &)(os | f); ends( os );
+}
+
 ifstream & ?|?(ifstream & in, string & this) {
     return in | (*this.inner); // read to internal string_res
@@ -118 +132 @@
 }
 
-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.wd == -1 ) fmt( is, f.scanset, "" ); // no input arguments
-                else for ( f.wd ) fmt( is, "%*c" );
-                return is;
-        } // if
-
+ifstream & ?|?( ifstream & is, _Istream_Sstr f ) {
         // .---------------,
-        // | | | | |...|0|0| check and guard
+        // | | | | |...|0|0| null terminator and guard if missing
         // `---------------'
-        enum { gwd = 128 + 2, wd = gwd - 1 };                           // guarded and unguarded width
+        enum { gwd = 128 + 1, wd = gwd - 1 };                           // guard and unguard width
         char cstr[gwd];                                                                         // read in chunks
         bool cont = false;
 
-        if ( f.wd == -1 ) f.wd = wd;
-        _Istream_Cstr cfmt = { cstr, (_Istream_str_base)f };
+        _Istream_Cstr cf = { cstr, (_Istream_str_base)f };
+        if ( ! cf.flags.rwd ) cf.wd = wd;
 
         cstr[wd] = '\0';                                                                        // guard null terminate string
         try {
-                is | cfmt;
+                is | cf;
         } catch( cstring_length * ) {
                 cont = true;
@@ -148 +154 @@
                 cont = false;
                 try {
-                        is | cfmt;
+                        is | cf;
                 } catch( cstring_length * ) {
                         cont = true;                                                            // continue not allowed
@@ -158 +164 @@
 } // ?|?
 
-void ?|?( ifstream & in, _Istream_str f ) {
+void ?|?( ifstream & in, _Istream_Sstr f ) {
     (ifstream &)(in | f); ends( in );
 }