Changeset 479fbe3

Timestamp:

Jan 14, 2024, 5:48:00 PM (10 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

739495a

Parents:

5ecaeca

Message:

formatting, add string constructor for char, add string *= operator, simplify ?+? and ?*? operations

Location:

libcfa/src/collections

Files:

• string.cfa (modified) (5 diffs)
• string.hfa (modified) (3 diffs)

libcfa/src/collections/string.cfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jan  4 11:27:37 2024
-// Update Count     : 233
+// Last Modified On : Sun Jan 14 12:03:47 2024
+// Update Count     : 240
 //
 
@@ -29 +29 @@
 // string RAII
 
-
-void ?{}( string & s ) {
-    (s.inner) { malloc() };
-    ?{}( *s.inner );
-}
-
 // private (not in header)
 static void ?{}( string & s, string_res & src, size_t start, size_t end ) {
@@ -41 +35 @@
 }
 
+void ?{}( string & s ) {
+    (s.inner) { malloc() };
+    ?{}( *s.inner );
+}
+
 void ?{}( string & s, const string & c ) {
     (s.inner) { malloc() };
@@ -50 +49 @@
 }
 
-void ?{}( string & s, const char * val ) {
-    (s.inner) { malloc() };
-    ?{}( *s.inner, val );
-}
-
-void ?{}( string & s, const char * buffer, size_t bsize) {
-    (s.inner) { malloc() };
-    ?{}( *s.inner, buffer, bsize );
+void ?{}( string & s, const char c ) {
+    (s.inner) { malloc() };
+        char cs[2] = { c, '\0' };
+    ?{}( *s.inner, cs );
+}
+
+void ?{}( string & s, const char * c ) {
+    (s.inner) { malloc() };
+    ?{}( *s.inner, c );
+}
+
+void ?{}( string & s, const char * c, size_t size) {
+    (s.inner) { malloc() };
+    ?{}( *s.inner, c, size );
 }
 
@@ -237 +242 @@
 }
 
-string ?*?(char c, size_t size) {
-    string ret = "";
-    for ((size_t)size) ret += c;
-    return ret;
-}
-
-string ?*?(const char *s, size_t factor) {
-    string ss = s;
-    return ss * factor;
+void ?*=?(string & s, size_t factor) {
+    s = s * factor;
+}
+
+string ?*?(char c, size_t factor) {
+    string ret = c;
+    return ret * factor;
+}
+
+string ?*?(const char * s, size_t factor) {
+    string ret = s;
+    return ret * factor;
 }
 

libcfa/src/collections/string.hfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jan  4 11:27:35 2024
-// Update Count     : 75
+// Last Modified On : Sun Jan 14 12:03:46 2024
+// Update Count     : 81
 //
 
@@ -33 +33 @@
 // RAII, assignment
 void ?{}(string & s); // empty string
-void ?{}(string & s, const char * initial); // copy from string literal (NULL-terminated)
-void ?{}(string & s, const char * buffer, size_t bsize); // copy specific length from buffer
-
 void ?{}(string & s, const string & s2);
 void ?{}(string & s, string & s2);
 
+void ?{}(string & s, const 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; }
@@ -112 +114 @@
 // Repetition
 string ?*?(const string & s, size_t factor);
-string ?*?(char c, size_t size);
-string ?*?(const char *s, size_t size);
+void ?*=?(string & s, size_t factor);
+string ?*?(char c, size_t factor);
+string ?*?(const char *s, size_t factor);
 
 // Character access