--- parser3/src/main/pa_string.C	2003/03/24 11:52:57	1.172.2.21.2.22
+++ parser3/src/main/pa_string.C	2003/03/25 10:21:08	1.172.2.21.2.29
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_STRING_C="$Date: 2003/03/24 11:52:57 $";
+static const char* IDENT_STRING_C="$Date: 2003/03/25 10:21:08 $";
 
 #include "pcre.h"
 
@@ -49,7 +49,10 @@ void String::ArrayFragment::append_posit
 		const element_type& fragment=i.next();
 		fragment_end=fragment_begin+fragment.length;		
 
-		if(fragment_begin<substr_begin) // not reached fragments which may include 'substr'?
+		if(substr_begin<fragment_begin) // not reached fragments which may include 'substr'?
+			continue;
+
+		if(substr_begin>fragment_end) // not reached fragments which may include 'substr'?
 			continue;
 
 		// found first fragment including piece of 'substr'
@@ -73,14 +76,20 @@ void String::ArrayFragment::append_posit
 		break;
 	}	
 }
-/*
-void String::ArrayFragment::mid(ArrayFragment& result, size_t substr_begin, size_t substr_end) {
-}
-*/
 
-// StringSimple methods
+// StringBody methods
 
+StringBody StringBody::Format(int value) {
+	char local[MAX_NUMBER];
+	size_t length=snprintf(local, MAX_NUMBER, "%d", value);
+	return StringBody(pa_strdup(local, length), length);
+}
 
+static int CORD_batched_iter_fn_generic_hash_code(char c, void * client_data) {
+	uint& result=*static_cast<uint*>(client_data);
+	generic_hash_code(result, c);
+	return 0;
+}
 static int CORD_batched_iter_fn_generic_hash_code(const char*  s, void * client_data) {
 	uint& result=*static_cast<uint*>(client_data);
 	generic_hash_code(result, s);
@@ -88,7 +97,9 @@ static int CORD_batched_iter_fn_generic_
 };
 uint StringBody::hash_code() const {
 	uint result=0;
-	CORD_iter5(body, 0, 0, CORD_batched_iter_fn_generic_hash_code, &result);
+	CORD_iter5(body, 0,
+		CORD_batched_iter_fn_generic_hash_code, 
+		CORD_batched_iter_fn_generic_hash_code, &result);
 	return result;
 }
 
@@ -165,7 +176,7 @@ size_t String::pos(const StringBody subs
 				"searching for '%s' starting from %ud problem: found begin in one fragment, but end in another",
 					substr.cstr(), this_offset);
 
-		if(fragment.lang==lang)
+		if(fragment.lang<=lang)
 			return substr_begin;
 		else { // bad lang...
 			/// WARNING: this possibly skips assert (*), but it's fast
@@ -277,7 +288,7 @@ Table* String::match(Charset& source_cha
 	const char* errptr;
 	int erroffset;
 	bool need_pre_post_match=false;
-	int option_bits[2];  regex_options(options, option_bits, need_pre_post_match);
+	int option_bits[2]={0};  regex_options(options, option_bits, need_pre_post_match);
 	bool global=option_bits[1]!=0;
 	pcre *code=pcre_compile(pattern, option_bits[0], 
 		&errptr, &erroffset,