Changes in libcfa/src/collections/string.hfa [829a955:5ad6f0d]

File:

• libcfa/src/collections/string.hfa (modified) (5 diffs)

libcfa/src/collections/string.hfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep 14 10:58:28 2025
-// Update Count     : 311
+// Last Modified On : Sun Apr 13 21:03:35 2025
+// Update Count     : 284
 //
 
@@ -43 +43 @@
 void ?{}( string & s, long double _Complex rhs );
 static inline void ?{}( string & s, int rhs ) { (s){(signed long int) rhs}; }
+
+// string str( ssize_t rhs );
+// string str( size_t rhs );
+// string str( double rhs );
+// string str( long double rhs );
+// string str( double _Complex rhs );
+// string str( long double _Complex rhs );
 
 PBOOST string & ?=?( string & s, string c );
@@ -61 +68 @@
 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; }
-char * strncpy( char * dst, string & src, size_t n );
-char * ?=?( char *& dst, string & src );
-void ?{}( char *& dst, string & src );
 
 // Alternate construction: request shared edits
@@ -183 +187 @@
 PBOOST string ?*?( string s, strmul_factor_t factor );
 string ?*?( const char * s, strmul_factor_t factor );
-static inline string ?*?( strmul_factor_t factor, char c ) { return c * factor; }
+static inline string ?*?( strmul_factor_t factor, char s ) { return s * 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; }
@@ -274 +278 @@
 
 size_t include( const string & s, const charclass & mask );
-static inline size_t include( const string & s, const char * mask ) { return include( s, (charclass){ mask } ); }
-static inline size_t include( const string & s, const string & mask ) { return include( s, (charclass){ mask } ); }
-static inline size_t include( const char * cs, const charclass & mask ) { return include( (string){ cs }, mask ); }
-static inline size_t include( const char * cs, const char * mask ) { return include( (string){ cs }, (charclass){ mask } ); }
-static inline size_t include( const char * cs, const string & mask ) { return include( (string){ cs }, (charclass){ mask } ); }
-
+static inline size_t include( const char * cs, const charclass & mask ) { const string s = cs; return include( s, mask ); }
 static inline string include( const string & s, const charclass & mask ) { return s( 0, include( s, mask ) ); }
-static inline string include( const string & s, const char * mask ) { return s( 0, include( s, (charclass){ mask } ) ); }
-static inline string include( const string & s, const string & mask ) { return s( 0, include( s, (charclass){ mask } ) ); }
 static inline string include( const char * cs, const charclass & mask ) { const string s = cs; return s( 0, include( s, mask ) ); }
-static inline string include( const char * cs, const char * mask ) { const string s = cs; return s( 0, include( s, (charclass){ mask } ) ); }
-static inline string include( const char * cs, const string & mask ) { const string s = cs; return s( 0, include( s, (charclass){ mask } ) ); }
 
 size_t exclude( const string & s, const charclass & mask );
-static inline size_t exclude( const string & s, const char * mask ) { return exclude( s, (charclass){ mask } ); }
-static inline size_t exclude( const string & s, const string & mask ) { return exclude( s, (charclass){ mask } ); }
-static inline size_t exclude( const char * cs, const charclass & mask ) { return exclude( (string){ cs }, mask ); }
-static inline size_t exclude( const char * cs, const string & mask ) { return exclude( (string){ cs }, (charclass){ mask } ); }
-static inline size_t exclude( const char * cs, const char * mask ) { return exclude( (string){ cs }, (charclass){ mask } ); }
-
+static inline size_t exclude( const char * cs, const charclass & mask ) { const string s = cs; return exclude( s, mask ); }
 static inline string exclude( const string & s, const charclass & mask ) { return s( 0, exclude( s, mask ) ); }
-static inline string exclude( const string & s, const char * mask ) { return s( 0, exclude( s, (charclass){ mask } ) ); }
-static inline string exclude( const string & s, const string & mask ) { return s( 0, exclude( s, (charclass){ mask } ) ); }
 static inline string exclude( const char * cs, const charclass & mask ) { const string s = cs; return s( 0, exclude( s, mask ) ); }
-static inline string exclude( const char * cs, const string & mask ) { const string s = cs; return s( 0, exclude( s, (charclass){ mask } ) ); }
-static inline string exclude( const char * cs, const char * mask ) { const string s = cs; return s( 0, exclude( s, (charclass){ mask } ) ); }
-
-size_t include( const string & s, int (* f)( int ) );   // for C character-class functions, e.g., isdigit
-static inline size_t include( const char * cs, int (* f)( int ) ) { return include( (string){ cs }, f ); }
-static inline string include( const string & s, int (* f)( int ) ) { return s( 0, include( s, f ) ); }
-static inline string include( const char * cs, int (* f)( int ) ) { const string s = cs; return s( 0, include( s, f ) ); }
-
-static inline size_t include( const string & s, bool (* f)( char ) ) { return include( s, (int (*)( int ))f ); }
-static inline size_t include( const char * cs, bool (* f)( char ) ) { return include( (string){ cs }, f ); }
-static inline string include( const string & s, bool (* f)( char ) ) { return s( 0, include( s, f ) ); }
-static inline string include( const char * cs, bool (* f)( char ) ) { const string s = cs; return s( 0, include( s, f ) ); }
-
-size_t exclude( const string & s, int (* f)( int ) );   // for C character-class functions, e.g., isdigit
-static inline size_t exclude( const char * cs, int (* f)( int ) ) { return exclude( (string){ cs }, f ); }
-static inline string exclude( const string & s, int (* f)( int ) ) { return s( 0, exclude( s, f ) ); }
-static inline string exclude( const char * cs, int (* f)( int ) ) { const string s = cs; return s( 0, exclude( s, f ) ); }
-
-static inline size_t exclude( const string & s, bool (* f)( char ) ) { return exclude( s, (int (*)( int ))f ); }
-static inline size_t exclude( const char * cs, bool (* f)( char ) ) { return exclude( (string){ cs }, f ); }
-static inline string exclude( const string & s, bool (* f)( char ) ) { return s( 0, exclude( s, f ) ); }
-static inline string exclude( const char * cs, bool (* f)( char ) ) { const string s = cs; return s( 0, exclude( s, f ) ); }
+
+size_t include( const string & s, int (*f)( int ) );
+static inline size_t include( const char * cs, int (*f)( int ) ) { const string S = cs; return include( S, f ); }
+static inline string include( const string & s, int (*f)( int ) ) { return s( 0, include( s, f ) ); }
+static inline string include( const char * cs, int (*f)( int ) ) { const string s = cs; return s( 0, include( s, f ) ); }
+
+size_t exclude( const string & s, int (*f)( int ) );
+static inline size_t exclude( const char * cs, int (*f)( int ) ) { const string s = cs; return exclude( s, f ); }
+static inline string exclude( const string & s, int (*f)( int ) ) { return s( 0, exclude( s, f ) ); }
+static inline string exclude( const char * cs, int (*f)( int ) ) { const string s = cs; return s( 0, exclude( s, f ) ); }
 
 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 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 ); }
-static inline string replace( const string & s, string & from, const char * to ) { return replace( s, from, (string){ to } ); }
-
-string translate( const string & s, int (* f)( int ) ); // for C character-class functions, e.g., isdigit
-static inline string translate( const char * cs, int (* f)( int ) ) { return translate( (string){ cs }, f ); }
-
-static inline string translate( const string & s, bool (* f)( char ) ) { return translate( s, (int (*)( int ))f ); }
-static inline string translate( const char * cs, bool (* f)( char ) ) { return translate( (string){ cs }, f ); }
+static inline string replace( const char * s, const char * from, const char * to ) { string S = s, From = from, To = to; return replace( S, From, To ); }
+static inline string replace( const string & s, const char * from, const char * to ) { const string From = from, To = to; return replace( s, From, To ); }
+static inline string replace( const string & s, const char * from, const string & to ) { const string From = from; return replace( s, From, to ); }
+static inline string replace( const string & s, string & from, const char * to ) { const string To = to; return replace( s, from, To ); }
+
+string translate( const string & s, int (*f)( int ) );
+static inline string translate( const char * c, int (*f)( int ) ) { const string S = c; return translate( S, f ); }
 
 #ifndef _COMPILING_STRING_CFA_