Changeset b1b513d for libcfa/src/collections/string.hfa

Timestamp:

Apr 10, 2025, 5:27:36 PM (9 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

234c432

Parents:

6174ecc (diff), bb506e0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

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 : Sat Apr  5 15:16:23 2025
-// Update Count     : 180
+// Last Modified On : Wed Apr  9 22:27:41 2025
+// Update Count     : 259
 //
 
@@ -17 +17 @@
 
 #include <fstream.hfa>
-
-
-// in string_res.hfa
-struct string_res;
-struct charclass_res;
+#include <string_res.hfa>
 
 struct string {
@@ -28 +24 @@
 
 // Getters
+static inline size_t len( const string & s ) { return len( *s.inner ); }
 static inline size_t len( const char * cs ) { return strlen( cs ); };
-size_t len( const string & s );
 static inline size_t strlen( const string & s ) { return len( s ); }
 
@@ -215 +211 @@
 bool contains( const string & s, char ch );                             // single character
 
-int find( const string & s, char key );
-static inline int ?^? ( const string & s, char key ) { return find( s, key ); }
-int find( const string & s, const char * key );
-static inline int ?^? ( const string & s, const char * key ) { return find( s, key ); }
-int find( const string & s, const string & key );
-static inline int ?^? ( const string & s, const string & key ) { return find( s, key ); }
-int find( const string & s, const char * key, size_t keysize );
-
-int find( const string & s, size_t start, char key );
-int find( const string & s, size_t start, const string & key );
-int find( const string & s, size_t start, const char * key );
-int find( const string & s, size_t start, const char * key, size_t keysize );
+//int find( const string & s, size_t start, size_t len, const string & key, size_t kstart, size_t klen );
+size_t find$( const string_res & s, size_t start, size_t len, const string & key_res, size_t kstart, size_t klen );
+
+size_t find( const string & s, char key );
+size_t find( const string & s, const char * key );
+size_t find( const string & s, const string & key );
+size_t find( const string & s, const char * key, size_t keysize );
+
+size_t find( const string & s, size_t start, char key );
+size_t find( const string & s, size_t start, const string & key );
+size_t find( const string & s, size_t start, const char * key );
+size_t find( const string & s, size_t start, const char * key, size_t keysize );
+static inline ?^?( const string & key, const string & s ) { return find( s, key ); }
+static inline ?^?( const char * key, const string & s ) { return find( s, key ); }
 
 bool includes( const string & s, const string & mask );
@@ -241 +239 @@
 
 // Slicing
-string ?()( string & s, ssize_t start, ssize_t len );           // TODO const?
+string ?()( string & s, ssize_t start, ssize_t len );
+static inline string ?()( const string & s, ssize_t start, ssize_t len ) { string & w = (string &)s; return w( start, len ); } // FIX ME
 string ?()( string & s, ssize_t start );
+static inline string ?()( const string & s, ssize_t start ) { string & w = (string &)s; return w( start ); } // FIX ME
 static inline string ?()( string & s, char m ) { return s( find( s, m ), 1 )`share; }
+static inline string ?()( const string & s, char m ) { string & w = (string &)s; return w( find( s, m ), 1 )`share; } // FIX ME
 static inline string ?()( string & s, const char * m ) { return s( find( s, m ), len( m ) )`share; }
+static inline string ?()( const string & s, const char * m ) { string & w = (string &)s; return w( find( s, m ), len( m ) )`share; } // FIX ME
 static inline string ?()( string & s, const string & m ) { return s( find( s, m ), len( m ) )`share; }
-
-// Modifiers
-void padStart( string & s, size_t n );
-void padStart( string & s, size_t n, char padding );
-void padEnd( string & s, size_t n );
-void padEnd( string & s, size_t n, char padding );
-
+static inline string ?()( const string & s, const string & m ) { string & w = (string &)s; return w( find( s, m ), len( m ) )`share; } // FIX ME
 
 struct charclass {
@@ -267 +263 @@
 void ^?{}( charclass & );
 
-int include( const string & s, const charclass & mask );
-
-int exclude( const string & s, const charclass & mask );
-
-/*
-What to do with?
-StrRet include( string & s, const charclass & mask );
-StrRet exclude( string & s, const charclass & mask );
-*/
+size_t include( const string & s, const charclass & mask );
+static inline size_t include( const char * s, const charclass & mask ) { string temp = s; return include( temp, mask ); }
+static inline string include( const string & s, const charclass & mask ) { ssize_t i = include( s, mask ); return s( 0, i )`share; }
+static inline string include( const char * s, const charclass & mask ) { string temp = s; ssize_t i = include( temp, mask ); return temp( 0, i ); }
+
+size_t exclude( const string & s, const charclass & mask );
+static inline size_t exclude( const char * s, const charclass & mask ) { string temp = s; return exclude( temp, mask ); }
+static inline string exclude( const string & s, const charclass & mask ) { ssize_t i = exclude( s, mask ); return s( 0, i )`share; }
+static inline string exclude( const char * s, const charclass & mask ) { string temp = s; ssize_t i = exclude( temp, mask ); return temp( 0, i ); }
+
+size_t test( const string & s, int (*f)( int ) );
+static inline size_t test( const char * c, int (*f)( int ) ) {
+        const string S = c;
+        return test( S, f );
+}
+
+string replace( string & s, const string & from, const string & to );
+static inline string replace( const char * s, const char * from, const char * to ) {
+        string S = s, From = from, To = to;
+        return replace( S, From, To );
+}
+static inline string replace( string & s, const char * from, const char * to ) {
+        string From = from, To = to;
+        return replace( s, From, To );
+}
+static inline string replace( string & s, const char * from, const string & to ) {
+        string From = from;
+        return replace( s, From, to );
+}
+static inline string replace( string & s, string & from, const char * to ) {
+        string To = to;
+        return replace( s, from, To );
+}
+
+string translate( const string & s, int (*f)( int ) );
+static inline string translate( const char * c, int (*f)( int ) ) {
+        const string S = c;
+        return translate( S, f );
+}