--- parser3/src/main/pa_string.C	2003/03/24 16:43:27	1.172.2.21.2.27
+++ parser3/src/main/pa_string.C	2003/04/02 10:10:01	1.172.2.21.2.35
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_STRING_C="$Date: 2003/03/24 16:43:27 $";
+static const char* IDENT_STRING_C="$Date: 2003/04/02 10:10:01 $";
 
 #include "pcre.h"
 
@@ -28,8 +28,7 @@ public:
 		*this+=new String("match");
 		*this+=new String("postmatch");
 		for(int i=0; i<MAX_MATCH_GROUPS; i++) {
-			char *cname=new(PointerFreeGC) char[3/*strlen("100")*/+1/*terminating 0*/];
-			*this+=new String(cname, sprintf(cname, "%d", 1+i));
+			*this+=new String(StringBody::Format(1+i), String::L_CLEAN);
 		}
 	}
 };
@@ -46,7 +45,7 @@ void String::ArrayFragment::append_posit
 	size_t fragment_begin=0;
 	size_t fragment_end;
 	for(Array_iterator<element_type> i(src); ; fragment_begin=fragment_end) {
-		const element_type& fragment=i.next();
+		const element_type fragment=i.next();
 		fragment_end=fragment_begin+fragment.length;		
 
 		if(substr_begin<fragment_begin) // not reached fragments which may include 'substr'?
@@ -62,7 +61,7 @@ void String::ArrayFragment::append_posit
 		while(substr_end>fragment_end) { // are there more fragments including pieces of 'substr'?
 			fragment_begin=fragment_end;
 
-			const element_type& fragment=i.next();
+			const element_type fragment=i.next();
 			fragment_end=fragment_begin+fragment.length;
 
 			if(substr_end>fragment_end) // are there still more?
@@ -77,8 +76,13 @@ void String::ArrayFragment::append_posit
 	}	
 }
 
-// StringSimple methods
+// StringBody methods
 
+StringBody StringBody::Format(int value) {
+	char local[MAX_NUMBER];
+	size_t length=snprintf(local, MAX_NUMBER, "%d", value);
+	return StringBody(pa_strdup(local, length), length);
+}
 
 static int CORD_batched_iter_fn_generic_hash_code(char c, void * client_data) {
 	uint& result=*static_cast<uint*>(client_data);
@@ -100,24 +104,32 @@ uint StringBody::hash_code() const {
 
 // String methods
 
-String::String(const char* cstr, size_t helper_length, bool tainted): body(CORD_EMPTY) {
-	append(cstr, helper_length, tainted?L_TAINTED:L_CLEAN);
+String::String(const char* cstr, size_t help_length, bool tainted): body(CORD_EMPTY) {
+	append_help_length(cstr, help_length, tainted?L_TAINTED:L_CLEAN);
 }
 
-String::String(const String& src): body(src.body), fragments(src.fragments) {}
+String::String(const String& src): body(src.body) {
+	fragments.append(src.fragments);
+}
 
-String& String::append(const char* str, size_t length, Language lang) {
+String& String::append_help_length(const char* str, size_t helper_length, Language lang) {
 	if(!str)
 		return *this;
-	size_t use_length=length?length:strlen(str);
+	size_t use_length=helper_length?helper_length:strlen(str);
 	if(!use_length)
 		return *this;
 
-	body.append(str, use_length);
+	body.append_help_length(str, use_length);
 	fragments+=Fragment(lang, use_length);
 
 	return *this;
 }
+String& String::append_strdup(const char* str, size_t length, Language lang) {
+	body.append_strdup(str, length);
+	fragments+=Fragment(lang, length);
+
+	return *this;
+}
 
 /// @todo check in doc: whether it documents NOW bad situation "abc".mid(-1, 3) =were?="ab"
 String& String::mid(size_t substr_begin, size_t substr_end) const {
@@ -157,7 +169,7 @@ size_t String::pos(const StringBody subs
 	size_t fragment_begin=0;
 	size_t fragment_end;
 	for(Array_iterator<ArrayFragment::element_type> i(fragments); i.has_next(); fragment_begin=fragment_end) {
-		const Fragment& fragment=i.next();
+		const Fragment fragment=i.next();
 		fragment_end=fragment_begin+fragment.length;
 
 		if(substr_begin<fragment_begin) // not reached fragments which may include 'result'?
@@ -374,6 +386,8 @@ Table* String::match(Charset& source_cha
 
 String& String::change_case(Charset& source_charset, Change_case_kind kind) const {
 	String& result=*new String();
+	if(is_empty())
+		return result;
 
 	const unsigned char *tables=source_charset.pcre_tables;
 
@@ -418,11 +432,12 @@ const String& String::replace(const Dict
 	const char* old_cstr=cstr();
 	const char* prematch_begin=old_cstr;
 
-	for(const char* current=old_cstr; *current; ) {
+	const char* current=old_cstr;
+	while(*current) {
 		if(Table::element_type row=dict.first_that_begins(current)) {
 			// prematch
 			if(size_t prematch_length=current-prematch_begin) {
-				result.body.append(prematch_begin, prematch_length);
+				result.body.append_strdup(prematch_begin, prematch_length);
 				result.fragments.append_positions(fragments, prematch_begin-old_cstr, current-old_cstr);
 			}
 
@@ -435,7 +450,7 @@ const String& String::replace(const Dict
 			if(row->count()>1) { // are there any b?
 				const String* b=row->get(1);
 				if(size_t b_length=b->length()) {
-					result.body.append(b->cstr_to_string_body());
+					result.body<<b->cstr_to_string_body();
 					result.fragments.append(b->fragments);
 				}
 			}
@@ -445,7 +460,7 @@ const String& String::replace(const Dict
 
 	// postmatch
 	if(size_t postmatch_length=current-prematch_begin) {
-		result.body.append(prematch_begin, postmatch_length);
+		result.body.append_strdup(prematch_begin, postmatch_length);
 		result.fragments.append_positions(fragments, prematch_begin-old_cstr, current-old_cstr);
 	}
 
@@ -542,7 +557,7 @@ String::C String::serialize(size_t prolo
 
 	// 3: lang info
 	for(Array_iterator<ArrayFragment::element_type> i(fragments); i.has_next(); ) {
-		const Fragment& fragment=i.next();
+		const Fragment fragment=i.next();
 		// lang
 		memcpy(cur, &fragment.lang, sizeof(fragment.lang));  cur+=sizeof(fragment.lang);
 		// length