--- parser3/src/main/pa_string.C	2001/05/15 15:41:20	1.84
+++ parser3/src/main/pa_string.C	2001/06/28 07:41:59	1.92
@@ -5,8 +5,9 @@
 
 	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.92 2001/06/28 07:41:59 parser Exp $
 */
+static char *RCSId="$Id: pa_string.C,v 1.92 2001/06/28 07:41:59 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
@@ -21,7 +22,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 +40,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;
@@ -187,7 +187,7 @@ int String::cmp(int& partial, const Stri
 	size_t pos=0; 
 
 	bool a_break=size()==0;
-	bool b_break=size()==0;
+	bool b_break=src.size()==0;
 	if(!(a_break || b_break)) while(true) {
 		if(pos+a_row->item.size > this_offset) {
 			if(lang!=UL_UNSPECIFIED && a_row->item.lang!=lang) 
@@ -308,7 +308,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 +486,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, 
@@ -635,3 +637,38 @@ break2:
 
 	return result;
 }
+
+double String::as_double() const { 
+	double result;
+	const char *cstr=this->cstr();
+	char *error_pos=0;
+	// 0xABC
+	if(cstr[0]=='0' && (cstr[1]=='x' || cstr[1]=='X'))
+		result=(double)(unsigned long)strtol(cstr, &error_pos, 0);
+	else
+		result=strtod(cstr, &error_pos);
+
+	if(error_pos && *error_pos)
+		THROW(0, 0,
+			this,
+			"invalid number (double)");
+
+	return result;
+}
+int String::as_int() const { 
+	int result;
+	const char *cstr=this->cstr();
+	char *error_pos=0;
+	// 0xABC
+	if(cstr[0]=='0' && (cstr[1]=='x' || cstr[1]=='X'))
+		result=(int)(unsigned long)strtol(cstr, &error_pos, 0);
+	else
+		result=(int)strtol(cstr, &error_pos, 0);
+
+	if(error_pos && *error_pos)
+		THROW(0, 0,
+			this,
+			"invalid number (int)");
+
+	return result;
+}