Index: libcfa/src/fstream.cfa
===================================================================
--- libcfa/src/fstream.cfa	(revision 8dcb8322993458ade50fa95feddca3d2de4d72b6)
+++ libcfa/src/fstream.cfa	(revision c8371b5a494957f77ac114c53bd54e6f5e7b1d34)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Oct  6 18:39:13 2021
-// Update Count     : 508
+// Last Modified On : Sun Oct 10 11:23:05 2021
+// Update Count     : 512
 //
 
@@ -206,4 +206,6 @@
 } // ?{}
 
+bool getANL$( ifstream & os ) { return os.nlOnOff$; }
+
 inline void lock( ifstream & os ) with( os ) { lock( os.lock$ ); }
 inline void unlock( ifstream & os ) { unlock( os.lock$ ); }
@@ -215,15 +217,13 @@
 void ^?{}( ifstream & is ) { close( is ); }
 
+bool fail( ifstream & is ) { return is.file$ == 0p || ferror( (FILE *)(is.file$) ); }
+void clear( ifstream & is ) { clearerr( (FILE *)(is.file$) ); }
+
 void nlOn( ifstream & os ) { os.nlOnOff$ = true; }
 void nlOff( ifstream & os ) { os.nlOnOff$ = false; }
-bool getANL( ifstream & os ) { return os.nlOnOff$; }
-
-bool fail( ifstream & is ) { return is.file$ == 0p || ferror( (FILE *)(is.file$) ); }
-void clear( ifstream & is ) { clearerr( (FILE *)(is.file$) ); }
-
-void ends( ifstream & is ) {
-} // ends
-
-bool eof( ifstream & is ) { return feof( (FILE *)(is.file$) ); }
+
+void ends( ifstream & is ) {}
+
+bool eof( ifstream & is ) { return feof( (FILE *)(is.file$) ) != 0; }
 
 void open( ifstream & is, const char name[], const char mode[] ) {
Index: libcfa/src/fstream.hfa
===================================================================
--- libcfa/src/fstream.hfa	(revision 8dcb8322993458ade50fa95feddca3d2de4d72b6)
+++ libcfa/src/fstream.hfa	(revision c8371b5a494957f77ac114c53bd54e6f5e7b1d34)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Oct  6 18:45:49 2021
-// Update Count     : 240
+// Last Modified On : Sun Oct 10 09:37:32 2021
+// Update Count     : 243
 //
 
@@ -77,4 +77,5 @@
 void open( ofstream &, const char name[] );
 void close( ofstream & );
+
 ofstream & write( ofstream &, const char data[], size_t size );
 
@@ -105,4 +106,6 @@
 
 // private
+bool getANL$( ifstream & );
+
 void lock( ifstream & );
 void unlock( ifstream & );
@@ -111,5 +114,4 @@
 void nlOn( ifstream & );
 void nlOff( ifstream & );
-bool getANL( ifstream & );
 void ends( ifstream & );
 int fmt( ifstream &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
@@ -121,4 +123,5 @@
 void open( ifstream & is, const char name[] );
 void close( ifstream & is );
+
 ifstream & read( ifstream & is, char data[], size_t size );
 ifstream & ungetc( ifstream & is, char c );
Index: libcfa/src/iostream.cfa
===================================================================
--- libcfa/src/iostream.cfa	(revision 8dcb8322993458ade50fa95feddca3d2de4d72b6)
+++ libcfa/src/iostream.cfa	(revision c8371b5a494957f77ac114c53bd54e6f5e7b1d34)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Oct  6 18:55:03 2021
-// Update Count     : 1344
+// Last Modified On : Sun Oct 10 09:28:17 2021
+// Update Count     : 1345
 //
 
@@ -822,5 +822,5 @@
 			fmt( is, "%c", &temp );						// must pass pointer through varg to fmt
 			// do not overwrite parameter with newline unless appropriate
-			if ( temp != '\n' || getANL( is ) ) { c = temp; break; }
+			if ( temp != '\n' || getANL$( is ) ) { c = temp; break; }
 			if ( eof( is ) ) break;
 		} // for
Index: libcfa/src/iostream.hfa
===================================================================
--- libcfa/src/iostream.hfa	(revision 8dcb8322993458ade50fa95feddca3d2de4d72b6)
+++ libcfa/src/iostream.hfa	(revision c8371b5a494957f77ac114c53bd54e6f5e7b1d34)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Oct  6 18:54:59 2021
-// Update Count     : 404
+// Last Modified On : Sun Oct 10 10:02:07 2021
+// Update Count     : 407
 //
 
@@ -291,8 +291,9 @@
 
 trait basic_istream( istype & ) {
-	bool getANL( istype & );							// get scan newline (on/off)
+	// private
+	bool getANL$( istype & );							// get scan newline (on/off)
+	// public
 	void nlOn( istype & );								// read newline
 	void nlOff( istype & );								// scan newline
-
 	void ends( istype & os );							// end of output statement
 	int fmt( istype &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));