--- parser3/src/main/pa_charset.C 2003/02/17 16:44:57 1.33.2.9 +++ parser3/src/main/pa_charset.C 2003/03/21 14:49:00 1.33.2.19.2.5 @@ -5,25 +5,15 @@ Author: Alexander Petrosyan(http://paf.design.ru) */ -static const char* IDENT_CHARSET_C="$Date: 2003/02/17 16:44:57 $"; +static const char* IDENT_CHARSET_C="$Date: 2003/03/21 14:49:00 $"; #include "pa_charset.h" +#include "pa_charsets.h" #ifdef XML #include "libxml/encoding.h" #endif -// globals - -#define CHARSET_UTF8_NAME "UTF-8" - -CharsetPtr UTF8_charset(new Charset(StringPtr(new String(CHARSET_UTF8_NAME)), - StringPtr(0)/*no file=system*/)); - -// consts - -#define MAX_CHARSET_UNI_CODES 500 - // helpers inline void prepare_case_tables(unsigned char *tables) { @@ -78,16 +68,16 @@ static void element2case(unsigned char f // methods extern "C" unsigned char pcre_default_tables[]; // pcre/chartables.c -Charset::Charset(StringPtr aname, StringPtr afile_spec): +Charset::Charset(const String& aname, const String* afile_spec): fname(aname), - fname_cstr(aname->cstr()) { + fname_cstr(aname.cstrm()) { for(char *c=fname_cstr; *c; c++) - *c = toupper(*c); + *c = toupper(*c); if(afile_spec) { fisUTF8=false; - load_definition(afile_spec); + load_definition(*afile_spec); #ifdef XML addEncoding(fname_cstr); #endif @@ -109,7 +99,7 @@ Charset::~Charset() { #endif } -void Charset::load_definition(StringPtr afile_spec) { +void Charset::load_definition(const String& afile_spec) { // pcre_tables // lowcase, flipcase, bits digit+word+whitespace, masks @@ -120,16 +110,14 @@ void Charset::load_definition(StringPtr cstr2ctypes(pcre_tables,(const unsigned char *)"*+?{^.$|()[", ctype_meta); // charset - memset(tables.fromTable, 0, sizeof(tables.fromTable)); - tables.toTable=(Charset_TransRec *)pool_for_load.calloc(sizeof(Charset_TransRec)*MAX_CHARSET_UNI_CODES); - tables.toTableSize=0; + memset(&tables, 0, sizeof(tables)); // strangly vital tables.toTable[tables.toTableSize].intCh=0; tables.toTable[tables.toTableSize].extCh=(XMLByte)0; tables.toTableSize++; // loading text - char *data=file_read_text(pool_for_load, *UTF8_charset, afile_spec); + char *data=file_read_text(UTF8_charset, afile_spec); // ignore header getrow(&data); @@ -159,7 +147,7 @@ void Charset::load_definition(StringPtr // charset if(tables.toTableSize>MAX_CHARSET_UNI_CODES) throw Exception("parser.runtime", - afile_spec, + &afile_spec, "charset must contain not more then %d unicode values", MAX_CHARSET_UNI_CODES); XMLCh unicode=(XMLCh)to_wchar_code(cell); @@ -219,8 +207,8 @@ static XMLByte xlatOneTo(const XMLCh toX return not_found; } -void Charset::transcode(Pool& pool, - const Charset& source_charset, const void *source_body, size_t source_content_length, +void Charset::transcode( + const Charset& source_charset, const void* source_body, size_t source_content_length, const Charset& dest_charset, const void *& dest_body, size_t& dest_content_length ) { if(!source_content_length) { @@ -231,17 +219,17 @@ void Charset::transcode(Pool& pool, switch((source_charset.isUTF8()?0x10:0x00)|(dest_charset.isUTF8()?0x01:0x00)) { default: // 0x00 - source_charset.transcodeToCharset(pool, dest_charset, + source_charset.transcodeToCharset(dest_charset, source_body, source_content_length, dest_body, dest_content_length); break; case 0x01: - source_charset.transcodeToUTF8(pool, + source_charset.transcodeToUTF8( source_body, source_content_length, dest_body, dest_content_length); break; case 0x10: - dest_charset.transcodeFromUTF8(pool, + dest_charset.transcodeFromUTF8( source_body, source_content_length, dest_body, dest_content_length); break; @@ -378,7 +366,7 @@ of ocetes consumed. } /// @todo digital entites only when xml/html output [at output in html/xml mode, in html part of a letter] static int transcodeFromUTF8( - const XMLByte *srcData, size_t& srcLen, + const XMLByte* srcData, size_t& srcLen, XMLByte* toFill, size_t& toFillLen, const Charset::Tables& tables) { const XMLByte* srcPtr=srcData; @@ -389,7 +377,7 @@ static int transcodeFromUTF8( // We now loop until we either run out of input data, or room to store while ((srcPtr < srcEnd) && (outPtr < outEnd)) { // Get the next leading byte out - const XMLByte firstByte = *srcPtr; + const XMLByte firstByte =* srcPtr; // Special-case ASCII, which is a leading byte value of<= 127 if(firstByte<= 127) { @@ -420,7 +408,7 @@ static int transcodeFromUTF8( default: throw Exception(0, - Exception::undefined_source, + 0, "transcodeFromUTF8 error: wrong trailingBytes value(%d)", trailingBytes); } tmpVal-=gUTFOffsets[trailingBytes]; @@ -435,7 +423,7 @@ static int transcodeFromUTF8( outPtr+=sprintf((char *)outPtr, "&#%d;", tmpVal); // &#decimal; } else throw Exception(0, - Exception::undefined_source, + 0, "transcodeFromUTF8 error: too big tmpVal(0x%08X)", tmpVal); } @@ -457,11 +445,11 @@ of ocetes consumed. } /// @todo not so memory-hungry with prescan -void Charset::transcodeToUTF8(Pool& pool, - const void *source_body, size_t source_content_length, +void Charset::transcodeToUTF8( + const void* source_body, size_t source_content_length, const void *& adest_body, size_t& dest_content_length) const { dest_content_length=source_content_length*6/*so that surly enough, max utf8 seq len=6*/; - XMLByte *dest_body=new(pool) XMLByte[dest_content_length]; + XMLByte *dest_body=new XMLByte[dest_content_length]; if(::transcodeToUTF8( (XMLByte *)source_body, source_content_length, @@ -474,11 +462,11 @@ void Charset::transcodeToUTF8(Pool& pool // return adest_body=dest_body; } -void Charset::transcodeFromUTF8(Pool& pool, - const void *source_body, size_t source_content_length, +void Charset::transcodeFromUTF8( + const void* source_body, size_t source_content_length, const void *& adest_body, size_t& dest_content_length) const { dest_content_length=source_content_length*6/*so that surly enough, "ÿ" has max ratio */; - XMLByte *dest_body=new(pool) XMLByte[dest_content_length]; + XMLByte *dest_body=new XMLByte[dest_content_length]; if(::transcodeFromUTF8( (XMLByte *)source_body, source_content_length, @@ -493,16 +481,16 @@ void Charset::transcodeFromUTF8(Pool& po } /// transcode using both charsets -void Charset::transcodeToCharset(Pool& pool, +void Charset::transcodeToCharset( const Charset& dest_charset, - const void *source_body, size_t source_content_length, + const void* source_body, size_t source_content_length, const void *& adest_body, size_t& adest_content_length) const { if(&dest_charset==this) { adest_body=source_body; adest_content_length=source_content_length; } else { size_t dest_content_length=source_content_length; - unsigned char *dest_body=new(pool) unsigned char[dest_content_length]; + unsigned char *dest_body=new unsigned char[dest_content_length]; const XMLByte* srcPtr=(XMLByte *)source_body; const XMLByte* srcEnd=(XMLByte *)source_body+source_content_length; @@ -549,8 +537,9 @@ static int xml256CharEncodingOut void Charset::addEncoding(char *name_cstr) { - xmlCharEncodingHandler *handler= - (xmlCharEncodingHandler *)malloc(sizeof(xmlCharEncodingHandler)); + xmlCharEncodingHandler* handler=new xmlCharEncodingHandler; + fcreated_handler=xmlCharEncodingHandlerPtr(handler); + handler->name=name_cstr; handler->input=xml256CharEncodingInputFunc; handler->inputInfo=&tables; handler->output=xml256CharEncodingOutputFunc; handler->outputInfo=&tables; @@ -558,33 +547,33 @@ void Charset::addEncoding(char *name_cst xmlRegisterCharEncodingHandler(handler); } -void Charset::initTranscoder(const String *source, const char* name_cstr) { +void Charset::initTranscoder(const String* source, const char* name_cstr) { ftranscoder=xmlFindCharEncodingHandler(name_cstr); transcoder(source); // check right way } -xmlCharEncodingHandler *Charset::transcoder(const String *source) { +xmlCharEncodingHandler& Charset::transcoder(const String* source) { if(!ftranscoder) throw Exception("parser.runtime", source, "unsupported encoding"); - return ftranscoder; + return *ftranscoder; } -const char* Charset::transcode_cstr(xmlChar *s) { +const char* Charset::transcode_cstrxmlChar* s) { if(!s) return ""; int inlen=strlen((const char* )s); int outlen=inlen+1; // max - char *out=(char *)malloc(outlen*sizeof(char)); + char *out=new char[outlen]; int error; - if(xmlCharEncodingOutputFunc output=transcoder(0)->output) { + if(xmlCharEncodingOutputFunc output=transcoder(0).output) { error=output( (unsigned char*)out, &outlen, (const unsigned char*)s, &inlen, - transcoder(0)->outputInfo); + transcoder(0).outputInfo); } else { memcpy(out, s, outlen=inlen); error=0; @@ -597,43 +586,46 @@ const char* Charset::transcode_cstr(xmlC out[outlen/*surely would be less then on input*/]=0; return out; } -String& Charset::transcode(xmlChar *s +const String& Charset::transcodexmlChar* s #ifndef NO_STRING_ORIGIN - , const String *origin + , const String& origin #endif ) { - String& result=*NEW String(pool()); - result.APPEND_CLEAN(transcode_cstr(s), 0/*auto-size*/, origin->origin().file, origin->origin().line); + const String& result(new String()); + result->APPEND_CLEAN( + transcode_cstr(s), 0/*auto-size*/, + origin->origin().file, origin->origin().line); return result; } -const char* Charset::transcode_cstr(GdomeDOMString *s) { +const char* Charset::transcode_cstrGdomeDOMString* s) { return s?transcode_cstr(BAD_CAST s->str):""; } -String& Charset::transcode(GdomeDOMString *s +const String& Charset::transcodeGdomeDOMString* s #ifndef NO_STRING_ORIGIN - , const String *origin + , const String& origin #endif ) { - String& result=*NEW String(pool()); - result.APPEND_CLEAN(transcode_cstr(s), 0/*auto-size*/, origin->origin().file, origin->origin().line); + const String& result(new String()); + result->APPEND_CLEAN(transcode_cstr(s), 0/*auto-size*/, origin->origin().file, origin->origin().line); return result; } /// @test less memory using -maybe- xmlParserInputBufferCreateMem -xmlChar *Charset::transcode_buf2xchar(Pool& pool, const char* buf, size_t buf_size) { - unsigned char *out; +void* Charset::transcode_buf2mchar(transcode_buf_malloc_func malloc_func, + const char* buf, size_t buf_size) { + unsigned char* out; int outlen; int error; - if(xmlCharEncodingInputFunc input=transcoder(0)->input) { + if(xmlCharEncodingInputFunc input=transcoder(0).input) { outlen=buf_size*6/*max*/; - out=new(pool) unsigned char[outlen+1]; + out=(unsigned char*)malloc_func(outlen+1); error=input( out, &outlen, (const unsigned char *)buf, (int *)&buf_size, - transcoder(0)->inputInfo); + transcoder(0).inputInfo); } else { outlen=buf_size; - out=new(pool) unsigned char[outlen+1]; + out=(unsigned char*)malloc_func(outlen+1); memcpy(out, buf, outlen); error=0; } @@ -644,13 +636,23 @@ xmlChar *Charset::transcode_buf2xchar(Po "transcode_buf failed (%d)", error); out[outlen/*surely would be less then on input*/]=0; - return (xmlChar *)out; + return out; +} + +xmlChar* Charset::transcode_buf2xchar(const char* buf, size_t buf_size) { + return static_cast(transcode_buf2mchar(xmlMalloc, buf, buf_size)); +} +static void* g_malloc_wrapper(size_t size) { + return g_malloc(size); +} +gchar* Charset::transcode_buf2gchar(const char* buf, size_t buf_size) { + return static_cast(transcode_buf2mchar(g_malloc_wrapper, buf, buf_size)); } GdomeDOMString_auto_ptr Charset::transcode_buf2dom(const char* buf, size_t buf_size) { - return GdomeDOMString_auto_ptr((gchar*)transcode_buf2xchar(buf, buf_size)); + return GdomeDOMString_auto_ptr(transcode_buf2gchar(buf, buf_size)); } GdomeDOMString_auto_ptr Charset::transcode(const String& s) { - const char* cstr=s.cstr(String::UL_UNSPECIFIED); + const char* cstr=s->cstr(String::L_UNSPECIFIED); return transcode_buf2dom(cstr, strlen(cstr)); }