Changeset 7abc3de for libcfa

Timestamp:

Jan 17, 2024, 6:31:03 PM (3 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

906d8fa

Parents:

11f65b3

Message:

Harmonize string constructors with assignments, refactor implementations to include string_res, add missing tests

Location:

libcfa/src/collections

Files:

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

libcfa/src/collections/string.cfa

@@ -45 +45 @@
 }
 
+void ?{}( string & s, const string & s2, size_t maxlen) {
+    (s.inner) { malloc() };
+    ?{}( *s.inner, *s2.inner, COPY_VALUE, maxlen );
+}
+
+
 void ?{}( string & s, string & c ) {
     ?{}( s, (const string &) c );
@@ -51 +57 @@
 void ?{}( string & s, const char c ) {
     (s.inner) { malloc() };
-        char cs[2] = { c, '\0' };
-    ?{}( *s.inner, cs );
+    ?{}( *s.inner, c );
 }
 

libcfa/src/collections/string.hfa

@@ -34 +34 @@
 void ?{}(string & s); // empty string
 void ?{}(string & s, const string & s2);
+void ?{}(string & s, const string & s2, size_t maxlen);
 void ?{}(string & s, string & s2);
 

libcfa/src/collections/string_res.hfa

@@ -78 +78 @@
     (s){ rhs, strlen(rhs) };
 }
-
+static inline void ?{}(string_res & s, char c ) {
+    ?{}( s, &c, 1);
+}
+
+// Deleting the copy constructors makes the compiler reject an attempt to call/return by value
 void ?{}(string_res & s, const string_res & s2) = void;
 void ?{}(string_res & s, string_res & s2) = void;
@@ -86 +90 @@
 static inline void ?{}(string_res & s, const string_res & src, StrResInitMode mode ) {
     ?{}( s, src, mode, 0, size(src));
+}
+static inline void ?{}(string_res & s, const string_res & src, StrResInitMode mode, size_t maxlen ) {
+    ?{}( s, src, mode, 0, (size(src) > maxlen)?maxlen:size(src) );
 }