Index: libcfa/src/collections/string.hfa
===================================================================
--- libcfa/src/collections/string.hfa	(revision bb1eabcd6f64b0ee41ffacd7dd40e7329004f68e)
+++ libcfa/src/collections/string.hfa	(revision d8a2f988fbdaa37173653d0e459271591e6afdd0)
@@ -10,6 +10,6 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May  3 23:24:08 2026
-// Update Count     : 324
+// Last Modified On : Mon May  4 21:54:23 2026
+// Update Count     : 332
 //
 
@@ -33,6 +33,6 @@
 PBOOST void ?{}( string & s, string s2 );
 void ?{}( string & s, char );
-void ?{}( string & s, const char * c );					// copy from string literal (NULL-terminated)
-void ?{}( string & s, const char * c, size_t size );	// copy specific length from buffer
+void ?{}( string & s, const char * cs );				// copy from string literal (NULL-terminated)
+void ?{}( string & s, const char * cs, size_t size );	// copy specific length from buffer
 
 void ?{}( string & s, signed long int rhs );
@@ -45,8 +45,8 @@
 
 PBOOST string & ?=?( string & s, string c );
-string & ?=?( string & s, const char * c );				// copy from "literal"
+string & ?=?( string & s, const char * cs );			// copy from "literal"
 string & ?=?( string & s, char c );						// copy from 'l'
 string & assign( string & s, const string & c, size_t n );
-string & assign( string & s, const char * c, size_t n );
+string & assign( string & s, const char * cs, size_t n );
 string & ?=?( string & s, signed long int rhs );
 string & ?=?( string & s, size_t rhs );
@@ -57,8 +57,16 @@
 static inline string & ?=?( string & s, int rhs ) { return s = ((signed long int) rhs); } // to match cost of (char * int): int
 
-static inline string & strcpy( string & s, const char * c ) { s = c; return s; }
-static inline string & strncpy( string & s, const char * c, size_t n ) { assign( s, c, n ); return s; }
-static inline string & strcpy( string & s, const string & c ) { s = c; return s; }
-static inline string & strncpy( string & s, const string & c, size_t n ) { assign( s, c, n ); return s; }
+static inline string tostr( char c ) { string s = c; return s; }
+static inline string tostr( const char * cs ) { string s = cs; return s; }
+static inline string tostr( signed long int v ) { string s = v; return s; }
+static inline string tostr( size_t v ) { string s = v; return s; }
+static inline string tostr( double v ) { string s = v; return s; }
+static inline string tostr( long double v ) { string s = v; return s; }
+static inline string tostr( long double _Complex v ) { string s = v; return s; }
+
+static inline string & strcpy( string & s, const char * cs ) { s = cs; return s; }
+static inline string & strncpy( string & s, const char * cs, size_t n ) { assign( s, cs, n ); return s; }
+static inline string & strcpy( string & s1, const string & s2 ) { s1 = s2; return s1; }
+static inline string & strncpy( string & s, const string & cs, size_t n ) { assign( s, cs, n ); return s; }
 char * strncpy( char * dst, string & src, size_t n );
 char * ?=?( char *& dst, string & src );
@@ -159,5 +167,5 @@
 PBOOST void ?+=?( string & s, string );
 void append( string & s, const string & s2, size_t maxlen );
-void ?+=?( string & s, const char * s2 );
+void ?+=?( string & s, const char * cs );
 void append( string & s, const char * buffer, size_t bsize );
 
@@ -165,14 +173,14 @@
 string ?+?( char c, string s );
 PBOOST string ?+?( string s, string s2 );
-string ?+?( const char * s, char c );					// not backwards compatible
-string ?+?( char c, const char * s );
-string ?+?( const char * c, const char * s );
-string ?+?( const char * c, string s );
-string ?+?( string s, const char * c );
+string ?+?( const char * cs, char c );					// not backwards compatible
+string ?+?( char c, const char * cs );
+string ?+?( const char * cs1 , const char * cs2 );
+string ?+?( const char * cs , string s );
+string ?+?( string s, const char * cs  );
 string ?+?( char, char );								// not being called 8-(
 
-static inline string & strcat( string & s, const string & s2 ) { s += s2; return s; }
-static inline string & strcat( string & s, const char * c ) { s += c; return s; }
-static inline string & strncat( string & s, const string & s2, size_t maxlen ) { append( s, s2, maxlen ); return s; }
+static inline string & strcat( string & s1, const string & s2 ) { s1 += s2; return s1; }
+static inline string & strcat( string & s, const char * cs  ) { s += cs; return s; }
+static inline string & strncat( string & s1, const string & s2, size_t maxlen ) { append( s1, s2, maxlen ); return s1; }
 static inline string & strncat( string & s, const char * buffer, size_t bsize ) { append( s, buffer, bsize ); return s; }
 
@@ -187,8 +195,8 @@
 string ?*?( char c, strmul_factor_t factor );					// not backwards compatible
 PBOOST string ?*?( string s, strmul_factor_t factor );
-string ?*?( const char * s, strmul_factor_t factor );
+string ?*?( const char * cs, strmul_factor_t factor );
 static inline string ?*?( strmul_factor_t factor, char c ) { return c * factor; }
 PBOOST static inline string ?*?( strmul_factor_t factor, string s ) { return s * factor; }
-static inline string ?*?( strmul_factor_t factor, const char * s ) { return s * factor; }
+static inline string ?*?( strmul_factor_t factor, const char * cs ) { return cs * factor; }
 
 // Character access
@@ -327,5 +335,5 @@
 
 string replace( const string & s, const string & from, const string & to );
-static inline string replace( const char * s, const char * from, const char * to ) { return replace( (string){ s }, (string){ from }, (string){ to } ); }
+static inline string replace( const char * cs, const char * from, const char * to ) { return replace( (string){ cs }, (string){ from }, (string){ to } ); }
 static inline string replace( const string & s, const char * from, const char * to ) { return replace( s, (string){ from }, (string){ to } ); }
 static inline string replace( const string & s, const char * from, const string & to ) { return replace( s, (string){ from }, to ); }