Changeset 71b5aad5 for libcfa/src/collections/string.cfa

Timestamp:

Jan 24, 2024, 6:05:54 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

16afb2a, 221c542e, 8a33777

Parents:

544deb9 (diff), 61e362f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/collections/string.cfa (modified) (3 diffs)

libcfa/src/collections/string.cfa

@@ -70 +70 @@
 }
 
+void ?{}( string & s, ssize_t rhs ) {
+    (s.inner) { malloc() };
+    ?{}( *s.inner, rhs );
+}
+
+void ?{}( string & s, size_t rhs ) {
+    (s.inner) { malloc() };
+    ?{}( *s.inner, rhs );
+}
+
+void ?{}( string & s, double rhs ) {
+    (s.inner) { malloc() };
+    ?{}( *s.inner, rhs );
+}
+
+void ?{}( string & s, long double rhs ) {
+    (s.inner) { malloc() };
+    ?{}( *s.inner, rhs );
+}
+
+void ?{}( string & s, double _Complex rhs ) {
+    (s.inner) { malloc() };
+    ?{}( *s.inner, rhs );
+}
+
+void ?{}( string & s, long double _Complex rhs ) {
+    (s.inner) { malloc() };
+    ?{}( *s.inner, rhs );
+}
+
 void ^?{}( string & s ) {
     ^(*s.inner){};
@@ -91 +121 @@
 // 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 +131 @@
 }
 
-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;
+}
+
+string & ?=?( string & s, ssize_t rhs ) {
+    (*s.inner) = rhs;
+    return s;
+}
+
+string & ?=?( string & s, size_t rhs ) {
+    (*s.inner) = rhs;
+    return s;
+}
+
+string & ?=?( string & s, double rhs ) {
+    (*s.inner) = rhs;
+    return s;
+}
+
+string & ?=?( string & s, long double rhs ) {
+    (*s.inner) = rhs;
+    return s;
+}
+
+string & ?=?( string & s, double _Complex rhs ) {
+    (*s.inner) = rhs;
+    return s;
+}
+
+string & ?=?( string & s, long double _Complex rhs ) {
+    (*s.inner) = rhs;
+    return s;
+}
 
 ////////////////////////////////////////////////////////