--- parser3/src/include/pa_pool.h	2001/02/22 10:43:42	1.23
+++ parser3/src/include/pa_pool.h	2001/03/22 16:38:19	1.41
@@ -1,5 +1,11 @@
-/*
-  $Id: pa_pool.h,v 1.23 2001/02/22 10:43:42 paf Exp $
+/** @file
+	Parser: pool class decl.
+
+	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: pa_pool.h,v 1.41 2001/03/22 16:38:19 paf Exp $
 */
 
 #ifndef PA_POOL_H
@@ -7,27 +13,52 @@
 
 #include <stddef.h>
 
-//class String;
 class Exception;
-class Local_exception;
+class Temp_exception;
+
+/** 
+	Pool mechanizm allows users not to free up allocated memory,
+	leaving that problem to 'pools'.
+
+	Also holds Exception object, which can be temporary set using 
+	Temp_exception auto-object.
+
+	@see Pooled
+*/
 
 class Pool {
-	friend Local_exception;
+	friend Temp_exception;
 public:
 
-	// Exception to report pool errors 
-	Pool(Exception& aexception) : fexception(&aexception) {}
-	~Pool() {}
+	Pool() : fstorage(0), fcontext(0), ftag(0), fexception(0) {}
+	~Pool();
+
+	void set_storage(void *astorage) { fstorage=astorage; }
+	void set_context(void *acontext) { fcontext=acontext; }
+	void set_tag(void *atag) { ftag=atag; }
+
+	void *storage() { return fstorage; }
+	void *context() { return fcontext; }
+	void *tag() { return ftag; }
 
+	/// current exception object of the pool
 	Exception& exception() const { return *fexception; }
 
+	/// allocates some bytes on pool
 	void *malloc(size_t size) {
 		return check(real_malloc(size), size);
 	}
+	/// allocates some bytes clearing them with zeros
 	void *calloc(size_t size) {
 		return check(real_calloc(size), size);
 	}
 
+private:
+
+	void *fstorage;
+	void *fcontext;
+	void *ftag;
+
 private: // implementation defined
 
     void *real_malloc(size_t size);
@@ -35,7 +66,7 @@ private: // implementation defined
 
 private: 
 
-	// checks whether mem allocated OK. throws exception otherwise
+	/// checks whether mem allocated OK. throws exception otherwise
 	void *check(void *ptr, size_t size) {
 		if(ptr)
 			return ptr;
@@ -45,13 +76,13 @@ private:
 		// never reached
 		return 0;
 	}
-	// raises proper exception
+	/// throws proper exception
 	void fail(size_t size) const;
 
-protected: // exception handling
+private: // exception handling
 
 	// exception replacement mechanism is 'protected' from direct usage
-	// Local_exception object enforces paired set/restore
+	// Temp_exception object enforces paired set/restore
 	Exception *set_exception(Exception *e){
 		Exception *r=fexception;
 		fexception=e;
@@ -72,11 +103,19 @@ private: //disabled
 	Pool& operator = (const Pool&) { return *this; }
 };
 
+/** 
+	Base for all classes that are allocated in 'pools'.
+
+	Holds Pool object. Contains useful wrappers to it's methods.
+
+	@see NEW, Temp_exception
+*/
 class Pooled {
 	// the pool i'm allocated on
 	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);
 	}
@@ -84,32 +123,79 @@ public:
 	Pooled(Pool& apool) : fpool(apool) {
 	}
 
+	/// my pool
 	Pool& pool() const { return fpool; }
 
+	/// useful wrapper around pool
 	void *malloc(size_t size) const { return fpool.malloc(size); }
+	/// useful wrapper around pool
 	void *calloc(size_t size) const { return fpool.calloc(size); }
+	/// useful wrapper around pool
 	Exception& exception() const { return fpool.exception(); }
 };
+/// useful macro for creating objects on current Pooled object Pooled::pool()
 #define NEW new(pool())
 
-class Local_exception {
-	Pool pool;
+/** 
+	Auto-object used for temporary changing Pool's exception().
+
+	Use by with these macros:
+	@code
+		TRY { 
+			// ... 
+			if(?) 
+				THROW(?); 
+			// ...
+		} CATCH(e) { 
+			// code, using e fields
+			// e.comment() 
+		}
+		END_CATCH
+	@endcode
+
+	@see TRY, THROW
+*/
+class Temp_exception {
+	Pool& fpool;
 	Exception *saved_exception;
 public:
-	Local_exception(Pool& apool, Exception& exception) : 
-		pool(apool),
+	Temp_exception(Pool& apool, Exception& exception) : 
+		fpool(apool),
 		saved_exception(apool.set_exception(&exception)) {
 	}
-	~Local_exception() { 
-		pool.restore_exception(saved_exception); 
+	~Temp_exception() { 
+		fpool.restore_exception(saved_exception); 
 	}
 };
 
-#define TRY if(setjmp((exception()).mark)==0){
-#define THROW exception()._throw
-#define CATCH(e) }else{ Exception& e=exception();
-#define END_CATCH }
-// usage:
-//   TRY { ...; if(?) RAISE(?); ...; } CATCH { catch-code EXCEPTION.comment() }
+#define XTRY(pool) \
+	{ \
+		Exception temp_exception; \
+		Temp_exception le(pool, temp_exception); \
+		if(setjmp(temp_exception.mark)==0)
+
+#define XTHROW(exception) exception._throw
+#define XCATCH(e) \
+		else{ \
+			Exception& e=temp_exception;
+
+#define XEND_CATCH \
+		} \
+	}
+
+//@{
+/// @see Temp_exception 
+#define TRY XTRY(pool())
+#define THROW XTHROW(exception())
+#define CATCH(e) XCATCH(e)
+#define END_CATCH XEND_CATCH 
+
+#define PTRY XTRY(pool)
+#define PTHROW XTHROW(pool.exception())
+#define PCATCH(e) XCATCH(e)
+#define PEND_CATCH XEND_CATCH 
+
+#define RTHROW XTHROW(r.pool().exception())
+//@}
 
 #endif