Changeset 38951c31 for libcfa/src/collections

Timestamp:

Jan 16, 2024, 5:30:58 PM (11 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

06280ad

Parents:

739495a

Message:

Add missing test for string *= and refactor */*= to follow +/+= pattern with string_res.

Location:

libcfa/src/collections

Files:

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

libcfa/src/collections/string.cfa

@@ -236 +236 @@
 // Repetition
 
+void ?*=?(string & s, size_t factor) {
+    (*s.inner) *= factor;
+}
+
 string ?*?(const string & s, size_t factor) {
-    string ret = "";
-    for (factor) ret += s;
-    return ret;
-}
-
-void ?*=?(string & s, size_t factor) {
-    s = s * factor;
+    string ret = s;
+    ret *= factor;
+    return ret;
 }
 
 string ?*?(char c, size_t factor) {
     string ret = c;
-    return ret * factor;
+    ret *= factor;
+    return ret;
 }
 
 string ?*?(const char * s, size_t factor) {
     string ret = s;
-    return ret * factor;
+    ret *= factor;
+    return ret;
 }
 

libcfa/src/collections/string_res.cfa

@@ -642 +642 @@
 
 
+///////////////////////////////////////////////////////////////////
+// Repetition
+
+void ?*=?(string_res & s, size_t factor) {
+    string_res s2 = { s, COPY_VALUE, 0, size(s) };
+    s = "";
+    for (factor) s += s2;
+}
+
 //////////////////////////////////////////////////////////
 // Comparisons

libcfa/src/collections/string_res.hfa

@@ -136 +136 @@
 }
 
+// Repetition
+void ?*=?(string_res & s, size_t factor);
+
 // Character access
 void assignAt(const string_res & s, size_t index, char val);