Changeset 0f107e4 for libcfa/src/iostream.hfa

Timestamp:

Sep 2, 2023, 2:57:43 PM (9 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

34c6e1e6

Parents:

686912c

Message:

add reading fixed strings, seperate skip input manipulator, getline checks for delimiter

File:

• libcfa/src/iostream.hfa (modified) (5 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 : Thu Aug 31 10:55:35 2023
-// Update Count     : 544
+// Last Modified On : Sat Sep  2 14:42:13 2023
+// Update Count     : 567
 //
 
@@ -388 +388 @@
         ISTYPE_VOID( long double _Complex & );
 
-//      istype & ?|?( istype &, const char [] );
-//      istype & ?|?( istype &, char [] );
-//      ISTYPE_VOID( char [] );
+        istype & ?|?( istype &, const char [] );
+        ISTYPE_VOID( const char [] );
 
         // manipulators
@@ -406 +405 @@
 // *********************************** manipulators ***********************************
 
+struct _Istream_Cskip {
+        const char * scanset;
+        unsigned wd;                                                                            // scan width
+}; // _Istream_Cskip
+
+static inline {
+        _Istream_Cskip skip( const char scanset[] ) { return (_Istream_Cskip)@{ scanset, 0 }; }
+        _Istream_Cskip skip( unsigned int wd ) { return (_Istream_Cskip)@{ 0p, wd }; }
+} // distribution
+forall( istype & | basic_istream( istype ) ) {
+        istype & ?|?( istype & is, _Istream_Cskip f );
+        ISTYPE_VOID( _Istream_Cskip );
+}
+
 struct _Istream_str_base {
         union {
                 const char * scanset;
-                char delimit[2];
+                char delimiter[2];
         };
         int wd;                                                                                         // width
@@ -417 +430 @@
                         unsigned char ignore:1;                                         // do not change input argument
                         unsigned char inex:1;                                           // include/exclude characters in scanset
-                        unsigned char delimit:1;                                        // delimit character
+                        unsigned char delimiter:1;                                      // delimit character
                         unsigned char rwd:1;                                            // read width
                 } flags;
@@ -436 +449 @@
                 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 & 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 & getline( _Istream_Cstr & fmt, const char delimiter = '\n' ) {
+                fmt.delimiter[0] = delimiter; fmt.delimiter[1] = '\0'; fmt.flags.delimiter = 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; }