--- 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/24 15:56:59	1.172.2.21.2.25
@@ -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/24 15:56:59 $";
 
 #include "pcre.h"
 
@@ -49,7 +49,7 @@ 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;
 
 		// found first fragment including piece of 'substr'
@@ -81,6 +81,11 @@ void String::ArrayFragment::mid(ArrayFra
 // StringSimple methods
 
 
+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 +93,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 +172,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