--- parser3/src/include/pa_pool.h 2003/01/23 11:37:55 1.86.2.2 +++ parser3/src/include/pa_pool.h 2003/02/03 15:57:43 1.86.2.26 @@ -1,7 +1,7 @@ /** @file Parser: Parser: reference counting classes decls. - Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -9,7 +9,9 @@ #ifndef PA_POOL_H #define PA_POOL_H -static const char* IDENT_POOL_H="$Date: 2003/01/23 11:37:55 $"; +static const char* IDENT_POOL_H="$Date: 2003/02/03 15:57:43 $"; + +// include #include "pa_config_includes.h" @@ -19,13 +21,13 @@ static const char* IDENT_POOL_H="$Date: # include "libxml/tree.h" #endif +// forwards + void *pa_malloc(size_t size); void *pa_calloc(size_t size); void pa_free(void *ptr); void *pa_realloc(void *ptr, size_t size); -// forwards - class Exception; class String; class Charset; @@ -68,7 +70,7 @@ public: //{@ helpers void *copy(const void *buf, const size_t size); - char *copy(const char *cstr); + char *copy(const char* cstr); //}@ //{@ source charset @@ -84,7 +86,7 @@ public: #ifdef XML /// @see Charset::transcode_cstr(xmlChar *s); - const char *transcode_cstr(xmlChar *s); + const char* transcode_cstr(xmlChar *s); /// @see Charset::transcode(xmlChar *s); String& transcode(xmlChar *s #ifndef NO_STRING_ORIGIN @@ -92,15 +94,15 @@ public: #endif ); /// @see Charset::transcode_cstr(GdomeDOMString *s); - const char *transcode_cstr(GdomeDOMString *s); + const char* transcode_cstr(GdomeDOMString *s); /// @see Charset::transcode(GdomeDOMString *s); String& transcode(GdomeDOMString *s #ifndef NO_STRING_ORIGIN , const String *origin #endif ); - /// @see Charset::transcode_cstr(const char *buf, size_t buf_size=0); - xmlChar *transcode_buf2xchar(const char *buf, size_t buf_size=0); + /// @see Charset::transcode_cstr(const char* buf, size_t buf_size=0); + xmlChar *transcode_buf2xchar(const char* buf, size_t buf_size=0); /// @see Charset::transcode(const String& s) GdomeDOMString_auto_ptr transcode(const String& s); @@ -194,10 +196,10 @@ public: void *calloc(size_t size) const { return fpool->calloc(size); } void register_cleanup(void (*cleanup) (void *), void *data) { fpool->register_cleanup(cleanup, data); } void *copy(const void *buf, const size_t size) { return fpool->copy(buf, size); } - char *copy(const char *cstr) { return fpool->copy(cstr); } + char *copy(const char* cstr) { return fpool->copy(cstr); } #ifdef XML - const char *transcode_cstr(GdomeDOMString *s) { return fpool->transcode_cstr(s); } + const char* transcode_cstr(GdomeDOMString *s) { return fpool->transcode_cstr(s); } String& transcode(GdomeDOMString *s #ifndef NO_STRING_ORIGIN , const String *origin @@ -219,11 +221,12 @@ public: */ #define override +#define rethrow throw -void *operator new(size_t size) { +inline void *operator new[] (size_t size) { return pa_malloc(size); } -void operator delete(void *ptr) { +inline void operator delete[] (void *ptr) { pa_free(ptr); } @@ -236,44 +239,62 @@ public: static void operator delete(void *ptr) { pa_free(ptr); } + static void *malloc(size_t size) { + return pa_malloc(size); + } + static void *calloc(size_t size) { + return pa_calloc(size); + } + static void *realloc(void *ptr, size_t size) { + return pa_realloc(ptr, size); + } + }; /** Base for all Parser classes, memory allocation/dallocation goes via pa_malloc/pa_free. */ class PA_Object: public PA_Allocated { - mutable unsigned long references; + mutable unsigned long freferences; public: - PA_Object(): references(0) {} + PA_Object(): freferences(0) {} virtual ~PA_Object()=0; - void ref() { - references++; + void ref() const { + freferences++; } - void unref() { - if(references) { - if(--references==0) + void unref() const { + if(freferences) { + if(--freferences==0) delete this; } } }; -template class object_auto_ptr { +template class object_ptr { T *ptr; public: typedef T element_type; - explicit object_auto_ptr(T *ptr = 0) { + explicit object_ptr(T *ptr = 0) { this->ptr=ptr; if(ptr) ptr->ref(); } - object_auto_ptr(const object_auto_ptr& src) { + template object_ptr(const object_ptr& src) { + this->ptr=src.get(); + if(ptr) + ptr->ref(); + } + object_ptr(const object_ptr& src) { ptr=src.get(); ptr->ref(); } - object_auto_ptr& operator=(object_auto_ptr& src) { + object_ptr(T *ptr, int) { + this->ptr=ptr; + } + object_ptr& operator=(const object_ptr& src) { if(this!=&src) if(ptr!=src.get()) { if(ptr) @@ -282,8 +303,9 @@ public: if(ptr) ptr->ref(); } + return *this; } - ~object_auto_ptr() { + ~object_ptr() { if(ptr) ptr->unref(); } @@ -296,43 +318,62 @@ public: T *get() const { return ptr; } + operator bool() const { + return get()!=0; + } + bool operator !() const { + return get()==0; + } }; -/// TEMPLATE CLASS simple_auto_ptr, stolen from stl:auto_ptr +#define DECLARE_OBJECT_PTR(name) \ + typedef object_ptr name##Ptr + +// typedef object_ptr name##Ptr; \ +// const object_ptr name##PtrZero(0); + +/// TEMPLATE CLASS smart_ptr, stolen from stl:auto_ptr & renamed field/params [not compiled on gcc] template - class simple_auto_ptr { + class smart_ptr { + bool owns; + T *ptr; public: typedef T element_type; - explicit simple_auto_ptr(T *_P = 0) - : _Owns(_P != 0), _Ptr(_P) {} - simple_auto_ptr(const simple_auto_ptr& _Y) - : _Owns(_Y._Owns), _Ptr(_Y.release()) {} - simple_auto_ptr& operator=(const simple_auto_ptr& _Y) - {if (this != &_Y) - {if (_Ptr != _Y.get()) - {if (_Owns) - delete _Ptr; - _Owns = _Y._Owns; } - else if (_Y._Owns) - _Owns = true; - _Ptr = _Y.release(); } + explicit smart_ptr(T *aptr = 0) + : owns(aptr != 0), ptr(aptr) {} + smart_ptr(const smart_ptr& src) + : owns(src.owns), ptr(src.release()) {} + smart_ptr& operator=(const smart_ptr& src) + {if (this != &src) + {if (ptr != src.get()) + {if (owns) + delete ptr; + owns = src.owns; } + else if (src.owns) + owns = true; + ptr = src.release(); } return (*this); } - ~simple_auto_ptr() - {if (_Owns) - delete _Ptr; } + ~smart_ptr() + {if (owns) + delete ptr; } T& operator*() const {return (*get()); } - T *operator->() const - {return (get()); } T *get() const - {return (_Ptr); } + {return ptr; } T *release() const - {((simple_auto_ptr *)this)->_Owns = false; - return (_Ptr); } -private: - bool _Owns; - T *_Ptr; + {((smart_ptr *)this)->owns = false; + return (ptr); } + operator bool() const { + return get()!=0; + } + operator T*() const { + return ptr; + } }; +// convinient types + +typedef smart_ptr CharPtr; +const CharPtr CharPtrZero(0); #endif