--- parser3/src/main/pa_string.C 2001/09/18 16:05:42 1.103 +++ parser3/src/main/pa_string.C 2001/10/29 15:15:11 1.115 @@ -2,10 +2,10 @@ Parser: string class. @see untasize_t.C. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: pa_string.C,v 1.115 2001/10/29 15:15:11 paf Exp $ */ -static const char *RCSId="$Id: pa_string.C,v 1.103 2001/09/18 16:05:42 parser Exp $"; #include "pa_config_includes.h" @@ -30,7 +30,7 @@ String::String(Pool& apool, const char * append_here=head.rows; head.preallocated_link=0; link_row=&head.rows[head.count]; - fused_rows=fsize=0; + fsize=0; if(src) if(tainted) @@ -44,7 +44,7 @@ String::String(const String& src) : forigins_mode(false) { head.count=CR_PREALLOCATED_COUNT; - size_t src_used_rows=src.fused_rows; + size_t src_used_rows=src.used_rows(); if(src_used_rows<=head.count) { // all new rows fit size_to preallocated area last_chunk=&head; @@ -67,7 +67,7 @@ String::String(const String& src) : // remaining rows size_to new_chunk size_t curr_chunk_rows=src_used_rows-head.count; last_chunk=static_cast( - malloc(sizeof(size_t)+sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *))); + malloc(sizeof(size_t)+sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *), 9)); last_chunk->count=curr_chunk_rows; head.preallocated_link=last_chunk; append_here=link_row=&last_chunk->rows[last_chunk->count]; @@ -95,14 +95,32 @@ String::String(const String& src) : } } link_row->link=0; - fused_rows=src_used_rows; + src_used_rows; fsize=src.fsize; } +/// @todo not very optimal +uint String::used_rows() const { + uint result=0; + const Chunk *chunk=&head; + do { + const Chunk::Row *row=chunk->rows; + for(size_t i=0; icount; i++, row++) { + if(row==append_here) + goto break2; + + result++; + } + chunk=row->link; + } while(chunk); + +break2: + return result; +} void String::expand() { size_t new_chunk_count=last_chunk->count+CR_GROW_COUNT; last_chunk=static_cast( - malloc(sizeof(size_t)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *))); + malloc(sizeof(size_t)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *), 10)); last_chunk->count=new_chunk_count; link_row->link=last_chunk; append_here=last_chunk->rows; @@ -146,14 +164,14 @@ String& String::real_append(STRING_APPEN append_here->item.origin.file=file; append_here->item.origin.line=line; #endif - append_here++; fused_rows++; + append_here++; return *this; } char String::first_char() const { - if(!fused_rows) - THROW(0, 0, + if(!fsize) + throw Exception(0, 0, this, "getting first char of empty string"); @@ -340,7 +358,7 @@ int String::cmp(int& partial, const char #ifndef NO_STRING_ORIGIN const Origin& String::origin() const { - if(!fused_rows) { + if(!fsize) { static const Origin empty_origin={"empty string"}; return empty_origin; } @@ -357,12 +375,12 @@ const Origin& String::origin() const { #endif String& String::mid(size_t start, size_t finish) const { + String& result=*NEW String(pool()); + start=max(0, start); finish=min(size(), finish); if(start==finish) - return *empty_string; - - String& result=*NEW String(pool()); + return result; size_t pos=0; const Chunk *chunk=&head; @@ -508,7 +526,7 @@ bool String::match(const unsigned char * bool *was_global) const { if(!regexp.size()) - THROW(0, 0, + throw Exception(0, 0, aorigin, "regexp is empty"); const char *pattern=regexp.cstr(UL_AS_IS); @@ -522,14 +540,14 @@ bool String::match(const unsigned char * pcre_tables); if(!code) - THROW(0, 0, + throw Exception(0, 0, ®exp.mid(erroffset, regexp.size()), "regular expression syntax error - %s", errptr); int info_substrings=pcre_info(code, 0, 0); if(info_substrings<0) { pcre_free(code); - THROW(0, 0, + throw Exception(0, 0, aorigin, "pcre_info error (%d)", info_substrings); @@ -540,7 +558,7 @@ bool String::match(const unsigned char * int length=strlen(subject); int ovecsize; int *ovector=(int *)malloc(sizeof(int)* - (ovecsize=(1/*match*/+info_substrings)*3)); + (ovecsize=(1/*match*/+info_substrings)*3), 11); { // create table Array& columns=*NEW Array(pool()); @@ -569,7 +587,7 @@ bool String::match(const unsigned char * if(exec_substrings<0) { pcre_free(code); - THROW(0, 0, + throw Exception(0, 0, aorigin, "regular expression execute error (%d)", exec_substrings); @@ -617,7 +635,7 @@ String& String::change_case(Pool& pool, b=0; break; default: - PTHROW(0, 0, + throw Exception(0, 0, this, "unknown change case kind #%d", static_cast(kind)); // never @@ -632,7 +650,7 @@ String& String::change_case(Pool& pool, if(row==append_here) goto break2; - char *new_cstr=(char *)pool.malloc(row->item.size); + char *new_cstr=(char *)pool.malloc(row->item.size, 12); char *dest=new_cstr; const char *src=row->item.ptr; for(int size=row->item.size; size--; src++) { @@ -654,7 +672,109 @@ break2: return result; } -String& String::replace(Pool& pool, Dictionary& dict) const { +void String::join_chain(Pool& pool, + size_t& ai, const Chunk*& achunk, const Chunk::Row*& arow, + Untaint_lang& joined_lang, const char *& joined_ptr, size_t& joined_size) const { + joined_lang=arow->item.lang; + + // calc size + joined_size=0; + { + size_t start_i=ai; + const Chunk::Row *start_row=arow; + const Chunk *chunk=achunk; + do { + const Chunk::Row *row=start_row; + for(size_t i=start_i; icount; i++, row++) { + if(row==append_here) + goto break21; + + if(row->item.lang==joined_lang) + joined_size+=row->item.size; + else + break; + } + if(chunk=row->link) { + start_i=0; + start_row=chunk->rows; + } else + break; + } while(true); +break21:; + } + + // if one row, return simply itself + if(joined_size==arow->item.size) { + joined_ptr=arow->item.ptr; + ai++; arow++; + if(ai==achunk->count) + achunk=arow->link; + } else { + // join adjacent rows + char *ptr=(char *)pool.malloc(joined_size,13); + joined_ptr=ptr; + size_t start_i=ai; + const Chunk::Row *start_row=arow; + const Chunk *chunk=achunk; + size_t i; + const Chunk::Row *row; + do { + row=start_row; + for(i=start_i; icount; i++, row++) { + if(row==append_here) + goto break22; + + if(row->item.lang==joined_lang) { + memcpy(ptr, row->item.ptr, row->item.size); + ptr+=row->item.size; + } else + break; + } + if(chunk=row->link) { + start_i=0; + start_row=chunk->rows; + } else + break; + } while(true); +break22:; + + // return joined rows + ai=i; + arow=row; + achunk=chunk; + } +} + +String& String::reconstruct(Pool& pool) const { + //_asm int 3; + String& result=*new(pool) String(pool); + const Chunk *chunk=&head; + do { + const Chunk::Row *row=chunk->rows; + for(size_t i=0; icount; ) { + if(row==append_here) + goto break2; + + Untaint_lang joined_lang; + const char *joined_ptr; + size_t joined_size; + join_chain(pool, i, chunk, row, + joined_lang, joined_ptr, joined_size); + + result.APPEND(joined_ptr, joined_size, + joined_lang, + row->item.origin.file, row->item.origin.line); + if(!chunk) + goto break2; + } + } while(true); +break2: + + return result; +}; + +String& String::replace_in_reconstructed(Pool& pool, Dictionary& dict) const { + //_asm int 3; String& result=*new(pool) String(pool); const Chunk *chunk=&head; do { @@ -665,26 +785,21 @@ String& String::replace(Pool& pool, Dict const char *src=row->item.ptr; size_t src_size=row->item.size; - char *new_cstr=(char *)pool.malloc((size_t)ceil(src_size*dict.max_ratio())); + char *new_cstr=(char *)pool.malloc((size_t)ceil(src_size*dict.max_ratio()), 14); char *dest=new_cstr; while(src_size) { // there is a row where first column starts 'src' - if(Table::Item *item=dict.first_that_starts(src)) { + if(Table::Item *item=dict.first_that_starts(src, src_size)) { // get a=>b values const String& a=*static_cast(item)->get_string(0); const String& b=*static_cast(item)->get_string(1); - // skip 'a' in 'src' - src+=a.size(); - // write 'b' to 'dest' - b.store_to(dest); - // skip 'b' in 'dest' - dest+=b.size(); - // reduce work size - src_size-=a.size(); + // skip 'a' in 'src' && reduce work size + src+=a.size(); src_size-=a.size(); + // write 'b' to 'dest' && skip 'b' in 'dest' + b.store_to(dest); dest+=b.size(); } else { - *dest++=*src++; - // reduce work size - src_size--; + // write a char to b && reduce work size + *dest++=*src++; src_size--; } } @@ -699,9 +814,21 @@ break2: return result; } +String& String::replace(Pool& pool, Dictionary& dict) const { + return reconstruct(pool).replace_in_reconstructed(pool, dict); +} + double String::as_double() const { double result; - const char *cstr=this->cstr(); + const char *cstr; + char buf[MAX_NUMBER]; + if(head.rows+1==append_here) { + int size=min(head.rows[0].item.size, MAX_NUMBER-1); + memcpy(buf, head.rows[0].item.ptr, size); + buf[size]=0; + cstr=buf; + } else + cstr=this->cstr(); char *error_pos; // 0xABC if(cstr[0]=='0') @@ -713,7 +840,7 @@ double String::as_double() const { result=(double)strtod(cstr, &error_pos); if(*error_pos/*not EOS*/) - THROW(0, 0, + throw Exception(0, 0, this, "invalid number (double)"); @@ -721,7 +848,15 @@ double String::as_double() const { } int String::as_int() const { int result; - const char *cstr=this->cstr(); + const char *cstr; + char buf[MAX_NUMBER]; + if(head.rows+1==append_here) { + int size=min(head.rows[0].item.size, MAX_NUMBER-1); + memcpy(buf, head.rows[0].item.ptr, size); + buf[size]=0; + cstr=buf; + } else + cstr=this->cstr(); char *error_pos; // 0xABC if(cstr[0]=='0') @@ -733,9 +868,75 @@ int String::as_int() const { result=(int)strtol(cstr, &error_pos, 0); if(*error_pos/*not EOS*/) - THROW(0, 0, + throw Exception(0, 0, this, "invalid number (int)"); return result; } + +/* @todo maybe network order worth spending some effort? + don't bothering myself with network byte order, + am not planning to be able to move resulting file across platforms + for now +*/ +void String::serialize(size_t prolog_size, void *& buf, size_t& buf_size) const { + buf_size= + prolog_size + +used_rows()*(sizeof(Untaint_lang)+sizeof(size_t)) + +size(); + buf=malloc(buf_size,15); + char *cur=(char *)buf+prolog_size; + + const Chunk *chunk=&head; + do { + const Chunk::Row *row=chunk->rows; + for(size_t i=0; icount; i++) { + if(row==append_here) + goto break2; + + // lang + memcpy(cur, &row->item.lang, sizeof(Untaint_lang)); + cur+=sizeof(Untaint_lang); + // size + memcpy(cur, &row->item.size, sizeof(size_t)); + cur+=sizeof(size_t); + // bytes + memcpy(cur, row->item.ptr, row->item.size); + cur+=row->item.size; + + row++; + } + chunk=row->link; + } while(chunk); +break2: + ; +} + +/* @todo maybe network order worth spending some effort? + don't bothering myself with network byte order, + am not planning to be able to move resulting file across platforms + for now +*/ +#ifndef DOXYGEN +struct Serialized_piece { + String::Untaint_lang lang; + size_t size; + char ptr[1]; +}; +#endif + +void String::deserialize(size_t prolog_size, void *buf, size_t buf_size, const char *file) { + char *cur=((char *)buf)+prolog_size; + buf_size-=prolog_size; + + while(buf_size) { + Serialized_piece& p=*(Serialized_piece *)cur; + APPEND(p.ptr, p.size, p.lang, file, 0); + + size_t piece_size=sizeof(p.lang)+sizeof(p.size)+p.size; + cur+=piece_size; + buf_size-=piece_size; + } +} +