--- parser3/src/main/pa_string.C 2002/04/19 09:36:51 1.155 +++ parser3/src/main/pa_string.C 2002/08/07 13:44:00 1.166 @@ -3,10 +3,10 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: pa_string.C,v 1.155 2002/04/19 09:36:51 paf Exp $ */ +static const char* IDENT_STRING_C="$Date: 2002/08/07 13:44:00 $"; + #include "pcre.h" #include "pa_pool.h" @@ -27,6 +27,17 @@ ulong string_piece_appends=0; #endif +String& String::OnPool(Pool& apool, const char *local_src, size_t src_size, bool tainted) { + if(local_src && *local_src) { + if(src_size==0) + src_size=strlen(local_src); + + char *pooled_src=(char *)apool.malloc(src_size); + memcpy(pooled_src, local_src, src_size); + return *new(apool) String(apool, pooled_src, src_size, tainted); + } else + return *new(apool) String(apool); +} String::String(Pool& apool, const char *src, size_t src_size, bool tainted) : Pooled(apool) { last_chunk=&head.chunk; @@ -332,8 +343,8 @@ const Origin& String::origin() const { String& String::mid(size_t start, size_t finish) const { String& result=*NEW String(pool()); - start=max(size_t(0), start); - finish=min(size(), finish); + start=min(start, size()); + finish=max(finish, start); if(start==finish) return result; @@ -518,7 +529,7 @@ bool String::match( int ovector[ovecsize]; // create table - *table=NEW Table(pool(), 0, string_match_table_columns); + *table=NEW Table(pool(), *string_match_table_template); int exec_option_bits=0; int prestart=0; @@ -616,68 +627,14 @@ String& String::change_case(Pool& pool, return result; } -void String::join_chain(Pool& pool, - const Chunk*& achunk, const Chunk::Row*& arow, uint& acountdown, - uchar& joined_lang, const char *& joined_ptr, size_t& joined_size) const { - joined_lang=arow->item.lang; - - // calc size - joined_size=0; - { - const Chunk* chunk=achunk; - const Chunk::Row* row=arow; - uint countdown=acountdown; - STRING_PREPARED_FOREACH_ROW(*this, - if(row->item.lang==joined_lang) - joined_size+=row->item.size; - else - break; - ); - } - - // if one row, return simply itself - if(joined_size==arow->item.size) { - joined_ptr=arow->item.ptr; - } else { - // join adjacent rows - char *ptr=(char *)pool.malloc(joined_size,13); - joined_ptr=ptr; - - const Chunk* chunk=achunk; - const Chunk::Row* row=arow; - uint countdown=acountdown; - STRING_PREPARED_FOREACH_ROW(*this, - if(row->item.lang==joined_lang) { - memcpy(ptr, row->item.ptr, row->item.size); ptr+=row->item.size; - } else - break; // before non-ours - ); - - // set pointers after joined piece - achunk=chunk; arow=row; acountdown=countdown; - // & one step back, see String::reconstruct - --arow; ++acountdown; - } -} - /// @test if in some piece were found no dict words, append it, not it's duplicate String& String::replace(Pool& pool, Dictionary& dict) const { // return reconstruct(pool).replace_in_reconstructed(pool, dict); String& result=*new(pool) String(pool); STRING_FOREACH_ROW( - uchar joined_lang; - const char *joined_ptr; - size_t joined_size; -IFNDEF_NO_STRING_ORIGIN( - const char *joined_origin_file=row->item.origin.file; - const size_t joined_origin_line=row->item.origin.line; -); - join_chain(pool, chunk, row, countdown, - joined_lang, joined_ptr, joined_size); - - const char *src=joined_ptr; - size_t src_size=joined_size; + 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()), 14); char *dest=new_cstr; while(src_size) { @@ -696,9 +653,44 @@ IFNDEF_NO_STRING_ORIGIN( } } - result.APPEND(new_cstr, dest-new_cstr, joined_lang, + result.APPEND(new_cstr, dest-new_cstr, row->item.lang, + row->item.origin.file, row->item.origin.line); + ); + return result; +} + +String& String::join_chains(Pool& pool, char** acstr) const { + char *lcstr=cstr(); + const char *current=lcstr; + + String& result=*new(pool) String(pool); + STRING_FOREACH_ROW( +IFNDEF_NO_STRING_ORIGIN( + const char *joined_origin_file=row->item.origin.file; + const size_t joined_origin_line=row->item.origin.line; +); + uchar joined_lang=row->item.lang; + const char *joined_ptr=current; + // calc size + size_t joined_size=0; + STRING_PREPARED_FOREACH_ROW(*this, + if(row->item.lang==joined_lang) + joined_size+=row->item.size; + else + break; // before non-ours + ); + current+=joined_size; + + // pointers are after joined piece + // & one step back, see STRING_FOREACH_ROW + --row; ++countdown; + + result.APPEND(joined_ptr, joined_size, joined_lang, joined_origin_file, joined_origin_line); ); + + if(acstr) + *acstr=lcstr; return result; } @@ -713,6 +705,11 @@ double String::as_double() const { cstr=buf; } else cstr=this->cstr(); + while(*cstr && isspace(*cstr)) + cstr++; + if(!*cstr) + return 0; + char *error_pos; // 0xABC if(cstr[0]=='0') @@ -723,10 +720,11 @@ double String::as_double() const { else result=(double)strtod(cstr, &error_pos); - if(*error_pos/*not EOS*/) - throw Exception("number.format", - this, - "invalid number (double)"); + while(char c=*error_pos++) + if(!isspace(c)) + throw Exception("number.format", + this, + "invalid number (double)"); return result; } @@ -735,12 +733,17 @@ int String::as_int() const { const char *cstr; char buf[MAX_NUMBER]; if(head.chunk.rows+1==append_here) { - int size=min(head.chunk.rows[0].item.size, MAX_NUMBER-1); + size_t size=min(head.chunk.rows[0].item.size, MAX_NUMBER-1); memcpy(buf, head.chunk.rows[0].item.ptr, size); buf[size]=0; cstr=buf; } else cstr=this->cstr(); + while(*cstr && isspace(*cstr)) + cstr++; + if(!*cstr) + return 0; + char *error_pos; // 0xABC if(cstr[0]=='0') @@ -751,10 +754,11 @@ int String::as_int() const { else result=(int)strtol(cstr, &error_pos, 0); - if(*error_pos/*not EOS*/) - throw Exception("number.format", - this, - "invalid number (int)"); + while(char c=*error_pos++) + if(!isspace(c)) + throw Exception("number.format", + this, + "invalid number (int)"); return result; }