--- parser3/src/include/pa_charset.h 2002/01/25 11:22:51 1.11 +++ parser3/src/include/pa_charset.h 2003/03/06 16:15:25 1.20.2.15 @@ -1,15 +1,15 @@ /** @file Parser: Charset connection decl. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) - - $Id: pa_charset.h,v 1.11 2002/01/25 11:22:51 paf Exp $ + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_CHARSET_H #define PA_CHARSET_H +static const char* IDENT_CHARSET_H="$Date: 2003/03/06 16:15:25 $"; + #include "pa_pool.h" #include "pa_exception.h" #include "pa_common.h" @@ -26,6 +26,8 @@ namespace PCRE { // defines +#define MAX_CHARSET_UNI_CODES 500 + # ifndef XMLCh typedef unsigned int XMLCh; # endif @@ -33,31 +35,37 @@ namespace PCRE { typedef unsigned char XMLByte; # endif +// forwards + +class GdomeDOMString_auto_ptr; + +// helpers + struct Charset_TransRec { XMLCh intCh; XMLByte extCh; }; /** charset holds name & transcode tables - registers Xerces transcoders + registers libxml transcoders */ -class Charset : public Pooled { +class Charset: public PA_Object { public: - Charset(Pool& apool, const String& aname, const String *request_file_spec); - Charset::~Charset(); + Charset(StringPtr aname, StringPtr afile_spec); + override ~Charset(); - const String& name() const { return fname; } + StringPtr name() const { return fname; } bool isUTF8() const { return fisUTF8; } - static void transcode(Pool& pool, - const Charset& source_transcoder, const void *source_body, size_t source_content_length, - const Charset& dest_transcoder, const void *& dest_body, size_t& dest_content_length + static void transcode(Pool& pool, + const Charset& source_transcoder, const void* source_body, size_t source_content_length, + const Charset& dest_transcoder, const void* & dest_body, size_t& dest_content_length ); #ifdef XML - xmlCharEncodingHandler *transcoder(const String *source); + xmlCharEncodingHandler& transcoder(StringPtr source); #endif public: @@ -66,68 +74,87 @@ public: private: - void loadDefinition(const String& request_file_spec); + void load_definition(StringPtr afile_spec); void sort_ToTable(); void transcodeToUTF8(Pool& pool, - const void *source_body, size_t source_content_length, - const void *& dest_body, size_t& dest_content_length) const; + const void* source_body, size_t source_content_length, + const void* & dest_body, size_t& dest_content_length) const; void transcodeFromUTF8(Pool& pool, - const void *source_body, size_t source_content_length, - const void *& dest_body, size_t& dest_content_length) const; + const void* source_body, size_t source_content_length, + const void* & dest_body, size_t& dest_content_length) const; + void transcodeToCharset(Pool& pool, const Charset& dest_transcoder, - const void *source_body, size_t source_content_length, - const void *& dest_body, size_t& dest_content_length) const; + const void* source_body, size_t source_content_length, + const void*& dest_body, size_t& dest_content_length) const; public: struct Tables { XMLCh fromTable[0x100]; - Charset_TransRec *toTable; + Charset_TransRec toTable[MAX_CHARSET_UNI_CODES]; uint toTableSize; }; private: - const String& fname; + StringPtr fname; + CharPtr fname_cstr; bool fisUTF8; Tables tables; #ifdef XML private: - void addEncoding(char *name_cstr); - void initTranscoder(const String *source, const char *name_cstr); + void addEncoding(char* name_cstr); + void initTranscoder(StringPtr source, const char* name_cstr); public: - /// converts GdomeDOMString string to char * - const char *transcode_cstr(GdomeDOMString *s); + /// converts GdomeDOMString string to char* + const char* transcode_cstr(GdomeDOMString* s); /// converts GdomeDOMString string to parser String - String& transcode(GdomeDOMString *s); - /// converts xmlChar* null-terminated string to char * - const char *transcode_cstr(xmlChar *s); + StringPtr transcode(GdomeDOMString* s +#ifndef NO_STRING_ORIGIN + , StringPtr origin +#endif + ); + /// converts xmlChar* null-terminated string to char* + CharPtr transcode_cstr(xmlChar* s); /// converts xmlChar* null-terminated string to parser String - String& transcode(xmlChar *s); - /// converts char * to GdomeDOMString - GdomeDOMString_auto_ptr transcode_buf(const char *buf, size_t buf_size); + StringPtr transcode(xmlChar* s +#ifndef NO_STRING_ORIGIN + , StringPtr origin +#endif + ); + /** converts sized char* to xmlChar* + @returns xmlChar* WHICH CALLER SHOULD FREE + */ + xmlChar* transcode_buf2xchar(const char* buf, size_t buf_size); + /// converts char* to GdomeDOMString + GdomeDOMString_auto_ptr transcode_buf2dom(const char* buf, size_t buf_size); /// converts parser String to GdomeDOMString - GdomeDOMString_auto_ptr transcode(const String& s); + GdomeDOMString_auto_ptr transcode(StringPtr s); private: - xmlCharEncodingHandler *ftranscoder; + typedef smart_ptr xmlCharEncodingHandlerPtr; + xmlCharEncodingHandlerPtr fcreated_handler; + xmlCharEncodingHandler* ftranscoder; #endif }; +DECLARE_OBJECT_PTR(Charset); +#ifdef XML /// Auto-object used to track GdomeDOMString usage class GdomeDOMString_auto_ptr { - GdomeDOMString *fstring; + GdomeDOMString* fstring; public: - explicit GdomeDOMString_auto_ptr(gchar *astring) : fstring(gdome_str_mkref(astring)) {} - explicit GdomeDOMString_auto_ptr(GdomeDOMString *astring) : fstring(astring) { + /// frees astring afterwards!!! + explicit GdomeDOMString_auto_ptr(gchar* astring) : fstring(gdome_str_mkref_own(astring)) {} + explicit GdomeDOMString_auto_ptr(GdomeDOMString* astring) : fstring(astring) { // not ref-ing, owning } ~GdomeDOMString_auto_ptr() { @@ -140,7 +167,7 @@ public: return fstring; } GdomeDOMString& operator*() { - return *fstring; + return* fstring; } // copying @@ -149,14 +176,15 @@ public: } GdomeDOMString_auto_ptr& operator =(const GdomeDOMString_auto_ptr& src) { if(this == &src) - return *this; + return* this; gdome_str_unref(fstring); fstring=src.fstring; gdome_str_ref(fstring); - return *this; + return* this; } }; +#endif #endif