--- parser3/src/main/pa_string.C 2001/09/18 16:05:42 1.103 +++ parser3/src/main/pa_string.C 2001/10/19 12:43:30 1.112 @@ -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.112 2001/10/19 12:43:30 parser 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" @@ -153,7 +153,7 @@ String& String::real_append(STRING_APPEN char String::first_char() const { if(!fused_rows) - THROW(0, 0, + throw Exception(0, 0, this, "getting first char of empty string"); @@ -357,12 +357,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 +508,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 +522,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); @@ -569,7 +569,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 +617,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 @@ -654,7 +654,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); + 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 { @@ -669,22 +771,17 @@ String& String::replace(Pool& pool, Dict 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,6 +796,10 @@ 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(); @@ -713,7 +814,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)"); @@ -733,7 +834,7 @@ 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)");