Changeset 63e129c

Timestamp:

Jan 28, 2024, 3:56:21 PM (11 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

b771581

Parents:

baa1d5d

Message:

cleanup, fix bug for input manipulator nl

Location:

libcfa/src

Files:

• fstream.cfa (modified) (2 diffs)
• iostream.cfa (modified) (3 diffs)
• iostream.hfa (modified) (2 diffs)

libcfa/src/fstream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Nov 15 10:51:14 2023
-// Update Count     : 552
+// Last Modified On : Sun Jan 28 09:56:08 2024
+// Update Count     : 554
 //
 
@@ -209 +209 @@
 void ?{}( ifstream & is, void * file ) with( is ) {
         file$ = file;
-        nlOnOff$ = false;
+        nlOnOff$ = false;                                                                       // => skip newlines when reading single characters
 } // ?{}
 

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jan 27 18:02:40 2024
-// Update Count     : 1909
+// Last Modified On : Sun Jan 28 11:58:54 2024
+// Update Count     : 1917
 //
 
@@ -944 +944 @@
         istype & nl( istype & is ) {
                 fmt( is, "%*[^\n]" );                                                   // ignore characters to newline
-                if ( ! eof( is ) && getANL$( is ) ) fmt( is, "%*c" ); // read newline
+                if ( ! eof( is ) ) fmt( is, "%*c" );                    // read newline
                 return is;
         } // nl
@@ -1101 +1101 @@
                 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
 

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 Jan 27 17:55:22 2024
-// Update Count     : 732
+// Last Modified On : Sun Jan 28 11:56:29 2024
+// Update Count     : 733
 //
 
@@ -455 +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 );
-// }
-
 forall( T & | sized( T ) )
 struct _Istream_Manip {