--- parser3/src/main/pa_string.C	2003/03/21 13:42:32	1.172.2.21.2.15
+++ parser3/src/main/pa_string.C	2003/03/25 10:21:08	1.172.2.21.2.29
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_STRING_C="$Date: 2003/03/21 13:42:32 $";
+static const char* IDENT_STRING_C="$Date: 2003/03/25 10:21:08 $";
 
 #include "pcre.h"
 
@@ -49,7 +49,10 @@ void String::ArrayFragment::append_posit
 		const element_type& fragment=i.next();
 		fragment_end=fragment_begin+fragment.length;		
 
-		if(fragment_begin<substr_begin) // not reached fragments which may include 'substr'?
+		if(substr_begin<fragment_begin) // not reached fragments which may include 'substr'?
+			continue;
+
+		if(substr_begin>fragment_end) // not reached fragments which may include 'substr'?
 			continue;
 
 		// found first fragment including piece of 'substr'
@@ -73,22 +76,30 @@ void String::ArrayFragment::append_posit
 		break;
 	}	
 }
-/*
-void String::ArrayFragment::mid(ArrayFragment& result, size_t substr_begin, size_t substr_end) {
-}
-*/
 
-// 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);
+	generic_hash_code(result, c);
+	return 0;
+}
 static int CORD_batched_iter_fn_generic_hash_code(const char*  s, void * client_data) {
 	uint& result=*static_cast<uint*>(client_data);
 	generic_hash_code(result, s);
 	return 0;
 };
-uint StringSimple::hash_code() const {
+uint StringBody::hash_code() const {
 	uint result=0;
-	CORD_iter5(body, 0, 0, CORD_batched_iter_fn_generic_hash_code, &result);
+	CORD_iter5(body, 0,
+		CORD_batched_iter_fn_generic_hash_code, 
+		CORD_batched_iter_fn_generic_hash_code, &result);
 	return result;
 }
 
@@ -100,21 +111,21 @@ String::String(const char* cstr, size_t
 
 String::String(const String& src): body(src.body), fragments(src.fragments) {}
 
-String& String::append(const char* str, size_t helper_length, Language lang) {
+String& String::append(const char* str, size_t length, Language lang) {
 	if(!str)
 		return *this;
-	size_t use_length=helper_length?helper_length:strlen(str);
+	size_t use_length=length?length:strlen(str);
 	if(!use_length)
 		return *this;
 
-	body=CORD_cat_char_star(body, str, use_length);
+	body.append(str, use_length);
 	fragments+=Fragment(lang, use_length);
 
 	return *this;
 }
 
 /// @todo check in doc: whether it documents NOW bad situation "abc".mid(-1, 3) =were?="ab"
-const String& String::mid(size_t substr_begin, size_t substr_end) const {
+String& String::mid(size_t substr_begin, size_t substr_end) const {
 	String& result=*new String;
 
 	size_t self_length=length();
@@ -124,7 +135,7 @@ const String& String::mid(size_t substr_
 		return result;
 
 	// first: letters themselves
-	result.body=CORD_substr(body, substr_begin, substr_end-substr_begin);
+	result.body=body.mid(substr_begin, substr_end-substr_begin);
 
 	// next: their langs
 	result.fragments.append_positions(fragments, substr_begin, substr_end);
@@ -134,10 +145,10 @@ const String& String::mid(size_t substr_
 	return result;
 }
 
-size_t String::pos(CORD substr, 
+size_t String::pos(const StringBody substr, 
 		   size_t this_offset, Language lang) const {
 	// first: letters themselves
-	size_t substr_begin=CORD_str(body, this_offset, substr);
+	size_t substr_begin=body.pos(substr, this_offset);
 	if(substr_begin==CORD_NOT_FOUND)
 		return STRING_NOT_FOUND;
 
@@ -147,7 +158,7 @@ size_t String::pos(CORD substr,
 		return substr_begin;
 
 	// substr must be in one fragment, and fragments' lang must = lang
-	size_t substr_end=substr_begin+CORD_len(substr);
+	size_t substr_end=substr_begin+substr.length();
 	size_t fragment_begin=0;
 	size_t fragment_end;
 	for(Array_iterator<ArrayFragment::element_type> i(fragments); i.has_next(); fragment_begin=fragment_end) {
@@ -163,17 +174,17 @@ size_t String::pos(CORD substr,
 			throw Exception(0, // (*) see below
 				this,
 				"searching for '%s' starting from %ud problem: found begin in one fragment, but end in another",
-					CORD_to_const_char_star(substr), this_offset);
+					substr.cstr(), this_offset);
 
-		if(fragment.lang==lang)
+		if(fragment.lang<=lang)
 			return substr_begin;
 		else { // bad lang...
 			/// WARNING: this possibly skips assert (*), but it's fast
-			substr_begin=CORD_str(body, fragment_end/*...search AFTER for more*/, substr);
+			substr_begin=body.pos(substr, fragment_end/*...search AFTER for more*/);
 			if(substr_begin==CORD_NOT_FOUND)
 				return STRING_NOT_FOUND;
 
-			size_t substr_end=substr_begin+CORD_len(substr);
+			size_t substr_end=substr_begin+substr.length();
 			// and continuing with next fragment
 		}
 	}	
@@ -189,7 +200,7 @@ size_t String::pos(const String& substr,
 void String::split(ArrayString& result, 
 				   size_t& pos_after, 
 				   const char* delim, 
-				   Language lang, int limit) {
+				   Language lang, int limit) const {
 	size_t self_length=length();
 	if(size_t delim_length=strlen(delim)) {
 		int pos_before;
@@ -231,7 +242,7 @@ void String::split(ArrayString& result,
 	}
 }
 
-static void regex_options(const String& options, int *result, bool& need_pre_post_match){
+static void regex_options(const String* options, int *result, bool& need_pre_post_match){
     struct Regex_option {
 		const char* keyL;
 		const char* keyU;
@@ -250,10 +261,10 @@ static void regex_options(const String&
 	result[0]=PCRE_EXTRA | PCRE_DOTALL | PCRE_DOLLAR_ENDONLY;
 	result[1]=0;
 
-    if(!options.is_empty()) 
+    if(options && !options->is_empty()) 
 		for(Regex_option *o=regex_option; o->keyL; o++) 
-			if(options.pos(o->keyL)>=0
-				|| (o->keyU && options.pos(o->keyU)>=0)) {
+			if(options->pos(o->keyL)>=0
+				|| (o->keyU && options->pos(o->keyU)>=0)) {
 				if(o->flag)
 					*o->flag=true;
 				else { // result
@@ -265,7 +276,7 @@ static void regex_options(const String&
 
 Table* String::match(Charset& source_charset,
 					   const String& regexp, 
-					   const String& options,
+					   const String* options,
 					   Row_action row_action, void *info,
 					   bool& just_matched) const { 
 	if(regexp.is_empty())
@@ -277,7 +288,7 @@ Table* String::match(Charset& source_cha
 	const char* errptr;
 	int erroffset;
 	bool need_pre_post_match=false;
-	int option_bits[2];  regex_options(options, option_bits, need_pre_post_match);
+	int option_bits[2]={0};  regex_options(options, option_bits, need_pre_post_match);
 	bool global=option_bits[1]!=0;
 	pcre *code=pcre_compile(pattern, option_bits[0], 
 		&errptr, &erroffset,
@@ -303,7 +314,7 @@ Table* String::match(Charset& source_cha
 	int ovector[oveclength];
 
 	// create table
-	Table* table=new Table(string_match_table_template);
+	Table& table=*new Table(string_match_table_template);
 
 	int exec_option_bits=0;
 	int prestart=0;
@@ -318,7 +329,7 @@ Table* String::match(Charset& source_cha
 			pcre_free(code);
 			row_action(table, 0/*last time, no raw*/, 0, 0, poststart, postfinish, info);
 			if(global || subpatterns)
-				return table; // global or with subpatterns=true+result
+				return &table; // global or with subpatterns=true+result
 			else {
 				just_matched=false; return 0; // not global=no result
 			}
@@ -355,7 +366,7 @@ Table* String::match(Charset& source_cha
 		if(!global || prestart==poststart) { // not global | going to hang
 			pcre_free(code);
 			row_action(table, 0/*last time, no row*/, 0, 0, poststart, postfinish, info);
-			return table;
+			return &table;
 		}
 		prestart=poststart;
 
@@ -366,7 +377,7 @@ Table* String::match(Charset& source_cha
 	}
 }
 
-String& String::change_case(Charset& source_charset, Change_case_kind kind) {
+String& String::change_case(Charset& source_charset, Change_case_kind kind) const {
 	String& result=*new String();
 
 	const unsigned char *tables=source_charset.pcre_tables;
@@ -416,7 +427,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=CORD_cat_char_star(result.body, prematch_begin, prematch_length);
+				result.body.append(prematch_begin, prematch_length);
 				result.fragments.append_positions(fragments, prematch_begin-old_cstr, current-old_cstr);
 			}
 
@@ -429,7 +440,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=CORD_cat(result.body, b->cstr_to_cord());
+					result.body.append(b->cstr_to_string_body());
 					result.fragments.append(b->fragments);
 				}
 			}
@@ -439,7 +450,7 @@ const String& String::replace(const Dict
 
 	// postmatch
 	if(size_t postmatch_length=current-prematch_begin) {
-		result.body=CORD_cat_char_star(result.body, prematch_begin, postmatch_length);
+		result.body.append(prematch_begin, postmatch_length);
 		result.fragments.append_positions(fragments, prematch_begin-old_cstr, current-old_cstr);
 	}
 
@@ -514,11 +525,9 @@ inline uint uchars2uint(uchar *bytes) {
 		| bytes[0];
 }
 
-static int CORD_batched_iter_fn_append(const char* s, void* client_data) {
-	char*& cur=*static_cast<char**>(client_data);
-
+static int serialize_body_piece(const char* s, char** cur) {
 	size_t length=strlen(s);
-	memcpy(cur, s, length);  cur+=length;
+	memcpy(*cur, s, length);  *cur+=length;
 	return 0;
 };
 String::C String::serialize(size_t prolog_length) const {
@@ -546,11 +555,11 @@ String::C String::serialize(size_t prolo
 	}
 
 	// 4: letters
-	CORD_iter5(body, 0, 0, CORD_batched_iter_fn_append, &cur);
+	body.for_each(serialize_body_piece, &cur);
 
 	return result;
 }
-bool String::deserialize(size_t prolog_length, void *buf, size_t buf_length, const char* file) {
+bool String::deserialize(size_t prolog_length, void *buf, size_t buf_length) {
 	if(buf_length<=prolog_length)
 		return false;
 	buf_length-=prolog_length;