--- parser3/src/main/pa_string.C 2001/03/19 16:44:02 1.45 +++ parser3/src/main/pa_string.C 2003/03/19 12:22:36 1.172.2.21.2.3 @@ -1,184 +1,96 @@ /** @file - Parser - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Parser: string class. @see untasize_t.C. - $Id: pa_string.C,v 1.45 2001/03/19 16:44:02 paf Exp $ + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ -#include +static const char* IDENT_STRING_C="$Date: 2003/03/19 12:22:36 $"; + +#include "pcre.h" -#include "pa_pool.h" #include "pa_string.h" -#include "pa_hash.h" #include "pa_exception.h" +#include "pa_table.h" +#include "pa_dictionary.h" +#include "pa_charset.h" + +// helpers + +/// String::match uses this as replace & global search table columns + +const int MAX_MATCH_GROUPS=100; + +class String_match_table_template_columns: public ArrayString { +public: + String_match_table_template_columns() { + *this+=new String("prematch"); + *this+=new String("match"); + *this+=new String("postmatch"); + for(int i=0; icount+last_chunk->count*CR_GROW_PERCENT/100; - last_chunk=static_cast( - malloc(sizeof(int)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *))); - last_chunk->count=new_chunk_count; - link_row->link=last_chunk; - append_here=last_chunk->rows; - link_row=&last_chunk->rows[last_chunk->count]; - link_row->link=0; -} +String::ArrayFragment& String::ArrayFragment::append(const ArrayFragment& src, + size_t substr_start, size_t substr_end) { + if(substr_start==substr_end) + return *this; -String::String(const String& src) : Pooled(src.pool()) { - head.count=CR_PREALLOCATED_COUNT; - - int src_used_rows=src.fused_rows; - if(src_used_rows<=head.count) { - // all new rows fit into preallocated area - int curr_chunk_rows=head.count; - memcpy(head.rows, src.head.rows, sizeof(Chunk::Row)*src_used_rows); - append_here=&head.rows[src_used_rows]; - link_row=&head.rows[curr_chunk_rows]; - } else { - // warning: - // heavily relies on the fact - // "preallocated area is the same for all strings" - // - // info: - // allocating only enough mem to fit src string rows - // next append would allocate a new chunk - // - // new rows don't fit into preallocated area: splitting into two chunks - // preallocated chunk src to constructing head - memcpy(head.rows, src.head.rows, sizeof(Chunk::Row)*head.count); - // remaining rows into new_chunk - int curr_chunk_rows=src_used_rows-head.count; - Chunk *new_chunk=static_cast( - malloc(sizeof(int)+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]; - - Chunk *old_chunk=src.head.preallocated_link; - Chunk::Row *new_rows=new_chunk->rows; - int rows_left_to_copy=new_chunk->count; - while(true) { - int old_count=old_chunk->count; - Chunk *next_chunk=old_chunk->rows[old_count].link; - if(next_chunk) { - // not last source chunk - // taking it all - memcpy(new_rows, old_chunk->rows, sizeof(Chunk::Row)*old_count); - new_rows+=old_count; - rows_left_to_copy-=old_count; - - old_chunk=next_chunk; - } else { - // the last source chunk - // taking only those rows of chunk that _left_to_copy - memcpy(new_rows, old_chunk->rows, sizeof(Chunk::Row)*rows_left_to_copy); - break; + size_t fragment_start=0; + size_t fragment_end; + for(Array_iterator i(src); ; fragment_start=fragment_end) { + const element_type& fragment=i.next(); + fragment_end=fragment_start+fragment.size; + + if(substr_startfragment_end) { // are there more fragments including pieces of 'substr'? + const element_type& fragment=i.next(); + fragment_end=fragment_start+fragment.size; + + if(substr_end>fragment_end) // are there still more? + simple_append(Fragment(fragment.lang, fragment.size)); // appending whole fragment + else { // no, it was last + simple_append(Fragment(fragment.lang, substr_end-fragment_start)); + goto break2; } } - } - link_row->link=0; - fused_rows=src_used_rows; - fsize=src.fsize; -} -String& String::append(const String& src, Untaint_lang lang, bool forced) { - int src_used_rows=src.fused_rows; - int dst_free_rows=link_row-append_here; + break; + } +break2: - if(src_used_rows<=dst_free_rows) { - // all new rows fit into last chunk - memcpy(append_here, src.head.rows, sizeof(Chunk::Row)*src_used_rows); - set_lang(append_here, lang, forced, src_used_rows); - append_here+=src_used_rows; - } else { - // not all new rows fit into last chunk: shrinking it to used part, - int used_rows=last_chunk->count-dst_free_rows; - //int *countp=append_here - link_row=&last_chunk->rows[last_chunk->count=used_rows]; - // allocating only enough mem to fit src string rows - // next append would allocate a new chunk - last_chunk=static_cast( - malloc(sizeof(int)+sizeof(Chunk::Row)*src_used_rows+sizeof(Chunk *))); - last_chunk->count=src_used_rows; - link_row->link=last_chunk; - append_here=link_row=&last_chunk->rows[src_used_rows]; - - const Chunk *old_chunk=&src.head; - Chunk::Row *new_rows=last_chunk->rows; - int rows_left_to_copy=src_used_rows; - while(true) { - int old_count=old_chunk->count; - Chunk *next_chunk=old_chunk->rows[old_count].link; - if(next_chunk) { - // not last source chunk - // taking it all - memcpy(new_rows, old_chunk->rows, sizeof(Chunk::Row)*old_count); - set_lang(new_rows, lang, forced, old_count); - new_rows+=old_count; - rows_left_to_copy-=old_count; - - old_chunk=next_chunk; - } else { - // the last source chunk - // taking only those rows of chunk that _left_to_copy - memcpy(new_rows, old_chunk->rows, sizeof(Chunk::Row)*rows_left_to_copy); - set_lang(new_rows, lang, forced, rows_left_to_copy); - break; - } - } - link_row->link=0; - } - fused_rows+=src_used_rows; - fsize+=src.fsize; - return *this; } -void String::set_lang(Chunk::Row *row, Untaint_lang lang, bool forced, size_t size) { - if(lang==PASS_APPENDED) - return; - - while(size--) { - Untaint_lang& item_lang=(row++)->item.lang; - if(item_lang==YES || forced) // tainted? need untaint language assignment - item_lang=lang; // assign untaint language - } +/* +void String::ArrayFragment::mid(ArrayFragment& result, size_t substr_start, size_t substr_end) { } +*/ -/*void String::change_lang(Untaint_lang lang) { - Chunk *chunk=&head; - do { - Chunk::Row *row=chunk->rows; - for(int i=0; icount; i++) { - if(row==append_here) - goto break2; +// String methods - row->item.lang=lang; - row++; - } - chunk=row->link; - } while(chunk); -break2: - return; +String::String(const char* src, size_t src_size, bool tainted): body(CORD_EMPTY) { + if(src) + if(tainted) + APPEND_TAINTED(src, src_size, 0, 0); + else + APPEND_CLEAN(src, src_size, 0, 0); } -*/ + +String::String(const String& src): body(src.body), fragments(src.fragments) {} + String& String::real_append(STRING_APPEND_PARAMS) { if(!src) return *this; @@ -187,148 +99,473 @@ String& String::real_append(STRING_APPEN if(!size) return *this; - if(chunk_is_full()) - expand(); - - append_here->item.ptr=src; - fsize+=append_here->item.size=size; - append_here->item.lang=tainted?YES:NO; -#ifndef NO_STRING_ORIGIN - append_here->item.origin.file=file; - append_here->item.origin.line=line; -#endif - append_here++; fused_rows++; + body=CORD_cat_char_star(body, src, size); + fragments+=Fragment(lang, size); return *this; } +static int CORD_batched_iter_fn_generic_hash_code(const char * s, void * client_data) { + uint& result=*static_cast(client_data); + generic_hash_code(result, s); +}; uint String::hash_code() const { uint result=0; + CORD_iter5(body, 0, 0, CORD_batched_iter_fn_generic_hash_code, &result); + return result; +} - const Chunk *chunk=&head; - do { - const Chunk::Row *row=chunk->rows; - for(int i=0; icount; i++) { - if(row==append_here) - goto break2; +const String& String::mid(size_t substr_start, size_t substr_end) const { + String& result=*new String; - result=Hash::generic_code(result, row->item.ptr, row->item.size); - row++; - } - chunk=row->link; - } while(chunk); -break2: + substr_start=min(substr_start, size()); + substr_end=max(substr_start, substr_end); + if(substr_start==substr_end) + return result; + + // first: letters themselves + result.body=CORD_substr(body, substr_start, substr_end-substr_start); + + // next: their langs + result.fragments.append(fragments, substr_start, substr_end); + +// SAPI::log(pool(), "piece of '%s' from %d to %d is '%s'", + //cstr(), substr_start, substr_end, result.cstr()); return result; } -int String::cmp(const String& src) const { - const Chunk *a_chunk=&head; - const Chunk *b_chunk=&src.head; - const Chunk::Row *a_row=a_chunk->rows; - const Chunk::Row *b_row=b_chunk->rows; - int a_offset=0; - int b_offset=0; - Chunk::Row *a_end=append_here; - Chunk::Row *b_end=src.append_here; - int a_countdown=a_chunk->count; - int b_countdown=b_chunk->count; - bool a_break=false; - bool b_break=false; - int result; - while(true) { - a_break=a_row==a_end; - b_break=b_row==b_end; - if(a_break || b_break) +size_t String::pos(CORD substr, + size_t this_offset, Untaint_lang lang) const { + // first: letters themselves + size_t substr_start=CORD_str(body, this_offset, substr); + if(substr_start==CORD_NOT_FOUND) + return NOT_FOUND; + + // next: check the lang when specified + + if(lang==UL_UNSPECIFIED) // ignore lang? + return substr_start; + + // substr must be in one fragment, and fragments' lang must = lang + size_t substr_end=substr_start+CORD_len(substr); + size_t fragment_start=0; + size_t fragment_end; + for(Array_iterator i(fragments); i.has_next(); fragment_start=fragment_end) { + const Fragment& fragment=i.next(); + fragment_end=fragment_start+fragment.size; + + if(substr_startfragment_end) // end of substr OUT of current fragment? break; - int size_diff= - (a_row->item.size-a_offset)- - (b_row->item.size-b_offset); - - if(size_diff==0) { // a has same size as b - result=memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, a_row->item.size-a_offset); - if(result) - return result; - a_row++; a_countdown--; a_offset=0; - b_row++; b_countdown--; b_offset=0; - } else if (size_diff>0) { // a longer - result=memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, b_row->item.size-b_offset); - if(result) - return result; - a_offset+=b_row->item.size-b_offset; - b_row++; b_countdown--; b_offset=0; - } else { // b longer - result=memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, a_row->item.size-a_offset); - if(result) - return result; - b_offset+=a_row->item.size-a_offset; - a_row++; a_countdown--; a_offset=0; - } - - if(!a_countdown) { - a_chunk=a_row->link; - a_row=a_chunk->rows; - a_countdown=a_chunk->count; - } - if(!b_countdown) { - b_chunk=b_row->link; - b_row=b_chunk->rows; - b_countdown=b_chunk->count; + return fragment.lang==lang?substr_end:NOT_FOUND; + } + + return NOT_FOUND; +} + +size_t String::pos(const String& substr, + size_t this_offset, Untaint_lang lang) const { + return pos(substr.body, this_offset, lang); +} + +void String::split(ArrayString& result, + size_t& pos_after, + const char* delim, + Untaint_lang lang, int limit) { + size_t self_size=size(); + if(size_t delim_size=strlen(delim)) { + int pos_before; + // while we have 'delim'... + for(; (pos_before=pos(delim, pos_after, lang))>=0 && limit; limit--) { + result+=&mid(pos_after, pos_before); + pos_after=pos_before+delim_size; + } + // last piece + if(pos_after=0 && limit; limit--) { + result+=&mid(pos_after, pos_before); + pos_after=pos_before+delim.size(); + } + // last piece + if(pos_afterkeyL; o++) + if(options.pos(o->keyL)>=0 + || (o->keyU && options.pos(o->keyU)>=0)) { + if(o->flag) + *o->flag=true; + else { // result + *o->result &= ~o->clear; + *o->result |= o->set; + } + } +} - const Chunk *a_chunk=&head; - const Chunk::Row *a_row=a_chunk->rows; - int a_offset=0; - int b_offset=0; - Chunk::Row *a_end=append_here; - int a_countdown=a_chunk->count; - bool a_break=false; - bool b_break=false; +Table* String::match(Charset& source_charset, + const String& regexp, + const String& options, + Row_action row_action, void *info, + bool& just_matched) const { + if(!regexp) + throw Exception(Exception::undefined_type, + Exception::undefined_source, + "regexp is empty"); + + const char* pattern=regexp.cstr(); + const char* errptr; + int erroffset; + bool need_pre_post_match=false; + int option_bits[2]; regex_options(options, option_bits, need_pre_post_match); + bool global=option_bits[1]!=0; + pcre *code=pcre_compile(pattern, option_bits[0], + &errptr, &erroffset, + source_charset.pcre_tables); + + if(!code) + throw Exception(Exception::undefined_type, + ®exp.mid(erroffset, regexp.size()), + "regular expression syntax error - %s", errptr); + + int subpatterns=pcre_info(code, 0, 0); + if(subpatterns<0) { + pcre_free(code); + throw Exception(0, + ®exp, + "pcre_info error (%d)", + subpatterns); + } + + C subject=cstr(); + const int ovecsize=(1/*match*/+MAX_MATCH_GROUPS)*3; + int ovector[ovecsize]; + + // create table + Table* table=new Table(string_match_table_template); + + int exec_option_bits=0; + int prestart=0; + int poststart=0; + int postfinish=size(); while(true) { - int size_diff= - (a_row->item.size-a_offset)- - (b_size-b_offset); - - if(size_diff==0) { // a has same size as b - if(memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, a_row->item.size-a_offset)!=0) - return false; - a_row++; a_countdown--; a_offset=0; - b_break=true; - } else if (size_diff>0) { // a longer - if(memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, b_size-b_offset)!=0) - return false; - a_offset+=b_size-b_offset; - b_break=true; - } else { // b longer - if(memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, a_row->item.size-a_offset)!=0) - return false; - b_offset+=a_row->item.size-a_offset; - a_row++; a_countdown--; a_offset=0; + int exec_substrings=pcre_exec(code, 0, + subject, subject.size, prestart, + exec_option_bits, ovector, ovecsize); + + if(exec_substrings==PCRE_ERROR_NOMATCH) { + pcre_free(code); + row_action(table, 0/*last time, no raw*/, 0, 0, poststart, postfinish, info); + if(global || subpatterns) + return table; // global or with subpatterns=true+result + else { + just_matched=false; return 0; // not global=no result + } } - a_break=a_row==a_end; - if(a_break || b_break) - break; + if(exec_substrings<0) { + pcre_free(code); + throw Exception(Exception::undefined_type, + ®exp, + "regular expression execute error (%d)", + exec_substrings); + } - if(!a_countdown) { - a_chunk=a_row->link; - a_row=a_chunk->rows; - a_countdown=a_chunk->count; + int prefinish=ovector[0]; + poststart=ovector[1]; + ArrayString* row=new ArrayString; + if(need_pre_post_match) { + *row+=&mid(0, prefinish); // .prematch column value + *row+=&mid(prefinish, poststart); // .match + *row+=&mid(poststart, postfinish); // .postmatch + } else { + *row+=0; // .prematch column value + *row+=0; // .match + *row+=0; // .postmatch } + + for(int i=1; i(kind)); // never + a=b=0; // calm, compiler + break; // never + } + + C new_cstr=cstr(); + const char *end=new_cstr+new_cstr.size; + char *dest=new_cstr; + for(const char* current=new_cstr; currentget(0); size_t a_size=a->size(); + // skip 'a' in 'current', in fragment lang index && reduce work size + current+=a_size; old_pos+=a_size; remaining_size-=a_size; + + if(row->count()>1) { // are there any b? + const String* b=row->get(1); size_t b_size=b->size(); + if(b_size) { + // write 'b' to 'dest' && skip 'b' in 'dest' + b->store_to(dest, String::UL_AS_IS); dest+=b_size; + + // append match fragments + result.fragments.append(b->fragments, 0, b->fragments.count()); + } + } + } else { + // write a char to b && reduce work size + *dest++=*current++; remaining_size--; + } + } while(remaining_size); + + { // postmatch + size_t now_pos=current-old_cstr; + if(now_pos!=old_pos) // have something at end? + result.fragments.append(fragments, old_pos, now_pos-old_pos); + } + + result.body=new_cstr; + return result; +} + +double String::as_double() { + double result; + char buf[MAX_STRING]; + if(size()>MAX_STRING-1) + throw Exception("number.format", + this, + "invalid number too long a string (%u>%u)", size(), MAX_STRING-1); + char *eol=store_to(buf, String::UL_AS_IS); *eol=0; + const char* cstr=buf; + + while(*cstr && isspace(*cstr)) + cstr++; + if(!*cstr) + return 0; + + char *error_pos; + // 0xABC + 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=(double)strtod(cstr, &error_pos); + + while(char c=*error_pos++) + if(!isspace(c)) + throw Exception("number.format", + this, + "invalid number (double)"); + + return result; +} +int String::as_int() { + int result; + char buf[MAX_STRING]; + if(size()>MAX_STRING-1) + throw Exception("number.format", + this, + "invalid number too long a string (%u>%u)", size(), MAX_STRING-1); + char *eol=store_to(buf, String::UL_AS_IS); *eol=0; + const char* cstr=buf; + + while(*cstr && isspace(*cstr)) + cstr++; + if(!*cstr) + return 0; + + char *error_pos; + // 0xABC + 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); + + while(char c=*error_pos++) + if(!isspace(c)) + throw Exception("number.format", + this, + "invalid number (int)"); + + return result; +} + +inline void uint2uchars(uint word, uchar *bytes) { + bytes[0]=word&0xFF; + bytes[1]=(word>>8)&0xFF; + bytes[2]=(word>>16)&0xFF; + bytes[3]=(word>>24)&0xFF; +} +inline uint uchars2uint(uchar *bytes) { + return bytes[3]<<24 + | bytes[2]<<16 + | bytes[1]<<8 + | bytes[0]; +} + +void String::serializesize_t prolog_size, char *& buf, size_t& buf_size) const { + buf_size= + prolog_size + +fused*(sizeof(String_UL)+sizeof(size_t)) + +size(); + buf=new char[buf_size]; + char *cur=buf+prolog_size; + + STRING_FOREACH_FRAGMENT( + // lang + memcpy(cur, &fragment->lang, sizeof(fragment->lang)); + cur+=sizeof(fragment->lang); + // size + // bug on some sparc platform [you can't work with integers on odd pointers] + // forces us to use byte array instead + uchar bytes[4]; + uint2uchars(fragment->size, bytes); + memcpy(cur, &bytes, sizeof(bytes)); cur+=sizeof(bytes); + // bytes + memcpy(cur, fragment->ptr, fragment->size); + cur+=fragment->size; + ); +} +bool String::deserialize(size_t prolog_size, void *buf, size_t buf_size, const char* file) { + if(buf_size<=prolog_size) + return false; + + char *cur=(char *)buf+prolog_size; + buf_size-=prolog_size; + + while(buf_size) { + if(sizeof(String_UL)+sizeof(size_t)>buf_size) // lang+size + return false; + + String_UL lang=*(String_UL *)(cur); + size_t size=uchars2uint((uchar *)cur); + + size_t piece_size=sizeof(String_UL)+sizeof(size_t)+size; + if(piece_size>buf_size) // buffer overrun, can be on incomplete cache files + return false; + + const char* ptr=(const char*)(cur+sizeof(String_UL)+sizeof(size_t)); + APPEND(ptr, size, lang, file, 0); + + cur+=piece_size; + buf_size-=piece_size; } - return a_break==b_break; + return true; }