--- parser3/src/main/pa_string.C	2001/05/15 15:41:20	1.84
+++ parser3/src/main/pa_string.C	2001/05/19 19:55:45	1.88
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_string.C,v 1.84 2001/05/15 15:41:20 parser Exp $
+	$Id: pa_string.C,v 1.88 2001/05/19 19:55:45 parser Exp $
 */
 
 #include "pa_config_includes.h"
@@ -21,7 +21,6 @@
 #include "pa_array.h"
 #include "pa_globals.h"
 #include "pa_table.h"
-#include "pa_threads.h"
 
 String::String(Pool& apool, const char *src, size_t src_size, bool tainted) :
 	Pooled(apool) {
@@ -40,7 +39,7 @@ String::String(Pool& apool, const char *
 }
 
 void String::expand() {
-	size_t new_chunk_count=last_chunk->count+last_chunk->count*CR_GROW_PERCENT/100;
+	size_t new_chunk_count=last_chunk->count+CR_GROW_COUNT;
 	last_chunk=static_cast<Chunk *>(
 		malloc(sizeof(size_t)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *)));
 	last_chunk->count=new_chunk_count;
@@ -308,7 +307,8 @@ int String::cmp(int& partial, const char
 			a_row++; a_countdown--; 
 		}
 
-		if(a_break=a_row==a_end)
+		a_break=a_row==a_end;
+		if(a_break || b_break)
 			break;
 		if(!a_countdown) {
 			a_chunk=a_row->link;
@@ -485,6 +485,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,
 				   const String *aorigin,
 				   const String& regexp,