Changeset ed5023d1 for libcfa/src/collections/string.cfa

Timestamp:

Apr 6, 2025, 10:46:19 PM (9 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

0393fda8

Parents:

56ec508

Message:

fix substring error being outside of string, simplify comparison operations, start refactoring string search operations

File:

• libcfa/src/collections/string.cfa (modified) (3 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 : Thu Apr  3 21:27:08 2025
-// Update Count     : 297
+// Last Modified On : Sat Apr  5 15:18:30 2025
+// Update Count     : 318
 //
 
@@ -256 +256 @@
         if ( start < 0 ) { start += len( s ); }
         if ( len < 0 ) { len = -len; start -= len; }
-        if ( start > len( s ) ) return (string){ "" };
+        if ( start >= len( s ) ) return (string){ "" };
         if ( start + len > len( s ) ) len = len( s ) - start;
         string ret = { *s.inner, start, len };
@@ -424 +424 @@
 }
 
-int find( const string & s, char search ) {
-        return find( *s.inner, search );
-}
-
-int find( const string & s, const string & search ) {
-        return find( *s.inner, *search.inner );
-}
-
-int find( const string & s, const char * search ) {
-        return find( *s.inner, search );
-}
-
-int find( const string & s, const char * search, size_t searchsize ) {
-        return find( *s.inner, search, searchsize );
-}
-
-int find( const string & s, size_t fromPos, char search ) {
-        return findFrom( *s.inner, fromPos, search );
-}
-
-int find( const string & s, size_t fromPos, const string & search ) {
-        return findFrom( *s.inner, fromPos, *search.inner );
-}
-
-int find( const string & s, size_t fromPos, const char * search ) {
-        return findFrom( *s.inner, fromPos, search );
-}
-
-int find( const string & s, size_t fromPos, const char * search, size_t searchsize ) {
-        return findFrom( *s.inner, fromPos, search, searchsize );
-}
-
-bool includes( const string & s, const string & search ) {
-        return includes( *s.inner, *search.inner );
-}
-
-bool includes( const string & s, const char * search ) {
-        return includes( *s.inner, search );
-}
-
-bool includes( const string & s, const char * search, size_t searchsize ) {
-        return includes( *s.inner, search, searchsize );
+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; }
+        if ( start >= len( s ) ) return 0;
+        if ( start + len > len( s ) ) len = len( s ) - start;
+
+        if ( kstart < 0 ) { kstart += len( key ); }
+        if ( klen < 0 ) { klen = -klen; kstart -= klen; }
+        if ( kstart >= len( key ) ) return 0;
+        if ( kstart + klen > len( key ) ) klen = len( key ) - kstart;
+        
+        return findFrom( *s.inner, start, *key.inner );
+}
+
+int find( const string & s, char key ) {
+        return find( *s.inner, key );
+}
+
+int find( const string & s, const string & key ) {
+        return find( *s.inner, *key.inner );
+}
+
+int find( const string & s, const char * key ) {
+        return find( *s.inner, key );
+}
+
+int find( const string & s, const char * key, size_t keysize ) {
+        return find( *s.inner, key, keysize );
+}
+
+int find( const string & s, size_t start, char key ) {
+        return findFrom( *s.inner, start, key );
+}
+
+int find( const string & s, size_t start, const char * key ) {
+        return findFrom( *s.inner, start, key );
+}
+
+int find( const string & s, size_t start, const char * key, size_t keysize ) {
+        return findFrom( *s.inner, start, key, keysize );
+}
+
+bool includes( const string & s, const string & mask ) {
+        return includes( *s.inner, *mask.inner );
+}
+
+bool includes( const string & s, const char * mask ) {
+        return includes( *s.inner, mask );
+}
+
+bool includes( const string & s, const char * mask, size_t masksize ) {
+        return includes( *s.inner, mask, masksize );
 }