Changeset baa1d5d for libcfa

Timestamp:

Jan 27, 2024, 11:29:57 PM (3 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

63e129c

Parents:

765ee42

Message:

update testing for manipulators

Location:

libcfa/src

Files:

• iostream.cfa (modified) (5 diffs)
• iostream.hfa (modified) (8 diffs)

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jan 25 08:39:31 2024
-// Update Count     : 1901
+// Last Modified On : Sat Jan 27 18:02:40 2024
+// Update Count     : 1909
 //
 
@@ -1002 +1002 @@
                         return is | *(_Istream_Cstr *)&f;
                 } // fini
-                if ( ! flags.ignore && args == 0 ) s[0] = '\0'; // read failed => no pattern match => set string to null
+                // read failed => no pattern match => set string to null
+                if ( ! flags.ignore && s != 0p && args == 0 ) s[0] = '\0';
                 if ( args == 1 && eof( is ) ) {                                 // data but scan ended at EOF
                         clear( is );                                                            // => reset EOF => detect again on next read
@@ -1055 +1056 @@
                         if ( flags.delimiter ) {                                        // getline
                                 int len = 0;                                                    // may not be set in fmt
-                                sprintf( &fmtstr[pos], "[^%c]%%n", delimiters[0] );
+                                if ( delimiters[2] != '\0' ) {                  // read single character ?
+                                        sprintf( &fmtstr[pos], "c%%n" );
+                                } else {
+                                        sprintf( &fmtstr[pos], "[^%c]%%n", delimiters[0] );
+                                } // if
                                 if ( flags.ignore ) args = fmt( is, fmtstr, &len ); // no string argument for '*'
                                 else args = fmt( is, fmtstr, s, &len );
@@ -1097 +1102 @@
         } // ?|?
 
-        istype & ?|?( istype & is, _Istream_Char f ) with(f) {
-                if ( ignore ) {
-                        fmt( is, "%*c" );                                                       // argument variable unused
-                } else {
-                        int len = -1, args = fmt( is, fmt, &c, &len );
-                        if ( args != -1 && len == -1 ) throwResume ExceptionInst( missing_data );
-                } // if
-                return is;
-        } // ?|?
+        // istype & ?|?( istype & is, _Istream_Char f ) with(f) {
+        //      if ( ignore ) {
+        //              fmt( is, "%*c" );                                                       // argument variable unused
+        //      } else {
+        //              int len = -1, args = fmt( is, fmt, &c, &len );
+        //              if ( args != -1 && len == -1 ) throwResume ExceptionInst( missing_data );
+        //      } // if
+        //      return is;
+        // } // ?|?
 } // distribution
 
@@ -1124 +1129 @@
 } // distribution
 
+INPUT_FMT_IMPL( char, "c" )
 INPUT_FMT_IMPL( signed char, "hhi" )
 INPUT_FMT_IMPL( unsigned char, "hhi" )

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 Jan 25 08:39:04 2024
-// Update Count     : 696
+// Last Modified On : Sat Jan 27 17:55:22 2024
+// Update Count     : 732
 //
 
@@ -366 +366 @@
         istype & nlOn( istype & );
         istype & nlOff( istype & );
-        istype & quoted( istype &, char & c );
 } // distribution
 
@@ -398 +397 @@
                         unsigned char ignore:1;                                         // do not change input argument
                         unsigned char inex:1;                                           // include/exclude characters in scanset
-                        unsigned char delimiter:1;                                      // delimit character
+                        unsigned char delimiter:1;                                      // delimit character(s)
                         unsigned char rwd:1;                                            // read width
                 } flags;
@@ -429 +428 @@
                 return (_Istream_Cwidth)@{ .s : s, { {.scanset : 0p}, .wd : rwd, {.flags.rwd : true} } };
         }
+        _Istream_Cquoted quoted( char & ch, const char Ldelimiter = '\'', const char Rdelimiter = '\0' ) {
+                return (_Istream_Cquoted)@{ { .s : &ch, { {.delimiters : { Ldelimiter, Rdelimiter, '\1' }}, .wd : 1, {.flags.rwd : true} } } };
+        }
         _Istream_Cquoted & quoted( _Istream_Cwidth & f, const char Ldelimiter = '"', const char Rdelimiter = '\0' ) {
                 f.delimiters[0] = Ldelimiter;  f.delimiters[1] = Rdelimiter;  f.delimiters[2] = '\0';
@@ -438 +440 @@
         _Istream_Cstr & incl( const char scanset[], _Istream_Cwidth & f ) { f.scanset = scanset; f.flags.inex = false; return (_Istream_Cstr &)f; }
         _Istream_Cstr & excl( const char scanset[], _Istream_Cwidth & f ) { f.scanset = scanset; f.flags.inex = true; return (_Istream_Cstr &)f; }
-        _Istream_Cstr ignore( char s[] ) { return (_Istream_Cwidth)@{ .s : s, { {.scanset : 0p}, .wd : -1, {.flags.ignore : true} } }; }
+        _Istream_Cstr ignore( const char s[] ) { return (_Istream_Cwidth)@{ .s : (char *)s, { {.scanset : 0p}, .wd : -1, {.flags.ignore : true} } }; }
         _Istream_Cstr & ignore( _Istream_Cwidth & f ) { f.flags.ignore = true; return (_Istream_Cstr &)f; }
         _Istream_Cquoted & ignore( _Istream_Cquoted & f ) { f.cstr.flags.ignore = true; return (_Istream_Cquoted &)f; }
@@ -453 +455 @@
 } // distribution
 
-struct _Istream_Char {
-        char & c;
-        bool ignore;                                                                            // do not change input argument
-        char fmt[7];                                                                            // \L%c\R%n\0
-}; // _Istream_Char
-
-static inline {
-        _Istream_Char quoted( char & c, const char Ldelimiter = '\'', const char Rdelimiter = '\0' ) {
-                return (_Istream_Char)@{ .c : c, .ignore : false,
-                                fmt : { Ldelimiter, '%', 'c', (Rdelimiter == '\0' ? Ldelimiter : Rdelimiter), '%', 'n', '\0' } };
-        }
-        _Istream_Char ignore( char ) {
-                return (_Istream_Char)@{ .c : *0p, .ignore : true };
-        }
-        _Istream_Char & ignore( _Istream_Char & fmt ) { fmt.ignore = true; return fmt; }
-} // distribution
-
-forall( istype & | basic_istream( istype ) ) {
-        istype & ?|?( istype & is, _Istream_Char f );
-}
+// struct _Istream_Char {
+//      char & c;
+//      bool ignore;                                                                            // do not change input argument
+//      char fmt[7];                                                                            // \L%c\R%n\0
+// }; // _Istream_Char
+
+// static inline {
+//      _Istream_Char quoted( char & c, const char Ldelimiter = '\'', const char Rdelimiter = '\0' ) {
+//              return (_Istream_Char)@{ .c : c, .ignore : false,
+//                              fmt : { Ldelimiter, '%', 'c', (Rdelimiter == '\0' ? Ldelimiter : Rdelimiter), '%', 'n', '\0' } };
+//      }
+//      _Istream_Char ignore( char ) {
+//              return (_Istream_Char)@{ .c : *0p, .ignore : true };
+//      }
+//      _Istream_Char & ignore( _Istream_Char & fmt ) { fmt.ignore = true; return fmt; }
+// } // distribution
+
+// forall( istype & | basic_istream( istype ) ) {
+//      istype & ?|?( istype & is, _Istream_Char f );
+// }
 
 forall( T & | sized( T ) )
@@ -483 +485 @@
 #define INPUT_FMT_DECL( T ) \
 static inline { \
+        _Istream_Manip(T) wdi( unsigned int wd, T & val ) { return (_Istream_Manip(T))@{ .val : val, .wd : wd, .ignore : false }; } \
         _Istream_Manip(T) ignore( const T & val ) { return (_Istream_Manip(T))@{ .val : (T &)val, .wd : -1, .ignore : true }; } \
         _Istream_Manip(T) & ignore( _Istream_Manip(T) & fmt ) { fmt.ignore = true; return fmt; } \
-        _Istream_Manip(T) wdi( unsigned int wd, T & val ) { return (_Istream_Manip(T))@{ .val : val, .wd : wd, .ignore : false }; } \
-        _Istream_Manip(T) & wdi( unsigned int wd, _Istream_Manip(T) & fmt ) { fmt.wd = wd; return fmt; } \
 } /* distribution */ \
 forall( istype & | basic_istream( istype ) ) { \
@@ -492 +493 @@
 } // ?|?
 
+INPUT_FMT_DECL( char )
 INPUT_FMT_DECL( signed char )
 INPUT_FMT_DECL( unsigned char )