--- parser3/src/include/pa_pool.h	2001/01/30 13:07:31	1.18
+++ parser3/src/include/pa_pool.h	2001/03/10 15:44:30	1.26
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_pool.h,v 1.18 2001/01/30 13:07:31 paf Exp $
+  $Id: pa_pool.h,v 1.26 2001/03/10 15:44:30 paf Exp $
 */
 
 #ifndef PA_POOL_H
@@ -7,20 +7,18 @@
 
 #include <stddef.h>
 
-#include "pa_string.h"
-#include "pa_hash.h"
-#include "pa_array.h"
-//#include "pa_table.h"
-#include "pa_exception.h"
+//class String;
+class Exception;
+class Temp_exception;
 
 class Pool {
+	friend Temp_exception;
 public:
 
-	// Exception to report pool errors 
-	Pool(Exception& aexception) : fexception(aexception) {}
+	Pool() : fexception(0) {}
 	~Pool() {}
 
-	Exception& exception() { return fexception; }
+	Exception& exception() const { return *fexception; }
 
 	void *malloc(size_t size) {
 		return check(real_malloc(size), size);
@@ -29,43 +27,43 @@ public:
 		return check(real_calloc(size), size);
 	}
 
-	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);
-	}
-	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);
-	}*/
-
-protected: // pure virtuals
+private: // implementation defined
 
-    virtual void *real_malloc(size_t size)=0;
-    virtual void *real_calloc(size_t size)=0;
+    void *real_malloc(size_t size);
+    void *real_calloc(size_t size);
 
-protected:
-
-	Exception& fexception;
+private: 
 
 	// checks whether mem allocated OK. throws exception otherwise
 	void *check(void *ptr, size_t size) {
-		if(!ptr)
-			fexception.raise(0, 0,
-				0,
-				"allocating %ud bytes", size);
-		
-		return ptr;
+		if(ptr)
+			return ptr;
+
+		fail(size);
+
+		// never reached
+		return 0;
+	}
+	// throws proper exception
+	void fail(size_t size) const;
+
+protected: // exception handling
+
+	// exception replacement mechanism is 'protected' from direct usage
+	// Temp_exception_change object enforces paired set/restore
+	Exception *set_exception(Exception *e){
+		Exception *r=fexception;
+		fexception=e;
+		return r;
 	}
+	void restore_exception(Exception *e) {
+		fexception=e;
+	}
+
+private:
+
+	// current request's exception object
+	Exception *fexception;
 
 private: //disabled
 
@@ -73,4 +71,55 @@ private: //disabled
 	Pool& operator = (const Pool&) { return *this; }
 };
 
+class Pooled {
+	// the pool i'm allocated on
+	Pool& fpool;
+public:
+	
+	static void *operator new(size_t size, Pool& apool) { 
+		return apool.malloc(size);
+	}
+
+	Pooled(Pool& apool) : fpool(apool) {
+	}
+
+	Pool& pool() const { return fpool; }
+
+	void *malloc(size_t size) const { return fpool.malloc(size); }
+	void *calloc(size_t size) const { return fpool.calloc(size); }
+	Exception& exception() const { return fpool.exception(); }
+};
+#define NEW new(pool())
+
+class Temp_exception {
+	Pool pool;
+	Exception *saved_exception;
+public:
+	Temp_exception(Pool& apool, Exception& exception) : 
+		pool(apool),
+		saved_exception(apool.set_exception(&exception)) {
+	}
+	~Temp_exception() { 
+		pool.restore_exception(saved_exception); 
+	}
+};
+
+#define TRY \
+	{ \
+		Exception temp_exception; \
+		Temp_exception le(pool(), temp_exception); \
+		if(setjmp(temp_exception.mark)==0)
+
+#define THROW exception()._throw
+#define POOL_THROW pool.exception()._throw
+#define CATCH(e) \
+		else{ \
+			Exception& e=temp_exception;
+
+#define END_CATCH \
+		} \
+	}
+// usage:
+//   TRY { ...; if(?) RAISE(?); ...; } CATCH(e) { catch-code e.comment() } END_CATCH
+
 #endif