Changeset e891349 for libcfa

Timestamp:

Jan 17, 2024, 2:16:04 PM (3 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

5bf685f

Parents:

06280ad

Message:

Tweak string assignment-strcpy-strncpy and concatenate-strcat-strncat declarations.

Implement -n- versions correctly.

Refactor to include string_res layer.

Add missing tests.

Location:

libcfa/src/collections

Files:

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

libcfa/src/collections/string.cfa

@@ -103 +103 @@
 }
 
+void 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) {
+    assign(*s.inner, c, n);
+}
+
 
 ////////////////////////////////////////////////////////
@@ -205 +212 @@
 }
 
+void append(string & s, const string & s2, size_t maxlen) {
+    append( (*s.inner), (*s2.inner), maxlen );
+}
+
 void ?+=?(string & s, const char * c) {
     (*s.inner) += c;
+}
+
+void append(string & s, const char * buffer, size_t bsize) {
+    append( (*s.inner), buffer, bsize );
 }
 

libcfa/src/collections/string.hfa

@@ -36 +36 @@
 void ?{}(string & s, string & s2);
 
-void ?{}(string & s, const char);
+void ?{}(string & s, char);
 void ?{}(string & s, const char * c); // copy from string literal (NULL-terminated)
 void ?{}(string & s, const char * c, size_t size); // copy specific length from buffer
 
 void ?=?(string & s, const char * c); // copy assignment from literal
-static inline string & strcpy(string & s, const char * c) { s = c; return s; }
-static inline string & strncpy(string & s, const char * c, size_t n) { s = c; return s; }
 void ?=?(string & s, const string & c);
-static inline string & strcpy(string & s, const string c) { s = c; return s; }
 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;
+
+static inline string & strcpy(string & s, const char * c) { s = c; return s; }
+static inline string & strncpy(string & s, const char * c, size_t n) { assign( s, c, n); return s; }
+static inline string & strcpy(string & s, const string & c) { s = c; return s; }
+static inline string & strncpy(string & s, const string & c, size_t n) { assign(s, c, n); return s; }
+
 void ^?{}(string & s);
 
@@ -104 +109 @@
 void ?+=?(string & s, char c); // append a character
 void ?+=?(string & s, const string & s2); // append-concatenate to first string
-static inline string & strcat(string & s, const string & s2) { s += s2; return s; }
-void ?+=?(string & s, const char * s2); // append-concatenate to first string
-static inline string & strcat(string & s, const char * c) { s += c; return s; }
+void append(string & s, const string & s2, size_t maxlen);  // append-concatenate to first string, up to maxlen
+void ?+=?(string & s, const char * s2); // append-concatenate NULL-terminated string to first string
+void append(string & s, const char * buffer, size_t bsize);  // append-concatenate given range to first string
+
 string ?+?(const string & s, char c); // add a character to a copy of the string
 string ?+?(const string & s, const string & s2); // copy and concatenate both strings
-string ?+?(const char * s1, const char * s2); // concatenate both strings
+string ?+?(const char * s1, const char * s2); // copy and concatenate both strings
 string ?+?(const string & s, const char * c); // copy and concatenate with NULL-terminated string
+
+static inline string & strcat(string & s, const string & s2) { s += s2; return s; }
+static inline string & strcat(string & s, const char * c) { s += c; return s; }
+static inline string & strncat(string & s, const string & s2, size_t maxlen) { append(s, s2, maxlen); return s; }
+static inline string & strncat(string & s, const char * buffer, size_t bsize) { append(s, buffer, bsize); return s; }
 
 // Repetition

libcfa/src/collections/string_res.cfa

@@ -563 +563 @@
 }
 
+string_res & assign(string_res & s, const string_res & src, size_t maxlen) {
+    return assign_(s, src.Handle.s, min(src.Handle.lnth, maxlen), *0p);
+}
+
 string_res & assign(string_res & s, const char * buffer, size_t bsize) {
     return assign_(s, buffer, bsize, *0p);
@@ -637 +641 @@
 }
 
+void append(string_res & str1, const string_res & str2, size_t maxlen) {
+    append( str1, str2.Handle.s, min(str2.Handle.lnth, maxlen) );
+}
+
 void ?+=?(string_res & s, char c) {
     append( s, & c, 1 );
 }
-
+void ?+=?(string_res & s, const char * c) {
+    append( s, c, strlen(c) );
+}
 
 ///////////////////////////////////////////////////////////////////

libcfa/src/collections/string_res.hfa

@@ -88 +88 @@
 }
 
+string_res & assign(string_res & s, const string_res & src, size_t maxlen); // copy specific length from other string
 string_res & assign(string_res & s, const char * buffer, size_t bsize); // copy specific length from buffer
 static inline string_res & ?=?(string_res & s, const char * c) {  // copy from string literal (NULL-terminated)
@@ -129 +130 @@
 
 // Concatenation
+void ?+=?(string_res & s, const string_res & s2);
+void ?+=?(string_res & s, char c);
+void append(string_res & s, const string_res & s2, size_t maxlen);
+void ?+=?(string_res & s, const char * c);
 void append(string_res & s, const char * buffer, size_t bsize);
-void ?+=?(string_res & s, char c); // append a character
-void ?+=?(string_res & s, const string_res & s2); // append-concatenate to first string
-static inline void ?+=?(string_res & s, const char * c) {
-    append( s, c, strlen(c) );
-}
+
+static inline string_res & strcat(string_res & s, const string_res & s2) { s += s2; return s; }
+static inline string_res & strcat(string_res & s, const char * c) { s += c; return s; }
+static inline string_res & strncat(string_res & s, const string_res & s2, size_t maxlen) { append(s, s2, maxlen); return s; }
+static inline string_res & strncat(string_res & s, const char * buffer, size_t bsize) { append(s, buffer, bsize); return s; }
 
 // Repetition