--- parser3/src/main/pa_string.C	2003/03/25 09:34:53	1.172.2.21.2.28
+++ parser3/src/main/pa_string.C	2003/03/27 10:53:01	1.172.2.21.2.33
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_STRING_C="$Date: 2003/03/25 09:34:53 $";
+static const char* IDENT_STRING_C="$Date: 2003/03/27 10:53:01 $";
 
 #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?
@@ -79,9 +79,10 @@ void String::ArrayFragment::append_posit
 
 // StringBody methods
 
-StringBody::StringBody(int value) {
+StringBody StringBody::Format(int value) {
 	char local[MAX_NUMBER];
-	body=pa_strdup(local, snprintf(local, MAX_NUMBER, "%d", value));
+	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) {
@@ -104,11 +105,13 @@ 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 length, bool tainted): body(CORD_EMPTY) {
+	append(cstr, 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) {
 	if(!str)
@@ -161,7 +164,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'?
@@ -378,6 +381,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;
 
@@ -422,7 +427,8 @@ 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) {
@@ -439,7 +445,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);
 				}
 			}
@@ -546,7 +552,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