--- parser3/src/include/pa_pool.h	2001/11/16 11:51:32	1.71
+++ parser3/src/include/pa_pool.h	2002/08/15 10:13:19	1.84
@@ -1,28 +1,30 @@
 /** @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://paf.design.ru)
-
-	$Id: pa_pool.h,v 1.71 2001/11/16 11:51:32 paf Exp $
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_POOL_H
 #define PA_POOL_H
 
+static const char* IDENT_POOL_H="$Date: 2002/08/15 10:13:19 $";
+
 #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 String;
+class Charset;
+class GdomeDOMString_auto_ptr;
 
 /** 
 	Pool mechanizm allows users not to free up allocated memory,
@@ -35,12 +37,11 @@ class Pool {
 public:
 
 	Pool(void *astorage);
-	~Pool();
 
-	///{@ statistics
+	//{@ 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; }
@@ -60,16 +61,44 @@ 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; }
+	//{@ helpers
+	void *copy(const void *buf, const size_t size);
+	char *copy(const char *cstr);
+	//}@
+
+	//{@ 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_cstr(const char *buf, size_t buf_size=0);
+	xmlChar *transcode_buf2xchar(const char *buf, size_t buf_size=0);
+	/// @see Charset::transcode(const String& s)
+	GdomeDOMString_auto_ptr transcode(const String& s);
+
+#endif
 
 private:
 
 	void *fstorage;
 	void *fcontext;
-	const String *charset;
+	Charset *source_charset;
+	Charset *client_charset;
 
 private: 
 	
@@ -101,29 +130,6 @@ 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;
@@ -142,6 +148,10 @@ private: //disabled
 
 	@see NEW
 */
+
+// all classes that are members parents of packed class [String] 
+// sould be packed also to avoid sparc odd st/lduh problem
+#include "pa_pragma_pack_begin.h"
 class Pooled {
 	// the pool i'm allocated on
 	Pool *fpool;
@@ -168,12 +178,17 @@ public:
 	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); }
+	void *copy(const void *buf, const size_t size) { return fpool->copy(buf, size); }
+	char *copy(const char *cstr) { return fpool->copy(cstr); }
 #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
 	//}
 };
+#include "pa_pragma_pack_end.h"
 /// useful macro for creating objects on current Pooled object Pooled::pool()
 #define NEW new(pool())