--- parser3/src/main/pa_string.C	2003/03/19 13:16:56	1.172.2.21.2.4
+++ parser3/src/main/pa_string.C	2003/09/24 14:32:06	1.175.2.6
@@ -1,11 +1,11 @@
 /** @file
-	Parser: string class. @see untasize_t.C.
+	Parser: string class. @see untalength_t.C.
 
 	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_STRING_C="$Date: 2003/03/19 13:16:56 $";
+static const char* IDENT_STRING_C="$Date: 2003/09/24 14:32:06 $";
 
 #include "pcre.h"
 
@@ -15,6 +15,32 @@ static const char* IDENT_STRING_C="$Date
 #include "pa_dictionary.h"
 #include "pa_charset.h"
 
+// cord lib extension
+
+#ifndef DOXYGEN
+typedef struct {
+    ssize_t countdown;
+    char target;	/* Character we're looking for	*/
+} chr_data;
+#endif
+static int CORD_range_contains_chr_greater_then_proc(char c, size_t size, void* client_data)
+{
+    register chr_data * d = (chr_data *)client_data;
+    
+    if (d -> countdown<=0) return(2);
+    d -> countdown -= size;
+    if (c > d -> target) return(1);
+    return(0);
+}
+int CORD_range_contains_chr_greater_then(CORD x, size_t i, size_t n, int c)
+{
+    chr_data d;
+
+    d.countdown = n;
+    d.target = c;
+    return(CORD_block_iter(x, i, CORD_range_contains_chr_greater_then_proc, &d) == 1/*alternatives: 0 normally ended, 2=struck 'n'*/);
+}
+
 // helpers
 
 /// String::match uses this as replace & global search table columns
@@ -28,196 +54,164 @@ public:
 		*this+=new String("match");
 		*this+=new String("postmatch");
 		for(int i=0; i<MAX_MATCH_GROUPS; i++) {
-			char *cname=new char[3/*strlen("100")*/+1/*terminating 0*/];
-			*this+=new String(cname, sprintf(cname, "%d", 1+i));
+			*this+=new String(String::Body::Format(1+i), String::L_CLEAN);
 		}
 	}
 };
 
 Table string_match_table_template(new String_match_table_template_columns);
 
-// String::ArrayFragment methods
-
-String::ArrayFragment& String::ArrayFragment::append(const ArrayFragment& src, 
-						     size_t substr_start, size_t substr_end) {
-	if(substr_start==substr_end)
-		return *this;
+// String::Body methods
 
-	size_t fragment_start=0;
-	size_t fragment_end;
-	for(Array_iterator<element_type> i(src); ; fragment_start=fragment_end) {
-		const element_type& fragment=i.next();
-		fragment_end=fragment_start+fragment.size;		
-
-		if(substr_start<fragment_start) // not reached fragments which may include 'substr'?
-			continue;
-
-		// found first fragment including piece of 'substr'
-		size_t piece_end=min(substr_end, fragment_end);
-		*this+=Fragment(fragment.lang, piece_end-substr_start);
-		
-		while(substr_end>fragment_end) { // are there more fragments including pieces of 'substr'?
-			const element_type& fragment=i.next();
-			fragment_end=fragment_start+fragment.size;
-
-			if(substr_end>fragment_end) // are there still more?
-				simple_append(Fragment(fragment.lang, fragment.size)); // appending whole fragment
-			else { // no, it was last
-				simple_append(Fragment(fragment.lang, substr_end-fragment_start));
-				goto break2;
-			}
-		}
+String::Body String::Body::Format(int value) {
+	char local[MAX_NUMBER];
+	size_t length=snprintf(local, MAX_NUMBER, "%d", value);
+	return String::Body(pa_strdup(local, length), length);
+}
 
-		break;
-	}	
-break2:
-	
-	return *this;
+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;
 }
-/*
-void String::ArrayFragment::mid(ArrayFragment& result, size_t substr_start, size_t substr_end) {
+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 String::Body::hash_code() const {
+	uint result=0;
+	CORD_iter5(body, 0,
+		CORD_batched_iter_fn_generic_hash_code, 
+		CORD_batched_iter_fn_generic_hash_code, &result);
+	return result;
 }
-*/
 
 // String methods
 
-String::String(const char* src, size_t src_size, bool tainted): body(CORD_EMPTY) {
-	if(src)
-		if(tainted)
-			APPEND_TAINTED(src, src_size, 0, 0);
-		else
-			APPEND_CLEAN(src, src_size, 0, 0);
+String::String(const char* cstr, size_t helper_length, bool tainted): body(CORD_EMPTY) {
+	append_help_length(cstr, helper_length, tainted?L_TAINTED:L_CLEAN);
+}
+String::String(const String::C cstr, bool tainted): body(CORD_EMPTY) {
+	append_know_length(cstr.str, cstr.length, tainted?L_TAINTED:L_CLEAN);
 }
 
-String::String(const String& src): body(src.body), fragments(src.fragments) {}
-
-String& String::real_append(STRING_APPEND_PARAMS) {
-	if(!src)
-		return *this;
-	if(!size)
-		size=strlen(src);
-	if(!size)
+String& String::append_know_length(const char* str, size_t known_length, Language lang) {
+	if(!known_length)
 		return *this;
 
-	body=CORD_cat_char_star(body, src, size);
-	fragments+=Fragment(lang, size);
+	// first: langs
+	langs.append(body, lang, known_length);
+	// next: letters themselves
+	body.append_know_length(str, known_length);
 
+	ASSERT_STRING_INVARIANT(*this);
 	return *this;
 }
+String& String::append_help_length(const char* str, size_t helper_length, Language lang) {
+	if(!str)
+		return *this;
+	size_t known_length=helper_length?helper_length:strlen(str);
+	if(!known_length)
+		return *this;
 
-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 String::hash_code() const {
-	uint result=0;
-	CORD_iter5(body, 0, 0, CORD_batched_iter_fn_generic_hash_code, &result);
-	return result;
+	return append_know_length(str, known_length, lang);
 }
+String& String::append_strdup(const char* str, size_t helper_length, Language lang) {
+	size_t known_length=helper_length?helper_length:strlen(str);
+	if(!known_length)
+		return *this;
 
-const String& String::mid(size_t substr_start, size_t substr_end) const {
-	String& result=*new String;
+	// first: langs
+	langs.append(body, lang, known_length);
+	// next: letters themselves
+	body.append_strdup_know_length(str, known_length);
 
-	substr_start=min(substr_start, size());
-	substr_end=max(substr_start, substr_end);
-	if(substr_start==substr_end)
-		return result;
+	ASSERT_STRING_INVARIANT(*this);
+	return *this;
+}
 
-	// first: letters themselves
-	result.body=CORD_substr(body, substr_start, substr_end-substr_start);
+/// @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 {
+	String& result=*new String;
 
-	// next: their langs
-	result.fragments.append(fragments, substr_start, substr_end);
+	size_t self_length=length();
+	substr_begin=min(substr_begin, self_length);
+	substr_end=min(max(substr_end, substr_begin), self_length);
+	size_t substr_length=substr_end-substr_begin;
+	if(!substr_length)
+		return result;
 
-//	SAPI::log(pool(), "piece of '%s' from %d to %d is '%s'",
-		//cstr(), substr_start, substr_end, result.cstr());
+	// first: their langs
+	result.langs.append(result.body, langs, substr_begin, substr_length);
+	// next: letters themselves
+	result.body=body.mid(substr_begin, substr_length);
+
+//	SAPI::log("piece of '%s' from %d to %d is '%s'",
+		//cstr(), substr_begin, substr_end, result.cstr());
+	ASSERT_STRING_INVARIANT(result);
 	return result;
 }
 
-size_t String::pos(CORD substr, 
-		   size_t this_offset, Untaint_lang lang) const {
-	// first: letters themselves
-	size_t substr_start=CORD_str(body, this_offset, substr);
-	if(substr_start==CORD_NOT_FOUND)
-		return NOT_FOUND;
-
-	// next: check the lang when specified
-
-	if(lang==UL_UNSPECIFIED) // ignore lang?
-		return substr_start;
-
-	// substr must be in one fragment, and fragments' lang must = lang
-	size_t substr_end=substr_start+CORD_len(substr);
-	size_t fragment_start=0;
-	size_t fragment_end;
-	for(Array_iterator<ArrayFragment::element_type> i(fragments); i.has_next(); fragment_start=fragment_end) {
-		const Fragment& fragment=i.next();
-		fragment_end=fragment_start+fragment.size;
-
-		if(substr_start<fragment_start) // not reached fragments which may include 'result'?
-			continue;
-		
-		if(substr_end>fragment_end) // end of substr OUT of current fragment?
-			break;
-
-		return fragment.lang==lang?substr_end:NOT_FOUND;
-	}	
+size_t String::pos(const String::Body substr, size_t this_offset, Language lang) const {
+	size_t substr_begin=body.pos(substr, this_offset);
+	if(substr_begin==CORD_NOT_FOUND || !langs.check_lang(lang, substr_begin, substr.length()))
+		return STRING_NOT_FOUND;
 
-	return NOT_FOUND;
+	return substr_begin;
 }
 
 size_t String::pos(const String& substr, 
-				size_t this_offset, Untaint_lang lang) const {
+				size_t this_offset, Language lang) const {
 	return pos(substr.body, this_offset, lang);
 }
 
 void String::split(ArrayString& result, 
-				   size_t& pos_after, 
-				   const char* delim, 
-				   Untaint_lang lang, int limit) {
-	size_t self_size=size();
-	if(size_t delim_size=strlen(delim)) {
+		   size_t& pos_after, 
+		   const char* delim, 
+		   Language lang, int limit) const {
+	size_t self_length=length();
+	if(size_t delim_length=strlen(delim)) {
 		int pos_before;
 		// while we have 'delim'...
-		for(; (pos_before=pos(delim, pos_after, lang))>=0 && limit; limit--) {
+		for(; (pos_before=pos(delim, pos_after, lang))!=STRING_NOT_FOUND && limit; limit--) {
 			result+=&mid(pos_after, pos_before);
-			pos_after=pos_before+delim_size;
+			pos_after=pos_before+delim_length;
 		}
 		// last piece
-		if(pos_after<self_size && limit) {
-			result+=&mid(pos_after, self_size);
-			pos_after=self_size;
+		if(pos_after<self_length && limit) {
+			result+=&mid(pos_after, self_length);
+			pos_after=self_length;
 		}
 	} else { // empty delim
 		result+=this;
-		pos_after+=self_size;
+		pos_after+=self_length;
 	}
 }
 
 void String::split(ArrayString& result, 
-				   size_t& pos_after, 
-				   const String& delim, Untaint_lang lang, 
-				   int limit) const {
-	if(delim) {
+		   size_t& pos_after, 
+		   const String& delim, Language lang, 
+		   int limit) const {
+	if(!delim.is_empty()) {
 		int pos_before;
 		// while we have 'delim'...
-		for(; (pos_before=pos(delim, pos_after, lang))>=0 && limit; limit--) {
+		for(; (pos_before=pos(delim, pos_after, lang))!=STRING_NOT_FOUND && limit; limit--) {
 			result+=&mid(pos_after, pos_before);
-			pos_after=pos_before+delim.size();
+			pos_after=pos_before+delim.length();
 		}
 		// last piece
-		if(pos_after<size() && limit) {
-			result+=&mid(pos_after, size());
-			pos_after=size();
+		if(pos_after<length() && limit) {
+			result+=&mid(pos_after, length());
+			pos_after=length();
 		}
 	} else { // empty delim
 		result+=this;
-		pos_after+=size();
+		pos_after+=length();
 	}
 }
 
-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;
@@ -236,10 +230,10 @@ static void regex_options(const String&
 	result[0]=PCRE_EXTRA | PCRE_DOTALL | PCRE_DOLLAR_ENDONLY;
 	result[1]=0;
 
-    if(options) 
+    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)!=STRING_NOT_FOUND
+				|| (o->keyU && options->pos(o->keyU)!=STRING_NOT_FOUND)) {
 				if(o->flag)
 					*o->flag=true;
 				else { // result
@@ -250,28 +244,28 @@ static void regex_options(const String&
 }
 
 Table* String::match(Charset& source_charset,
-					   const String& regexp, 
-					   const String& options,
-					   Row_action row_action, void *info,
-					   bool& just_matched) const { 
-	if(!regexp)
-		throw Exception(Exception::undefined_type,
-			Exception::undefined_source,
+		     const String& regexp, 
+		     const String* options,
+		     Row_action row_action, void *info,
+		     bool& just_matched) const { 
+	if(regexp.is_empty())
+		throw Exception(0,
+			0,
 			"regexp is empty");
 
 	const char* pattern=regexp.cstr();
 	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,
 		source_charset.pcre_tables);
 
 	if(!code)
-		throw Exception(Exception::undefined_type,
-			&regexp.mid(erroffset, regexp.size()),
+		throw Exception(0,
+			&regexp.mid(erroffset, regexp.length()),
 			"regular expression syntax error - %s", errptr);
 	
 	int subpatterns=pcre_info(code, 0, 0);
@@ -283,27 +277,29 @@ Table* String::match(Charset& source_cha
 				subpatterns);
 	}
 
-	C subject=cstr();
-	const int ovecsize=(1/*match*/+MAX_MATCH_GROUPS)*3;
-	int ovector[ovecsize];
+	const char* subject=cstr();
+	size_t subject_length=strlen(subject);
+	const int oveclength=(1/*match*/+MAX_MATCH_GROUPS)*3;
+	int ovector[oveclength];
 
 	// create table
-	Table* table=new Table(string_match_table_template);
+	Table::Action_options table_options;
+	Table& table=*new Table(string_match_table_template, table_options);
 
 	int exec_option_bits=0;
 	int prestart=0;
 	int poststart=0;
-	int postfinish=size();
+	int postfinish=length();
 	while(true) {
 		int exec_substrings=pcre_exec(code, 0,
-			subject, subject.size, prestart,
-			exec_option_bits, ovector, ovecsize);
+			subject, subject_length, prestart,
+			exec_option_bits, ovector, oveclength);
 		
 		if(exec_substrings==PCRE_ERROR_NOMATCH) {
 			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
 			}
@@ -311,7 +307,7 @@ Table* String::match(Charset& source_cha
 
 		if(exec_substrings<0) {
 			pcre_free(code);
-			throw Exception(Exception::undefined_type,
+			throw Exception(0,
 				&regexp,
 				"regular expression execute error (%d)", 
 					exec_substrings);
@@ -340,7 +336,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;
 
@@ -351,8 +347,10 @@ 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();
+	if(is_empty())
+		return result;
 
 	const unsigned char *tables=source_charset.pcre_tables;
 
@@ -368,7 +366,7 @@ String& String::change_case(Charset& sou
 		b=0;
 		break;
 	default:
-		throw Exception(Exception::undefined_type, 
+		throw Exception(0, 
 			this, 
 			"unknown change case kind #%d", 
 				static_cast<int>(kind)); // never
@@ -376,95 +374,78 @@ String& String::change_case(Charset& sou
 		break; // never
 	}	
 
-	C new_cstr=cstr();
-	const char *end=new_cstr+new_cstr.size;
+	char* new_cstr=cstrm();
 	char *dest=new_cstr;
-	for(const char* current=new_cstr; current<end; current++) {
-		unsigned char c=a[(unsigned char)*current];
+	unsigned char index;
+	for(const char* current=new_cstr; index=(unsigned char)*current; current++) {
+		unsigned char c=a[index];
 		if(b)
 			c=b[c];
 
 		*dest++=(char)c;
 	}
+	result.langs=langs;
 	result.body=new_cstr;
-	result.fragments.append(fragments, 0, fragments.count());
 
 	return result;
 }
 
 const String& String::replace(const Dictionary& dict) const {
 	String& result=*new String();
-	C old_cstr=cstr();
-	const char* current=old_cstr;
-	size_t old_pos=0;
+	const char* old_cstr=cstr();
+	const char* prematch_begin=old_cstr;
 
-	char *new_cstr=new char[(size_t)ceil(old_cstr.size*dict.max_ratio())];
-	char *dest=new_cstr;
-	size_t remaining_size=old_cstr.size;
-	do {
-		if(Table::element_type row=dict.first_that_starts(current, remaining_size)) {
-			{ // prematch
-				size_t now_pos=current-old_cstr;
-				if(now_pos!=old_pos) {
-					result.fragments.append(fragments, old_pos, now_pos);
-					old_pos=now_pos;
-				}
+	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.langs.append(result.body, langs, prematch_begin-old_cstr, current-old_cstr);
+				result.body.append_strdup_know_length(prematch_begin, prematch_length);
 			}
 
-			const String* a=row->get(0); size_t a_size=a->size();
-			// skip 'a' in 'current', in fragment lang index && reduce work size
-			current+=a_size;  old_pos+=a_size;  remaining_size-=a_size;
+			// match
 
-			if(row->count()>1) { // are there any b?
-				const String* b=row->get(1); size_t b_size=b->size();
-				if(b_size) {
-					// write 'b' to 'dest' && skip 'b' in 'dest'
-					b->store_to(dest, String::UL_AS_IS);  dest+=b_size;
+			const String* a=row->get(0);
+			// skip 'a' in 'current'; move prematch_begin
+			current+=a->length(); prematch_begin=current;
 
-					// append match fragments
-					result.fragments.append(b->fragments, 0, b->fragments.count());
-				}
+			if(row->count()>1) { // are there any b?
+				const String* b=row->get(1);
+				result<<*b;
 			}
-		} else {
-			// write a char to b && reduce work size
-			*dest++=*current++;  remaining_size--;
-		}
-	} while(remaining_size);
+		} else // simply advance
+			current++; 
+	}
 
-	{ // postmatch
-		size_t now_pos=current-old_cstr;
-		if(now_pos!=old_pos) // have something at end?
-			result.fragments.append(fragments, old_pos, now_pos-old_pos);
+	// postmatch
+	if(size_t postmatch_length=current-prematch_begin) {
+		result.langs.append(result.body, langs, prematch_begin-old_cstr, current-old_cstr);
+		result.body.append_strdup_know_length(prematch_begin, postmatch_length);
 	}
 
-	result.body=new_cstr;
+	ASSERT_STRING_INVARIANT(result);
 	return result;
 }
 
-double String::as_double() { 
+double String::as_double() const { 
 	double result;
-	char buf[MAX_STRING];
-	if(size()>MAX_STRING-1)
-		throw Exception("number.format",
-			this,
-			"invalid number too long a string (%u>%u)", size(), MAX_STRING-1);
-	char *eol=store_to(buf, String::UL_AS_IS); *eol=0;
-	const char* cstr=buf;
-
-	while(*cstr && isspace(*cstr))
-		cstr++;
-	if(!*cstr)
+	const char *str=cstr();
+
+	while(*str && isspace(*str))
+		str++;
+	if(!*str)
 		return 0;
 
 	char *error_pos;
 	// 0xABC
-	if(cstr[0]=='0')
-		if(cstr[1]=='x' || cstr[1]=='X')
-			result=(double)(unsigned long)strtol(cstr, &error_pos, 0);
+	if(str[0]=='0')
+		if(str[1]=='x' || str[1]=='X')
+			result=(double)(unsigned long)strtol(str, &error_pos, 0);
 		else
-			result=(double)strtod(cstr+1/*skip leading 0*/, &error_pos);
+			result=(double)strtod(str+1/*skip leading 0*/, &error_pos);
 	else
-		result=(double)strtod(cstr, &error_pos);
+		result=(double)strtod(str, &error_pos);
 
 	while(char c=*error_pos++)
 		if(!isspace(c))
@@ -474,30 +455,24 @@ double String::as_double() {
 
 	return result;
 }
-int String::as_int() { 
+int String::as_int() const { 
 	int result;
-	char buf[MAX_STRING];
-	if(size()>MAX_STRING-1)
-		throw Exception("number.format",
-			this,
-			"invalid number too long a string (%u>%u)", size(), MAX_STRING-1);
-	char *eol=store_to(buf, String::UL_AS_IS); *eol=0;
-	const char* cstr=buf;
-
-	while(*cstr && isspace(*cstr))
-		cstr++;
-	if(!*cstr)
+	const char *str=cstr();
+
+	while(*str && isspace(*str))
+		str++;
+	if(!*str)
 		return 0;
 
 	char *error_pos;
 	// 0xABC
-	if(cstr[0]=='0')
-		if(cstr[1]=='x' || cstr[1]=='X')
-			result=(int)(unsigned long)strtol(cstr, &error_pos, 0);
+	if(str[0]=='0')
+		if(str[1]=='x' || str[1]=='X')
+			result=(int)(unsigned long)strtol(str, &error_pos, 0);
 		else
-			result=(int)strtol(cstr+1/*skip leading 0*/, &error_pos, 0);
+			result=(int)strtol(str+1/*skip leading 0*/, &error_pos, 0);
 	else
-		result=(int)strtol(cstr, &error_pos, 0);
+		result=(int)strtol(str, &error_pos, 0);
 
 	while(char c=*error_pos++)
 		if(!isspace(c))
@@ -521,76 +496,110 @@ 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);
-
-	size_t size=strlen(s);
-	memcpy(cur, s, size);  cur+=size;
+static int serialize_body_piece(const char* s, char** cur) {
+	size_t length=strlen(s);
+	memcpy(*cur, s, length);  *cur+=length;
 	return 0;
 };
-String::C String::serialize(size_t prolog_size) const {
-	size_t buf_size=
-		prolog_size
-		+fragments.count()*(sizeof(Untaint_lang)+sizeof(size_t))
-		+size();
-	C result(new char[buf_size], buf_size);
+String::Cm String::serialize(size_t prolog_length) const {
+#if TODO
+	//_asm int 3;
+	size_t buf_length=
+		prolog_length
+		+sizeof(size_t)
+		+langs.count()*(sizeof(Language)+sizeof(size_t))
+		+length();
+	String::Cm result(new(PointerFreeGC) char[buf_length], buf_length);
 
 	// 1: prolog
-	char *cur=result.str+prolog_size;
+	char *cur=result.str+prolog_length;
 
 
-	// 2: fragments.count
-	size_t fragments_count=fragments.count();
+	// 2: langs.count
+	size_t fragments_count=langs.count();
 	memcpy(cur, &fragments_count, sizeof(fragments_count));  cur+=sizeof(fragments_count);
 
 	// 3: lang info
-	for(Array_iterator<ArrayFragment::element_type> i(fragments); i.has_next(); ) {
-		const Fragment& fragment=i.next();
+	for(Array_iterator<ArrayFragment::element_type> i(langs); i.has_next(); ) {
+		const Fragment fragment=i.next();
 		// lang
 		memcpy(cur, &fragment.lang, sizeof(fragment.lang));  cur+=sizeof(fragment.lang);
-		// size
-		memcpy(cur, &fragment.size, sizeof(fragment.size));  cur+=sizeof(fragment.size);
+		// length
+		memcpy(cur, &fragment.length, sizeof(fragment.length));  cur+=sizeof(fragment.length);
 	}
 
 	// 4: letters
-	CORD_iter5(body, 0, 0, CORD_batched_iter_fn_append, &cur);
+	body.for_each(serialize_body_piece, &cur);
 
 	return result;
+#endif
+	return String::Cm(0, 0);
 }
-bool String::deserialize(size_t prolog_size, void *buf, size_t buf_size, const char* file) {
-	if(buf_size<=prolog_size)
+bool String::deserialize(size_t prolog_length, void *buf, size_t buf_length) {
+#if TODO
+	if(buf_length<=prolog_length)
 		return false;
-	buf_size-=prolog_size;
+	buf_length-=prolog_length;
 
 	// 1: prolog
-	const char *cur=(const char *)buf+prolog_size;
+	const char* cur=(const char* )buf+prolog_length;
 
-	// 2: fragments.count
-	if(buf_size<sizeof(size_t)) // fragments.count don't fit?
+	// 2: langs.count
+	if(buf_length<sizeof(size_t)) // langs.count don't fit?
 		return false;
 	size_t fragments_count=*reinterpret_cast<const size_t*>(cur);  cur+=sizeof(size_t);
-	buf_size-=sizeof(size_t);
+	buf_length-=sizeof(size_t);
+	
+	if(fragments_count) {
+		// 3: lang info
+		size_t total_length=0;
+		for(size_t f=0; f<fragments_count; f++) {
+			size_t piece_length=sizeof(Language)+sizeof(size_t);
+			if(buf_length<piece_length) // lang+length
+				return false;
+
+			Language lang=*reinterpret_cast<const Language *>(cur);  cur+=sizeof(Language);
+			size_t fragment_length=*reinterpret_cast<const size_t*>(cur);  cur+=sizeof(size_t);
+			langs+=Fragment(lang, fragment_length);
+			total_length+=fragment_length;
 
-	// 3: lang info
-	size_t total_size=0;
-	for(size_t f=0; f<fragments_count; f++) {
-		size_t piece_size=sizeof(Untaint_lang)+sizeof(size_t);
-		if(buf_size<piece_size) // lang+size
-			return false;
+			buf_length-=piece_length;
+		}
 
-		Untaint_lang lang=*reinterpret_cast<const Untaint_lang *>(cur);  cur+=sizeof(Untaint_lang);
-		size_t fragment_size=*reinterpret_cast<const size_t*>(cur);  cur+=sizeof(size_t);
-		fragments+=Fragment(lang, fragment_size);
-		total_size+=fragment_size;
+		// 4: letters
+		if(buf_length!=total_length)
+			return false;
 
-		buf_size-=piece_size;
+		body=String::Body(cur, buf_length);
 	}
 
-	// 4: letters
-	if(buf_size!=total_size)
-		return false;
+	ASSERT_STRING_INVARIANT(*this);
+	return true;
+#endif
+	return false;
+}
 
-	body=CORD_cat_char_star(CORD_EMPTY, cur, buf_size);
+const char* String::Body::v() const {
+	return CORD_to_const_char_star(body);
+}
+const char* String::Languages::v() const {
+	if(is_not_just_lang)
+		return CORD_to_const_char_star(langs);
+	else
+		return (const char*)&langs;
+}
+const char* String::v() const {
+#define LIMIT_VIEW 20
+	char* buf=(char*)malloc(MAX_STRING);
+	const char*body_view=body.v();
+	const char*langs_view=langs.v();
+	snprintf(buf, MAX_STRING, 
+		"body=[[[%.*s%s]]]   "
+		"langs=[[[%.*s%s]]]",
+		LIMIT_VIEW, body_view, strlen(body_view)>LIMIT_VIEW?"...":"",
+		LIMIT_VIEW, langs_view, strlen(langs_view)>LIMIT_VIEW?"...":""
+	);
 
-	return true;
+	return buf;
+#undef LIMIT_VIEW
 }