Changeset bb1eabc for libcfa/src/collections

Timestamp:

May 4, 2026, 7:26:38 AM (10 days ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

244335b

Parents:

8403b32

Message:

harmonize output quote manipulator with input quote manipulator, adding left/right quote parameters

Location:

libcfa/src/collections

Files:

• string.cfa (modified) (2 diffs)
• string.hfa (modified) (3 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 : Mon Sep 15 10:26:35 2025
-// Update Count     : 394
+// Last Modified On : Sun May  3 23:21:25 2026
+// Update Count     : 395
 //
 
@@ -214 +214 @@
                 for ( i; l ) cstr[i] = f.val[i];                                        // copy string
                 cstr[l] = '\0';                                                                         // terminate
-                _Ostream_Manip(const char *) cf @= { cstr, f.wd, f.pc, f.base, {f.all} };
+                _Ostream_Manip(const char *) cf @= { cstr, f.wd, f.pc, f.base, {f.all}, f.qleft, f.qright };
                 return os | cf | nonl;
         } // ?|?

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 : Sat May  2 19:09:55 2026
-// Update Count     : 322
+// Last Modified On : Sun May  3 23:24:08 2026
+// Update Count     : 324
 //
 
@@ -90 +90 @@
         _Ostream_Manip(string) oct( string s ) { return (_Ostream_Manip(string))@{ .val = s, .wd = 1, .pc = 0, .base = 'o', { .all = 0 } }; }
         _Ostream_Manip(string) hex( string s ) { return (_Ostream_Manip(string))@{ .val = s, .wd = 1, .pc = 0, .base = 'x', { .all = 0 } }; }
-        _Ostream_Manip(string) quote( string s ) { return (_Ostream_Manip(string))@{ .val = s, .wd = 1, .pc = 0, .base = 's', { .flags.quote = true } }; }
+        _Ostream_Manip(string) quote( string s, const char qleft = '"', const char qright = '\0' ) {
+                return (_Ostream_Manip(string))@{ .val = s, .wd = 1, .pc = 0, .base = 's', { .flags.quote = true }, .qleft = qleft, .qright = qright }; }
         _Ostream_Manip(string) wd( unsigned int wd, string s ) { return (_Ostream_Manip(string))@{ .val = s, .wd = wd, .pc = 0, .base = 's', { .all = 0 } }; }
         _Ostream_Manip(string) wd( unsigned int wd, unsigned int pc, string s ) { return (_Ostream_Manip(string))@{ .val = s, .wd = wd, .pc = pc, .base = 's', { .flags.pc = true } }; }
@@ -98 +99 @@
         _Ostream_Manip(string) & nobase( _Ostream_Manip(string) & fmt ) { fmt.flags.nobsdp = true; return fmt; }
         _Ostream_Manip(string) & upcase( _Ostream_Manip(string) & fmt ) { if ( fmt.base == 'x' || fmt.base == 'b' ) fmt.base -= 32; /* upper case */ return fmt; }
-        _Ostream_Manip(string) & quote( _Ostream_Manip(string) & fmt ) { fmt.flags.quote = true; return fmt; } \
+        _Ostream_Manip(string) & quote( _Ostream_Manip(string) & fmt, const char qleft = '"', const char qright = '\0' ) {
+                fmt.flags.quote = true; fmt.qleft = qleft, fmt.qright = qright; return fmt; }
 } // distribution