--- parser3/src/include/pa_pool.h	2001/02/22 11:08:06	1.24
+++ parser3/src/include/pa_pool.h	2001/03/13 16:38:22	1.32
@@ -1,5 +1,9 @@
 /*
-  $Id: pa_pool.h,v 1.24 2001/02/22 11:08:06 paf Exp $
+	Parser
+	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.32 2001/03/13 16:38:22 paf Exp $
 */
 
 #ifndef PA_POOL_H
@@ -7,12 +11,11 @@
 
 #include <stddef.h>
 
-//class String;
 class Exception;
-class Temp_exception_change;
+class Temp_exception;
 
 class Pool {
-	friend Temp_exception_change;
+	friend Temp_exception;
 public:
 
 	Pool() : fexception(0) {}
@@ -91,26 +94,28 @@ public:
 };
 #define NEW new(pool())
 
-class Temp_exception_change {
-	Pool pool;
+class Temp_exception {
+	Pool& fpool;
 	Exception *saved_exception;
 public:
-	Temp_exception_change(Pool& apool, Exception& exception) : 
-		pool(apool),
+	Temp_exception(Pool& apool, Exception& exception) : 
+		fpool(apool),
 		saved_exception(apool.set_exception(&exception)) {
 	}
-	~Temp_exception_change() { 
-		pool.restore_exception(saved_exception); 
+	~Temp_exception() { 
+		fpool.restore_exception(saved_exception); 
 	}
 };
 
 #define TRY \
 	{ \
 		Exception temp_exception; \
-		Temp_exception_change le(pool(), temp_exception); \
+		Temp_exception le(pool(), temp_exception); \
 		if(setjmp(temp_exception.mark)==0)
 
 #define THROW exception()._throw
+#define PTHROW pool.exception()._throw
+#define RTHROW r.pool().exception()._throw
 #define CATCH(e) \
 		else{ \
 			Exception& e=temp_exception;