--- parser3/src/include/pa_pool.h	2001/10/19 14:42:53	1.65
+++ parser3/src/include/pa_pool.h	2002/02/08 08:30:13	1.78
@@ -1,11 +1,11 @@
 /** @file
 	Parser: pool class decl.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_pool.h,v 1.65 2001/10/19 14:42:53 parser Exp $
+	$Id: pa_pool.h,v 1.78 2002/02/08 08:30:13 paf Exp $
 */
 
 #ifndef PA_POOL_H
@@ -14,16 +14,17 @@
 #include "pa_config_includes.h"
 
 #ifdef XML
-#include< memory>
-#include <XalanDOM/XalanDOMString.hpp>
-#include <util/TransService.hpp>
+#	include "gdome.h"
+// for xmlChar
+#	include "libxml/tree.h"
 #endif
 
 // forwards
 
 class Exception;
-class Temp_exception;
 class String;
+class Charset;
+class GdomeDOMString_auto_ptr;
 
 /** 
 	Pool mechanizm allows users not to free up allocated memory,
@@ -36,17 +37,18 @@ class Pool {
 public:
 
 	Pool(void *astorage);
-	~Pool();
+
+	///{@ statistics
+	size_t total_allocated() { return ftotal_allocated; }
+	unsigned int total_times() { return ftotal_times; }
+	///}@
 
 	void set_context(void *acontext) { fcontext=acontext; }
 	void *get_context() { return fcontext; }
 
-	void set_tag(void *atag) { ftag=atag; }
-	void *tag() { return ftag; }
-
 	/// allocates some bytes on pool
-	void *malloc(size_t size/*, int place=0*/) {
-		return check(real_malloc(size/*, place*/), size);
+	void *malloc(size_t size, int place=0) {
+		return check(real_malloc(size, place), size);
 	}
 	/// allocates some bytes clearing them with zeros
 	void *calloc(size_t size) {
@@ -59,23 +61,43 @@ public:
 			fail_register_cleanup();
 	}
 
-	/// resets transcoder if they change charset 
-	void set_charset(const String &charset);
-	/// returns current charset
-	const String& get_charset() { return *charset; }
+	///{@ source charset
+	void set_source_charset(Charset& acharset);
+	Charset& get_source_charset();
+	///}@
+
+	///{@ client charset
+	void set_client_charset(Charset& charset);
+	Charset& get_client_charset();
+	///}@
+
+#ifdef XML
+
+	/// @see Charset::transcode_cstr(xmlChar *s);
+	const char *transcode_cstr(xmlChar *s);
+	/// @see Charset::transcode(xmlChar *s);
+	String& transcode(xmlChar *s);
+	/// @see Charset::transcode_cstr(GdomeDOMString *s);
+	const char *transcode_cstr(GdomeDOMString *s);
+	/// @see Charset::transcode(GdomeDOMString *s);
+	String& transcode(GdomeDOMString *s);
+	/// @see Charset::transcode(const String& s)
+	GdomeDOMString_auto_ptr transcode(const String& s);
+
+#endif
 
 private:
 
 	void *fstorage;
 	void *fcontext;
-	void *ftag;
-	const String *charset;
+	Charset *source_charset;
+	Charset *client_charset;
 
 private: 
 	
 	//{
 	/// @name implementation defined
-    void *real_malloc(size_t size/*, int place*/);
+    void *real_malloc(size_t size, int place);
     void *real_calloc(size_t size);
 	bool real_register_cleanup(void (*cleanup) (void *), void *data);
 	//}
@@ -84,8 +106,11 @@ private:
 
 	/// checks whether mem allocated OK. throws exception otherwise
 	void *check(void *ptr, size_t size) {
-		if(ptr)
+		if(ptr) {
+			ftotal_allocated+=size;
+			ftotal_times++;
 			return ptr;
+		}
 
 		fail_alloc(size);
 
@@ -98,28 +123,10 @@ private:
 	/// throws register cleanup exception
 	void fail_register_cleanup() const;
 
-#ifdef XML
-
-public:
-	/// converts Xalan string to char *
-	const char *transcode_cstr(const XalanDOMString& s);
-	/// converts Xalan string to parser String
-	String& transcode(const XalanDOMString& s);
-	/// converts char * to Xalan string
-	std::auto_ptr< XalanDOMString> transcode_buf(const char *buf, size_t buf_size);
-	/// converts parser String to Xalan string
-	std::auto_ptr<XalanDOMString> transcode(const String& s);
-
-private:
-
-	void set_charset(const char *new_scharset);
-	void update_transcoder();
-
-private:
-
-	XMLTranscoder *transcoder;
-
-#endif
+private: // statistics
+	
+	size_t ftotal_allocated;
+	unsigned int ftotal_times;
 
 private: //disabled
 
@@ -141,7 +148,7 @@ public:
 
 	/// the Pooled-sole: Pooled instances can be allocated in Pool rather then on heap
 	static void *operator new(size_t size, Pool& apool) { 
-		return apool.malloc(size/*, 1*/);
+		return apool.malloc(size, 1);
 	}
 
 	Pooled(Pool& apool) : fpool(&apool) {}
@@ -157,12 +164,14 @@ public:
 
 	//{
 	/// @name useful wrapper around pool
-	void *malloc(size_t size) const { return fpool->malloc(size); }
+	void *malloc(size_t size, int place=0) const { return fpool->malloc(size, place); }
 	void *calloc(size_t size) const { return fpool->calloc(size); }
 	void register_cleanup(void (*cleanup) (void *), void *data) { fpool->register_cleanup(cleanup, data); }
 #ifdef XML
-	const char *transcode_cstr(const XalanDOMString& s) { return fpool->transcode_cstr(s); }
-	String& transcode(const XalanDOMString& s) { return fpool->transcode(s); }
+
+	const char *transcode_cstr(GdomeDOMString *s) { return fpool->transcode_cstr(s); }
+	String& transcode(GdomeDOMString *s) { return fpool->transcode(s); }
+
 #endif
 	//}
 };