Changeset 234c432 for libcfa

Timestamp:

Apr 10, 2025, 6:06:23 PM (5 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

831b2ec

Parents:

b1b513d

Message:

Reorder string quasi-lifecycle functions to ensure string dtor called by all static-inline implementations.

This situation is not exercised currently, but will be, upon upcoming string-overload reorganizations. Incumbent tests are adequate to show if a static-inline change misses the custom dtor: have observed "allocated but not freed" failures from test.py.

Doing this code-move ahead of the string-overload reorganizations keeps them more standalone.

File:

• libcfa/src/collections/string.hfa (modified) (4 diffs)

libcfa/src/collections/string.hfa

@@ -23 +23 @@
 };
 
-// Getters
-static inline size_t len( const string & s ) { return len( *s.inner ); }
-static inline size_t len( const char * cs ) { return strlen( cs ); };
-static inline size_t strlen( const string & s ) { return len( s ); }
-
 // RAII, assignment
+void ^?{}( string & s );
+
 void ?{}( string & s );                                                                 // empty string
 void ?{}( string & s, const string & s2 );
@@ -58 +55 @@
 string & assign( string & s, const string & c, size_t n );
 string & assign( string & s, const char * c, size_t n );
-
-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; }
-
 string & ?=?( string & s, ssize_t rhs );
 string & ?=?( string & s, size_t rhs );
@@ -71 +62 @@
 string & ?=?( string & s, long double _Complex rhs );
 
-void ^?{}( string & s );
+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; }
 
 // Alternate construction: request shared edits
@@ -79 +73 @@
 string_Share ?`share( string & s );
 void ?{}( string & s, string_Share src );
+
+// Getters
+static inline size_t len( const string & s ) { return len( *s.inner ); }
+static inline size_t len( const char * cs ) { return strlen( cs ); };
+static inline size_t strlen( const string & s ) { return len( s ); }
 
 // IO Operator