--- parser3/src/main/pa_string.C	2003/03/27 10:04:08	1.172.2.21.2.32
+++ parser3/src/main/pa_string.C	2003/03/27 14:51:29	1.172.2.21.2.34
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_STRING_C="$Date: 2003/03/27 10:04:08 $";
+static const char* IDENT_STRING_C="$Date: 2003/03/27 14:51:29 $";
 
 #include "pcre.h"
 
@@ -46,7 +46,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 +62,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?
@@ -105,26 +105,32 @@ uint StringBody::hash_code() const {
 
 // String methods
 
-String::String(const char* cstr, size_t length, bool tainted): body(CORD_EMPTY) {
-	append(cstr, 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.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 {
@@ -164,7 +170,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'?
@@ -432,7 +438,7 @@ const String& String::replace(const Dict
 		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);
 			}
 
@@ -455,7 +461,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);
 	}
 
@@ -552,7 +558,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