--- parser3/src/main/pa_string.C	2001/12/13 10:47:34	1.131
+++ parser3/src/main/pa_string.C	2001/12/25 09:00:28	1.136
@@ -4,13 +4,10 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_string.C,v 1.131 2001/12/13 10:47:34 paf Exp $
+	$Id: pa_string.C,v 1.136 2001/12/25 09:00:28 paf Exp $
 */
 
-#include "pa_config_includes.h"
-
 #include "pcre.h"
-#include "internal.h"
 
 #include "pa_pool.h"
 #include "pa_string.h"
@@ -21,6 +18,7 @@
 #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) {
@@ -209,7 +207,7 @@ int String::cmp(int& partial, const Stri
 	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=
@@ -294,7 +292,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=
@@ -503,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,
@@ -523,7 +521,7 @@ 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 Exception(0, 0,
@@ -605,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;
@@ -693,8 +692,12 @@ break21:;
 	if(joined_size==arow->item.size) {
 		joined_ptr=arow->item.ptr;
 		ai++; arow++;
-		if(ai==achunk->count)
-			achunk=arow->link;		
+		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);
@@ -735,29 +738,27 @@ String& String::reconstruct(Pool& pool)
 	//_asm int 3;
 	String& result=*new(pool) String(pool);
 	const Chunk *chunk=&head; 
-	while(true) {
-		const Chunk::Row *row=chunk->rows;
-		for(uint i=0; i<chunk->count; ) {
-			if(row==append_here)
-				goto break2;
+	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;
+		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;
+		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);
+		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)
-				goto break2;
-		}
+		result.APPEND(joined_ptr, joined_size, joined_lang,
+			joined_origin_file, joined_origin_line);
+
+		if(!chunk)
+			break;
 	}
-break2:
 
 	return result;
 };
@@ -892,6 +893,9 @@ 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;