Changeset ed5023d1 for libcfa/src/collections/string_res.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_res.cfa (modified) (3 diffs)

libcfa/src/collections/string_res.cfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr  1 23:29:58 2025
-// Update Count     : 91
+// Last Modified On : Sun Apr  6 07:38:02 2025
+// Update Count     : 111
 //
 
@@ -724 +724 @@
 }
 
-void ?+=?(string_res & str1, const string_res & str2) {
-        append( str1, str2.Handle.s, str2.Handle.lnth );
-}
-
-void append(string_res & str1, const string_res & str2, size_t maxlen) {
-        append( str1, str2.Handle.s, min(str2.Handle.lnth, maxlen) );
-}
-
-void ?+=?(string_res & s, char c) {
-        append( s, & c, 1 );
-}
-void ?+=?(string_res & s, const char * c) {
-        append( s, c, strlen(c) );
+void append( string_res & s, const string_res & s2, size_t maxlen ) {
+        append( s, s2.Handle.s, min( s2.Handle.lnth, maxlen ) );
 }
 
@@ -751 +740 @@
 // Comparisons
 
-int strcmp(const string_res & s1, const string_res & s2) {
-        // return 0;
-        int ans1 = memcmp(s1.Handle.s, s2.Handle.s, min(s1.Handle.lnth, s2.Handle.lnth));
-        if (ans1 != 0) return ans1;
-        return s1.Handle.lnth - s2.Handle.lnth;
-}
-
-bool ?==?(const string_res & s1, const string_res & s2) { return strcmp(s1, s2) == 0; }
-bool ?!=?(const string_res & s1, const string_res & s2) { return strcmp(s1, s2) != 0; }
-bool ?>? (const string_res & s1, const string_res & s2) { return strcmp(s1, s2) >  0; }
-bool ?>=?(const string_res & s1, const string_res & s2) { return strcmp(s1, s2) >= 0; }
-bool ?<=?(const string_res & s1, const string_res & s2) { return strcmp(s1, s2) <= 0; }
-bool ?<? (const string_res & s1, const string_res & s2) { return strcmp(s1, s2) <  0; }
-
-int strcmp (const string_res & s1, const char * s2) {
-        string_res s2x = s2;
-        return strcmp(s1, s2x);
-}
-
-bool ?==?(const string_res & s1, const char * s2) { return strcmp(s1, s2) == 0; }
-bool ?!=?(const string_res & s1, const char * s2) { return strcmp(s1, s2) != 0; }
-bool ?>? (const string_res & s1, const char * s2) { return strcmp(s1, s2) >  0; }
-bool ?>=?(const string_res & s1, const char * s2) { return strcmp(s1, s2) >= 0; }
-bool ?<=?(const string_res & s1, const char * s2) { return strcmp(s1, s2) <= 0; }
-bool ?<? (const string_res & s1, const char * s2) { return strcmp(s1, s2) <  0; }
-
-int strcmp (const char * s1, const string_res & s2) {
-        string_res s1x = s1;
-        return strcmp(s1x, s2);
-}
-
-bool ?==?(const char * s1, const string_res & s2) { return strcmp(s1, s2) == 0; }
-bool ?!=?(const char * s1, const string_res & s2) { return strcmp(s1, s2) != 0; }
-bool ?>? (const char * s1, const string_res & s2) { return strcmp(s1, s2) >  0; }
-bool ?>=?(const char * s1, const string_res & s2) { return strcmp(s1, s2) >= 0; }
-bool ?<=?(const char * s1, const string_res & s2) { return strcmp(s1, s2) <= 0; }
-bool ?<? (const char * s1, const string_res & s2) { return strcmp(s1, s2) <  0; }
-
+int strcmp$( const char * s1, size_t l1, const char * s2, size_t l2 ) {
+        int ret = memcmp( s1, s2, min( l1, l2 ) );
+        if ( ret != 0 ) return ret;
+        return l1 - l2;
+}
 
 //////////////////////////////////////////////////////////