--- parser3/src/include/pa_pool.h	2001/01/26 15:28:39	1.2
+++ parser3/src/include/pa_pool.h	2001/01/30 13:43:42	1.19
@@ -1,14 +1,5 @@
 /*
-
-	String				Chunk0
-	======				========
-	head--------->[ptr, size]
-	append_here-------->[ptr, size]
-	link_row      ........
-			.			.
-			.			[ptr, size]
-			...........>[link to the next chunk]
-
+  $Id: pa_pool.h,v 1.19 2001/01/30 13:43:42 paf Exp $
 */
 
 #ifndef PA_POOL_H
@@ -16,83 +7,70 @@
 
 #include <stddef.h>
 
-class Pool;
+#include "pa_string.h"
+#include "pa_hash.h"
+#include "pa_array.h"
+//#include "pa_table.h"
+#include "pa_exception.h"
 
-class String {
+class Pool {
 public:
-	enum {
-		CR_PREALLOCATED_COUNT=5,
-		CR_GROW_PERCENT=60
-	};
-
-private:
-	friend Pool;
-
-	// the pool I'm allocated on
-	Pool *pool;
-
-	// last chank allocated count cache
-	int curr_chunk_rows;
-	struct Chunk {
-		// the number of rows per chunk
-		int count;
-		union Row {
-			// chunk item
-			struct {
-				char *ptr;  // pointer to the start of string fragment
-				size_t size;  // length of the fragment
-			} item;
-			Chunk *link;  // link to the next chunk in chain
-		} first[CR_PREALLOCATED_COUNT];
-		// next rows are here
-		Chunk *preallocated_link;
-	}
-		head;  // the head chunk of the chunk chain
-
-	// next append would write to this record
-	Chunk::Row *append_here;
-	
-	// the address of place where lies address 
-	// of the link to the next chunk to allocate
-	Chunk::Row *link_row;
-
-	// new&constructors made private to enforce factory manufacturing at pool
-	void *operator new(size_t size, Pool *apool);
-
-	void construct(Pool *apool);
-	String(Pool *apool) { 
-		construct(apool); 
-	}
-	String(Pool *apool, char *src) {
-		construct(apool);
-		*this+=src;
+
+	// Exception to report pool errors 
+	Pool(Exception& aexception) : fexception(aexception) {}
+	~Pool() {}
+
+	Exception& exception() { return fexception; }
+
+	void *malloc(size_t size) {
+		return check(real_malloc(size), size);
+	}
+	void *calloc(size_t size) {
+		return check(real_calloc(size), size);
 	}
 
-	bool chunk_is_full() {
-		return append_here == link_row;
+	String& make_string() {
+		return *new(*this) String(*this);
+	}
+	Hash& make_hash() {
+		return *new(*this) Hash(*this, false);
+	}
+	Hash& make_thread_safe_hash() {
+		return *new(*this) Hash(*this, true);
+	}
+	Array& make_array() {
+		return *new(*this) Array(*this);
 	}
-	void expand();
+	Array& make_array(int initial_rows) {
+		return *new(*this) Array(*this, initial_rows);
+	}
+	/*Table& make_table(char *afile, uint aline, Array *acolumns, int initial_rows) {
+		return *new(this) Table(this, afile, aline, acolumns, initial_rows);
+	}*/
 
-public:
+protected: // pure virtuals
 
-	size_t size();
-	char *c_str();
-	String& operator += (char *src);
-};
+    virtual void *real_malloc(size_t size)=0;
+    virtual void *real_calloc(size_t size)=0;
 
-class Pool {
-public:
-	Pool();
-	~Pool();
-    void *alloc(size_t size);
-    void *calloc(size_t size);
+protected:
 
-	String *makeString() { 
-		return new(this) String(this);
-	}
-	String *makeString(char *src) {
-		return new(this) String(this, src);
+	Exception& fexception;
+
+	// checks whether mem allocated OK. throws exception otherwise
+	void *check(void *ptr, size_t size) {
+		if(!ptr)
+			fexception.raise(0, 0,
+				0,
+				"Pool::_alloc(%u) returned NULL", size);
+		
+		return ptr;
 	}
+
+private: //disabled
+
+	// Pool(const Pool&) {}
+	Pool& operator = (const Pool&) { return *this; }
 };
 
 #endif