--- parser3/src/main/pa_string.C 2001/08/01 12:08:40 1.97 +++ parser3/src/main/pa_string.C 2001/09/06 14:55:06 1.102 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) */ -static const char *RCSId="$Id: pa_string.C,v 1.97 2001/08/01 12:08:40 parser Exp $"; +static const char *RCSId="$Id: pa_string.C,v 1.102 2001/09/06 14:55:06 parser Exp $"; #include "pa_config_includes.h" @@ -20,6 +20,7 @@ static const char *RCSId="$Id: pa_string #include "pa_array.h" #include "pa_globals.h" #include "pa_table.h" +#include "pa_dictionary.h" String::String(Pool& apool, const char *src, size_t src_size, bool tainted) : Pooled(apool), @@ -46,6 +47,7 @@ String::String(const String& src) : size_t src_used_rows=src.fused_rows; if(src_used_rows<=head.count) { // all new rows fit size_to preallocated area + last_chunk=&head; size_t curr_chunk_rows=head.count; memcpy(head.rows, src.head.rows, sizeof(Chunk::Row)*src_used_rows); append_here=&head.rows[src_used_rows]; @@ -64,15 +66,15 @@ String::String(const String& src) : memcpy(head.rows, src.head.rows, sizeof(Chunk::Row)*head.count); // remaining rows size_to new_chunk size_t curr_chunk_rows=src_used_rows-head.count; - Chunk *new_chunk=static_cast( + last_chunk=static_cast( malloc(sizeof(size_t)+sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *))); - new_chunk->count=curr_chunk_rows; - head.preallocated_link=new_chunk; - append_here=link_row=&new_chunk->rows[new_chunk->count]; + last_chunk->count=curr_chunk_rows; + head.preallocated_link=last_chunk; + append_here=link_row=&last_chunk->rows[last_chunk->count]; Chunk *old_chunk=src.head.preallocated_link; - Chunk::Row *new_rows=new_chunk->rows; - size_t rows_left_to_copy=new_chunk->count; + Chunk::Row *new_rows=last_chunk->rows; + size_t rows_left_to_copy=last_chunk->count; while(true) { size_t old_count=old_chunk->count; Chunk *next_chunk=old_chunk->rows[old_count].link; @@ -526,7 +528,7 @@ bool String::match(const unsigned char * int info_substrings=pcre_info(code, 0, 0); if(info_substrings<0) { - (*pcre_free)(code); + pcre_free(code); THROW(0, 0, aorigin, "pcre_info error (%d)", @@ -560,13 +562,13 @@ bool String::match(const unsigned char * exec_option_bits, ovector, ovecsize); if(exec_substrings==PCRE_ERROR_NOMATCH) { - (*pcre_free)(code); - (*row_action)(**table, 0/*last time, no row*/, 0, 0, info); + pcre_free(code); + row_action(**table, 0/*last time, no row*/, 0, 0, info); return option_bits[1]!=0; // global=true+table, not global=false } if(exec_substrings<0) { - (*pcre_free)(code); + pcre_free(code); THROW(0, 0, aorigin, "regular expression execute error (%d)", @@ -583,13 +585,14 @@ bool String::match(const unsigned char * row+=&mid(ovector[i*2+0], ovector[i*2+1]); // .i column value } - (*row_action)(**table, &row, startoffset, ovector[0], info); + row_action(**table, &row, startoffset, ovector[0], info); - if(!option_bits[1] || !(startoffset=ovector[1])) { // not global | going to hang - (*pcre_free)(code); - (*row_action)(**table, 0/*last time, no row*/, 0, 0, info); + if(!option_bits[1] || startoffset==ovector[1]) { // not global | going to hang + pcre_free(code); + row_action(**table, 0/*last time, no row*/, 0, 0, info); return true; } + startoffset=ovector[1]; /* if(option_bits[0] & PCRE_MULTILINE) @@ -651,17 +654,65 @@ break2: return result; } +String& String::replace(Pool& pool, Dictionary& dict) const { + String& result=*new(pool) String(pool); + 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; + + 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 *dest=new_cstr; + while(src_size) { + // there is a row where first column starts 'src' + if(Table::Item *item=dict.first_that_starts(src)) { + // 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(); + } else { + *dest++=*src++; + // reduce work size + src_size--; + } + } + + result.APPEND(new_cstr, dest-new_cstr, + row->item.lang, + row->item.origin.file, row->item.origin.line); + } + chunk=row->link; + } while(chunk); + +break2: + return result; +} + double String::as_double() const { double result; const char *cstr=this->cstr(); - char *error_pos=0; + char *error_pos; // 0xABC - if(cstr[0]=='0' && (cstr[1]=='x' || cstr[1]=='X')) - result=(double)(unsigned long)strtol(cstr, &error_pos, 0); + if(cstr[0]=='0') + if(cstr[1]=='x' || cstr[1]=='X') + result=(double)(unsigned long)strtol(cstr, &error_pos, 0); + else + result=(double)strtod(cstr+1/*skip leading 0*/, &error_pos); else - result=strtod(cstr, &error_pos); + result=(double)strtod(cstr, &error_pos); - if(error_pos && *error_pos) + if(error_pos==cstr/*empty*/ || *error_pos/*not eos*/) THROW(0, 0, this, "invalid number (double)"); @@ -671,14 +722,17 @@ double String::as_double() const { int String::as_int() const { int result; const char *cstr=this->cstr(); - char *error_pos=0; + char *error_pos; // 0xABC - if(cstr[0]=='0' && (cstr[1]=='x' || cstr[1]=='X')) - result=(int)(unsigned long)strtol(cstr, &error_pos, 0); + if(cstr[0]=='0') + if(cstr[1]=='x' || cstr[1]=='X') + result=(int)(unsigned long)strtol(cstr, &error_pos, 0); + else + result=(int)strtol(cstr+1/*skip leading 0*/, &error_pos, 0); else result=(int)strtol(cstr, &error_pos, 0); - if(error_pos && *error_pos) + if(error_pos==cstr/*empty*/ || *error_pos/*not eos*/) THROW(0, 0, this, "invalid number (int)");