Changeset e8b3717 for libcfa

Timestamp:

Jan 18, 2024, 10:17:21 PM (3 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

f988834

Parents:

906d8fa

Message:

Modify substring interface from start-end to start-len, and add a missing test.

Location:

libcfa/src/collections

Files:

• string.cfa (modified) (3 diffs)
• string.hfa (modified) (1 diff)
• string_res.cfa (modified) (3 diffs)
• string_res.hfa (modified) (1 diff)

libcfa/src/collections/string.cfa

@@ -30 +30 @@
 
 // private (not in header)
-static void ?{}( string & s, string_res & src, size_t start, size_t end ) {
-    (s.inner) { malloc() };
-    ?{}( *s.inner, src, SHARE_EDITS, start, end );
+static void ?{}( string & s, string_res & src, size_t start, size_t len ) {
+    (s.inner) { malloc() };
+    ?{}( *s.inner, src, SHARE_EDITS, start, len );
 }
 
@@ -161 +161 @@
 // Slicing
 
-string ?()( string & s, size_t start, size_t end ) {
-    string ret = { *s.inner, start, end };
+string ?()( string & s, size_t start, size_t len ) {
+    string ret = { *s.inner, start, len };
     return ret`shareEdits;
 }
 
 string ?()( string & s, size_t start ) {
-    string ret = { *s.inner, start, size( s ) };
+    string ret = { *s.inner, start, size( s ) - start };
     return ret`shareEdits;
 }
@@ -286 +286 @@
 
 string ?[?](string & s, size_t index) {
-    string ret = { *s.inner, index, index + 1 };
+    string ret = { *s.inner, index, 1 };
     return ret`shareEdits;
 }

libcfa/src/collections/string.hfa

@@ -162 +162 @@
 
 // Slicing
-string ?()( string & s, size_t start, size_t end );  // TODO const?
+string ?()( string & s, size_t start, size_t len );  // TODO const?
 string ?()( string & s, size_t start);
 

libcfa/src/collections/string_res.cfa

@@ -346 +346 @@
 }
 
+
 // General copy constructor
-void ?{}(string_res & s, const string_res & s2, StrResInitMode mode, size_t start, size_t end ) {
-
+void ?{}(string_res & s, const string_res & s2, StrResInitMode mode, size_t start, size_t len ) {
+
+    size_t end = start + len;
     verify( start <= end && end <= s2.Handle.lnth );
 
@@ -611 +613 @@
 
 void assignAt(const string_res & s, size_t index, char val) {
-    string_res editZone = { s, SHARE_EDITS, index, index+1 };
+    // caution: not tested (not reachable by string-api-coverage interface)
+    // equivalent form at string level is `s[index] = val`,
+    // which uses the overload that returns a length-1 string
+    string_res editZone = { s, SHARE_EDITS, index, 1 };
     assign(editZone, &val, 1);
 }
@@ -656 +661 @@
 
 void ?*=?(string_res & s, size_t factor) {
-    string_res s2 = { s, COPY_VALUE, 0, size(s) };
+    string_res s2 = { s, COPY_VALUE };
     s = "";
     for (factor) s += s2;

libcfa/src/collections/string_res.hfa

@@ -87 +87 @@
 
 enum StrResInitMode { COPY_VALUE, SHARE_EDITS };
-void ?{}(string_res & s, const string_res & src, StrResInitMode, size_t start, size_t end );
+void ?{}(string_res & s, const string_res & src, StrResInitMode, size_t start, size_t len );
 static inline void ?{}(string_res & s, const string_res & src, StrResInitMode mode ) {
     ?{}( s, src, mode, 0, size(src));