--- parser3/src/main/pa_string.C	2002/03/04 10:03:35	1.148
+++ parser3/src/main/pa_string.C	2002/04/10 08:53:55	1.151
@@ -4,7 +4,7 @@
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_string.C,v 1.148 2002/03/04 10:03:35 paf Exp $
+	$Id: pa_string.C,v 1.151 2002/04/10 08:53:55 paf Exp $
 */
 
 #include "pcre.h"
@@ -29,9 +29,9 @@ ulong string_piece_appends=0;
 
 String::String(Pool& apool, const char *src, size_t src_size, bool tainted) :
 	Pooled(apool) {
-	last_chunk=&head;
-	head.count=CR_PREALLOCATED_COUNT;
-	append_here=head.rows;
+	last_chunk=&head.chunk;
+	head.chunk.count=CR_PREALLOCATED_COUNT;
+	append_here=head.chunk.rows;
 
 	if(src)
 		if(tainted)
@@ -42,9 +42,9 @@ String::String(Pool& apool, const char *
 
 String::String(const String& src) :	
 	Pooled(src.pool()) {
-	last_chunk=&head;
-	head.count=CR_PREALLOCATED_COUNT;
-	append_here=head.rows;
+	last_chunk=&head.chunk;
+	head.chunk.count=CR_PREALLOCATED_COUNT;
+	append_here=head.chunk.rows;
 
 	append(src, UL_UNSPECIFIED);
 }
@@ -71,7 +71,12 @@ void String::expand() {
 		new_chunk_count=max_integral(Chunk::count_type);
 
 	Chunk *new_chunk=static_cast<Chunk *>(
-		malloc(sizeof(Chunk::count_type)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *), 10));
+		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;
 	
@@ -81,7 +86,7 @@ void String::expand() {
 
 String& String::real_append(STRING_APPEND_PARAMS) {
 	if(!last_chunk) // growth stopped [we're appended as string to somebody]
-		throw Exception(0, 0,
+		throw Exception(0,
 			this,
 			"string growth stopped (append cstr)");
 
@@ -131,11 +136,11 @@ String& String::real_append(STRING_APPEN
 
 char String::first_char() const {
 	if(is_empty())
-		throw Exception(0, 0,
+		throw Exception(0,
 			this,
 			"getting first char of empty string");
 
-	return *head.rows[0].item.ptr;
+	return *head.chunk.rows[0].item.ptr;
 }
 
 uint String::hash_code() const {
@@ -153,8 +158,8 @@ 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;
-	const Chunk *b_chunk=&src.head;
+	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;
 	size_t a_offset=this_offset;
@@ -243,7 +248,7 @@ 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;
+	const Chunk *a_chunk=&head.chunk;
 	const Chunk::Row *a_row=a_chunk->rows;
 	size_t a_offset=this_offset;
 	size_t b_offset=0;
@@ -320,7 +325,7 @@ 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.rows[0].item.origin;
+	Origin& first_origin=head.chunk.rows[0].item.origin;
 	return first_origin.file ? first_origin : append_here[-1].item.origin;
 }
 #endif
@@ -473,7 +478,7 @@ bool String::match(
 				   bool *was_global) const { 
 
 	if(regexp.is_empty())
-		throw Exception(0, 0,
+		throw Exception(0,
 			aorigin,
 			"regexp is empty");
 	const char *pattern=regexp.cstr();
@@ -487,14 +492,14 @@ bool String::match(
 		pool().get_source_charset().pcre_tables);
 
 	if(!code)
-		throw Exception(0, 0,
+		throw Exception(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 Exception(0, 0,
+		throw Exception(0,
 			aorigin,
 			"pcre_info error (%d)", 
 				info_substrings);
@@ -534,7 +539,7 @@ bool String::match(
 
 		if(exec_substrings<0) {
 			pcre_free(code);
-			throw Exception(0, 0,
+			throw Exception(0,
 				aorigin,
 				"regular expression execute error (%d)", 
 					exec_substrings);
@@ -583,7 +588,7 @@ String& String::change_case(Pool& pool,
 		b=0;
 		break;
 	default:
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			this, 
 			"unknown change case kind #%d", 
 				static_cast<int>(kind)); // never
@@ -655,9 +660,11 @@ void String::join_chain(Pool& pool,
 	}
 }
 
-String& String::reconstruct(Pool& pool) const {
-	//_asm int 3;
+/// @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;
@@ -668,20 +675,9 @@ IFNDEF_NO_STRING_ORIGIN(
 );
 		join_chain(pool, chunk, row, countdown,
 			joined_lang, joined_ptr, joined_size);
-
-		result.APPEND(joined_ptr, joined_size, joined_lang,
-			joined_origin_file, joined_origin_line);
-	);
-
-	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;
+		
+		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 *dest=new_cstr;
 		while(src_size) {
@@ -700,24 +696,19 @@ String& String::replace_in_reconstructed
 			}
 		}
 
-		result.APPEND(new_cstr, dest-new_cstr, 
-			row->item.lang,
-			row->item.origin.file, row->item.origin.line);
+		result.APPEND(new_cstr, dest-new_cstr, joined_lang,
+			joined_origin_file, joined_origin_line);
 	);
 	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;
 	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);
+	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
@@ -733,7 +724,7 @@ double String::as_double() const {
 		result=(double)strtod(cstr, &error_pos);
 
 	if(*error_pos/*not EOS*/)
-		throw Exception(0, 0,
+		throw Exception("number.format",
 			this,
 			"invalid number (double)");
 
@@ -743,9 +734,9 @@ int String::as_int() const {
 	int result;
 	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);
+	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
@@ -761,7 +752,7 @@ int String::as_int() const {
 		result=(int)strtol(cstr, &error_pos, 0);
 
 	if(*error_pos/*not EOS*/)
-		throw Exception(0, 0,
+		throw Exception("number.format",
 			this,
 			"invalid number (int)");