--- parser3/src/include/pa_charset.h 2003/01/22 15:39:07 1.20.2.1 +++ parser3/src/include/pa_charset.h 2009/04/10 11:31:34 1.41 @@ -1,24 +1,26 @@ /** @file Parser: Charset connection decl. - Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 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/01/22 15:39:07 $"; +static const char * const IDENT_CHARSET_H="$Date: 2009/04/10 11:31:34 $"; + -#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 { +// pcre.h must be included BEFORE pcre_internal.h #include "pcre.h" -# include "internal.h" -}; +// have to call config.h for using pcre_internal.h as well +#include "../lib/pcre/config.h" +#include "pcre_internal.h" #ifdef XML #include "libxml/encoding.h" @@ -26,38 +28,67 @@ namespace PCRE { // defines -# ifndef XMLCh - typedef unsigned int XMLCh; -# endif -# ifndef XMLByte - typedef unsigned char XMLByte; -# endif - -struct Charset_TransRec { - XMLCh intCh; - XMLByte extCh; -}; +#define MAX_CHARSETS 10 + +#define MAX_CHARSET_UNI_CODES 500 + +#ifndef XMLCh + typedef unsigned int XMLCh; +#endif +#ifndef XMLByte + typedef unsigned char XMLByte; +#endif + +// helpers + +typedef Hash HashStringString; /** charset holds name & transcode tables - registers Xerces transcoders + registers libxml transcoders */ -class Charset : public PA_Object { +class Charset: public PA_Object { public: - Charset(const String& aname, const String *request_file_spec); - Charset::~Charset(); + Charset(Request_charsets* charsets, const String::Body ANAME, const String* afile_spec); - const String& 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( - 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); + + static String::Body escape(const String::Body src, + const Charset& source_charset); + + static String& escape(const String& src, + const Charset& source_charset); + + void store_Char(XMLByte*& outPtr, XMLCh src, XMLByte not_found); #ifdef XML - xmlCharEncodingHandler *transcoder(const String *source); + xmlCharEncodingHandler& transcoder(const String::Body NAME); #endif public: @@ -66,112 +97,83 @@ public: private: - void loadDefinition(const String& request_file_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; + Rec toTable[MAX_CHARSET_UNI_CODES]; uint toTableSize; }; + struct UTF8CaseTable { + struct Rec { + XMLCh from, to; + }; + + uint size; + Rec* records; + }; + private: - const String& fname; + const String::Body FNAME; + char* 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(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 - String& transcode(GdomeDOMString *s -#ifndef NO_STRING_ORIGIN - , const String *origin -#endif - ); - /// converts xmlChar* null-terminated string to char * - const char *transcode_cstr(xmlChar *s); + /// converts xmlChar* null-terminated string to char* + String::C transcode_cstr(const xmlChar* s); /// converts xmlChar* null-terminated string to parser String - String& transcode(xmlChar *s -#ifndef NO_STRING_ORIGIN - , const String *origin -#endif - ); - /** converts sized char * to xmlChar* - @returns xmlChar * which caller should free + 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 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); + xmlChar* transcode_buf2xchar(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: - xmlCharEncodingHandler *ftranscoder; + xmlCharEncodingHandler* ftranscoder; #endif }; -#ifdef XML -/// Auto-object used to track GdomeDOMString usage -class GdomeDOMString_auto_ptr { - GdomeDOMString *fstring; -public: - explicit GdomeDOMString_auto_ptr(gchar *astring) : fstring(gdome_str_mkref(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); +size_t getUTF8BytePos(const XMLByte* srcBegin, const XMLByte* srcEnd, size_t charPos/*position in characters*/); +size_t getUTF8CharPos(const XMLByte* srcBegin, const XMLByte* srcEnd, size_t bytePos/*position in bytes*/); +size_t lengthUTF8(const XMLByte* srcBegin, const XMLByte* srcEnd); #endif