Index: libcfa/src/fstream.cfa
===================================================================
--- libcfa/src/fstream.cfa	(revision e3fea427569271c0c15fd2ca6d3296f213856ead)
+++ libcfa/src/fstream.cfa	(revision 7030dab75c493bbd89de53cb88e496019c794ff4)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  4 11:55:29 2020
-// Update Count     : 356
+// Last Modified On : Fri Feb  7 19:01:01 2020
+// Update Count     : 363
 //
 
@@ -32,29 +32,29 @@
 
 void ?{}( ofstream & os, void * file ) {
-	os.file = file;
-	os.sepDefault = true;
-	os.sepOnOff = false;
-	os.nlOnOff = true;
-	os.prt = false;
-	os.sawNL = false;
+	os.$file = file;
+	os.$sepDefault = true;
+	os.$sepOnOff = false;
+	os.$nlOnOff = true;
+	os.$prt = false;
+	os.$sawNL = false;
+	$sepSetCur( os, sepGet( os ) );
 	sepSet( os, " " );
-	sepSetCur( os, sepGet( os ) );
 	sepSetTuple( os, ", " );
 } // ?{}
 
 // private
-bool sepPrt( ofstream & os ) { setNL( os, false ); return os.sepOnOff; }
-void sepReset( ofstream & os ) { os.sepOnOff = os.sepDefault; }
-void sepReset( ofstream & os, bool reset ) { os.sepDefault = reset; os.sepOnOff = os.sepDefault; }
-const char * sepGetCur( ofstream & os ) { return os.sepCur; }
-void sepSetCur( ofstream & os, const char sepCur[] ) { os.sepCur = sepCur; }
-bool getNL( ofstream & os ) { return os.sawNL; }
-void setNL( ofstream & os, bool state ) { os.sawNL = state; }
-bool getANL( ofstream & os ) { return os.nlOnOff; }
-bool getPrt( ofstream & os ) { return os.prt; }
-void setPrt( ofstream & os, bool state ) { os.prt = state; }
+bool $sepPrt( ofstream & os ) { $setNL( os, false ); return os.$sepOnOff; }
+void $sepReset( ofstream & os ) { os.$sepOnOff = os.$sepDefault; }
+void $sepReset( ofstream & os, bool reset ) { os.$sepDefault = reset; os.$sepOnOff = os.$sepDefault; }
+const char * $sepGetCur( ofstream & os ) { return os.$sepCur; }
+void $sepSetCur( ofstream & os, const char sepCur[] ) { os.$sepCur = sepCur; }
+bool $getNL( ofstream & os ) { return os.$sawNL; }
+void $setNL( ofstream & os, bool state ) { os.$sawNL = state; }
+bool $getANL( ofstream & os ) { return os.$nlOnOff; }
+bool $getPrt( ofstream & os ) { return os.$prt; }
+void $setPrt( ofstream & os, bool state ) { os.$prt = state; }
 
 // public
-void ?{}( ofstream & os ) { os.file = 0; }
+void ?{}( ofstream & os ) { os.$file = 0p; }
 
 void ?{}( ofstream & os, const char name[], const char mode[] ) {
@@ -70,41 +70,41 @@
 } // ^?{}
 
-void sepOn( ofstream & os ) { os.sepOnOff = ! getNL( os ); }
-void sepOff( ofstream & os ) { os.sepOnOff = false; }
+void sepOn( ofstream & os ) { os.$sepOnOff = ! $getNL( os ); }
+void sepOff( ofstream & os ) { os.$sepOnOff = false; }
 
 bool sepDisable( ofstream & os ) {
-	bool temp = os.sepDefault;
-	os.sepDefault = false;
-	sepReset( os );
+	bool temp = os.$sepDefault;
+	os.$sepDefault = false;
+	$sepReset( os );
 	return temp;
 } // sepDisable
 
 bool sepEnable( ofstream & os ) {
-	bool temp = os.sepDefault;
-	os.sepDefault = true;
-	if ( os.sepOnOff ) sepReset( os );					// start of line ?
+	bool temp = os.$sepDefault;
+	os.$sepDefault = true;
+	if ( os.$sepOnOff ) $sepReset( os );				// start of line ?
 	return temp;
 } // sepEnable
 
-void nlOn( ofstream & os ) { os.nlOnOff = true; }
-void nlOff( ofstream & os ) { os.nlOnOff = false; }
-
-const char * sepGet( ofstream & os ) { return os.separator; }
+void nlOn( ofstream & os ) { os.$nlOnOff = true; }
+void nlOff( ofstream & os ) { os.$nlOnOff = false; }
+
+const char * sepGet( ofstream & os ) { return os.$separator; }
 void sepSet( ofstream & os, const char s[] ) {
 	assert( s );
-	strncpy( os.separator, s, sepSize - 1 );
-	os.separator[sepSize - 1] = '\0';
+	strncpy( os.$separator, s, sepSize - 1 );
+	os.$separator[sepSize - 1] = '\0';
 } // sepSet
 
-const char * sepGetTuple( ofstream & os ) { return os.tupleSeparator; }
+const char * sepGetTuple( ofstream & os ) { return os.$tupleSeparator; }
 void sepSetTuple( ofstream & os, const char s[] ) {
 	assert( s );
-	strncpy( os.tupleSeparator, s, sepSize - 1 );
-	os.tupleSeparator[sepSize - 1] = '\0';
+	strncpy( os.$tupleSeparator, s, sepSize - 1 );
+	os.$tupleSeparator[sepSize - 1] = '\0';
 } // sepSet
 
 void ends( ofstream & os ) {
-	if ( getANL( os ) ) nl( os );
-	else setPrt( os, false );							// turn off
+	if ( $getANL( os ) ) nl( os );
+	else $setPrt( os, false );							// turn off
 	if ( &os == &exit ) exit( EXIT_FAILURE );
 	if ( &os == &abort ) abort();
@@ -112,9 +112,9 @@
 
 int fail( ofstream & os ) {
-	return os.file == 0 || ferror( (FILE *)(os.file) );
+	return os.$file == 0 || ferror( (FILE *)(os.$file) );
 } // fail
 
 int flush( ofstream & os ) {
-	return fflush( (FILE *)(os.file) );
+	return fflush( (FILE *)(os.$file) );
 } // flush
 
@@ -122,5 +122,5 @@
 	FILE * file = fopen( name, mode );
 	#ifdef __CFA_DEBUG__
-	if ( file == 0 ) {
+	if ( file == 0p ) {
 		abort | IO_MSG "open output file \"" | name | "\"" | nl | strerror( errno );
 	} // if
@@ -134,7 +134,7 @@
 
 void close( ofstream & os ) {
-	if ( (FILE *)(os.file) == stdout || (FILE *)(os.file) == stderr ) return;
-
-	if ( fclose( (FILE *)(os.file) ) == EOF ) {
+	if ( (FILE *)(os.$file) == stdout || (FILE *)(os.$file) == stderr ) return;
+
+	if ( fclose( (FILE *)(os.$file) ) == EOF ) {
 		abort | IO_MSG "close output" | nl | strerror( errno );
 	} // if
@@ -146,5 +146,5 @@
 	} // if
 
-	if ( fwrite( data, 1, size, (FILE *)(os.file) ) != size ) {
+	if ( fwrite( data, 1, size, (FILE *)(os.$file) ) != size ) {
 		abort | IO_MSG "write" | nl | strerror( errno );
 	} // if
@@ -155,7 +155,7 @@
 	va_list args;
 	va_start( args, format );
-	int len = vfprintf( (FILE *)(os.file), format, args );
+	int len = vfprintf( (FILE *)(os.$file), format, args );
 	if ( len == EOF ) {
-		if ( ferror( (FILE *)(os.file) ) ) {
+		if ( ferror( (FILE *)(os.$file) ) ) {
 			abort | IO_MSG "invalid write";
 		} // if
@@ -163,6 +163,6 @@
 	va_end( args );
 
-	setPrt( os, true );									// called in output cascade
-	sepReset( os );										// reset separator
+	$setPrt( os, true );								// called in output cascade
+	$sepReset( os );									// reset separator
 	return len;
 } // fmt
@@ -184,10 +184,10 @@
 // private
 void ?{}( ifstream & is, void * file ) {
-	is.file = file;
-	is.nlOnOff = false;
+	is.$file = file;
+	is.$nlOnOff = false;
 } // ?{}
 
 // public
-void ?{}( ifstream & is ) {	is.file = 0; }
+void ?{}( ifstream & is ) { is.$file = 0p; }
 
 void ?{}( ifstream & is, const char name[], const char mode[] ) {
@@ -203,14 +203,14 @@
 } // ^?{}
 
-void nlOn( ifstream & os ) { os.nlOnOff = true; }
-void nlOff( ifstream & os ) { os.nlOnOff = false; }
-bool getANL( ifstream & os ) { return os.nlOnOff; }
+void nlOn( ifstream & os ) { os.$nlOnOff = true; }
+void nlOff( ifstream & os ) { os.$nlOnOff = false; }
+bool getANL( ifstream & os ) { return os.$nlOnOff; }
 
 int fail( ifstream & is ) {
-	return is.file == 0 || ferror( (FILE *)(is.file) );
+	return is.$file == 0p || ferror( (FILE *)(is.$file) );
 } // fail
 
 int eof( ifstream & is ) {
-	return feof( (FILE *)(is.file) );
+	return feof( (FILE *)(is.$file) );
 } // eof
 
@@ -218,9 +218,9 @@
 	FILE * file = fopen( name, mode );
 	#ifdef __CFA_DEBUG__
-	if ( file == 0 ) {
+	if ( file == 0p ) {
 		abort | IO_MSG "open input file \"" | name | "\"" | nl | strerror( errno );
 	} // if
 	#endif // __CFA_DEBUG__
-	is.file = file;
+	is.$file = file;
 } // open
 
@@ -230,7 +230,7 @@
 
 void close( ifstream & is ) {
-	if ( (FILE *)(is.file) == stdin ) return;
-
-	if ( fclose( (FILE *)(is.file) ) == EOF ) {
+	if ( (FILE *)(is.$file) == stdin ) return;
+
+	if ( fclose( (FILE *)(is.$file) ) == EOF ) {
 		abort | IO_MSG "close input" | nl | strerror( errno );
 	} // if
@@ -242,5 +242,5 @@
 	} // if
 
-	if ( fread( data, size, 1, (FILE *)(is.file) ) == 0 ) {
+	if ( fread( data, size, 1, (FILE *)(is.$file) ) == 0 ) {
 		abort | IO_MSG "read" | nl | strerror( errno );
 	} // if
@@ -253,5 +253,5 @@
 	} // if
 
-	if ( ungetc( c, (FILE *)(is.file) ) == EOF ) {
+	if ( ungetc( c, (FILE *)(is.$file) ) == EOF ) {
 		abort | IO_MSG "ungetc" | nl | strerror( errno );
 	} // if
@@ -263,7 +263,7 @@
 
 	va_start( args, format );
-	int len = vfscanf( (FILE *)(is.file), format, args );
+	int len = vfscanf( (FILE *)(is.$file), format, args );
 	if ( len == EOF ) {
-		if ( ferror( (FILE *)(is.file) ) ) {
+		if ( ferror( (FILE *)(is.$file) ) ) {
 			abort | IO_MSG "invalid read";
 		} // if