Changeset b1eefe50

Timestamp:

Jan 19, 2024, 4:36:18 PM (6 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

dd10bf4

Parents:

ac939461

Message:

Adjust string assignment declarations for consistent/standard return type.

Location:

libcfa/src/collections

Files:

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

libcfa/src/collections/string.cfa

@@ -91 +91 @@
 // Assignment
 
-void ?=?( string & s, const char * val ) {
-    (*s.inner) = val;
-}
-
-// with and without const on "other" argument helps keep prevent autogen ?=? calls
-void ?=?(string & s, const string & c) {
+string & ?=?(string & s, const string & c) {
     (*s.inner) = (*c.inner);
-}
+    return s;
+}
+
 string & ?=?(string & s, string & c) {
     (*s.inner) = (*c.inner);
@@ -104 +101 @@
 }
 
-void ?=?( string & s, char val ) {
+string & ?=?( string & s, const char * val ) {
     (*s.inner) = val;
-}
-
-void assign(string & s, const string & c, size_t n) {
+    return s;
+}
+
+string & ?=?( string & s, char val ) {
+    (*s.inner) = val;
+    return s;
+}
+
+string & assign(string & s, const string & c, size_t n) {
     assign(*s.inner, *c.inner, n);
-}
-void assign(string & s, const char * c, size_t n) {
+    return s;
+}
+
+string & assign(string & s, const char * c, size_t n) {
     assign(*s.inner, c, n);
+    return s;
 }
 

libcfa/src/collections/string.hfa

@@ -41 +41 @@
 void ?{}(string & s, const char * c, size_t size); // copy specific length from buffer
 
-void ?=?(string & s, const char * c); // copy assignment from literal
-void ?=?(string & s, const string & c);
-void ?=?(string & s, char c);
-string & ?=?(string & s, string & c);  // surprising ret seems to help avoid calls to autogen
-void assign(string & s, const string & c, size_t n);
-void assign(string & s, const char * c, size_t n);
-//string ?=?( string &, string ) = void;
+string & ?=?(string & s, const string & c);
+string & ?=?(string & s, string & c);
+string & ?=?(string & s, const char * c); // copy from "literal"
+string & ?=?(string & s, char c);  // copy from 'l'
+string & assign(string & s, const string & c, size_t n);
+string & assign(string & s, const char * c, size_t n);
 
 static inline string & strcpy(string & s, const char * c) { s = c; return s; }