--- parser3/src/main/pa_string.C	2001/05/17 10:12:28	1.87
+++ parser3/src/main/pa_string.C	2001/07/18 10:06:04	1.94
@@ -4,9 +4,8 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_string.C,v 1.87 2001/05/17 10:12:28 parser Exp $
 */
+static const char *RCSId="$Id: pa_string.C,v 1.94 2001/07/18 10:06:04 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
@@ -23,7 +22,8 @@
 #include "pa_table.h"
 
 String::String(Pool& apool, const char *src, size_t src_size, bool tainted) :
-	Pooled(apool) {
+	Pooled(apool),
+	forigins_mode(false) {
 	last_chunk=&head;
 	head.count=CR_PREALLOCATED_COUNT;
 	append_here=head.rows;
@@ -38,18 +38,9 @@ String::String(Pool& apool, const char *
 			APPEND_CLEAN(src, src_size, 0, 0);
 }
 
-void String::expand() {
-	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;
-	link_row->link=last_chunk;
-	append_here=last_chunk->rows;
-	link_row=&last_chunk->rows[last_chunk->count];
-	link_row->link=0;
-}
-
-String::String(const String& src) :	Pooled(src.pool()) {
+String::String(const String& src) :	
+	Pooled(src.pool()),
+	forigins_mode(false) {
 	head.count=CR_PREALLOCATED_COUNT;
 	
 	size_t src_used_rows=src.fused_rows;
@@ -106,6 +97,17 @@ String::String(const String& src) :	Pool
 	fsize=src.fsize;
 }
 
+void String::expand() {
+	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;
+	link_row->link=last_chunk;
+	append_here=last_chunk->rows;
+	link_row=&last_chunk->rows[last_chunk->count];
+	link_row->link=0;
+}
+
 String& String::append(const String& src, Untaint_lang lang, bool forced) {
 	const Chunk *chunk=&src.head; 
 	do {
@@ -186,7 +188,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) 
@@ -485,6 +487,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 +638,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;
+}