--- parser3/src/main/pa_string.C	2002/04/10 08:53:55	1.151
+++ parser3/src/main/pa_string.C	2003/01/24 14:36:11	1.172.2.5
@@ -1,38 +1,50 @@
 /** @file
 	Parser: string class. @see untasize_t.C.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_string.C,v 1.151 2002/04/10 08:53:55 paf Exp $
 */
 
+static const char* IDENT_STRING_C="$Date: 2003/01/24 14:36:11 $";
+
 #include "pcre.h"
 
 #include "pa_pool.h"
 #include "pa_string.h"
-#include "pa_hash.h"
 #include "pa_exception.h"
-#include "pa_common.h"
 #include "pa_array.h"
-#include "pa_globals.h"
 #include "pa_table.h"
 #include "pa_dictionary.h"
 #include "pa_charset.h"
 
-#define DEBUG_STRING_APPENDS_VS_EXPANDS
+// helpers
 
+/// String::match uses this as replace & global search table columns
 
-#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS
-ulong string_piece_appends=0;
-#endif
+const int MAX_MATCH_GROUPS=100;
+
+class String_match_table_template_columns: public Array<ConstStringPtr> {
+	Pool pool;
+public:
+	String_match_table_template_columns() {
+		*this+=ConstStringPtr(new String("prematch"));
+		*this+=ConstStringPtr(new String("match"));
+		*this+=ConstStringPtr(new String("postmatch"));
+		for(int i=0; i<MAX_MATCH_GROUPS; i++) {
+			char *cname=new(pool) char[3/*strlen("100")*/+1/*terminating 0*/];
+			ConstStringPtr sname(new String(cname, sprintf(cname, "%d", 1+i)));
+			*this+=sname;
+		}
+	}
+};
 
-String::String(Pool& apool, const char *src, size_t src_size, bool tainted) :
-	Pooled(apool) {
-	last_chunk=&head.chunk;
-	head.chunk.count=CR_PREALLOCATED_COUNT;
-	append_here=head.chunk.rows;
+Table string_match_table_template(
+								  String::undefined_origin, 
+								  Table::columns_type(new String_match_table_template_columns));
 
+// methods
+
+String::String(const char *src, size_t src_size, bool tainted): Array<String_fragment>(1), fsize(0) {
 	if(src)
 		if(tainted)
 			APPEND_TAINTED(src, src_size, 0, 0);
@@ -40,56 +52,11 @@ String::String(Pool& apool, const char *
 			APPEND_CLEAN(src, src_size, 0, 0);
 }
 
-String::String(const String& src) :	
-	Pooled(src.pool()) {
-	last_chunk=&head.chunk;
-	head.chunk.count=CR_PREALLOCATED_COUNT;
-	append_here=head.chunk.rows;
-
-	append(src, UL_UNSPECIFIED);
-}
-
-size_t  String::size() const {
-	size_t result=0;
-	STRING_FOREACH_ROW(
-			result+=row->item.size;
-	);
-	return result;
-}
-
-/// @todo not very optimal
-uint String::used_rows() const {
-	uint result=0;
-	STRING_FOREACH_ROW(
-		result++;
-	);
-	return result;
-}
-void String::expand() {
-	uint new_chunk_count=last_chunk->count+CR_GROW_COUNT;
-	if(new_chunk_count>max_integral(Chunk::count_type))
-		new_chunk_count=max_integral(Chunk::count_type);
-
-	Chunk *new_chunk=static_cast<Chunk *>(
-		malloc(
-			sizeof(Chunk)// count+interpadding(?)+rows[CR_PREALLOCATED_COUNT]+tailpadding(??)
-			-sizeof(Chunk::rows_type) // PREALLOCATED rows
-			+sizeof(Chunk::Row)*new_chunk_count // neaded rows
-			+sizeof(Chunk *) // link size
-		, 10));
-	new_chunk->rows[new_chunk->count=new_chunk_count].link=0;
-	last_chunk->rows[last_chunk->count].link=new_chunk;
-	
-	last_chunk=new_chunk;
-	append_here=last_chunk->rows;
+String::String(const String& src): Array<String_fragment>(src.count()) {
+	append(src, UL_PASS_APPENDED);
 }
 
 String& String::real_append(STRING_APPEND_PARAMS) {
-	if(!last_chunk) // growth stopped [we're appended as string to somebody]
-		throw Exception(0,
-			this,
-			"string growth stopped (append cstr)");
-
 	if(!src)
 		return *this;
 	if(!size)
@@ -97,56 +64,25 @@ String& String::real_append(STRING_APPEN
 	if(!size)
 		return *this;
 
-#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS
-	string_piece_appends++;
-#endif
+	if(is_full())
+		expand(fdelta);
 
-	// manually unrolled to avoid extra check
-	while(size>max_integral(Chunk::Row::item_size_type)) {
-		if(chunk_is_full())
-			expand();
-
-		append_here->item.ptr=src;
-		append_here->item.size=max_integral(Chunk::Row::item_size_type);
-		append_here->item.lang=lang;
+	String_fragment *fragment=&felements[fused++];
+	fragment->ptr=src;
+	fragment->size=size;
+	fragment->lang=lang;
 #ifndef NO_STRING_ORIGIN
-		append_here->item.origin.file=file;
-		append_here->item.origin.line=line;
+	fragment->origin.file=file;
+	fragment->origin.line=line;
 #endif
-		append_here++;
-
-		src+=max_integral(Chunk::Row::item_size_type);
-		size-=max_integral(Chunk::Row::item_size_type);
-	}
-
-	if(chunk_is_full())
-		expand();
-
-	append_here->item.ptr=src;
-	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++;
 
 	return *this;
 }
 
-char String::first_char() const {
-	if(is_empty())
-		throw Exception(0,
-			this,
-			"getting first char of empty string");
-
-	return *head.chunk.rows[0].item.ptr;
-}
-
 uint String::hash_code() const {
 	uint result=0;
-	STRING_FOREACH_ROW(
-			result=Hash::generic_code(result, row->item.ptr, row->item.size);
+	STRING_FOREACH_FRAGMENT(
+		result=generic_hash_code(result, fragment->ptr, fragment->size);
 	);
 	return result;
 }
@@ -158,77 +94,56 @@ int String::cmp(int& partial, const Stri
 	size_t a_size=size();
 	this_offset=min(this_offset, a_size-1);
 
-	const Chunk *a_chunk=&head.chunk;
-	const Chunk *b_chunk=&src.head.chunk;
-	const Chunk::Row *a_row=a_chunk->rows;
-	const Chunk::Row *b_row=b_chunk->rows;
+	const String_fragment *a_current=felements;
+	const String_fragment *b_current=src.felements;
 	size_t a_offset=this_offset;
 	size_t b_offset=0;
-	Chunk::Row *a_end=append_here;
-	Chunk::Row *b_end=src.append_here;
-	uint a_countdown=a_chunk->count;
-	uint b_countdown=b_chunk->count;
+	String_fragment *a_end=felements+fused;
+	String_fragment *b_end=src.felements+src.fused;
 	int result;
 	size_t pos=0; 
 
-	bool a_break=a_size==0;
-	bool b_break=src.is_empty();
-	if(!(a_break || b_break)) while(true) {
-		if(pos+a_row->item.size > this_offset) {
-			if(lang!=UL_UNSPECIFIED && a_row->item.lang>lang) 
+	bool a_break;
+	bool b_break;
+	while(!(
+		(a_break=(a_current==a_end))
+		|| (b_break=(b_current==b_end)))) {
+		if(pos+a_current->size > this_offset) {
+			if(lang!=UL_UNSPECIFIED && a_current->lang>lang) 
 				return -1; // wrong lang -- bail out
 
 			int size_diff=
-				(a_row->item.size-a_offset)-
-				(b_row->item.size-b_offset);
+				(a_current->size-a_offset)-
+				(b_current->size-b_offset);
 			
 			if(size_diff==0) { // a has same size as b
-				result=memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, 
-					a_row->item.size-a_offset);
+				result=memcmp(a_current->ptr+a_offset, b_current->ptr+b_offset, 
+					a_current->size-a_offset);
 				if(result)
 					return result;
-				pos+=a_row->item.size;
-				a_row++; a_countdown--; a_offset=0;
-				b_row++; b_countdown--; b_offset=0;
-			} else if (size_diff>0) { // a longer
-				result=memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, 
-					b_row->item.size-b_offset);
+				pos+=a_current->size;
+				a_current++; a_offset=0;
+				b_current++; b_offset=0;
+			} else if(size_diff>0) { // a longer
+				result=memcmp(a_current->ptr+a_offset, b_current->ptr+b_offset, 
+					b_current->size-b_offset);
 				if(result)
 					return result;
-				a_offset+=b_row->item.size-b_offset;
-				b_row++; b_countdown--; b_offset=0;
+				a_offset+=b_current->size-b_offset;
+				b_current++; b_offset=0;
 			} else { // b longer
-				result=memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, 
-					a_row->item.size-a_offset);
+				result=memcmp(a_current->ptr+a_offset, b_current->ptr+b_offset, 
+					a_current->size-a_offset);
 				if(result)
 					return result;
-				b_offset+=a_row->item.size-a_offset;
-				pos+=a_row->item.size;
-				a_row++; a_countdown--; a_offset=0;
-			}
-			if(b_break=b_row==b_end) {
-				a_break=a_row==a_end;
-				break;			
-			}
-			if(!b_countdown) {
-				b_chunk=b_row->link;
-				b_row=b_chunk->rows;
-				b_countdown=b_chunk->count;
+				b_offset+=a_current->size-a_offset;
+				pos+=a_current->size;
+				a_current++; a_offset=0;
 			}
 		} else {
-			a_offset-=a_row->item.size;
-			pos+=a_row->item.size;
-			a_row++; a_countdown--; 
-		}
-
-		if(a_break=a_row==a_end) {
-			b_break=b_row==b_end;
-			break;
-		}
-		if(!a_countdown) {
-			a_chunk=a_row->link;
-			a_row=a_chunk->rows;
-			a_countdown=a_chunk->count;
+			a_offset-=a_current->size;
+			pos+=a_current->size;
+			a_current++;
 		}
 	}
 	if(a_break==b_break) { // ended simultaneously
@@ -248,59 +163,50 @@ int String::cmp(int& partial, const char
 	size_t b_size=src_size?src_size:b_ptr?strlen(b_ptr):0;
 	this_offset=min(this_offset, a_size-1);
 
-	const Chunk *a_chunk=&head.chunk;
-	const Chunk::Row *a_row=a_chunk->rows;
+	const String_fragment *a_current=felements;
 	size_t a_offset=this_offset;
 	size_t b_offset=0;
-	Chunk::Row *a_end=append_here;
-	uint a_countdown=a_chunk->count;
+	String_fragment *a_end=felements+fused;
 	size_t pos=0;
 
-	bool a_break=a_size==0;
+	bool a_break;
 	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) 
+	while(!(
+		(a_break=(a_current==a_end))
+		|| b_break)) {
+		if(pos+a_current->size > this_offset) {
+			if(lang!=UL_UNSPECIFIED && a_current->lang>lang) 
 				return -1; // wrong lang -- bail out
 
 			int size_diff=
-				(a_row->item.size-a_offset)-
+				(a_current->size-a_offset)-
 				(b_size-b_offset);
 			
 			if(size_diff==0) { // a has same size as b
-				if(int result=memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, 
-					a_row->item.size-a_offset)!=0)
+				if(int result=memcmp(a_current->ptr+a_offset, b_ptr+b_offset, 
+					a_current->size-a_offset)!=0)
 					return result;
-				pos+=a_row->item.size;
-				a_row++; a_countdown--; a_offset=0;
+				pos+=a_current->size;
+				a_current++; a_offset=0;
 				b_break=true;
 			} else if (size_diff>0) { // a longer
-				if(int result=memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, 
+				if(int result=memcmp(a_current->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(int result=memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, 
-					a_row->item.size-a_offset)!=0)
+				if(int result=memcmp(a_current->ptr+a_offset, b_ptr+b_offset, 
+					a_current->size-a_offset)!=0)
 					return result;
-				b_offset+=a_row->item.size-a_offset;
-				pos+=a_row->item.size;
-				a_row++; a_countdown--; a_offset=0;
+				b_offset+=a_current->size-a_offset;
+				pos+=a_current->size;
+				a_current++; a_offset=0;
 			}
 		} else {
-			a_offset-=a_row->item.size; 
-			pos+=a_row->item.size;
-			a_row++; a_countdown--; 
-		}
-
-		a_break=a_row==a_end;
-		if(a_break || b_break)
-			break;
-		if(!a_countdown) {
-			a_chunk=a_row->link;
-			a_row=a_chunk->rows;
-			a_countdown=a_chunk->count;
+			a_offset-=a_current->size; 
+			pos+=a_current->size;
+			a_current++; 
 		}
 	}
 	if(a_break==b_break) { // ended simultaneously
@@ -313,9 +219,9 @@ int String::cmp(int& partial, const char
 }
 
 #ifndef NO_STRING_ORIGIN
-const Origin& String::origin() const { 
+const String_fragment::Origin& String::origin() const { 
 	if(is_empty()) {
-		static const Origin empty_origin={"empty string"};
+		static const String_fragment::Origin empty_origin={"empty string"};
 		return empty_origin;
 	}
 	
@@ -325,35 +231,35 @@ const Origin& String::origin() const {
 	// when last peice is constant, 
 	// ex: parser_root_auto_path{dynamic} / auto.p{const}
 	// using first piece
-	Origin& first_origin=head.chunk.rows[0].item.origin;
-	return first_origin.file ? first_origin : append_here[-1].item.origin;
+	String_fragment::Origin& first_origin=felements[0].origin;
+	return first_origin.file ? first_origin : felements[fused-1].origin;
 }
 #endif
 
-String& String::mid(size_t start, size_t finish) const {
-	String& result=*NEW String(pool());
+StringPtr String::mid(size_t start, size_t finish) const {
+	StringPtr result(new String());
 
-	start=max(size_t(0), start);
-	finish=min(size(), finish);
+	start=min(start, size());
+	finish=max(start, finish);
 	if(start==finish)
 		return result;
 
 	size_t pos=0;
-	STRING_FOREACH_ROW(
-		size_t item_finish=pos+row->item.size;
+	STRING_FOREACH_FRAGMENT(
+		size_t item_finish=pos+fragment->size;
 		if(item_finish > start) { // started now or already?
-			bool started=result.is_empty(); // started now?
+			bool started=result->is_empty(); // 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);
+			size_t size=finished?finish-pos:fragment->size;
+			result->APPEND(
+				fragment->ptr+offset, size-offset, 
+				fragment->lang,
+				fragment->origin.file, fragment->origin.line);
 			if(finished)
 				goto break2;
 		}
-		pos+=row->item.size;
+		pos+=fragment->size;
 	);
 break2:
 //	SAPI::log(pool(), "piece of '%s' from %d to %d is '%s'",
@@ -389,7 +295,7 @@ int String::pos(const char *substr, size
 	return -1;
 }
 
-void String::split(Array& result, 
+void String::split(Array<ConstStringPtr>& result, 
 				   size_t* pos_after_ref, 
 				   const char *delim, size_t delim_size, 
 				   Untaint_lang lang, int limit) const {
@@ -399,24 +305,24 @@ void String::split(Array& result,
 		int pos_before;
 		// while we have 'delim'...
 		for(; (pos_before=pos(delim, delim_size, pos_after, lang))>=0 && limit; limit--) {
-			result+=&mid(pos_after, pos_before);
+			result+=mid(pos_after, pos_before);
 			pos_after=pos_before+delim_size;
 		}
 		// last piece
 		if(pos_after<self_size && limit) {
-			result+=&mid(pos_after, self_size);
+			result+=mid(pos_after, self_size);
 			pos_after=self_size;
 		}
 		if(pos_after_ref)
 			*pos_after_ref=pos_after;
 	} else { // empty delim
-		result+=this;
+		result+=ConstStringPtr(this);
 		if(pos_after_ref)
 			*pos_after_ref+=self_size;
 	}
 }
 
-void String::split(Array& result, 
+void String::split(Array<ConstStringPtr>& result, 
 				   size_t* pos_after_ref, 
 				   const String& delim, Untaint_lang lang, 
 				   int limit) const {
@@ -425,75 +331,81 @@ void String::split(Array& result,
 		int pos_before;
 		// while we have 'delim'...
 		for(; (pos_before=pos(delim, pos_after, lang))>=0 && limit; limit--) {
-			result+=&mid(pos_after, pos_before);
+			result+=mid(pos_after, pos_before);
 			pos_after=pos_before+delim.size();
 		}
 		// last piece
 		if(pos_after<size() && limit) {
-			result+=&mid(pos_after, size());
+			result+=mid(pos_after, size());
 			pos_after=size();
 		}
 		if(pos_after_ref)
 			*pos_after_ref=pos_after;
 	} else { // empty delim
-		result+=this;
+		result+=ConstStringPtr(this);
 		if(pos_after_ref)
 			*pos_after_ref+=size();
 	}
 }
 
-static void regex_options(char *options, int *result){
+static void regex_options(ConstStringPtr options, int *result, bool& need_pre_post_match){
     struct Regex_option {
-		char key;
+		const char *keyL;
+		const char *keyU;
 		int clear, set;
 		int *result;
+		bool *flag;
     } regex_option[]={
-		{'i', 0, PCRE_CASELESS, result}, // a=A
-		{'s', 0, PCRE_DOTALL, result}, // \n\n$ [default]
-		{'x', 0, PCRE_EXTENDED, result}, // whitespace in regex ignored
-		{'m', PCRE_DOTALL, PCRE_MULTILINE, result}, // ^aaa\n$^bbb\n$
-		{'g', 0, true, result+1}, // many rows
-		{0},
+		{"i", "I", 0, PCRE_CASELESS, result}, // a=A
+		{"s", "S", 0, PCRE_DOTALL, result}, // \n\n$ [default]
+		{"x", "U", 0, PCRE_EXTENDED, result}, // whitespace in regex ignored
+		{"m", "M", PCRE_DOTALL, PCRE_MULTILINE, result}, // ^aaa\n$^bbb\n$
+		{"g", "G", 0, true, result+1}, // many rows
+		{"'", 0, 0, 0, 0, &need_pre_post_match},
+		{0}
     };
-	result[0]=PCRE_EXTRA | PCRE_DOTALL;
+	result[0]=PCRE_EXTRA | PCRE_DOTALL | PCRE_DOLLAR_ENDONLY;
 	result[1]=0;
 
     if(options) 
-		for(Regex_option *o=regex_option; o->key; o++) 
-			if(
-				strchr(options, o->key) || 
-				strchr(options, toupper(o->key))) {
-				*(o->result)&=~o->clear;
-				*(o->result)|=o->set;
+		for(Regex_option *o=regex_option; o->keyL; o++) 
+			if(options->pos(o->keyL)>=0
+				|| (o->keyU && options->pos(o->keyU)>=0)) {
+				if(o->flag)
+					*o->flag=true;
+				else { // result
+					*o->result &= ~o->clear;
+					*o->result |= o->set;
+				}
 			}
 }
 
-/// @todo maybe need speedup: some option to remove pre/match/post string generation
-bool String::match(
-				   const String *aorigin,
-				   const String& regexp, 
-				   const String *options,
-				   Table **table,
-				   Row_action row_action, void *info,
-				   bool *was_global) const { 
+TablePtr String::match(Charset& source_charset,
+					   ConstStringPtr aorigin,		
+					   const String& regexp, 
+					   ConstStringPtr options,
+					   Row_action row_action, void *info,
+					   bool *was_global) const { 
 
 	if(regexp.is_empty())
 		throw Exception(0,
 			aorigin,
 			"regexp is empty");
-	const char *pattern=regexp.cstr();
+
+	CharPtr pattern=regexp.cstr();
 	const char *errptr;
 	int erroffset;
-    int option_bits[2];  regex_options(options?options->cstr():0, option_bits);
+    bool need_pre_post_match=false;
+	int option_bits[2];  regex_options(options, option_bits, need_pre_post_match);
 	if(was_global)
 		*was_global=option_bits[1]!=0;
-	pcre *code=pcre_compile(pattern, option_bits[0], 
+	pcre *code=pcre_compile(pattern.get(), option_bits[0], 
 		&errptr, &erroffset,
-		pool().get_source_charset().pcre_tables);
+		source_charset.pcre_tables);
 
 	if(!code)
 		throw Exception(0,
-			&regexp.mid(erroffset, regexp.size()),
+			regexp.mid(erroffset, regexp.size()),
 			"regular expression syntax error - %s", errptr);
 	
 	int info_substrings=pcre_info(code, 0, 0);
@@ -505,36 +417,30 @@ bool String::match(
 				info_substrings);
 	}
 
-	int startoffset=0;
-	const char *subject=cstr();
-	int length=strlen(subject);
-	int ovecsize;
-	int *ovector=(int *)malloc(sizeof(int)*
-		(ovecsize=(1/*match*/+info_substrings)*3), 11);
-
-	{ // create table
-		Array& columns=*NEW Array(pool());
-		columns+=string_pre_match_name;
-		columns+=string_match_name;
-		columns+=string_post_match_name;
-		for(int i=1; i<=info_substrings; i++) {
-			char *column=(char *)malloc(MAX_NUMBER);
-			snprintf(column, MAX_NUMBER, "%d", i);
-			columns+=NEW String(pool(), column); // .i column name
-		}
-		*table=NEW Table(pool(), aorigin, &columns);
-	}
+	CharPtr subject=cstr();
+	int length=size();
+	const int ovecsize=(1/*match*/+MAX_MATCH_GROUPS)*3;
+	int ovector[ovecsize];
+
+	// create table
+	TablePtr result(new Table(string_match_table_template));
 
 	int exec_option_bits=0;
+	int prestart=0;
+	int poststart=0;
+	int postfinish=size();
 	while(true) {
 		int exec_substrings=pcre_exec(code, 0,
-			subject, length, startoffset,
+			subject.get(), length, prestart,
 			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);
-			return option_bits[1]!=0; // global=true+table, not global=false
+			row_action(*result.get(), 0/*last time, no raw*/, 0, 0, poststart, postfinish, info);
+			if(option_bits[1])
+				return result; // global=true+result
+			else
+				return TablePtr(0);// not global=no result
 		}
 
 		if(exec_substrings<0) {
@@ -545,24 +451,32 @@ bool String::match(
 					exec_substrings);
 		}
 
-		Array& row=*NEW Array(pool());
-		row+=&mid(0, ovector[0]); // .prematch column value
-		row+=&mid(ovector[0], ovector[1]); // .match
-		row+=&mid(ovector[1], size()); // .postmatch
+		int prefinish=ovector[0];
+		poststart=ovector[1];
+		object_ptr<Array<ConstStringPtr> > row;
+		if(need_pre_post_match) {
+			*row+=mid(0, prefinish); // .prematch column value
+			*row+=mid(prefinish, poststart); // .match
+			*row+=mid(poststart, postfinish); // .postmatch
+		} else {
+			*row+=ConstStringPtrZero; // .prematch column value
+			*row+=ConstStringPtrZero; // .match
+			*row+=ConstStringPtrZero; // .postmatch
+		}
 		
 		for(int i=1; i<exec_substrings; i++) {
 			// -1:-1 case handled peacefully by mid() itself
-			row+=&mid(ovector[i*2+0], ovector[i*2+1]); // .i column value
+			*row+=mid(ovector[i*2+0], ovector[i*2+1]); // .i column value
 		}
 		
-		row_action(**table, &row, startoffset, ovector[0], info);
+		row_action(*result, row.get(), prestart, prefinish, poststart, postfinish, info);
 
-		if(!option_bits[1] || startoffset==ovector[1]) { // not global | going to hang
+		if(!option_bits[1] || prestart==poststart) { // not global | going to hang
 			pcre_free(code);
-			row_action(**table, 0/*last time, no row*/, 0, 0, info);
-			return true;
+			row_action(*result, 0/*last time, no row*/, 0, 0, poststart, postfinish, info);
+			return result;
 		}
-		startoffset=ovector[1];
+		prestart=poststart;
 
 /*
 		if(option_bits[0] & PCRE_MULTILINE)
@@ -571,10 +485,10 @@ bool String::match(
 	}
 }
 
-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);
+StringPtr String::change_case(Pool& pool, Charset& source_charset, Change_case_kind kind) const {
+	StringPtr result(new String());
+
+	const unsigned char *tables=source_charset.pcre_tables;
 
 	const unsigned char *a;
 	const unsigned char *b;
@@ -589,130 +503,135 @@ String& String::change_case(Pool& pool,
 		break;
 	default:
 		throw Exception(0, 
-			this, 
+			ConstStringPtr(this), 
 			"unknown change case kind #%d", 
 				static_cast<int>(kind)); // never
 		a=b=0; // calm, compiler
 		break; // never
 	}	
 
-	STRING_FOREACH_ROW(
-		char *new_cstr=(char *)pool.malloc(row->item.size, 12);
+	STRING_FOREACH_FRAGMENT(
+		char *new_cstr=new(pool) char[fragment->size];
 		char *dest=new_cstr;
-		const char *src=row->item.ptr; 
-		for(int size=row->item.size; size--; src++) {
-			unsigned char c=a[(unsigned char)*src];
+		const char *end=fragment->ptr+fragment->size;
+		for(const char *current=fragment->ptr; current<end; current++) {
+			unsigned char c=a[(unsigned char)*current];
 			if(b)
 				c=b[c];
 
 			*dest++=(char)c;
 		}
 		
-		result.APPEND(new_cstr, row->item.size, 
-			row->item.lang,
-			row->item.origin.file, row->item.origin.line);
+		result->APPEND(new_cstr, fragment->size, 
+			fragment->lang,
+			fragment->origin.file, fragment->origin.line);
 	);
 
 	return result;
 }
 
-void String::join_chain(Pool& pool, 
-					   const Chunk*& achunk, const Chunk::Row*& arow, uint& acountdown, 
-					   uchar& joined_lang, const char *& joined_ptr, size_t& joined_size) const {
-	joined_lang=arow->item.lang;
-	
-	// calc size
-	joined_size=0;
-	{
-		const Chunk* chunk=achunk;
-		const Chunk::Row* row=arow;
-		uint countdown=acountdown;
-		STRING_PREPARED_FOREACH_ROW(*this, 
-			if(row->item.lang==joined_lang)
-				joined_size+=row->item.size;
-			else
-				break;
-		);
-	}
+/// @test if in some piece were found no dict words, append it, not it's duplicate
+StringPtr String::replace(Pool& pool, Dictionary& dict) const {
+	StringPtr result(new String());
+	CharPtr lcstr(cstr());
+	const char *current=lcstr.get();
 
-	// if one row, return simply itself
-	if(joined_size==arow->item.size) {
-		joined_ptr=arow->item.ptr;
-	} else {
-		// join adjacent rows
-		char *ptr=(char *)pool.malloc(joined_size,13);  
-		joined_ptr=ptr;
-
-		const Chunk* chunk=achunk;
-		const Chunk::Row* row=arow;
-		uint countdown=acountdown;
-		STRING_PREPARED_FOREACH_ROW(*this, 
-			if(row->item.lang==joined_lang) {
-				memcpy(ptr, row->item.ptr, row->item.size);  ptr+=row->item.size;
-			} else
+	STRING_FOREACH_FRAGMENT(
+IFNDEF_NO_STRING_ORIGIN(
+		const char *joined_origin_file=fragment->origin.file;
+		const size_t joined_origin_line=fragment->origin.line;
+);
+		uchar joined_lang=fragment->lang;
+		const char *joined_ptr=current;
+		// calc size
+		size_t joined_size=0;
+		STRING_PREPARED_FOREACH_FRAGMENT(
+			if(fragment->lang==joined_lang)
+				joined_size+=fragment->size;
+			else
 				break; // before non-ours
 		);
-		
-		// set pointers after joined piece
-		achunk=chunk;  arow=row;  acountdown=countdown;
-		// & one step back, see String::reconstruct
-		--arow;  ++acountdown;
-	}
-}
+		current+=joined_size;
 
-/// @test if in some piece were found no dict words, append it, not it's duplicate
-String& String::replace(Pool& pool, Dictionary& dict) const {
-//	return reconstruct(pool).replace_in_reconstructed(pool, dict);
-	String& result=*new(pool) String(pool);
-
-	STRING_FOREACH_ROW(
-		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;
-);
-		join_chain(pool, chunk, row, countdown,
-			joined_lang, joined_ptr, joined_size);
+		// pointers are after joined piece
+		// & one step back, see STRING_PREPARED_FOREACH_FRAGMENT
+		--fragment;
 		
-		const char *src=joined_ptr; 
-		size_t src_size=joined_size;
-		char *new_cstr=(char *)pool.malloc((size_t)ceil(src_size*dict.max_ratio()), 14);
+		char *new_cstr=new(pool) char[(size_t)ceil(joined_size*dict.max_ratio())];
 		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)) {
+		while(joined_size) {
+			// there is a fragment where first column starts 'joined_ptr'
+			if(Table::element_type row=dict.first_that_starts(joined_ptr, joined_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();
+				ConstStringPtr a=row->get(0);
+				ConstStringPtr b=row->get(1);
+				// skip 'a' in 'joined_ptr' && reduce work size
+				joined_ptr+=a->size();  joined_size-=a->size();
 				// write 'b' to 'dest' && skip 'b' in 'dest'
-				b.store_to(dest);  dest+=b.size();
+				b->store_to(dest, String::UL_AS_IS);  dest+=b->size();
 			} else {
 				// write a char to b && reduce work size
-				*dest++=*src++;  src_size--;
+				*dest++=*joined_ptr++;  joined_size--;
 			}
 		}
 
-		result.APPEND(new_cstr, dest-new_cstr, joined_lang,
+		result->APPEND(new_cstr, dest-new_cstr, joined_lang,
+			joined_origin_file, joined_origin_line);
+	);
+
+	return result;
+}
+
+StringPtr String::join_chains(Pool& pool) const {
+	StringPtr result(new String());
+	
+	char *pooled_buf=new(pool) char[cstr_bufsize()];
+	store_to(pooled_buf, String::UL_AS_IS);
+	const char *current=pooled_buf;
+
+	STRING_FOREACH_FRAGMENT(
+IFNDEF_NO_STRING_ORIGIN(
+		const char *joined_origin_file=fragment->origin.file;
+		const size_t joined_origin_line=fragment->origin.line;
+);
+		uchar joined_lang=fragment->lang;
+		const char *joined_ptr=current;
+		// calc size
+		size_t joined_size=0;
+		STRING_PREPARED_FOREACH_FRAGMENT(
+			if(fragment->lang==joined_lang)
+				joined_size+=fragment->size;
+			else
+				break; // before non-ours
+		);
+		current+=joined_size;
+
+		// pointers are after joined piece
+		// & one step back, see STRING_PREPARED_FOREACH_FRAGMENT
+		--fragment;
+		
+		result->APPEND(joined_ptr, joined_size, joined_lang,
 			joined_origin_file, joined_origin_line);
 	);
+
 	return result;
 }
 
 double String::as_double() const { 
 	double result;
-	const char *cstr;
-	char buf[MAX_NUMBER];
-	if(head.chunk.rows+1==append_here) {
-		int size=min(head.chunk.rows[0].item.size, MAX_NUMBER-1);
-		memcpy(buf, head.chunk.rows[0].item.ptr, size);
-		buf[size]=0;
-		cstr=buf;
-	} else
-		cstr=this->cstr();
+	char buf[MAX_STRING];
+	if(size()>MAX_STRING-1)
+		throw Exception("number.format",
+			ConstStringPtr(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)
+		return 0;
+
 	char *error_pos;
 	// 0xABC
 	if(cstr[0]=='0')
@@ -723,24 +642,29 @@ double String::as_double() const {
 	else
 		result=(double)strtod(cstr, &error_pos);
 
-	if(*error_pos/*not EOS*/)
-		throw Exception("number.format",
-			this,
-			"invalid number (double)");
+	while(char c=*error_pos++)
+		if(!isspace(c))
+			throw Exception("number.format",
+				ConstStringPtr(this),
+				"invalid number (double)");
 
 	return result;
 }
 int String::as_int() const { 
 	int result;
-	const char *cstr;
-	char buf[MAX_NUMBER];
-	if(head.chunk.rows+1==append_here) {
-		int size=min(head.chunk.rows[0].item.size, MAX_NUMBER-1);
-		memcpy(buf, head.chunk.rows[0].item.ptr, size);
-		buf[size]=0;
-		cstr=buf;
-	} else
-		cstr=this->cstr();
+	char buf[MAX_STRING];
+	if(size()>MAX_STRING-1)
+		throw Exception("number.format",
+			ConstStringPtr(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)
+		return 0;
+
 	char *error_pos;
 	// 0xABC
 	if(cstr[0]=='0')
@@ -751,46 +675,49 @@ int String::as_int() const {
 	else
 		result=(int)strtol(cstr, &error_pos, 0);
 
-	if(*error_pos/*not EOS*/)
-		throw Exception("number.format",
-			this,
-			"invalid number (int)");
+	while(char c=*error_pos++)
+		if(!isspace(c))
+			throw Exception("number.format",
+				ConstStringPtr(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 {
+inline void uint2uchars(uint word, uchar *bytes) {
+	bytes[0]=word&0xFF;
+	bytes[1]=(word>>8)&0xFF;
+	bytes[2]=(word>>16)&0xFF;
+	bytes[3]=(word>>24)&0xFF;
+}
+inline uint uchars2uint(uchar *bytes) {
+	return bytes[3]<<24
+		| bytes[2]<<16
+		| bytes[1]<<8
+		| bytes[0];
+}
+
+void String::serialize(Pool& pool, size_t prolog_size, char *& buf, size_t& buf_size) const {
 	buf_size=
 		prolog_size
-		+used_rows()*(sizeof(uchar)+sizeof(ushort))
+		+fused*(sizeof(uchar)+sizeof(size_t))
 		+size();
-	buf=malloc(buf_size,15);
-	char *cur=(char *)buf+prolog_size;
+	buf=new(pool) char[buf_size];
+	char *cur=buf+prolog_size;
 
-	STRING_FOREACH_ROW(
+	STRING_FOREACH_FRAGMENT(
 		// lang
-		memcpy(cur, &row->item.lang, sizeof(uchar));
-		cur+=sizeof(uchar);
+		memcpy(cur, &fragment->lang, sizeof(fragment->lang));
+		cur+=sizeof(fragment->lang);
 		// 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);
+		// bug on some sparc platform [you can't work with integers on odd pointers]
+		// forces us to use byte array instead
+		uchar bytes[4];
+		uint2uchars(fragment->size, bytes);
+		memcpy(cur, &bytes, sizeof(bytes)); cur+=sizeof(bytes);
 		// bytes
-		memcpy(cur, row->item.ptr, row->item.size);
-		cur+=row->item.size;
+		memcpy(cur, fragment->ptr, fragment->size);
+		cur+=fragment->size;
 	);
 }
 bool String::deserialize(size_t prolog_size, void *buf, size_t buf_size, const char *file) {
@@ -801,20 +728,17 @@ bool String::deserialize(size_t prolog_s
 	buf_size-=prolog_size;
 
 	while(buf_size) {
-		if(sizeof(uchar)+sizeof(ushort)>buf_size) // lang+size
+		if(sizeof(uchar)+sizeof(size_t)>buf_size) // lang+size
 			return false;
 
 		uchar lang=*(uchar *)(cur);		
-		ushort size=uchars2ushort(
-			*(uchar*)(cur+sizeof(uchar)*1),
-			*(uchar*)(cur+sizeof(uchar)*2)
-		);
+		size_t size=uchars2uint((uchar *)cur);
 
-		size_t piece_size=sizeof(uchar)+sizeof(ushort)+size;
+		size_t piece_size=sizeof(uchar)+sizeof(size_t)+size;
 		if(piece_size>buf_size) // buffer overrun, can be on incomplete cache files
 			return false;
 
-		const char *ptr=(const char*)(cur+sizeof(uchar)*3); 
+		const char *ptr=(const char*)(cur+sizeof(uchar)+sizeof(size_t)); 
 		APPEND(ptr, size, lang, file, 0);
 
 		cur+=piece_size;