Changeset bb1eabc for libcfa/src/iostream.hfa

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

File:

• libcfa/src/iostream.hfa (modified) (7 diffs)

libcfa/src/iostream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May  2 18:48:56 2026
-// Update Count     : 780
+// Last Modified On : Sun May  3 21:55:06 2026
+// Update Count     : 829
 //
 
@@ -209 +209 @@
         char base;                                                                                      // numeric base / floating-point style
         inline _Ostream_Manip_Mode;
+        char qleft, qright;                                                                     // quote delimiters (PLACE HERE SO OPTIONAL IN INITIALIZATION)
 }; // _Ostream_Manip
 
@@ -289 +290 @@
         _Ostream_Manip(char) oct( char c ) { return (_Ostream_Manip(char))@{ .val = c, .wd = 1, .pc = 0, .base = 'o', { .all = 0 } }; }
         _Ostream_Manip(char) hex( char c ) { return (_Ostream_Manip(char))@{ .val = c, .wd = 1, .pc = 0, .base = 'x', { .all = 0 } }; }
-        _Ostream_Manip(char) quote( char c ) { return (_Ostream_Manip(char))@{ .val = c, .wd = 1, .pc = 0, .base = 'c', { .flags.quote = true } }; }
+        _Ostream_Manip(char) quote( char c, const char qleft = '\'', const char qright = '\0' ) {
+                return (_Ostream_Manip(char))@{ .val = c, .wd = 1, .pc = 0, .base = 'c', { .flags.quote = true }, .qleft = qleft, .qright = qright }; }
         _Ostream_Manip(char) wd( unsigned int wd, char c ) { return (_Ostream_Manip(char))@{ .val = c, .wd = wd, .pc = 0, .base = 'c', { .all = 0 } }; }
         _Ostream_Manip(char) & wd( unsigned int wd, _Ostream_Manip(char) & fmt ) { fmt.wd = wd; return fmt; }
@@ -295 +297 @@
         _Ostream_Manip(char) & upcase( _Ostream_Manip(char) & fmt ) { if ( fmt.base == 'x' || fmt.base == 'b' ) fmt.base -= 32; /* upper case */ return fmt; }
         _Ostream_Manip(char) & nobase( _Ostream_Manip(char) & fmt ) { fmt.flags.nobsdp = true; return fmt; }
-        _Ostream_Manip(char) & quote( _Ostream_Manip(char) & fmt ) { fmt.flags.quote = true; return fmt; }
+        _Ostream_Manip(char) & quote( _Ostream_Manip(char) & fmt, const char qleft = '\'', const char qright = '\0' ) {
+                fmt.flags.quote = true; fmt.qleft = qleft, fmt.qright = qright; return fmt; }
 } // distribution
 forall( ostype & | basic_ostream( ostype ) ) {
@@ -308 +311 @@
         _Ostream_Manip(const char *) oct( const char s[] ) { return (_Ostream_Manip(const char *))@{ .val = s, .wd = 1, .pc = 0, .base = 'o', { .all = 0 } }; }
         _Ostream_Manip(const char *) hex( const char s[] ) { return (_Ostream_Manip(const char *))@{ .val = s, .wd = 1, .pc = 0, .base = 'x', { .all = 0 } }; }
-        _Ostream_Manip(const char *) quote( const char s[] ) { return (_Ostream_Manip(const char *))@{ .val = s, .wd = 1, .pc = 0, .base = 's', { .flags.quote = true } }; }
+        _Ostream_Manip(const char *) quote( const char s[], const char qleft = '"', const char qright = '\0' ) {
+                return (_Ostream_Manip(const char *))@{ .val = s, .wd = 1, .pc = 0, .base = 's', { .flags.quote = true }, .qleft = qleft, .qright = qright }; }
         _Ostream_Manip(const char *) wd( unsigned int wd, const char s[] ) { return (_Ostream_Manip(const char *))@{ .val = s, .wd = wd, .pc = 0, .base = 's', { .all = 0 } }; }
         _Ostream_Manip(const char *) wd( unsigned int wd, unsigned int pc, const char s[] ) { return (_Ostream_Manip(const char *))@{ .val = s, .wd = wd, .pc = pc, .base = 's', { .flags.pc = true } }; }
@@ -316 +320 @@
         _Ostream_Manip(const char *) & upcase( _Ostream_Manip(const char *) & fmt ) { if ( fmt.base == 'x' || fmt.base == 'b' ) fmt.base -= 32; /* upper case */ return fmt; }
         _Ostream_Manip(const char *) & nobase( _Ostream_Manip(const char *) & fmt ) { fmt.flags.nobsdp = true; return fmt; }
-        _Ostream_Manip(const char *) & quote( _Ostream_Manip(const char *) & fmt ) { fmt.flags.quote = true; return fmt; } \
+        _Ostream_Manip(const char *) & quote( _Ostream_Manip(const char *) & fmt, const char qleft = '"', const char qright = '\0' ) {
+                fmt.flags.quote = true; fmt.qleft = qleft; fmt.qright = qright; return fmt; }
 } // distribution
 forall( ostype & | basic_ostream( ostype ) ) {
@@ -430 +435 @@
         union {
                 const char * scanset;
-                char delimiters[3];                                                             // [0] => left, [1] => right
+                char delimiters[3];                                                             // [0] => qleft or terminator, [1] => qright or getline '\0', [2] => char '\0' or char * '\1'
         };
         int wd;                                                                                         // width