Changeset 5ad6f0d for libcfa/src/collections/string.cfa

Timestamp:

Apr 13, 2025, 9:15:33 PM (9 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

b0296dba

Parents:

a514fed

Message:

more inlining, add strnlen and strncmp for string type

File:

• libcfa/src/collections/string.cfa (modified) (6 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 : Fri Apr 11 18:18:07 2025
-// Update Count     : 370
+// Last Modified On : Sun Apr 13 07:58:55 2025
+// Update Count     : 390
 //
 
@@ -202 +202 @@
         return s;
 }
+
+////////////////////////////////////////////////////////
+// Getter
+
+size_t strnlen( const string & s, size_t maxlen ) { return min( len( s ), maxlen ); }
 
 ////////////////////////////////////////////////////////
@@ -265 +270 @@
 
 ////////////////////////////////////////////////////////
-// Comparison
-
-int strcmp( const string & s1, const string & s2 ) { return strcmp( *s1.inner, *s2.inner ); }
-bool ?==?( const string & s1, const string & s2 ) { return *s1.inner == *s2.inner; }
-bool ?!=?( const string & s1, const string & s2 ) { return *s1.inner != *s2.inner; }
-bool ?>? ( const string & s1, const string & s2 ) { return *s1.inner >  *s2.inner; }
-bool ?>=?( const string & s1, const string & s2 ) { return *s1.inner >= *s2.inner; }
-bool ?<=?( const string & s1, const string & s2 ) { return *s1.inner <= *s2.inner; }
-bool ?<? ( const string & s1, const string & s2 ) { return *s1.inner <  *s2.inner; }
-
-int strcmp( const string & s1, const char * s2 ) { return strcmp( *s1.inner, s2 ); }
-bool ?==?( const string & s1, const char * s2 ) { return *s1.inner == s2; }
-bool ?!=?( const string & s1, const char * s2 ) { return *s1.inner != s2; }
-bool ?>? ( const string & s1, const char * s2 ) { return *s1.inner >  s2; }
-bool ?>=?( const string & s1, const char * s2 ) { return *s1.inner >= s2; }
-bool ?<=?( const string & s1, const char * s2 ) { return *s1.inner <= s2; }
-bool ?<? ( const string & s1, const char * s2 ) { return *s1.inner <  s2; }
-
-int strcmp( const char * s1, const string & s2 ) { return strcmp( s1, *s2.inner ); }
-bool ?==?( const char * s1, const string & s2 ) { return s1 == *s2.inner; }
-bool ?!=?( const char * s1, const string & s2 ) { return s1 != *s2.inner; }
-bool ?>? ( const char * s1, const string & s2 ) { return s1 >  *s2.inner; }
-bool ?>=?( const char * s1, const string & s2 ) { return s1 >= *s2.inner; }
-bool ?<=?( const char * s1, const string & s2 ) { return s1 <= *s2.inner; }
-bool ?<? ( const char * s1, const string & s2 ) { return s1 <  *s2.inner; }
-
-////////////////////////////////////////////////////////
 // Concatenation
 
@@ -403 +381 @@
         string ret = { *s.inner, index, 1 };
         return ret`share;
+}
+
+////////////////////////////////////////////////////////
+// Comparison
+
+#define STRNCPY_FMT "**** Error **** strncpy: maximum length %zu is greater than string lengths %zd or %zd."
+
+int strncmp( const string & s1, const string & s2, size_t maxlen ) {
+        if ( maxlen > len( s1 ) || maxlen > len( s2 ) ) {
+                abort( STRNCPY_FMT, maxlen, len( s1 ), len( s2 ) );
+        } // if
+        return strcmp$( s1.inner->Handle.s, maxlen, s2.inner->Handle.s, maxlen );
+}
+
+int strncmp( const string & s1, const char * s2, size_t maxlen ) {
+        size_t s2len = len( s2 );
+        if ( maxlen > len( s1 ) || maxlen > s2len ) {
+                abort( STRNCPY_FMT, maxlen, len( s1 ), s2len );
+        } // if
+        return strcmp$( s1.inner->Handle.s, maxlen, s2, maxlen );
+}
+
+int strncmp( const char * s1, const string & s2, size_t maxlen ) {
+        size_t s1len = len( s1 );
+        if ( maxlen > s1len || maxlen > len( s2 ) ) {
+                abort( STRNCPY_FMT, maxlen, s1len, len( s2 ) );
+        } // if
+        return strcmp$( s1, maxlen, s2.inner->Handle.s, maxlen );
 }
 
@@ -523 +529 @@
 }
 
-size_t test( const string & s, int (*f)( int ) ) {
+size_t include( const string & s, int (*f)( int ) ) {
         size_t l = len( s );
         for ( i; l ) {
@@ -531 +537 @@
 }
 
-string replace( string & s, const string & from, const string & to ) {
+size_t exclude( 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( const string & s, const string & from, const string & to ) {
         ssize_t pos;
     string r;