--- parser3/src/main/pa_charset.C	2003/01/28 11:46:44	1.33.2.3
+++ parser3/src/main/pa_charset.C	2003/02/26 10:17:30	1.33.2.12
@@ -1,14 +1,13 @@
 /** @file
 	Parser: Charset connection implementation.
 
-	Copyright(c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan<paf@design.ru>(http://paf.design.ru)
 */
 
-static const char* IDENT_CHARSET_C="$Date: 2003/01/28 11:46:44 $";
+static const char* IDENT_CHARSET_C="$Date: 2003/02/26 10:17:30 $";
 
 #include "pa_charset.h"
-//#include "pa_globals.h"
 
 #ifdef XML
 #include "libxml/encoding.h"
@@ -18,12 +17,8 @@ static const char* IDENT_CHARSET_C="$Dat
 
 #define CHARSET_UTF8_NAME "UTF-8"
 
-CharsetPtr UTF8_charset(new Charset(ConstStringPtr(new String(CHARSET_UTF8_NAME)), 
-					 ConstStringPtrZero/*no file=system*/));
-
-// consts
-
-#define MAX_CHARSET_UNI_CODES 500
+CharsetPtr UTF8_charset(new Charset(StringPtr(new String(CHARSET_UTF8_NAME)), 
+					 StringPtr(0)/*no file=system*/));
 
 // helpers
 
@@ -42,7 +37,7 @@ inline void cstr2ctypes(unsigned char *t
 		ctypes_table[c]|=bit;
 	}
 }
-inline unsigned int to_wchar_code(const char *cstr) {
+inline unsigned int to_wchar_code(const char* cstr) {
 	if(!cstr || !*cstr)
 		return 0;
 	if(cstr[1]==0)
@@ -51,7 +46,7 @@ inline unsigned int to_wchar_code(const
 	char *error_pos;
 	return(unsigned int)strtol(cstr, &error_pos, 0);
 }
-inline bool to_bool(const char *cstr) {
+inline bool to_bool(const char* cstr) {
 	return cstr && *cstr!=0;
 }
 static void element2ctypes(unsigned char c, bool belongs,
@@ -79,7 +74,7 @@ static void element2case(unsigned char f
 // methods
 
 extern "C" unsigned char pcre_default_tables[]; // pcre/chartables.c
-Charset::Charset(ConstStringPtr aname, ConstStringPtr afile_spec): 
+Charset::Charset(StringPtr aname, StringPtr afile_spec): 
 	fname(aname),
 	fname_cstr(aname->cstr()) {
 
@@ -88,7 +83,7 @@ Charset::Charset(ConstStringPtr aname, C
 
 	if(afile_spec) {
 		fisUTF8=false;
-		load_definition(fname);
+		load_definition(afile_spec);
 #ifdef XML
 		addEncoding(fname_cstr);
 #endif
@@ -110,7 +105,7 @@ Charset::~Charset() {
 #endif
 }
 
-void Charset::load_definition(ConstStringPtr afile_spec) {
+void Charset::load_definition(StringPtr afile_spec) {
 	// pcre_tables
 	// lowcase, flipcase, bits digit+word+whitespace, masks
 
@@ -121,16 +116,15 @@ void Charset::load_definition(ConstStrin
 	cstr2ctypes(pcre_tables,(const unsigned char *)"*+?{^.$|()[", ctype_meta);
 
 	// charset
-	memset(tables.fromTable, 0, sizeof(tables.fromTable));
-	tables.toTable=(Charset_TransRec *)pool_for_load.calloc(sizeof(Charset_TransRec)*MAX_CHARSET_UNI_CODES);
-	tables.toTableSize=0;
+	memset(&tables, 0, sizeof(tables));
 	// strangly vital
 	tables.toTable[tables.toTableSize].intCh=0;
 	tables.toTable[tables.toTableSize].extCh=(XMLByte)0;
 	tables.toTableSize++;
 
 	// loading text
-	char *data=file_read_text(pool_for_load, *UTF8_charset, afile_spec);
+	Pool pool_for_load_only;
+	char *data=file_read_text(pool_for_load_only, *UTF8_charset, afile_spec);
 
 	// ignore header
 	getrow(&data);
@@ -462,7 +456,7 @@ void Charset::transcodeToUTF8(Pool& pool
 								 const void *source_body, size_t source_content_length,
 								 const void *& adest_body, size_t& dest_content_length) const {
 	dest_content_length=source_content_length*6/*so that surly enough, max utf8 seq len=6*/;
-	XMLByte *dest_body=(XMLByte*)pool.malloc(dest_content_length);
+	XMLByte *dest_body=new(pool) XMLByte[dest_content_length];
 
 	if(::transcodeToUTF8(
 		(XMLByte *)source_body, source_content_length,
@@ -479,7 +473,7 @@ void Charset::transcodeFromUTF8(Pool& po
 								   const void *source_body, size_t source_content_length,
 								   const void *& adest_body, size_t& dest_content_length) const {
 	dest_content_length=source_content_length*6/*so that surly enough, "&#255;" has max ratio */;
-	XMLByte *dest_body=(XMLByte*)pool.malloc(dest_content_length);
+	XMLByte *dest_body=new(pool) XMLByte[dest_content_length];
 
 	if(::transcodeFromUTF8(
 		(XMLByte *)source_body, source_content_length,
@@ -503,7 +497,7 @@ void Charset::transcodeToCharset(Pool& p
 		adest_content_length=source_content_length;
 	} else {
 		size_t dest_content_length=source_content_length;
-		unsigned char *dest_body=(unsigned char *)pool.malloc(dest_content_length);
+		unsigned char *dest_body=new(pool) unsigned char[dest_content_length];
 
 		const XMLByte* srcPtr=(XMLByte *)source_body;
 		const XMLByte* srcEnd=(XMLByte *)source_body+source_content_length;
@@ -551,7 +545,7 @@ static int         xml256CharEncodingOut
 
 void Charset::addEncoding(char *name_cstr) {
 	xmlCharEncodingHandler *handler=
-		(xmlCharEncodingHandler *)malloc(sizeof(xmlCharEncodingHandler));
+		(xmlCharEncodingHandler *)[ADD to local array of autoptrs to autofree]new ...(sizeof(xmlCharEncodingHandler));
 	handler->name=name_cstr;
 	handler->input=xml256CharEncodingInputFunc; handler->inputInfo=&tables;
 	handler->output=xml256CharEncodingOutputFunc; handler->outputInfo=&tables;
@@ -559,7 +553,7 @@ void Charset::addEncoding(char *name_cst
 	xmlRegisterCharEncodingHandler(handler);
 }
 
-void Charset::initTranscoder(const String *source, const char *name_cstr) {
+void Charset::initTranscoder(const String *source, const char* name_cstr) {
 	ftranscoder=xmlFindCharEncodingHandler(name_cstr);
 	transcoder(source); // check right way
 }
@@ -572,13 +566,13 @@ xmlCharEncodingHandler *Charset::transco
 	return ftranscoder;
 }
 
-const char *Charset::transcode_cstr(xmlChar *s) {
+CharPtr Charset::transcode_cstr(xmlChar *s) {
 	if(!s)
 		return "";
 
-	int inlen=strlen((const char *)s);
+	int inlen=strlen((const char* )s);
 	int outlen=inlen+1; // max
-	char *out=(char *)malloc(outlen*sizeof(char));
+	char *out=new char[outlen];
 	
 	int error;
 	if(xmlCharEncodingOutputFunc output=transcoder(0)->output) {
@@ -607,7 +601,7 @@ String& Charset::transcode(xmlChar *s
 	result.APPEND_CLEAN(transcode_cstr(s), 0/*auto-size*/, origin->origin().file, origin->origin().line);
 	return result; 
 }
-const char *Charset::transcode_cstr(GdomeDOMString *s) { 
+const char* Charset::transcode_cstr(GdomeDOMString *s) { 
 	return s?transcode_cstr(BAD_CAST s->str):"";
 }
 String& Charset::transcode(GdomeDOMString *s
@@ -621,20 +615,20 @@ String& Charset::transcode(GdomeDOMStrin
 }
 
 /// @test less memory using -maybe- xmlParserInputBufferCreateMem
-xmlChar *Charset::transcode_buf2xchar(const char *buf, size_t buf_size) {
+xmlChar *Charset::transcode_buf2xchar(Pool& pool, const char* buf, size_t buf_size) {
 	unsigned char *out;
 	int outlen;
 	int error;
 	if(xmlCharEncodingInputFunc input=transcoder(0)->input) {
 		outlen=buf_size*6/*max*/;
-		out=(unsigned char*)malloc((outlen+1)*sizeof(unsigned char));
+		out=new(pool) unsigned char[outlen+1];
 		error=input(
 			out, &outlen,
 			(const unsigned char *)buf,  (int *)&buf_size,
 			transcoder(0)->inputInfo);
 	} else {
 		outlen=buf_size;
-		out=(unsigned char*)malloc((outlen+1)*sizeof(unsigned char));
+		out=new(pool) unsigned char[outlen+1];
 		memcpy(out, buf, outlen);
 		error=0;
 	}
@@ -647,11 +641,11 @@ xmlChar *Charset::transcode_buf2xchar(co
 	out[outlen/*surely would be less then on input*/]=0;
 	return (xmlChar *)out;
 }
-GdomeDOMString_auto_ptr Charset::transcode_buf2dom(const char *buf, size_t buf_size) { 
+GdomeDOMString_auto_ptr Charset::transcode_buf2dom(const char* buf, size_t buf_size) { 
 	return GdomeDOMString_auto_ptr((gchar*)transcode_buf2xchar(buf, buf_size));
 }
 GdomeDOMString_auto_ptr Charset::transcode(const String& s) { 
-	const char *cstr=s.cstr(String::UL_UNSPECIFIED);
+	CharPtr cstr=s.cstr(String::UL_UNSPECIFIED);
 
 	return transcode_buf2dom(cstr, strlen(cstr)); 
 }