Changeset 8a9a3ab for libcfa/src/iostream.hfa

Timestamp:

Sep 1, 2023, 3:54:42 PM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

4b30318b

Parents:

4269d1b (diff), 4c0fa03 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/iostream.hfa (modified) (3 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 : Fri Aug 25 14:55:06 2023
-// Update Count     : 535
+// Last Modified On : Thu Aug 31 10:55:35 2023
+// Update Count     : 544
 //
 
@@ -406 +406 @@
 // *********************************** manipulators ***********************************
 
-struct _Istream_Cstr {
-        char * s;
+struct _Istream_str_base {
         union {
                 const char * scanset;
@@ -422 +421 @@
                 } flags;
         };
+}; // _Istream_str_base
+
+struct _Istream_Cstr {
+        char * s;
+        inline _Istream_str_base;
 }; // _Istream_Cstr
 
 static inline {
         // width must include room for null terminator
-        _Istream_Cstr wdi( unsigned int wd, char s[] ) { return (_Istream_Cstr)@{ s, {0p}, wd, {.all : 0} }; }
+        _Istream_Cstr wdi( unsigned int wd, char s[] ) { return (_Istream_Cstr)@{ s, { {0p}, wd, {.all : 0} } }; }
         // read width does not include null terminator
         _Istream_Cstr wdi( unsigned int wd, unsigned int rwd, char s[] ) {
                 if ( wd <= rwd ) throw (cstring_length){ &cstring_length_vt };
-                return (_Istream_Cstr)@{ s, {0p}, rwd, {.flags.rwd : true} };
+                return (_Istream_Cstr)@{ s, { {0p}, rwd, {.flags.rwd : true} } };
         }
-        _Istream_Cstr skip( const char scanset[] ) { return (_Istream_Cstr)@{ 0p, {scanset}, -1, {.all : 0} }; }
-        _Istream_Cstr skip( unsigned int wd ) { return (_Istream_Cstr)@{ 0p, {0p}, wd, {.all : 0} }; }
+        _Istream_Cstr skip( const char scanset[] ) { return (_Istream_Cstr)@{ 0p, { {scanset}, -1, {.all : 0} } }; }
+        _Istream_Cstr skip( unsigned int wd ) { return (_Istream_Cstr)@{ 0p, { {0p}, wd, {.all : 0} } }; }
         _Istream_Cstr & getline( _Istream_Cstr & fmt, const char delimit = '\n' ) {
                 fmt.delimit[0] = delimit; fmt.delimit[1] = '\0'; fmt.flags.delimit = true; fmt.flags.inex = true; return fmt; }
         _Istream_Cstr & incl( const char scanset[], _Istream_Cstr & fmt ) { fmt.scanset = scanset; fmt.flags.inex = false; return fmt; }
         _Istream_Cstr & excl( const char scanset[], _Istream_Cstr & fmt ) { fmt.scanset = scanset; fmt.flags.inex = true; return fmt; }
-        _Istream_Cstr ignore( char s[] ) { return (_Istream_Cstr)@{ s, {0p}, -1, {.flags.ignore : true} }; }
+        _Istream_Cstr ignore( char s[] ) { return (_Istream_Cstr)@{ s, { {0p}, -1, {.flags.ignore : true} } }; }
         _Istream_Cstr & ignore( _Istream_Cstr & fmt ) { fmt.flags.ignore = true; return fmt; }
 } // distribution