--- parser3/src/include/pa_pool.h	2001/10/19 14:42:53	1.65
+++ parser3/src/include/pa_pool.h	2023/09/26 20:49:07	1.96
@@ -1,32 +1,21 @@
 /** @file
 	Parser: pool class decl.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2000-2023 Art. Lebedev Studio (http://www.artlebedev.com)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_pool.h,v 1.65 2001/10/19 14:42:53 parser Exp $
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #ifndef PA_POOL_H
 #define PA_POOL_H
 
-#include "pa_config_includes.h"
-
-#ifdef XML
-#include< memory>
-#include <XalanDOM/XalanDOMString.hpp>
-#include <util/TransService.hpp>
-#endif
+#define IDENT_PA_POOL_H "$Id: pa_pool.h,v 1.96 2023/09/26 20:49:07 moko Exp $"
 
-// forwards
-
-class Exception;
-class Temp_exception;
-class String;
+#include "pa_config_includes.h"
+#include "pa_array.h"
 
 /** 
-	Pool mechanizm allows users not to free up allocated memory,
+	Pool mechanizm allows users not to free up allocated objects,
 	leaving that problem to 'pools'.
 
 	@see Pooled
@@ -35,92 +24,37 @@ class String;
 class Pool {
 public:
 
-	Pool(void *astorage);
-	~Pool();
-
-	void set_context(void *acontext) { fcontext=acontext; }
-	void *get_context() { return fcontext; }
+	struct Cleanup : public PA_Allocated {
+		void (*cleanup) (void *);
+		void *data;
 
-	void set_tag(void *atag) { ftag=atag; }
-	void *tag() { return ftag; }
+		Cleanup(void (*acleanup) (void *), void *adata): cleanup(acleanup), data(adata) {}
+	};
 
-	/// allocates some bytes on pool
-	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) {
-		return check(real_calloc(size), size);
-	}
+	Pool();
+	~Pool();
 
 	/// registers a routine to clean up non-pooled allocations
-	void register_cleanup(void (*cleanup) (void *), void *data) {
-		if(!real_register_cleanup(cleanup, data))
-			fail_register_cleanup();
-	}
-
-	/// resets transcoder if they change charset 
-	void set_charset(const String &charset);
-	/// returns current charset
-	const String& get_charset() { return *charset; }
+	void register_cleanup(void (*cleanup) (void *), void *data);
+	/// unregister it, looking it up by it's data
+	void unregister_cleanup(void *cleanup_data);
 
 private:
 
-	void *fstorage;
-	void *fcontext;
-	void *ftag;
-	const String *charset;
+	Array<Cleanup> cleanups;
 
 private: 
 	
 	//{
 	/// @name implementation defined
-    void *real_malloc(size_t size/*, int place*/);
-    void *real_calloc(size_t size);
 	bool real_register_cleanup(void (*cleanup) (void *), void *data);
 	//}
 
 private: 
 
-	/// checks whether mem allocated OK. throws exception otherwise
-	void *check(void *ptr, size_t size) {
-		if(ptr)
-			return ptr;
-
-		fail_alloc(size);
-
-		// never reached
-		return 0;
-	}
-	/// throws allocation exception
-	void fail_alloc(size_t size) const;
-
 	/// 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: //disabled
 
 	Pool(const Pool&);
@@ -129,44 +63,21 @@ private: //disabled
 
 /** 
 	Base for all classes that are allocated in 'pools'.
-
-	Holds Pool object. Contains useful wrappers to it's methods.
-
-	@see NEW
+	Holds Pool object.
 */
 class Pooled {
 	// the pool i'm allocated on
-	Pool *fpool;
+	Pool& fpool;
 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*/);
-	}
-
-	Pooled(Pool& apool) : fpool(&apool) {}
+	Pooled(Pool& apool);
 
 	/// my pool
-	Pool& pool() const { return *fpool; }
+	//Pool& pool() const { return *fpool; }
 
-	/** used for moving objects from one pool to another. 
-		in between object can have no pool and can not be used
-		@see SQL_Driver_manager
-	*/
-	void set_pool(Pool *apool) { fpool=apool; }
+	/// Sole: this got called automatically from Pool::~Pool()
+	virtual ~Pooled();
 
-	//{
-	/// @name useful wrapper around pool
-	void *malloc(size_t size) const { return fpool->malloc(size); }
-	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); }
-#endif
-	//}
 };
-/// useful macro for creating objects on current Pooled object Pooled::pool()
-#define NEW new(pool())
 
 #endif