--- parser3/src/main/pa_string.C	2003/09/29 09:42:12	1.181
+++ parser3/src/main/pa_string.C	2003/10/21 05:11:00	1.185
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_STRING_C="$Date: 2003/09/29 09:42:12 $";
+static const char* IDENT_STRING_C="$Date: 2003/10/21 05:11:00 $";
 
 #include "pcre.h"
 
@@ -15,6 +15,8 @@ static const char* IDENT_STRING_C="$Date
 #include "pa_dictionary.h"
 #include "pa_charset.h"
 
+const String String::Empty;
+
 // cord lib extension
 
 #ifndef DOXYGEN
@@ -167,11 +169,18 @@ String& String::mid(size_t substr_begin,
 }
 
 size_t String::pos(const String::Body substr, size_t this_offset, Language lang) const {
-	size_t substr_begin=body.pos(substr, this_offset);
-	if(substr_begin==CORD_NOT_FOUND || !langs.check_lang(lang, substr_begin, substr.length()))
-		return STRING_NOT_FOUND;
+	size_t substr_length=substr.length();
+	while(true) {
+		size_t substr_begin=body.pos(substr, this_offset);
+		
+		if(substr_begin==CORD_NOT_FOUND)
+			return STRING_NOT_FOUND;
+
+		if(langs.check_lang(lang, substr_begin, substr_length))
+			return substr_begin;
 
-	return substr_begin;
+		this_offset=substr_begin+substr_length;
+	}
 }
 
 size_t String::pos(const String& substr, 
@@ -334,9 +343,9 @@ Table* String::match(Charset& source_cha
 			*row+=&mid(prefinish, poststart); // .match
 			*row+=&mid(poststart, postfinish); // .postmatch
 		} else {
-			*row+=0; // .prematch column value
-			*row+=0; // .match
-			*row+=0; // .postmatch
+			*row+=&Empty; // .prematch column value
+			*row+=&Empty; // .match
+			*row+=&Empty; // .postmatch
 		}
 		
 		for(int i=1; i<exec_substrings; i++) {
@@ -422,7 +431,7 @@ const String& String::replace(const Dict
 
 	const char* current=old_cstr;
 	while(*current) {
-		if(Table::element_type row=dict.first_that_begins(current)) {
+		if(Dictionary::Subst subst=dict.first_that_begins(current)) {
 			// prematch
 			if(size_t prematch_length=current-prematch_begin) {
 				result.langs.append(result.body, langs, prematch_begin-old_cstr, prematch_length);
@@ -430,15 +439,11 @@ const String& String::replace(const Dict
 			}
 
 			// match
-
-			const String* a=row->get(0);
 			// skip 'a' in 'current'; move prematch_begin
-			current+=a->length(); prematch_begin=current;
+			current+=subst.from_length; prematch_begin=current;
 
-			if(row->count()>1) { // are there any b?
-				const String* b=row->get(1);
+			if(const String* b=subst.to) // are there any b?
 				result<<*b;
-			}
 		} else // simply advance
 			current++; 
 	}
@@ -543,7 +548,8 @@ String::Cm String::serialize(size_t prol
 	langs.for_each(body, serialize_lang_piece, &cur);
 	// 4: letters
 	body.for_each(serialize_body_char, serialize_body_piece, &cur);
-	// 5: zero terminator already there put by new(PointerFreeGC)
+	// 5: zero terminator
+	*cur=0;
 
 	return result;
 }