Changeset c4f8c4bf

Timestamp:

Apr 11, 2025, 1:23:19 PM (6 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

602ac05, cefaa2df

Parents:

dab6e39

Message:

Fix string-operator handling on +=

Files:

• libcfa/src/collections/string.cfa (modified) (1 diff)
• libcfa/src/collections/string.hfa (modified) (1 diff)
• tests/collections/.expect/string-operator.txt (modified) (1 diff)
• tests/collections/string-operator.cfa (modified) (1 diff)

libcfa/src/collections/string.cfa

@@ -298 +298 @@
 }
 
-void ?+=?( string & s, const string & s2 ) {
+PBOOST void ?+=?( string & s, string s2 ) {
         (*s.inner) += (*s2.inner);
 }

libcfa/src/collections/string.hfa

@@ -160 +160 @@
 // Concatenation
 void ?+=?( string & s, char c );
-void ?+=?( string & s, const string & s2 );
+PBOOST void ?+=?( string & s, string );
 void append( string & s, const string & s2, size_t maxlen );
 void ?+=?( string & s, const char * s2 );

tests/collections/.expect/string-operator.txt

@@ -99 +99 @@
 (skip)
 0x2a 0x2d
+
+a
+aa
+aaaa
+
+ab
+abab
+ababababab
+
+42
+139
+
+a ab

tests/collections/string-operator.cfa

@@ -322 +322 @@
             printf( "0x%x 0x%x\n", ch, ch + 3 );  // 0x3 0x6 
         }
+        sout | nl;
+
+        s = "";
+        s += 'a';               sout | s;   // a
+        s += "a";               sout | s;   // aa
+        s += s;                 sout | s;   // aaaa
+                                sout | nl;
+
+        s = "";
+        s += 'a' + 'b';         sout | s;   // ab
+        s += "a" + "b";         sout | s;   // abab
+        s += s + 'a' + 'b';     sout | s;   // ababababab
+                                sout | nl;
+
+        {
+            char ch = 42;       sout | (unsigned char) ch; // 42
+            ch += 'a';          sout | (unsigned char) ch; // 139
+                                sout | nl;
+        }
+
+        {
+            char retc = 'a';
+            string rets = "a";
+            char & weird() { return retc; }
+            string & weird() { return rets; }
+            (return char &) weird();
+            (return string &) weird();
+            weird() += 'b';                 // (ideally ambiguous)
+            sout | retc | ' ' | rets;       // a ab (known approximation flaw)
+        }
 }