Changes in libcfa/src/collections/string.cfa [9018dcf:ed5023d1]

File:

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

libcfa/src/collections/string.cfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr  9 22:27:40 2025
-// Update Count     : 368
+// Last Modified On : Sat Apr  5 15:18:30 2025
+// Update Count     : 318
 //
 
@@ -295 +295 @@
 bool ?<? ( const char * s1, const string & s2 ) { return s1 <  *s2.inner; }
 
+
+////////////////////////////////////////////////////////
+// Getter
+
+size_t len( const string & s ) {
+        return len( *s.inner );
+}
+
 ////////////////////////////////////////////////////////
 // Concatenation
@@ -416 +424 @@
 }
 
-size_t find( const string & s, size_t start, size_t len, const string & key, size_t kstart, size_t klen ) {
+int find( const string & s, size_t start, size_t len, const string & key, size_t kstart, size_t klen ) {
         if ( start < 0 ) { start += len( s ); }
         if ( len < 0 ) { len = -len; start -= len; }
@@ -426 +434 @@
         if ( kstart >= len( key ) ) return 0;
         if ( kstart + klen > len( key ) ) klen = len( key ) - kstart;
-
+        
         return findFrom( *s.inner, start, *key.inner );
 }
 
-size_t find( const string & s, char key ) {
+int find( const string & s, char key ) {
         return find( *s.inner, key );
 }
 
-size_t find( const string & s, const string & key ) {
+int find( const string & s, const string & key ) {
         return find( *s.inner, *key.inner );
 }
 
-size_t find( const string & s, const char * key ) {
+int find( const string & s, const char * key ) {
         return find( *s.inner, key );
 }
 
-size_t find( const string & s, const char * key, size_t keysize ) {
+int find( const string & s, const char * key, size_t keysize ) {
         return find( *s.inner, key, keysize );
 }
 
-size_t find( const string & s, size_t start, char key ) {
+int find( const string & s, size_t start, char key ) {
         return findFrom( *s.inner, start, key );
 }
 
-size_t find( const string & s, size_t start, const char * key ) {
+int find( const string & s, size_t start, const char * key ) {
         return findFrom( *s.inner, start, key );
 }
 
-size_t find( const string & s, size_t start, const char * key, size_t keysize ) {
+int find( const string & s, size_t start, const char * key, size_t keysize ) {
         return findFrom( *s.inner, start, key, keysize );
 }
@@ -519 +527 @@
 }
 
-size_t exclude( const string & s, const charclass & mask ) {
+
+int exclude( const string & s, const charclass & mask ) {
         return exclude( *s.inner, *mask.inner );
 }
-
-size_t include( const string & s, const charclass & mask ) {
+/*
+StrSlice exclude( string & s, const charclass & mask ) {
+}
+*/
+
+int include( const string & s, const charclass & mask ) {
         return include( *s.inner, *mask.inner );
 }
 
-size_t test( const string & s, int (*f)( int ) ) {
-        size_t l = len( s );
-        for ( i; l ) {
-                if ( ! f( s[i] ) ) return i;
-        } // for
-        return l;
-}
-
-string replace( string & s, const string & from, const string & to ) {
-        ssize_t pos;
-    string r;
-
-    pos = find( s, from );
-    if ( pos < len( s ) ) {
-                r = s( 0, pos ) + to + replace( s( pos + (ssize_t)len( from ) ), from, to );
-                string front = s( 0, pos );
-                string back = s( pos + (ssize_t)len( from ) );
-                r = front + to + replace( back, from, to );
-    } else {
-                r = s;
-    } // if
-    return r;
-}
-
-string translate( const string & s, int (*f)( int ) ) {
-        string r = s;
-        size_t l = len( r );
-        for ( i; l ) {
-                r[i] = (char)f( r[i] );
-        } // for
-        return r;
-}
+/*
+StrSlice include( string & s, const charclass & mask ) {
+}
+*/