--- parser3/src/main/pa_string.C	2001/04/23 13:38:31	1.78
+++ parser3/src/main/pa_string.C	2001/05/15 15:51:05	1.85
@@ -5,12 +5,13 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_string.C,v 1.78 2001/04/23 13:38:31 paf Exp $
+	$Id: pa_string.C,v 1.85 2001/05/15 15:51:05 parser Exp $
 */
 
 #include "pa_config_includes.h"
 
 #include "pcre.h"
+#include "internal.h"
 
 #include "pa_pool.h"
 #include "pa_string.h"
@@ -22,10 +23,6 @@
 #include "pa_table.h"
 #include "pa_threads.h"
 
-//#include "pa_sapi.h"
-
-// String
-
 String::String(Pool& apool, const char *src, size_t src_size, bool tainted) :
 	Pooled(apool) {
 	last_chunk=&head;
@@ -43,7 +40,7 @@ String::String(Pool& apool, const char *
 }
 
 void String::expand() {
-	size_t new_chunk_count=last_chunk->count+last_chunk->count*CR_GROW_PERCENT/100;
+	size_t new_chunk_count=last_chunk->count+CR_GROW_COUNT;
 	last_chunk=static_cast<Chunk *>(
 		malloc(sizeof(size_t)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *)));
 	last_chunk->count=new_chunk_count;
@@ -186,16 +183,12 @@ int String::cmp(int& partial, const Stri
 	Chunk::Row *b_end=src.append_here;
 	size_t a_countdown=a_chunk->count;
 	size_t b_countdown=b_chunk->count;
-	bool a_break=false;
-	bool b_break=false;
 	size_t result;
 	size_t pos=0; 
-	while(true) {
-		a_break=a_row==a_end;
-		b_break=b_row==b_end;
-		if(a_break || b_break)
-			break;
 
+	bool a_break=size()==0;
+	bool b_break=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) 
 				return -1; // wrong lang -- bail out
@@ -228,7 +221,10 @@ int String::cmp(int& partial, const Stri
 				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;
@@ -240,6 +236,10 @@ int String::cmp(int& partial, const Stri
 			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;
@@ -268,14 +268,11 @@ int String::cmp(int& partial, const char
 	size_t b_offset=0;
 	Chunk::Row *a_end=append_here;
 	size_t a_countdown=a_chunk->count;
-	bool a_break=false;
-	bool b_break=false;
 	size_t pos=0;
-	while(true) {
-		a_break=a_row==a_end;
-		if(a_break || b_break)
-			break;
 
+	bool a_break=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) 
 				return -1; // wrong lang -- bail out
@@ -311,6 +308,8 @@ int String::cmp(int& partial, const char
 			a_row++; a_countdown--; 
 		}
 
+		if(a_break=a_row==a_end)
+			break;
 		if(!a_countdown) {
 			a_chunk=a_row->link;
 			a_row=a_chunk->rows;
@@ -336,7 +335,11 @@ const Origin& String::origin() const {
 	// determining origin by last appended piece
 	// because first one frequently constant. 
 	// ex: ^load[/file] "document_root" + "/file"
-	return append_here[-1].item.origin; 
+	// when last peice is constant, 
+	// ex: parser_root_auto_path{dynamic} / auto.p{const}
+	// using first piece
+	Origin& last_origin=append_here[-1].item.origin;
+	return last_origin.file ? last_origin : head.rows[0].item.origin;
 }
 #endif
 
@@ -463,7 +466,7 @@ static void regex_options(char *options,
 		int *result;
     } regex_option[]={
 		{'i', 0, PCRE_CASELESS, result}, // a=A
-		{'s', 0, PCRE_DOTALL, result}, // \n\n$
+		{'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
@@ -482,13 +485,6 @@ static void regex_options(char *options,
 			}
 }
 
-/**
-	returns true if fills table.
-	table format is defined and fixed[can be used by others]: 
-	@verbatim
-		pre-match/match/post-match/1/2/3/...
-	@endverbatim
-*/
 bool String::match(const unsigned char *pcre_tables,
 				   const String *aorigin,
 				   const String& regexp, 
@@ -563,9 +559,9 @@ bool String::match(const unsigned char *
 		}
 
 		Array& row=*NEW Array(pool());
-		row+=&mid(0, ovector[0]); // .pre-match column value
+		row+=&mid(0, ovector[0]); // .prematch column value
 		row+=&mid(ovector[0], ovector[1]); // .match
-		row+=&mid(ovector[1], size()); // .post-match
+		row+=&mid(ovector[1], size()); // .postmatch
 		
 		for(int i=1; i<exec_substrings; i++) {
 			// -1:-1 case handled peacefully by mid() itself
@@ -586,3 +582,56 @@ bool String::match(const unsigned char *
 */
 	}
 }
+
+String& String::change_case(Pool& pool, const unsigned char *tables, 
+							Change_case_kind kind) const {
+	String& result=*new(pool) String(pool);
+
+	const unsigned char *a;
+	const unsigned char *b;
+	switch(kind) {
+	case CC_UPPER:
+		a=tables+lcc_offset;
+		b=tables+fcc_offset;
+		break;
+	case CC_LOWER:
+		a=tables+lcc_offset;
+		b=0;
+		break;
+	default:
+		PTHROW(0, 0, 
+			this, 
+			"unknown change case kind #%d", 
+				static_cast<int>(kind)); // never
+		a=b=0; // calm, compiler
+		break; // never
+	}	
+
+	const Chunk *chunk=&head; 
+	do {
+		const Chunk::Row *row=chunk->rows;
+		for(size_t i=0; i<chunk->count; i++, row++) {
+			if(row==append_here)
+				goto break2;
+
+			char *new_cstr=(char *)pool.malloc(row->item.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];
+				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);
+		}
+		chunk=row->link;
+	} while(chunk);
+break2:
+
+	return result;
+}