--- parser3/src/main/pa_string.C	2024/11/10 20:46:08	1.280
+++ parser3/src/main/pa_string.C	2025/05/26 00:52:15	1.283
@@ -12,7 +12,7 @@
 #include "pa_charset.h"
 #include "pa_vregex.h"
 
-volatile const char * IDENT_PA_STRING_C="$Id: pa_string.C,v 1.280 2024/11/10 20:46:08 moko Exp $" IDENT_PA_STRING_H;
+volatile const char * IDENT_PA_STRING_C="$Id: pa_string.C,v 1.283 2025/05/26 00:52:15 moko Exp $" IDENT_PA_STRING_H;
 
 const String String::Empty;
 
@@ -233,7 +233,7 @@ public:
 		*this+=new String("match");
 		*this+=new String("postmatch");
 		for(int i=0; i<MAX_MATCH_GROUPS; i++) {
-			*this+=new String(pa_uitoa(1+i), String::L_CLEAN);
+			*this+=new String(String::Body::uitoa(1+i), String::L_CLEAN);
 		}
 	}
 };
@@ -247,6 +247,15 @@ static Table &string_match_table_templat
 
 // String::Body methods
 
+String::Body String::Body::uitoa(size_t aindex) {
+	static const size_t CACHE_SIZE=256;
+	static String::Body cache[CACHE_SIZE];
+	if (aindex < CACHE_SIZE)
+		return !cache[aindex] ? (cache[aindex]=Body(pa_uitoa(aindex))) : cache[aindex];
+	else
+		return Body(pa_uitoa(aindex));
+}
+
 String::Body String::Body::trim(String::Trim_kind kind, const char* chars, size_t* out_start, size_t* out_length, Charset* source_charset) const {
 	size_t our_length=length();
 	if(!our_length)
@@ -266,7 +275,7 @@ String::Body String::Body::trim(String::
 	size_t start=0;
 	size_t end=our_length;
 	if(!chars)
-		chars=" \t\n"; // white space
+		chars=" \t\r\n"; // white space
 
 	if(fast){
 		// from left...
@@ -276,9 +285,9 @@ String::Body String::Body::trim(String::
 				char c=CORD_pos_fetch(pos);
 				if(strchr(chars, c)) {
 					if(++start==our_length)
-						return 0; // all chars are empty, just return empty string
+						return String::Body(); // all chars are empty, just return empty string
 				} else
-					break;			
+					break;
 
 				CORD_next(pos);
 			}
@@ -291,9 +300,9 @@ String::Body String::Body::trim(String::
 				char c=CORD_pos_fetch(pos);
 				if(strchr(chars, c)) {
 					if(--end==0) // optimization: NO need to check for 'end>=start', that's(<) impossible
-						return 0; // all chars are empty, just return empty string
+						return String::Body(); // all chars are empty, just return empty string
 				} else
-					break;			
+					break;
 
 				CORD_prev(pos);
 			}
@@ -321,7 +330,7 @@ String::Body String::Body::trim(String::
 				if(found){
 					start+=char_length;
 					if(start==our_length)
-						return 0; // all chars are empty, just return empty string
+						return String::Body(); // all chars are empty, just return empty string
 				} else
 					break;
 			}
@@ -345,7 +354,7 @@ String::Body String::Body::trim(String::
 				if(found){
 					end-=char_length;
 					if(end==0)
-						return 0; // all chars are empty, just return empty string
+						return String::Body(); // all chars are empty, just return empty string
 				} else
 					break;
 			}
@@ -622,7 +631,7 @@ void String::split(ArrayString& result,
 	if(size_t delim_length=strlen(delim)) {
 		size_t pos_before;
 		// while we have 'delim'...
-		while((pos_before=pos(delim, pos_after, lang))!=STRING_NOT_FOUND) {
+		while((pos_before=pos(String::Body(delim), pos_after, lang)) != STRING_NOT_FOUND) {
 			result+=&mid(pos_after, pos_before);
 			pos_after=pos_before+delim_length;
 		}
@@ -768,7 +777,7 @@ String& String::change_case(Charset& sou
 		}
 	}
 	result.langs=langs;
-	result.body=new_cstr;
+	result.body=String::Body(new_cstr);
 
 	return result;
 }