Changeset baa1d5d for libcfa/src/iostream.cfa

Timestamp:

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

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

63e129c

Parents:

765ee42

Message:

update testing for manipulators

File:

• libcfa/src/iostream.cfa (modified) (5 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" )