--- parser3/src/include/pa_string.h	2001/05/15 15:41:19	1.90
+++ parser3/src/include/pa_string.h	2001/05/21 16:38:46	1.95
@@ -5,29 +5,26 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_string.h,v 1.90 2001/05/15 15:41:19 parser Exp $
+	$Id: pa_string.h,v 1.95 2001/05/21 16:38:46 parser Exp $
 */
 
 #ifndef PA_STRING_H
 #define PA_STRING_H
 
 #include "pa_config_includes.h"
-
-#include <string.h>
-#include <stddef.h>
-
 #include "pa_pool.h"
 #include "pa_types.h"
 
 class Table;
 
 /**
-	$MAIN:html-typo table elements must enlarge string not more that that
+	$MAIN:html-typo table elements must enlarge string not more that that.
+
 	that's a tradeoff - otherwise we'd have to scan string twice:
 	- first for buffer length
 	- second for replacements themselves
 */
-#define UNTAINT_TIMES_BIGGER 20
+#define UNTAINT_TIMES_BIGGER 10
 
 #ifndef NO_STRING_ORIGIN
 #	define STRING_APPEND_PARAMS \
@@ -86,7 +83,7 @@ public:
 
 	enum {
 		CR_PREALLOCATED_COUNT=2, ///< default preallocated item count
-		CR_GROW_PERCENT=60 ///< each time the String chunk_is_full() string expanded()
+		CR_GROW_COUNT=2 ///< each time the String chunk_is_full() string expanded()
 	};
 
 	/// piece is tainted or not. the language to use when detaint 
@@ -122,7 +119,7 @@ public:
 		SQL_Connection *connection=0,
 		const char *charset=0) const {
 
-		char *result=(char *)malloc(size()*UNTAINT_TIMES_BIGGER+1);
+		char *result=(char *)malloc(cstr_bufsize(lang));
 		char *eol=store_to(result, lang, connection, charset);
 		*eol=0;
 		return result;
@@ -221,6 +218,8 @@ public:
 	};
 	String& change_case(Pool& pool, const unsigned char *pcre_tables, 
 		Change_case_kind kind) const;
+	double as_double();
+	int as_int();
 
 #ifndef NO_STRING_ORIGIN
 	/// origin of string. calculated by first row
@@ -274,6 +273,7 @@ private:
 	}
 	void expand();
 
+	size_t cstr_bufsize(Untaint_lang lang) const;
 	/// convert to C string, store to 'dest' which must be big enough for proper untaint
 	char *store_to(char *dest, Untaint_lang lang=UL_UNSPECIFIED, 
 		SQL_Connection *connection=0,