--- parser3/src/include/pa_pool.h	2001/10/18 13:09:37	1.63
+++ parser3/src/include/pa_pool.h	2001/11/05 11:46:24	1.69
@@ -3,9 +3,9 @@
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_pool.h,v 1.63 2001/10/18 13:09:37 parser Exp $
+	$Id: pa_pool.h,v 1.69 2001/11/05 11:46:24 paf Exp $
 */
 
 #ifndef PA_POOL_H
@@ -14,6 +14,7 @@
 #include "pa_config_includes.h"
 
 #ifdef XML
+#include <memory>
 #include <XalanDOM/XalanDOMString.hpp>
 #include <util/TransService.hpp>
 #endif
@@ -21,35 +22,30 @@
 // forwards
 
 class Exception;
-class Temp_exception;
 class String;
 
 /** 
 	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 Temp_exception;
 public:
 
 	Pool(void *astorage);
 	~Pool();
 
 	void set_context(void *acontext) { fcontext=acontext; }
-	void *context() { return fcontext; }
+	void *get_context() { return fcontext; }
 
 	void set_tag(void *atag) { ftag=atag; }
 	void *tag() { return ftag; }
 
 	/// allocates some bytes on pool
-	void *malloc(size_t size/*, int place=0*/) {
-		return check(real_malloc(size/*, place*/), size);
+	void *malloc(size_t size, int place=0) {
+		return check(real_malloc(size, place), size);
 	}
 	/// allocates some bytes clearing them with zeros
 	void *calloc(size_t size) {
@@ -62,9 +58,6 @@ public:
 			fail_register_cleanup();
 	}
 
-	/// current exception object of the pool
-	Exception& exception() const { return *fexception; }
-
 	/// resets transcoder if they change charset 
 	void set_charset(const String &charset);
 	/// returns current charset
@@ -81,7 +74,7 @@ private:
 	
 	//{
 	/// @name implementation defined
-    void *real_malloc(size_t size/*, int place*/);
+    void *real_malloc(size_t size, int place);
     void *real_calloc(size_t size);
 	bool real_register_cleanup(void (*cleanup) (void *), void *data);
 	//}
@@ -104,24 +97,6 @@ private:
 	/// throws register cleanup exception
 	void fail_register_cleanup() const;
 
-private: // exception handling
-
-	// exception replacement mechanism is 'private'zed from direct usage
-	// Temp_exception 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;
-
 #ifdef XML
 
 public:
@@ -130,9 +105,9 @@ public:
 	/// converts Xalan string to parser String
 	String& transcode(const XalanDOMString& s);
 	/// converts char * to Xalan string
-	XalanDOMString& Pool::transcode_buf(const char *buf, size_t buf_size);
+	std::auto_ptr<XalanDOMString> transcode_buf(const char *buf, size_t buf_size);
 	/// converts parser String to Xalan string
-	XalanDOMString& Pool::transcode(const String& s);
+	std::auto_ptr<XalanDOMString> transcode(const String& s);
 
 private:
 
@@ -147,8 +122,8 @@ private:
 
 private: //disabled
 
-	// Pool(const Pool&) {}
-	Pool& operator = (const Pool&) { return *this; }
+	Pool(const Pool&);
+	Pool& operator= (const Pool&);
 };
 
 /** 
@@ -156,7 +131,7 @@ private: //disabled
 
 	Holds Pool object. Contains useful wrappers to it's methods.
 
-	@see NEW, Temp_exception
+	@see NEW
 */
 class Pooled {
 	// the pool i'm allocated on
@@ -165,7 +140,7 @@ 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/*, 1*/);
+		return apool.malloc(size, 1);
 	}
 
 	Pooled(Pool& apool) : fpool(&apool) {}
@@ -181,10 +156,9 @@ public:
 
 	//{
 	/// @name useful wrapper around pool
-	void *malloc(size_t size) const { return fpool->malloc(size); }
+	void *malloc(size_t size, int place=0) const { return fpool->malloc(size, place); }
 	void *calloc(size_t size) const { return fpool->calloc(size); }
 	void register_cleanup(void (*cleanup) (void *), void *data) { fpool->register_cleanup(cleanup, data); }
-	Exception& exception() const { return fpool->exception(); }
 #ifdef XML
 	const char *transcode_cstr(const XalanDOMString& s) { return fpool->transcode_cstr(s); }
 	String& transcode(const XalanDOMString& s) { return fpool->transcode(s); }
@@ -194,64 +168,4 @@ public:
 /// useful macro for creating objects on current Pooled object Pooled::pool()
 #define NEW new(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:
-	Temp_exception(Pool& apool, Exception& exception) : 
-		fpool(apool),
-		saved_exception(apool.set_exception(&exception)) {
-	}
-	~Temp_exception() { 
-		fpool.restore_exception(saved_exception); 
-	}
-};
-
-#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 
-//@}
-
 #endif