--- parser3/src/main/pa_string.C	2001/12/24 09:05:34	1.135
+++ parser3/src/main/pa_string.C	2002/02/20 10:40:08	1.140
@@ -1,10 +1,10 @@
 /** @file
 	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)
+	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.135 2001/12/24 09:05:34 paf Exp $
+	$Id: pa_string.C,v 1.140 2002/02/20 10:40:08 paf Exp $
 */
 
 #include "pcre.h"
@@ -20,12 +20,19 @@
 #include "pa_dictionary.h"
 #include "pa_charset.h"
 
+#define DEBUG_STRING_APPENDS_VS_EXPANDS
+
+
+#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS
+ulong string_piece_appends=0;
+#endif
+
 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;
-	head_link=0;
+	initial_head_link=0;
 	link_row=&head.rows[head.count];
 
 	if(src)
@@ -34,7 +41,7 @@ String::String(Pool& apool, const char *
 		else
 			APPEND_CLEAN(src, src_size, 0, 0);
 }
-
+/*
 String::String(const String& src) :	
 	Pooled(src.pool()) {
 	head.count=CR_PREALLOCATED_COUNT;
@@ -62,16 +69,15 @@ String::String(const String& src) :
 		// remaining rows size_to new_chunk
 		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));
+			malloc(sizeof(Chunk::count_type)+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 *old_chunk=src.head.rows[src.head.count].link; 
 		Chunk::Row *new_rows=last_chunk->rows;
 		uint rows_left_to_copy=last_chunk->count;
 		while(true) {
-			uint old_count=old_chunk->count;
+			Chunk::count_type old_count=old_chunk->count;
 			Chunk *next_chunk=old_chunk->rows[old_count].link;
 			if(next_chunk) {
 				// not last source chunk
@@ -90,7 +96,18 @@ String::String(const String& src) :
 		}
 	}
 	link_row->link=0;
-	src_used_rows;
+}
+*/
+
+String::String(const String& src) :	
+	Pooled(src.pool()) {
+	last_chunk=&head;
+	head.count=CR_PREALLOCATED_COUNT;
+	append_here=head.rows;
+	initial_head_link=0;
+	link_row=&head.rows[head.count];
+
+	append(src, UL_UNSPECIFIED);
 }
 
 size_t  String::size() const {
@@ -112,12 +129,12 @@ break2:
 	return result;
 }
 void String::expand() {
-	uint new_chunk_count=last_chunk->count+CR_GROW_COUNT;
-	if(new_chunk_count>MAX_USHORT)
-		new_chunk_count=MAX_USHORT;
+	Chunk::count_type 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);
 
 	last_chunk=static_cast<Chunk *>(
-		malloc(sizeof(uint)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *), 10));
+		malloc(sizeof(Chunk::count_type)+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;
@@ -126,6 +143,11 @@ 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,
+			this,
+			"string growth stopped");
+
 	if(!src)
 		return *this;
 	if(!size)
@@ -133,12 +155,17 @@ String& String::real_append(STRING_APPEN
 	if(!size)
 		return *this;
 
-	while(size>MAX_USHORT) {
+#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS
+	string_piece_appends++;
+#endif
+
+	// 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_USHORT;
+		append_here->item.size=max_integral(Chunk::Row::item_size_type);
 		append_here->item.lang=lang;
 #ifndef NO_STRING_ORIGIN
 		append_here->item.origin.file=file;
@@ -146,8 +173,8 @@ String& String::real_append(STRING_APPEN
 #endif
 		append_here++;
 
-		src+=MAX_USHORT;
-		size-=MAX_USHORT;
+		src+=max_integral(Chunk::Row::item_size_type);
+		size-=max_integral(Chunk::Row::item_size_type);
 	}
 
 	if(chunk_is_full())
@@ -166,7 +193,7 @@ String& String::real_append(STRING_APPEN
 }
 
 char String::first_char() const {
-	if(!used_rows())
+	if(is_empty())
 		throw Exception(0, 0,
 			this,
 			"getting first char of empty string");
@@ -204,10 +231,10 @@ int String::cmp(int& partial, const Stri
 	size_t pos=0; 
 
 	bool a_break=a_size==0;
-	bool b_break=src.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) 
+			if(lang!=UL_UNSPECIFIED && a_row->item.lang>lang) 
 				return -1; // wrong lang -- bail out
 
 			int size_diff=
@@ -292,7 +319,7 @@ int String::cmp(int& partial, const char
 	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=
@@ -346,7 +373,7 @@ int String::cmp(int& partial, const char
 
 #ifndef NO_STRING_ORIGIN
 const Origin& String::origin() const { 
-	if(!used_rows()) {
+	if(is_empty()) {
 		static const Origin empty_origin={"empty string"};
 		return empty_origin;
 	}
@@ -365,7 +392,7 @@ const Origin& String::origin() const {
 String& String::mid(size_t start, size_t finish) const {
 	String& result=*NEW String(pool());
 
-	start=max(0, start);
+	start=max(size_t(0), start);
 	finish=min(size(), finish);
 	if(start==finish)
 		return result;
@@ -374,7 +401,7 @@ String& String::mid(size_t start, size_t
 	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 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;
@@ -452,7 +479,7 @@ void String::split(Array& result,
 				   size_t* pos_after_ref, 
 				   const String& delim, Untaint_lang lang, 
 				   int limit) const {
-	if(delim.size()) {
+	if(!delim.is_empty()) {
 		size_t pos_after=pos_after_ref?*pos_after_ref:0;
 		int pos_before;
 		// while we have 'delim'...
@@ -509,7 +536,7 @@ bool String::match(
 				   Row_action row_action, void *info,
 				   bool *was_global) const { 
 
-	if(!regexp.size())
+	if(regexp.is_empty())
 		throw Exception(0, 0,
 			aorigin,
 			"regexp is empty");
@@ -631,7 +658,7 @@ String& String::change_case(Pool& pool,
 	const Chunk *chunk=&head; 
 	do {
 		const Chunk::Row *row=chunk->rows;
-		for(uint i=0; i<chunk->count; i++, row++) {
+		for(Chunk::count_type i=0; i<chunk->count; i++, row++) {
 			if(row==append_here)
 				goto break2;