--- parser3/src/include/pa_charset.h 2003/03/07 11:02:11 1.20.2.16 +++ parser3/src/include/pa_charset.h 2008/07/15 12:52:01 1.36 @@ -1,18 +1,20 @@ /** @file Parser: Charset connection decl. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 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/07 11:02:11 $"; +static const char * const IDENT_CHARSET_H="$Date: 2008/07/15 12:52:01 $"; + -#include "pa_pool.h" #include "pa_exception.h" #include "pa_common.h" +#include "pa_hash.h" +#include "pa_array.h" // hiding into namespace so to avoid stupid conflict namespace PCRE { @@ -26,6 +28,8 @@ namespace PCRE { // defines +#define MAX_CHARSETS 10 + #define MAX_CHARSET_UNI_CODES 500 # ifndef XMLCh @@ -35,16 +39,9 @@ namespace PCRE { typedef unsigned char XMLByte; # endif -// forwards - -class GdomeDOMString_auto_ptr; - // helpers -struct Charset_TransRec { - XMLCh intCh; - XMLByte extCh; -}; +typedef Hash HashStringString; /** charset holds name & transcode tables registers libxml transcoders @@ -52,20 +49,42 @@ struct Charset_TransRec { class Charset: public PA_Object { public: - Charset(StringPtr aname, StringPtr afile_spec); - override ~Charset(); + Charset(Request_charsets* charsets, const String::Body ANAME, const String* afile_spec); - StringPtr name() const { return fname; } + const String::Body NAME() const { return FNAME; } + const char* NAME_CSTR() const { return FNAME_CSTR; } 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 String::C transcode(const String::C src, + const Charset& source_charset, + const Charset& dest_charset ); + static String& transcode(const String& src, + const Charset& source_transcoder, + const Charset& dest_transcoder); + + static String::Body transcode(const String::Body src, + const Charset& source_transcoder, + const Charset& dest_transcoder); + + static void transcode(ArrayString& src, + const Charset& source_transcoder, + const Charset& dest_transcoder); + + static void transcode(HashStringString& src, + const Charset& source_transcoder, + const Charset& dest_transcoder); + + static String::C escape(const String::C src, + const Charset& source_charset + ); + + void store_Char(XMLByte*& outPtr, XMLCh src, XMLByte not_found); + #ifdef XML - xmlCharEncodingHandler& transcoder(StringPtr source); + xmlCharEncodingHandler& transcoder(const String::Body NAME); #endif public: @@ -74,33 +93,41 @@ public: private: - void load_definition(StringPtr afile_spec); + void load_definition(Request_charsets& charsets, const String& 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; - void transcodeFromUTF8(Pool& pool, - 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 String::C transcodeToUTF8(const String::C src) const; + const String::C transcodeFromUTF8(const String::C src) const; + + const String::C transcodeToCharset(const String::C src, + const Charset& dest_transcoder) const; public: struct Tables { + struct Rec { + XMLCh intCh; + XMLByte extCh; + }; + XMLCh fromTable[0x100]; - Charset_TransRec toTable[MAX_CHARSET_UNI_CODES]; + Rec toTable[MAX_CHARSET_UNI_CODES]; uint toTableSize; }; + struct UTF8CaseTable { + struct Rec { + XMLCh from, to; + }; + + uint size; + Rec* records; + }; + private: - StringPtr fname; - CharPtr fname_cstr; + const String::Body FNAME; + char* FNAME_CSTR; bool fisUTF8; Tables tables; @@ -108,94 +135,38 @@ private: private: void addEncoding(char* name_cstr); - void initTranscoder(StringPtr source, const char* name_cstr); + void initTranscoder(const String::Body name, const char* name_cstr); public: - /// converts GdomeDOMString string to char* - const char* transcode_cstr(GdomeDOMString* s); - /// converts GdomeDOMString string to parser String - StringPtr transcode(GdomeDOMString* s -#ifndef NO_STRING_ORIGIN - , StringPtr origin -#endif - ); /// converts xmlChar* null-terminated string to char* - CharPtr transcode_cstr(xmlChar* s); + String::C transcode_cstr(const xmlChar* s); /// converts xmlChar* null-terminated string to parser String - StringPtr transcode(xmlChar* s -#ifndef NO_STRING_ORIGIN - , StringPtr origin -#endif - ); + const String& transcode(const xmlChar* s); /** converts sized char* to xmlChar* @returns xmlChar* WHICH CALLER SHOULD FREE */ xmlChar* transcode_buf2xchar(const char* buf, size_t buf_size); - /** converts sized char* to gchar* - @returns gchar* WHICH CALLER SHOULD FREE - */ - gchar* transcode_buf2gchar(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(StringPtr s); - -private: - - typedef void* (*transcode_buf_malloc_func)(size_t size); - void* transcode_buf2mchar(transcode_buf_malloc_func malloc_func, - const char* buf, size_t buf_size); + /// converts parser String to xmlChar* + xmlChar* transcode(const String& s); + /// converts parser String::Body to xmlChar* + xmlChar* transcode(const String::Body s); private: - 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; -public: - /// 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() { - gdome_str_unref(fstring); - } - GdomeDOMString* get() { - return fstring; - } - GdomeDOMString* operator->() { - return fstring; - } - GdomeDOMString& operator*() { - return* fstring; - } - - // copying - GdomeDOMString_auto_ptr(const GdomeDOMString_auto_ptr& src) : fstring(src.fstring) { - gdome_str_ref(fstring); - } - GdomeDOMString_auto_ptr& operator =(const GdomeDOMString_auto_ptr& src) { - if(this == &src) - return* this; - - gdome_str_unref(fstring); - fstring=src.fstring; - gdome_str_ref(fstring); - return* this; - } -}; -#endif +// externs + +extern Charset::UTF8CaseTable UTF8CaseToUpper; +extern Charset::UTF8CaseTable UTF8CaseToLower; +void change_case_UTF8(const XMLByte* srcData, size_t srcLen, + XMLByte* toFill, size_t toFillLen, + const Charset::UTF8CaseTable& table); #endif