Changeset ee70ff5 for libcfa/src/collections/string_res.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_res.cfa (modified) (6 diffs)

libcfa/src/collections/string_res.cfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 14 15:45:24 2025
-// Update Count     : 88
+// Last Modified On : Tue Apr  1 23:29:58 2025
+// Update Count     : 91
 //
 
@@ -193 +193 @@
 
 // Returns the size of the string in bytes
-size_t size(const string_res & s) with(s) {
+size_t len(const string_res & s) with(s) {
         return Handle.lnth;
 }
@@ -255 +255 @@
   fini: {
                 char rfmt[5] = { ' ', delimiters[0], '%', 'n', '\0' };
-                int len = -1;                                                                   // may not be set in fmt
-                args = fmt( is, rfmt, &len );                                   // remove leading whitespace and quote
-          if ( eof( is ) || len == -1 ) break fini;
+                int l = -1;                                                                             // may not be set in fmt
+                args = fmt( is, rfmt, &l );                                             // remove leading whitespace and quote
+          if ( eof( is ) || l == -1 ) break fini;
 
                 // Change the remainder of the read into a getline by reseting the closing delimiter.
@@ -353 +353 @@
 void ?{}( string_res & s, ssize_t rhs ) {
         char buf[64];
-        int len;
-        snprintf( buf, sizeof(buf)-1, "%zd%n", rhs, &len );
-        ( s ){ buf, len };
+        int l;
+        snprintf( buf, sizeof(buf)-1, "%zd%n", rhs, &l );
+        ( s ){ buf, l };
 }
 void ?{}( string_res & s, size_t rhs ) {
         char buf[64];
-        int len;
-        snprintf( buf, sizeof(buf)-1, "%zu%n", rhs, &len );
-        ( s ){ buf, len };
+        int l;
+        snprintf( buf, sizeof(buf)-1, "%zu%n", rhs, &l );
+        ( s ){ buf, l };
 }
 void ?{}( string_res & s, double rhs ) {
         char buf[64];
-        int len;
-        snprintf( buf, sizeof(buf)-1, "%g%n", rhs, &len );
-        ( s ){ buf, len };
+        int l;
+        snprintf( buf, sizeof(buf)-1, "%g%n", rhs, &l );
+        ( s ){ buf, l };
 }
 void ?{}( string_res & s, long double rhs ) {
         char buf[64];
-        int len;
-        snprintf( buf, sizeof(buf)-1, "%Lg%n", rhs, &len );
-        ( s ){ buf, len };
+        int l;
+        snprintf( buf, sizeof(buf)-1, "%Lg%n", rhs, &l );
+        ( s ){ buf, l };
 }
 void ?{}( string_res & s, double _Complex rhs ) {
         char buf[64];
-        int len;
-        snprintf( buf, sizeof(buf)-1, "%g+%gi%n", creal( rhs ), cimag( rhs ), &len );
-        ( s ){ buf, len };
+        int l;
+        snprintf( buf, sizeof(buf)-1, "%g+%gi%n", creal( rhs ), cimag( rhs ), &l );
+        ( s ){ buf, l };
 }
 void ?{}( string_res & s, long double _Complex rhs ) {
         char buf[64];
-        int len;
-        snprintf( buf, sizeof(buf)-1, "%Lg+%Lgi%n", creall( rhs ), cimagl( rhs ), &len );
-        ( s ){ buf, len };
+        int l;
+        snprintf( buf, sizeof(buf)-1, "%Lg+%Lgi%n", creall( rhs ), cimagl( rhs ), &l );
+        ( s ){ buf, l };
 }
 
@@ -794 +794 @@
 
 bool contains(const string_res & s, char ch) {
-        for ( i; size(s) ) {
+        for ( i; len(s) ) {
                 if (s[i] == ch) return true;
         }
@@ -941 +941 @@
 
 int exclude(const string_res & s, const charclass_res & mask) {
-        for ( i; size(s) ) {
+        for ( i; len(s) ) {
                 if ( test(mask, s[i]) ) return i;
         }
-        return size(s);
+        return len(s);
 }
 
 int include(const string_res & s, const charclass_res & mask) {
-        for ( i; size(s) ) {
+        for ( i; len(s) ) {
                 if ( ! test(mask, s[i]) ) return i;
         }
-        return size(s);
+        return len(s);
 }