--- parser3/src/main/pa_string.C	2001/08/01 12:08:40	1.97
+++ parser3/src/main/pa_string.C	2001/12/25 09:00:28	1.136
@@ -2,15 +2,12 @@
 	Parser: string class. @see untasize_t.C.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	$Id: pa_string.C,v 1.136 2001/12/25 09:00:28 paf Exp $
 */
-static const char *RCSId="$Id: pa_string.C,v 1.97 2001/08/01 12:08:40 parser Exp $"; 
-
-#include "pa_config_includes.h"
 
 #include "pcre.h"
-#include "internal.h"
 
 #include "pa_pool.h"
 #include "pa_string.h"
@@ -20,16 +17,16 @@ static const char *RCSId="$Id: pa_string
 #include "pa_array.h"
 #include "pa_globals.h"
 #include "pa_table.h"
+#include "pa_dictionary.h"
+#include "pa_charset.h"
 
 String::String(Pool& apool, const char *src, size_t src_size, bool tainted) :
-	Pooled(apool),
-	forigins_mode(false) {
+	Pooled(apool) {
 	last_chunk=&head;
 	head.count=CR_PREALLOCATED_COUNT;
 	append_here=head.rows;
-	head.preallocated_link=0;
+	head_link=0;
 	link_row=&head.rows[head.count];
-	fused_rows=fsize=0;
 
 	if(src)
 		if(tainted)
@@ -39,14 +36,14 @@ String::String(Pool& apool, const char *
 }
 
 String::String(const String& src) :	
-	Pooled(src.pool()),
-	forigins_mode(false) {
+	Pooled(src.pool()) {
 	head.count=CR_PREALLOCATED_COUNT;
 	
-	size_t src_used_rows=src.fused_rows;
+	uint src_used_rows=src.used_rows();
 	if(src_used_rows<=head.count) {
 		// all new rows fit size_to preallocated area
-		size_t curr_chunk_rows=head.count;
+		last_chunk=&head;
+		uint curr_chunk_rows=head.count;
 		memcpy(head.rows, src.head.rows, sizeof(Chunk::Row)*src_used_rows);
 		append_here=&head.rows[src_used_rows];
 		link_row=&head.rows[curr_chunk_rows];
@@ -63,18 +60,18 @@ String::String(const String& src) :
 		// preallocated chunk src to constructing head
 		memcpy(head.rows, src.head.rows, sizeof(Chunk::Row)*head.count);
 		// remaining rows size_to new_chunk
-		size_t curr_chunk_rows=src_used_rows-head.count;
-		Chunk *new_chunk=static_cast<Chunk *>(
-			malloc(sizeof(size_t)+sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *)));
-		new_chunk->count=curr_chunk_rows;
-		head.preallocated_link=new_chunk;
-		append_here=link_row=&new_chunk->rows[new_chunk->count];
-
-		Chunk *old_chunk=src.head.preallocated_link; 
-		Chunk::Row *new_rows=new_chunk->rows;
-		size_t rows_left_to_copy=new_chunk->count;
+		uint curr_chunk_rows=src_used_rows-head.count;
+		last_chunk=static_cast<Chunk *>(
+			malloc(sizeof(uint)+sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *), 9));
+		last_chunk->count=curr_chunk_rows;
+		head_link=last_chunk;
+		append_here=link_row=&last_chunk->rows[last_chunk->count];
+
+		Chunk *old_chunk=src.head_link; 
+		Chunk::Row *new_rows=last_chunk->rows;
+		uint rows_left_to_copy=last_chunk->count;
 		while(true) {
-			size_t old_count=old_chunk->count;
+			uint old_count=old_chunk->count;
 			Chunk *next_chunk=old_chunk->rows[old_count].link;
 			if(next_chunk) {
 				// not last source chunk
@@ -93,14 +90,34 @@ String::String(const String& src) :
 		}
 	}
 	link_row->link=0;
-	fused_rows=src_used_rows;
-	fsize=src.fsize;
+	src_used_rows;
 }
 
+size_t  String::size() const {
+	size_t result=0;
+	STRING_FOREACH_ROW(
+			result+=row->item.size;
+	);
+break2:
+	return result;
+}
+
+/// @todo not very optimal
+uint String::used_rows() const {
+	uint result=0;
+	STRING_FOREACH_ROW(
+		result++;
+	);
+break2:
+	return result;
+}
 void String::expand() {
-	size_t new_chunk_count=last_chunk->count+CR_GROW_COUNT;
+	uint new_chunk_count=last_chunk->count+CR_GROW_COUNT;
+	if(new_chunk_count>MAX_USHORT)
+		new_chunk_count=MAX_USHORT;
+
 	last_chunk=static_cast<Chunk *>(
-		malloc(sizeof(size_t)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *)));
+		malloc(sizeof(uint)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *), 10));
 	last_chunk->count=new_chunk_count;
 	link_row->link=last_chunk;
 	append_here=last_chunk->rows;
@@ -108,24 +125,6 @@ void String::expand() {
 	link_row->link=0;
 }
 
-String& String::append(const String& src, Untaint_lang lang, bool forced) {
-	const Chunk *chunk=&src.head; 
-	do {
-		const Chunk::Row *row=chunk->rows;
-		for(size_t i=0; i<chunk->count; i++, row++) {
-			if(row==src.append_here)
-				goto break2;
-			
-			APPEND(row->item.ptr, row->item.size, 
-				(lang!=UL_PASS_APPENDED && (row->item.lang==UL_TAINTED || forced))?lang:row->item.lang,
-				row->item.origin.file, row->item.origin.line);
-		}
-		chunk=row->link;
-	} while(chunk);
-break2:
-	return *this;
-}
-
 String& String::real_append(STRING_APPEND_PARAMS) {
 	if(!src)
 		return *this;
@@ -134,24 +133,41 @@ String& String::real_append(STRING_APPEN
 	if(!size)
 		return *this;
 
+	while(size>MAX_USHORT) {
+		if(chunk_is_full())
+			expand();
+
+		append_here->item.ptr=src;
+		append_here->item.size=MAX_USHORT;
+		append_here->item.lang=lang;
+#ifndef NO_STRING_ORIGIN
+		append_here->item.origin.file=file;
+		append_here->item.origin.line=line;
+#endif
+		append_here++;
+
+		src+=MAX_USHORT;
+		size-=MAX_USHORT;
+	}
+
 	if(chunk_is_full())
 		expand();
 
 	append_here->item.ptr=src;
-	fsize+=append_here->item.size=size;
+	append_here->item.size=size;
 	append_here->item.lang=lang;
 #ifndef NO_STRING_ORIGIN
 	append_here->item.origin.file=file;
 	append_here->item.origin.line=line;
 #endif
-	append_here++; fused_rows++;
+	append_here++;
 
 	return *this;
 }
 
 char String::first_char() const {
-	if(!fused_rows)
-		THROW(0, 0,
+	if(!used_rows())
+		throw Exception(0, 0,
 			this,
 			"getting first char of empty string");
 
@@ -160,19 +176,9 @@ char String::first_char() const {
 
 uint String::hash_code() const {
 	uint result=0;
-
-	const Chunk *chunk=&head; 
-	do {
-		const Chunk::Row *row=chunk->rows;
-		for(size_t i=0; i<chunk->count; i++) {
-			if(row==append_here)
-				goto break2;
-
+	STRING_FOREACH_ROW(
 			result=Hash::generic_code(result, row->item.ptr, row->item.size);
-			row++;
-		}
-		chunk=row->link;
-	} while(chunk);
+	);
 break2:
 	return result;
 }
@@ -181,7 +187,8 @@ break2:
 int String::cmp(int& partial, const String& src, 
 				size_t this_offset, Untaint_lang lang) const {
 	partial=-1;
-	this_offset=min(this_offset, size()-1);
+	size_t a_size=size();
+	this_offset=min(this_offset, a_size-1);
 
 	const Chunk *a_chunk=&head;
 	const Chunk *b_chunk=&src.head;
@@ -191,16 +198,16 @@ int String::cmp(int& partial, const Stri
 	size_t b_offset=0;
 	Chunk::Row *a_end=append_here;
 	Chunk::Row *b_end=src.append_here;
-	size_t a_countdown=a_chunk->count;
-	size_t b_countdown=b_chunk->count;
-	size_t result;
+	uint a_countdown=a_chunk->count;
+	uint b_countdown=b_chunk->count;
+	int result;
 	size_t pos=0; 
 
-	bool a_break=size()==0;
+	bool a_break=a_size==0;
 	bool b_break=src.size()==0;
 	if(!(a_break || b_break)) while(true) {
 		if(pos+a_row->item.size > this_offset) {
-			if(lang!=UL_UNSPECIFIED && a_row->item.lang!=lang) 
+			if(lang!=UL_UNSPECIFIED && a_row->item.lang>lang) 
 				return -1; // wrong lang -- bail out
 
 			int size_diff=
@@ -269,22 +276,23 @@ int String::cmp(int& partial, const Stri
 int String::cmp(int& partial, const char* b_ptr, size_t src_size, 
 				size_t this_offset, Untaint_lang lang) const {
 	partial=-1;
+	size_t a_size=size();
 	size_t b_size=src_size?src_size:b_ptr?strlen(b_ptr):0;
-	this_offset=min(this_offset, size()-1);
+	this_offset=min(this_offset, a_size-1);
 
 	const Chunk *a_chunk=&head;
 	const Chunk::Row *a_row=a_chunk->rows;
 	size_t a_offset=this_offset;
 	size_t b_offset=0;
 	Chunk::Row *a_end=append_here;
-	size_t a_countdown=a_chunk->count;
+	uint a_countdown=a_chunk->count;
 	size_t pos=0;
 
-	bool a_break=size()==0;
+	bool a_break=a_size==0;
 	bool b_break=b_size==0;
 	if(!(a_break || b_break)) while(true) {
 		if(pos+a_row->item.size > this_offset) {
-			if(lang!=UL_UNSPECIFIED && a_row->item.lang!=lang) 
+			if(lang!=UL_UNSPECIFIED && a_row->item.lang>lang) 
 				return -1; // wrong lang -- bail out
 
 			int size_diff=
@@ -292,20 +300,20 @@ int String::cmp(int& partial, const char
 				(b_size-b_offset);
 			
 			if(size_diff==0) { // a has same size as b
-				if(size_t result=memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, 
+				if(int result=memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, 
 					a_row->item.size-a_offset)!=0)
 					return result;
 				pos+=a_row->item.size;
 				a_row++; a_countdown--; a_offset=0;
 				b_break=true;
 			} else if (size_diff>0) { // a longer
-				if(size_t result=memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, 
+				if(int result=memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, 
 					b_size-b_offset)!=0)
 					return result;
 				a_offset+=b_size-b_offset;
 				b_break=true;
 			} else { // b longer
-				if(size_t result=memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, 
+				if(int result=memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, 
 					a_row->item.size-a_offset)!=0)
 					return result;
 				b_offset+=a_row->item.size-a_offset;
@@ -338,7 +346,7 @@ int String::cmp(int& partial, const char
 
 #ifndef NO_STRING_ORIGIN
 const Origin& String::origin() const { 
-	if(!fused_rows) {
+	if(!used_rows()) {
 		static const Origin empty_origin={"empty string"};
 		return empty_origin;
 	}
@@ -355,37 +363,30 @@ const Origin& String::origin() const {
 #endif
 
 String& String::mid(size_t start, size_t finish) const {
+	String& result=*NEW String(pool());
+
 	start=max(0, start);
 	finish=min(size(), finish);
 	if(start==finish)
-		return *empty_string;
-
-	String& result=*NEW String(pool());
+		return result;
 
 	size_t pos=0;
-	const Chunk *chunk=&head; 
-	do {
-		const Chunk::Row *row=chunk->rows;
-		for(size_t i=0; i<chunk->count; pos+=row->item.size, i++, row++) {
-			if(row==append_here)
+	STRING_FOREACH_ROW(
+		size_t item_finish=pos+row->item.size;
+		if(item_finish > start) { // started now or already?
+			bool started=result.size()==0; // started now?
+			bool finished=finish <= item_finish; // finished now?
+			size_t offset=started?start-pos:0;
+			size_t size=finished?finish-pos:row->item.size;
+			result.APPEND(
+				row->item.ptr+offset, size-offset, 
+				row->item.lang,
+				row->item.origin.file, row->item.origin.line);
+			if(finished)
 				goto break2;
-
-			size_t item_finish=pos+row->item.size;
-			if(item_finish > start) { // started now or already?
-				bool started=result.size()==0; // started now?
-				bool finished=finish <= item_finish; // finished now?
-				size_t offset=started?start-pos:0;
-				size_t size=finished?finish-pos:row->item.size;
-				result.APPEND(
-					row->item.ptr+offset, size-offset, 
-					row->item.lang,
-					row->item.origin.file, row->item.origin.line);
-				if(finished)
-					goto break2;
-			}
 		}
-		chunk=row->link;
-	} while(chunk);
+		pos+=row->item.size;
+	);
 break2:
 //	SAPI::log(pool(), "piece of '%s' from %d to %d is '%s'",
 		//cstr(), start, finish, result.cstr());
@@ -393,8 +394,9 @@ break2:
 }
 
 int String::pos(const String& substr, 
-				size_t result, Untaint_lang lang) const {
-	for(; result<size(); result++) {
+				int result, Untaint_lang lang) const {
+	size_t self_size=size();
+	for(; size_t(result)<self_size; result++) {
 		int partial; cmp(partial, substr, result, lang);
 		if(
 			partial==0 || // full match
@@ -406,8 +408,9 @@ int String::pos(const String& substr,
 }
 
 int String::pos(const char *substr, size_t substr_size, 
-				size_t result, Untaint_lang lang) const {
-	for(; result<size(); result++) {
+				int result, Untaint_lang lang) const {
+	size_t self_size=size();
+	for(; size_t(result)<self_size; result++) {
 		int partial; cmp(partial, substr, substr_size, result, lang);
 		if(
 			partial==0 || // full match
@@ -422,6 +425,7 @@ void String::split(Array& result,
 				   size_t* pos_after_ref, 
 				   const char *delim, size_t delim_size, 
 				   Untaint_lang lang, int limit) const {
+	size_t self_size=size();
 	if(delim_size) {
 		size_t pos_after=pos_after_ref?*pos_after_ref:0;
 		int pos_before;
@@ -431,16 +435,16 @@ void String::split(Array& result,
 			pos_after=pos_before+delim_size;
 		}
 		// last piece
-		if(pos_after<size() && limit) {
-			result+=&mid(pos_after, size());
-			pos_after=size();
+		if(pos_after<self_size && limit) {
+			result+=&mid(pos_after, self_size);
+			pos_after=self_size;
 		}
 		if(pos_after_ref)
 			*pos_after_ref=pos_after;
 	} else { // empty delim
 		result+=this;
 		if(pos_after_ref)
-			*pos_after_ref+=size();
+			*pos_after_ref+=self_size;
 	}
 }
 
@@ -497,7 +501,7 @@ static void regex_options(char *options,
 }
 
 /// @todo maybe need speedup: some option to remove pre/match/post string generation
-bool String::match(const unsigned char *pcre_tables,
+bool String::match(
 				   const String *aorigin,
 				   const String& regexp, 
 				   const String *options,
@@ -506,10 +510,10 @@ bool String::match(const unsigned char *
 				   bool *was_global) const { 
 
 	if(!regexp.size())
-		THROW(0, 0,
+		throw Exception(0, 0,
 			aorigin,
 			"regexp is empty");
-	const char *pattern=regexp.cstr(UL_AS_IS);
+	const char *pattern=regexp.cstr();
 	const char *errptr;
 	int erroffset;
     int option_bits[2];  regex_options(options?options->cstr():0, option_bits);
@@ -517,28 +521,28 @@ bool String::match(const unsigned char *
 		*was_global=option_bits[1]!=0;
 	pcre *code=pcre_compile(pattern, option_bits[0], 
 		&errptr, &erroffset,
-		pcre_tables);
+		pool().get_source_charset().pcre_tables);
 
 	if(!code)
-		THROW(0, 0,
+		throw Exception(0, 0,
 			&regexp.mid(erroffset, regexp.size()),
 			"regular expression syntax error - %s", errptr);
 	
 	int info_substrings=pcre_info(code, 0, 0);
 	if(info_substrings<0) {
-		(*pcre_free)(code);
-		THROW(0, 0,
+		pcre_free(code);
+		throw Exception(0, 0,
 			aorigin,
 			"pcre_info error (%d)", 
 				info_substrings);
 	}
 
 	int startoffset=0;
-	const char *subject=cstr(UL_AS_IS);
+	const char *subject=cstr();
 	int length=strlen(subject);
 	int ovecsize;
 	int *ovector=(int *)malloc(sizeof(int)*
-		(ovecsize=(1/*match*/+info_substrings)*3));
+		(ovecsize=(1/*match*/+info_substrings)*3), 11);
 
 	{ // create table
 		Array& columns=*NEW Array(pool());
@@ -560,14 +564,14 @@ bool String::match(const unsigned char *
 			exec_option_bits, ovector, ovecsize);
 		
 		if(exec_substrings==PCRE_ERROR_NOMATCH) {
-			(*pcre_free)(code);
-			(*row_action)(**table, 0/*last time, no row*/, 0, 0, info);
+			pcre_free(code);
+			row_action(**table, 0/*last time, no row*/, 0, 0, info);
 			return option_bits[1]!=0; // global=true+table, not global=false
 		}
 
 		if(exec_substrings<0) {
-			(*pcre_free)(code);
-			THROW(0, 0,
+			pcre_free(code);
+			throw Exception(0, 0,
 				aorigin,
 				"regular expression execute error (%d)", 
 					exec_substrings);
@@ -583,13 +587,14 @@ bool String::match(const unsigned char *
 			row+=&mid(ovector[i*2+0], ovector[i*2+1]); // .i column value
 		}
 		
-		(*row_action)(**table, &row, startoffset, ovector[0], info);
+		row_action(**table, &row, startoffset, ovector[0], info);
 
-		if(!option_bits[1] || !(startoffset=ovector[1])) { // not global | going to hang
-			(*pcre_free)(code);
-			(*row_action)(**table, 0/*last time, no row*/, 0, 0, info);
+		if(!option_bits[1] || startoffset==ovector[1]) { // not global | going to hang
+			pcre_free(code);
+			row_action(**table, 0/*last time, no row*/, 0, 0, info);
 			return true;
 		}
+		startoffset=ovector[1];
 
 /*
 		if(option_bits[0] & PCRE_MULTILINE)
@@ -598,8 +603,9 @@ bool String::match(const unsigned char *
 	}
 }
 
-String& String::change_case(Pool& pool, const unsigned char *tables, 
+String& String::change_case(Pool& pool, 
 							Change_case_kind kind) const {
+	const unsigned char *tables=pool.get_source_charset().pcre_tables;
 	String& result=*new(pool) String(pool);
 
 	const unsigned char *a;
@@ -614,7 +620,7 @@ String& String::change_case(Pool& pool,
 		b=0;
 		break;
 	default:
-		PTHROW(0, 0, 
+		throw Exception(0, 0, 
 			this, 
 			"unknown change case kind #%d", 
 				static_cast<int>(kind)); // never
@@ -625,11 +631,11 @@ String& String::change_case(Pool& pool,
 	const Chunk *chunk=&head; 
 	do {
 		const Chunk::Row *row=chunk->rows;
-		for(size_t i=0; i<chunk->count; i++, row++) {
+		for(uint i=0; i<chunk->count; i++, row++) {
 			if(row==append_here)
 				goto break2;
 
-			char *new_cstr=(char *)pool.malloc(row->item.size);
+			char *new_cstr=(char *)pool.malloc(row->item.size, 12);
 			char *dest=new_cstr;
 			const char *src=row->item.ptr; 
 			for(int size=row->item.size; size--; src++) {
@@ -651,18 +657,171 @@ break2:
 	return result;
 }
 
+void String::join_chain(Pool& pool, 
+					   uint& ai, const Chunk*& achunk, const Chunk::Row*& arow,
+					   uchar& joined_lang, const char *& joined_ptr, size_t& joined_size) const {
+	joined_lang=arow->item.lang;
+	
+	// calc size
+	joined_size=0;
+	{
+		uint start_i=ai;
+		const Chunk::Row *start_row=arow;
+		const Chunk *chunk=achunk;
+		do {
+			const Chunk::Row *row=start_row;
+			for(uint i=start_i; i<chunk->count; i++, row++) {
+				if(row==append_here)
+					goto break21;
+				
+				if(row->item.lang==joined_lang)
+					joined_size+=row->item.size;
+				else
+					goto break21;
+			}
+			if(chunk=row->link) {
+				start_i=0;
+				start_row=chunk->rows;
+			} else
+				break;
+		} while(true);
+break21:;
+	}
+
+	// if one row, return simply itself
+	if(joined_size==arow->item.size) {
+		joined_ptr=arow->item.ptr;
+		ai++; arow++;
+		if(ai==achunk->count) {
+			if(achunk=arow->link) {
+				ai=0;
+				arow=achunk->rows;
+			}
+		}
+	} else {
+		// join adjacent rows
+		char *ptr=(char *)pool.malloc(joined_size,13);
+		joined_ptr=ptr;
+		uint start_i=ai;
+		const Chunk::Row *start_row=arow;
+		const Chunk *chunk=achunk;
+		uint i;
+		const Chunk::Row *row;
+		do {
+			row=start_row;
+			for(i=start_i; i<chunk->count; i++, row++) {
+				if(row==append_here)
+					goto break22;
+				
+				if(row->item.lang==joined_lang) {
+					memcpy(ptr, row->item.ptr, row->item.size);
+					ptr+=row->item.size;
+				} else
+					goto break22;
+			}
+			if(chunk=row->link) {
+				start_i=0;
+				start_row=chunk->rows;
+			} else
+				break;
+		} while(true);
+break22:;
+		
+		// return joined rows
+		ai=i;
+		arow=row;
+		achunk=chunk;
+	}
+}
+
+String& String::reconstruct(Pool& pool) const {
+	//_asm int 3;
+	String& result=*new(pool) String(pool);
+	const Chunk *chunk=&head; 
+	const Chunk::Row *row=chunk->rows;
+	for(uint i=0; i<chunk->count; ) {
+		if(row==append_here)
+			break;
+
+		uchar joined_lang;
+		const char *joined_ptr;
+		size_t joined_size;
+#ifndef NO_STRING_ORIGIN
+		const char *joined_origin_file=row->item.origin.file;
+		const size_t joined_origin_line=row->item.origin.line;
+#endif
+		join_chain(pool, i, chunk, row,
+			joined_lang, joined_ptr, joined_size);
+
+		result.APPEND(joined_ptr, joined_size, joined_lang,
+			joined_origin_file, joined_origin_line);
+
+		if(!chunk)
+			break;
+	}
+
+	return result;
+};
+
+String& String::replace_in_reconstructed(Pool& pool, Dictionary& dict) const {
+	//_asm int 3;
+	String& result=*new(pool) String(pool);
+	STRING_FOREACH_ROW(
+		const char *src=row->item.ptr; 
+		size_t src_size=row->item.size;
+		char *new_cstr=(char *)pool.malloc((size_t)ceil(src_size*dict.max_ratio()), 14);
+		char *dest=new_cstr;
+		while(src_size) {
+			// there is a row where first column starts 'src'
+			if(Table::Item *item=dict.first_that_starts(src, src_size)) {
+				// get a=>b values
+				const String& a=*static_cast<Array *>(item)->get_string(0);
+				const String& b=*static_cast<Array *>(item)->get_string(1);
+				// skip 'a' in 'src' && reduce work size
+				src+=a.size();  src_size-=a.size();
+				// write 'b' to 'dest' && skip 'b' in 'dest'
+				b.store_to(dest);  dest+=b.size();
+			} else {
+				// write a char to b && reduce work size
+				*dest++=*src++;  src_size--;
+			}
+		}
+
+		result.APPEND(new_cstr, dest-new_cstr, 
+			row->item.lang,
+			row->item.origin.file, row->item.origin.line);
+	);
+break2:
+	return result;
+}
+
+String& String::replace(Pool& pool, Dictionary& dict) const {
+	return reconstruct(pool).replace_in_reconstructed(pool, dict);
+}
+
 double String::as_double() const { 
 	double result;
-	const char *cstr=this->cstr();
-	char *error_pos=0;
+	const char *cstr;
+	char buf[MAX_NUMBER];
+	if(head.rows+1==append_here) {
+		int size=min(head.rows[0].item.size, MAX_NUMBER-1);
+		memcpy(buf, head.rows[0].item.ptr, size);
+		buf[size]=0;
+		cstr=buf;
+	} else
+		cstr=this->cstr();
+	char *error_pos;
 	// 0xABC
-	if(cstr[0]=='0' && (cstr[1]=='x' || cstr[1]=='X'))
-		result=(double)(unsigned long)strtol(cstr, &error_pos, 0);
+	if(cstr[0]=='0')
+		if(cstr[1]=='x' || cstr[1]=='X')
+			result=(double)(unsigned long)strtol(cstr, &error_pos, 0);
+		else
+			result=(double)strtod(cstr+1/*skip leading 0*/, &error_pos);
 	else
-		result=strtod(cstr, &error_pos);
+		result=(double)strtod(cstr, &error_pos);
 
-	if(error_pos && *error_pos)
-		THROW(0, 0,
+	if(*error_pos/*not EOS*/)
+		throw Exception(0, 0,
 			this,
 			"invalid number (double)");
 
@@ -670,18 +829,89 @@ double String::as_double() const {
 }
 int String::as_int() const { 
 	int result;
-	const char *cstr=this->cstr();
-	char *error_pos=0;
+	const char *cstr;
+	char buf[MAX_NUMBER];
+	if(head.rows+1==append_here) {
+		int size=min(head.rows[0].item.size, MAX_NUMBER-1);
+		memcpy(buf, head.rows[0].item.ptr, size);
+		buf[size]=0;
+		cstr=buf;
+	} else
+		cstr=this->cstr();
+	char *error_pos;
 	// 0xABC
-	if(cstr[0]=='0' && (cstr[1]=='x' || cstr[1]=='X'))
-		result=(int)(unsigned long)strtol(cstr, &error_pos, 0);
+	if(cstr[0]=='0')
+		if(cstr[1]=='x' || cstr[1]=='X')
+			result=(int)(unsigned long)strtol(cstr, &error_pos, 0);
+		else
+			result=(int)strtol(cstr+1/*skip leading 0*/, &error_pos, 0);
 	else
 		result=(int)strtol(cstr, &error_pos, 0);
 
-	if(error_pos && *error_pos)
-		THROW(0, 0,
+	if(*error_pos/*not EOS*/)
+		throw Exception(0, 0,
 			this,
 			"invalid number (int)");
 
 	return result;
 }
+
+inline void ushort2uchars(ushort word, uchar& byte1, uchar& byte2) {
+	byte1=word&0xFF;
+	byte2=word>>8;
+}
+inline ushort uchars2ushort(uchar byte1, uchar byte2) {
+	return (byte2<<8) | byte1;
+}
+/* @todo maybe network order worth spending some effort?
+	don't bothering myself with network byte order,
+	am not planning to be able to move resulting file across platforms
+	for now
+*/
+void String::serialize(size_t prolog_size, void *& buf, size_t& buf_size) const {
+	buf_size=
+		prolog_size
+		+used_rows()*(sizeof(uchar)+sizeof(ushort))
+		+size();
+	buf=malloc(buf_size,15);
+	char *cur=(char *)buf+prolog_size;
+
+	STRING_FOREACH_ROW(
+		// lang
+		memcpy(cur, &row->item.lang, sizeof(uchar));
+		cur+=sizeof(uchar);
+		// size
+		uchar byte1; uchar byte2;
+		ushort2uchars(row->item.size, byte1, byte2);
+		memcpy(cur, &byte1, sizeof(uchar)); cur+=sizeof(uchar);
+		memcpy(cur, &byte2, sizeof(uchar)); cur+=sizeof(uchar);
+		// bytes
+		memcpy(cur, row->item.ptr, row->item.size);
+		cur+=row->item.size;
+	);
+break2:
+	;
+}
+void String::deserialize(size_t prolog_size, void *buf, size_t buf_size, const char *file) {
+	if(buf_size<=prolog_size)
+		return;
+
+	char *cur=(char *)buf+prolog_size;
+	buf_size-=prolog_size;
+
+	while(buf_size) {
+		uchar lang=*(uchar *)(cur);
+		
+		ushort size=uchars2ushort(
+			*(uchar*)(cur+sizeof(uchar)*1),
+			*(uchar*)(cur+sizeof(uchar)*2)
+		);
+
+		const char *ptr=(const char*)(cur+sizeof(uchar)*3); 
+		APPEND(ptr, size, lang, file, 0);
+
+		size_t piece_size=sizeof(uchar)+sizeof(ushort)+size;
+		cur+=piece_size;
+		buf_size-=piece_size;
+	}
+}