Changeset ee70ff5 for libcfa/src/collections/string.cfa

Timestamp:

Apr 2, 2025, 11:12:18 PM (9 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

9aa8dcc

Parents:

f8913b7c

Message:

harmonize length computations to function name "len"

File:

• libcfa/src/collections/string.cfa (modified) (7 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 : Tue Apr  1 09:17:34 2025
-// Update Count     : 288
+// Last Modified On : Wed Apr  2 14:12:35 2025
+// Update Count     : 295
 //
 
@@ -223 +223 @@
 
 ofstream & ?|?( ofstream & os, _Ostream_Manip(string) f ) {
-        size_t len = size( f.val );
-        char cstr[len + 1];                                                                     // room for null terminator
-        for ( i; len ) cstr[i] = f.val[i];                                      // copy string
-        cstr[len] = '\0';                                                                       // terminate
+        size_t l = len( f.val );
+        char cstr[l + 1];                                                                       // room for null terminator
+        for ( i; l ) cstr[i] = f.val[i];                                        // copy string
+        cstr[l] = '\0';                                                                         // terminate
         _Ostream_Manip(const char *) cf @= { cstr, f.wd, f.pc, f.base, {f.all} };
         return os | cf | nonl;
@@ -254 +254 @@
 
 string ?()( string & s, ssize_t start, ssize_t len ) {
-        if ( start < 0 ) { start += s`len; }
+        if ( start < 0 ) { start += len( s ); }
         if ( len < 0 ) { len = -len; start -= len; }
-        if ( start > s`len ) return (string){ "" };
-        if ( start + len > s`len ) len = s`len - start;
+        if ( start > len( s ) ) return (string){ "" };
+        if ( start + len > len( s ) ) len = len( s ) - start;
         string ret = { *s.inner, start, len };
         return ret`share;
@@ -263 +263 @@
 
 string ?()( string & s, ssize_t start ) {
-        if ( start < 0 ) { start += s`len; }
-        string ret = { *s.inner, start, size( s ) - start };
+        if ( start < 0 ) { start += len( s ); }
+        string ret = { *s.inner, start, len( s ) - start };
         return ret`share;
 }
@@ -299 +299 @@
 // Getter
 
-size_t size( const string & s ) {
-        return size( *s.inner );
+size_t len( const string & s ) {
+        return len( *s.inner );
 }
 
@@ -362 +362 @@
 }
 
-string ?+?( const char * s1, string & s2 ) {
+string ?+?( const char * s1, const string & s2 ) {
         string ret = s1;
         ret += s2;
@@ -371 +371 @@
         string ret = s;
         ret += c;
+        return ret;
+}
+
+string ?+?( char c1, char c2 ) {
+        string ret = c1;
+        ret += c2;
         return ret;
 }