--- parser3/src/main/pa_pool.C	2001/01/26 14:47:52	1.1.1.1
+++ parser3/src/main/pa_pool.C	2012/03/16 09:24:14	1.63
@@ -1,17 +1,57 @@
-#include <stdlib.h>
+/** @file
+	Parser: pool class.
+
+	Copyright (c) 2000-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+*/
 
 #include "pa_pool.h"
+#include "pa_exception.h"
+#include "pa_common.h"
+#include "pa_sapi.h"
+#include "pa_charset.h"
 
-Pool::Pool() {
-}
+volatile const char * IDENT_PA_POOL_C="$Id: pa_pool.C,v 1.63 2012/03/16 09:24:14 moko Exp $" IDENT_PA_POOL_H;
+
+// Pool
+
+Pool::Pool(){}
 
+static void cleanup(Pool::Cleanup item, int) {
+	if(item.cleanup)
+		item.cleanup(item.data);
+}
 Pool::~Pool() {
+	//__asm__("int3");
+	//_asm int 3;
+	//fprintf(stderr, "cleanups: %d\n", cleanups.size());
+	// cleanups first, because they use some object's memory pointers
+	cleanups.for_each(cleanup, 0);
+}
+
+void Pool::register_cleanup(void (*cleanup) (void *), void *data) {
+	cleanups+=Cleanup(cleanup, data);
+}
+
+static void unregister_cleanup(Pool::Cleanup& item, void* cleanup_data) {
+	if(item.data==cleanup_data)
+		item.cleanup=0;
+}
+void Pool::unregister_cleanup(void *cleanup_data) {
+	cleanups.for_each_ref(::unregister_cleanup, cleanup_data);
+}
+
+// Pooled
+
+static void cleanup(void *data) {
+	static_cast<Pooled*>(data)->~Pooled();
 }
 
-void *Pool::alloc(size_t size) {
-	return ::malloc(size);
+Pooled::Pooled(Pool& apool): fpool(apool) {
+	fpool.register_cleanup(cleanup, this);
 }
 
-void *Pool::calloc(size_t size) {
-	return ::calloc(size, 1);
+/// Sole: this got called automatically from Pool::~Pool()
+Pooled::~Pooled() {
+	fpool.unregister_cleanup(this);
 }