Changeset 9018dcf for libcfa/src/collections/string_res.cfa

Timestamp:

Apr 10, 2025, 7:33:31 AM (9 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

7e4f226

Parents:

931f1b4

Message:

updates to string type

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 : Sun Apr  6 07:38:02 2025
-// Update Count     : 111
+// Last Modified On : Wed Apr  9 08:44:17 2025
+// Update Count     : 128
 //
 
@@ -190 +190 @@
 const char * DEBUG_string_heap_start( VbyteHeap * heap ) {
         return heap->StartVbyte;
-}
-
-// Returns the size of the string in bytes
-size_t len(const string_res & s) with(s) {
-        return Handle.lnth;
 }
 
@@ -756 +751 @@
 }
 
-int find(const string_res & s, char search) {
+// int find$( const string_res & s, ssize_t start, ssize_t len, const string_res & k, ssize_t kstart, ssize_t klen ) {
+//     if ( start < 0 ) start = s.Handle.lnth + start;          // adjust negative starting locations
+//     if ( kstart < 0 ) kstart = k.Handle.lnth + kstart;
+
+//      if ( start + len > s.Handle.lnth ) return start + 1;  // cannot be there
+//      if ( kstart + len > k.Handle.lnth ) return start + 1;
+//      if ( klen > len ) return start + 1;
+
+//      int i, r;
+
+//      for ( i = max( start, 1 ); ; i += 1 ) {
+//              if ( i > s.Handle.lnth - k.Handle.lnth + 1 ) {
+//                      r = s.Handle.lnth + 1;
+//                      break;
+//          } // exit
+//              if ( HeapArea->ByteCmp( s.Handle.s, i, k.Handle.lnth, k.Handle.s, 1, k.Handle.lnth ) == 0 ) {
+//                      r = i;
+//                      break;
+//          } // exit
+//      } // for
+//      return r;
+// }
+
+int find( const string_res & s, char search ) {
         return findFrom(s, 0, search);
 }
 
-int findFrom(const string_res & s, size_t fromPos, char search) {
+int findFrom( const string_res & s, size_t fromPos, char search ) {
         // FIXME: This paricular overload (find of single char) is optimized to use memchr.
         // The general overload (find of string, memchr applying to its first character) and `contains` should be adjusted to match.