--- parser3/src/main/pa_string.C	2001/05/14 13:18:07	1.82
+++ parser3/src/main/pa_string.C	2001/05/21 16:39:32	1.90
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_string.C,v 1.82 2001/05/14 13:18:07 parser Exp $
+	$Id: pa_string.C,v 1.90 2001/05/21 16:39:32 parser Exp $
 */
 
 #include "pa_config_includes.h"
@@ -21,11 +21,6 @@
 #include "pa_array.h"
 #include "pa_globals.h"
 #include "pa_table.h"
-#include "pa_threads.h"
-
-//#include "pa_sapi.h"
-
-// String
 
 String::String(Pool& apool, const char *src, size_t src_size, bool tainted) :
 	Pooled(apool) {
@@ -44,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;
@@ -187,16 +182,12 @@ int String::cmp(int& partial, const Stri
 	Chunk::Row *b_end=src.append_here;
 	size_t a_countdown=a_chunk->count;
 	size_t b_countdown=b_chunk->count;
-	bool a_break=false;
-	bool b_break=false;
 	size_t result;
 	size_t pos=0; 
-	while(true) {
-		a_break=a_row==a_end;
-		b_break=b_row==b_end;
-		if(a_break || b_break)
-			break;
 
+	bool a_break=size()==0;
+	bool b_break=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) 
 				return -1; // wrong lang -- bail out
@@ -229,7 +220,10 @@ int String::cmp(int& partial, const Stri
 				pos+=a_row->item.size;
 				a_row++; a_countdown--; a_offset=0;
 			}
-			
+			if(b_break=b_row==b_end) {
+				a_break=a_row==a_end;
+				break;			
+			}
 			if(!b_countdown) {
 				b_chunk=b_row->link;
 				b_row=b_chunk->rows;
@@ -241,6 +235,10 @@ int String::cmp(int& partial, const Stri
 			a_row++; a_countdown--; 
 		}
 
+		if(a_break=a_row==a_end) {
+			b_break=b_row==b_end;
+			break;
+		}
 		if(!a_countdown) {
 			a_chunk=a_row->link;
 			a_row=a_chunk->rows;
@@ -269,14 +267,11 @@ int String::cmp(int& partial, const char
 	size_t b_offset=0;
 	Chunk::Row *a_end=append_here;
 	size_t a_countdown=a_chunk->count;
-	bool a_break=false;
-	bool b_break=false;
 	size_t pos=0;
-	while(true) {
-		a_break=a_row==a_end;
-		if(a_break || b_break)
-			break;
 
+	bool a_break=size()==0;
+	bool b_break=b_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) 
 				return -1; // wrong lang -- bail out
@@ -312,6 +307,9 @@ int String::cmp(int& partial, const char
 			a_row++; a_countdown--; 
 		}
 
+		a_break=a_row==a_end;
+		if(a_break || b_break)
+			break;
 		if(!a_countdown) {
 			a_chunk=a_row->link;
 			a_row=a_chunk->rows;
@@ -487,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, 
@@ -637,3 +636,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;
+}