--- parser3/src/include/pa_pool.h	2001/09/21 07:30:25	1.56
+++ parser3/src/include/pa_pool.h	2001/10/19 14:42:53	1.65
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_pool.h,v 1.56 2001/09/21 07:30:25 parser Exp $
+	$Id: pa_pool.h,v 1.65 2001/10/19 14:42:53 parser Exp $
 */
 
 #ifndef PA_POOL_H
@@ -13,10 +13,11 @@
 
 #include "pa_config_includes.h"
 
+#ifdef XML
+#include< memory>
 #include <XalanDOM/XalanDOMString.hpp>
 #include <util/TransService.hpp>
-#include <PlatformSupport/XSLException.hpp>
-
+#endif
 
 // forwards
 
@@ -28,21 +29,17 @@ 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; }
@@ -62,28 +59,17 @@ 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);
-	/// converts Xalan string to char *
-	const char *transcode(const XalanDOMString& s);
-	/// converts XSL exception to parser exception
-	void _throw(const String *source, const XSLException& e);
-
-private:
-
-	void set_charset(const char *new_scharset);
-	void update_transcoder();
+	/// returns current charset
+	const String& get_charset() { return *charset; }
 
 private:
 
 	void *fstorage;
 	void *fcontext;
 	void *ftag;
-	const String *scharset; const char *charset;
-	XMLTranscoder *transcoder;
+	const String *charset;
 
 private: 
 	
@@ -112,28 +98,33 @@ private:
 	/// throws register cleanup exception
 	void fail_register_cleanup() const;
 
-private: // exception handling
+#ifdef XML
 
-	// 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;
-	}
+public:
+	/// converts Xalan string to char *
+	const char *transcode_cstr(const XalanDOMString& s);
+	/// converts Xalan string to parser String
+	String& transcode(const XalanDOMString& s);
+	/// converts char * to Xalan string
+	std::auto_ptr< XalanDOMString> transcode_buf(const char *buf, size_t buf_size);
+	/// converts parser String to Xalan string
+	std::auto_ptr<XalanDOMString> transcode(const String& s);
+
+private:
+
+	void set_charset(const char *new_scharset);
+	void update_transcoder();
 
 private:
 
-	// current request's exception object
-	Exception *fexception;
+	XMLTranscoder *transcoder;
+
+#endif
 
 private: //disabled
 
-	// Pool(const Pool&) {}
-	Pool& operator = (const Pool&) { return *this; }
+	Pool(const Pool&);
+	Pool& operator= (const Pool&);
 };
 
 /** 
@@ -141,7 +132,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
@@ -164,82 +155,18 @@ public:
 	*/
 	void set_pool(Pool *apool) { fpool=apool; }
 
-	/// useful wrapper around pool
+	//{
+	/// @name 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
-	void register_cleanup(void (*cleanup) (void *), void *data) { 
-		fpool->register_cleanup(cleanup, data);
-	}
-	/// useful wrapper around pool
-	Exception& exception() const { return fpool->exception(); }
-	/// useful wrapper around pool
-	const char *transcode(const XalanDOMString& s) { return fpool->transcode(s); }
-	/// useful wrapper around pool
-	void _throw(const String *source, const XSLException& e) { fpool->_throw(source, e); }
+	void register_cleanup(void (*cleanup) (void *), void *data) { fpool->register_cleanup(cleanup, data); }
+#ifdef XML
+	const char *transcode_cstr(const XalanDOMString& s) { return fpool->transcode_cstr(s); }
+	String& transcode(const XalanDOMString& s) { return fpool->transcode(s); }
+#endif
+	//}
 };
 /// 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