--- parser3/src/include/pa_pool.h 2001/09/15 13:20:22 1.54 +++ parser3/src/include/pa_pool.h 2001/10/18 13:09:37 1.63 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_pool.h,v 1.54 2001/09/15 13:20:22 parser Exp $ + $Id: pa_pool.h,v 1.63 2001/10/18 13:09:37 parser Exp $ */ #ifndef PA_POOL_H @@ -13,8 +13,16 @@ #include "pa_config_includes.h" +#ifdef XML +#include +#include +#endif + +// forwards + class Exception; class Temp_exception; +class String; /** Pool mechanizm allows users not to free up allocated memory, @@ -30,7 +38,8 @@ class Pool { friend Temp_exception; public: - Pool(void *astorage) : fstorage(astorage), fcontext(0), ftag(0), fexception(0) {} + Pool(void *astorage); + ~Pool(); void set_context(void *acontext) { fcontext=acontext; } void *context() { return fcontext; } @@ -56,11 +65,17 @@ public: /// 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 + const String& get_charset() { return *charset; } + private: void *fstorage; void *fcontext; void *ftag; + const String *charset; private: @@ -107,6 +122,29 @@ private: // current request's exception object Exception *fexception; +#ifdef XML + +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 + XalanDOMString& Pool::transcode_buf(const char *buf, size_t buf_size); + /// converts parser String to Xalan string + XalanDOMString& Pool::transcode(const String& s); + +private: + + void set_charset(const char *new_scharset); + void update_transcoder(); + +private: + + XMLTranscoder *transcoder; + +#endif + private: //disabled // Pool(const Pool&) {} @@ -141,16 +179,17 @@ 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 + 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); } +#endif + //} }; /// useful macro for creating objects on current Pooled object Pooled::pool() #define NEW new(pool())