--- parser3/src/main/pa_string.C	2001/12/07 13:10:18	1.125.2.1.2.2
+++ parser3/src/main/pa_string.C	2001/12/15 21:28:21	1.132
@@ -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.125.2.1.2.2 2001/12/07 13:10:18 paf Exp $
+	$Id: pa_string.C,v 1.132 2001/12/15 21:28:21 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) {
@@ -398,7 +396,7 @@ break2:
 int String::pos(const String& substr, 
 				int result, Untaint_lang lang) const {
 	size_t self_size=size();
-	for(; result<self_size; result++) {
+	for(; size_t(result)<self_size; result++) {
 		int partial; cmp(partial, substr, result, lang);
 		if(
 			partial==0 || // full match
@@ -412,7 +410,7 @@ int String::pos(const String& substr,
 int String::pos(const char *substr, size_t substr_size, 
 				int result, Untaint_lang lang) const {
 	size_t self_size=size();
-	for(; result<self_size; result++) {
+	for(; size_t(result)<self_size; result++) {
 		int partial; cmp(partial, substr, substr_size, result, lang);
 		if(
 			partial==0 || // full match
@@ -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;
@@ -678,7 +677,7 @@ void String::join_chain(Pool& pool,
 				if(row->item.lang==joined_lang)
 					joined_size+=row->item.size;
 				else
-					break;
+					goto break21;
 			}
 			if(chunk=row->link) {
 				start_i=0;
@@ -714,7 +713,7 @@ break21:;
 					memcpy(ptr, row->item.ptr, row->item.size);
 					ptr+=row->item.size;
 				} else
-					break;
+					goto break22;
 			}
 			if(chunk=row->link) {
 				start_i=0;
@@ -735,7 +734,7 @@ String& String::reconstruct(Pool& pool)
 	//_asm int 3;
 	String& result=*new(pool) String(pool);
 	const Chunk *chunk=&head; 
-	do {
+	while(true) {
 		const Chunk::Row *row=chunk->rows;
 		for(uint i=0; i<chunk->count; ) {
 			if(row==append_here)
@@ -744,16 +743,19 @@ String& String::reconstruct(Pool& pool)
 			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;
+#endif
 			join_chain(pool, i, chunk, row,
 				joined_lang, joined_ptr, joined_size);
 
-			result.APPEND(joined_ptr, joined_size, 
-				joined_lang,
-				row->item.origin.file, row->item.origin.line);
+			result.APPEND(joined_ptr, joined_size, joined_lang,
+				joined_origin_file, joined_origin_line);
 			if(!chunk)
 				goto break2;
 		}
-	} while(true);
+	}
 break2:
 
 	return result;