--- parser3/src/main/pa_string.C 2003/03/20 15:39:03 1.172.2.21.2.12 +++ parser3/src/main/pa_string.C 2003/03/26 07:45:24 1.172.2.21.2.30 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_STRING_C="$Date: 2003/03/20 15:39:03 $"; +static const char* IDENT_STRING_C="$Date: 2003/03/26 07:45:24 $"; #include "pcre.h" @@ -38,10 +38,10 @@ Table string_match_table_template(new St // String::ArrayFragment methods -String::ArrayFragment& String::ArrayFragment::append(const ArrayFragment& src, - size_t substr_begin, size_t substr_end) { +void String::ArrayFragment::append_positions(const ArrayFragment& src, + size_t substr_begin, size_t substr_end) { if(substr_begin==substr_end) - return *this; + return; size_t fragment_begin=0; size_t fragment_end; @@ -49,7 +49,10 @@ String::ArrayFragment& String::ArrayFrag const element_type& fragment=i.next(); fragment_end=fragment_begin+fragment.length; - if(fragment_beginfragment_end) // not reached fragments which may include 'substr'? continue; // found first fragment including piece of 'substr' @@ -63,84 +66,68 @@ String::ArrayFragment& String::ArrayFrag fragment_end=fragment_begin+fragment.length; if(substr_end>fragment_end) // are there still more? - simple_append(Fragment(fragment.lang, fragment.length)); // appending whole fragment + append(Fragment(fragment.lang, fragment.length)); // appending whole fragment else { // no, it was last - simple_append(Fragment(fragment.lang, substr_end-fragment_begin)); - goto break2; + append(Fragment(fragment.lang, substr_end-fragment_begin)); + return; } } break; } -break2: - - return *this; } -/* -void String::ArrayFragment::mid(ArrayFragment& result, size_t substr_begin, size_t substr_end) { -} -*/ -// String methods +// StringBody methods -String::String(const char* cstr, size_t helper_length, bool tainted): body(CORD_EMPTY) { - append_cstr(cstr, helper_length, tainted?UL_TAINTED:UL_CLEAN); +StringBody StringBody::Format(int value) { + char local[MAX_NUMBER]; + size_t length=snprintf(local, MAX_NUMBER, "%d", value); + return StringBody(pa_strdup(local, length), length); } -String::String(const String& src): body(src.body), fragments(src.fragments) {} +static int CORD_batched_iter_fn_generic_hash_code(char c, void * client_data) { + uint& result=*static_cast(client_data); + generic_hash_code(result, c); + return 0; +} +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); + return 0; +}; +uint StringBody::hash_code() const { + uint result=0; + CORD_iter5(body, 0, + CORD_batched_iter_fn_generic_hash_code, + CORD_batched_iter_fn_generic_hash_code, &result); + return result; +} -String& String::append_cstr(const char* heap_variable, size_t helper_length, Untaint_lang lang) { - if(!heap_variable) - return *this; - size_t use_length; - if(helper_length) { -#ifdef _DEBUG - size_t real_length=strlen(heap_variable); - if(helper_length!=real_length) - throw Exception(0, - this, - "bad String::String(real=%d, helper%d", - real_length, helper_length); -#endif - use_length=helper_length; - } else - use_length=strlen(heap_variable); - size_t length=helper_length?helper_length:strlen(heap_variable); - if(!length) - return *this; +// String methods - body=CORD_cat_char_star(body, heap_variable, length); - fragments+=Fragment(lang, length); +String::String(const char* cstr, size_t helper_length, bool tainted): body(CORD_EMPTY) { + append(cstr, helper_length, tainted?L_TAINTED:L_CLEAN); +} - return *this; +String::String(const String& src): body(src.body) { + fragments.append(src.fragments); } -String& String::append_copy(const char* auto_variable, size_t helper_length, Untaint_lang lang) { - if(!auto_variable) +String& String::append(const char* str, size_t length, Language lang) { + if(!str) return *this; - size_t use_length=helper_length?helper_length:strlen(auto_variable); + size_t use_length=length?length:strlen(str); if(!use_length) return *this; - body=pa_strdup(auto_variable, use_length); + body.append(str, use_length); fragments+=Fragment(lang, use_length); 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); - return 0; -}; -uint String::hash_code() const { - uint result=0; - CORD_iter5(body, 0, 0, CORD_batched_iter_fn_generic_hash_code, &result); - return result; -} - /// @todo check in doc: whether it documents NOW bad situation "abc".mid(-1, 3) =were?="ab" -const String& String::mid(size_t substr_begin, size_t substr_end) const { +String& String::mid(size_t substr_begin, size_t substr_end) const { String& result=*new String; size_t self_length=length(); @@ -150,30 +137,30 @@ const String& String::mid(size_t substr_ return result; // first: letters themselves - result.body=CORD_substr(body, substr_begin, substr_end-substr_begin); + result.body=body.mid(substr_begin, substr_end-substr_begin); // next: their langs - result.fragments.append(fragments, substr_begin, substr_end); + result.fragments.append_positions(fragments, substr_begin, substr_end); -// SAPI::log(pool(), "piece of '%s' from %d to %d is '%s'", +// SAPI::log("piece of '%s' from %d to %d is '%s'", //cstr(), substr_begin, substr_end, result.cstr()); return result; } -size_t String::pos(CORD substr, - size_t this_offset, Untaint_lang lang) const { +size_t String::pos(const StringBody substr, + size_t this_offset, Language lang) const { // first: letters themselves - size_t substr_begin=CORD_str(body, this_offset, substr); + size_t substr_begin=body.pos(substr, this_offset); if(substr_begin==CORD_NOT_FOUND) return STRING_NOT_FOUND; // next: check the lang when specified - if(lang==UL_UNSPECIFIED) // ignore lang? + if(lang==L_UNSPECIFIED) // ignore lang? return substr_begin; // substr must be in one fragment, and fragments' lang must = lang - size_t substr_end=substr_begin+CORD_len(substr); + size_t substr_end=substr_begin+substr.length(); size_t fragment_begin=0; size_t fragment_end; for(Array_iterator i(fragments); i.has_next(); fragment_begin=fragment_end) { @@ -189,17 +176,17 @@ size_t String::pos(CORD substr, throw Exception(0, // (*) see below this, "searching for '%s' starting from %ud problem: found begin in one fragment, but end in another", - CORD_to_const_char_star(substr), this_offset); + substr.cstr(), this_offset); - if(fragment.lang==lang) + if(fragment.lang<=lang) return substr_begin; else { // bad lang... /// WARNING: this possibly skips assert (*), but it's fast - substr_begin=CORD_str(body, fragment_end/*...search AFTER for more*/, substr); + substr_begin=body.pos(substr, fragment_end/*...search AFTER for more*/); if(substr_begin==CORD_NOT_FOUND) return STRING_NOT_FOUND; - size_t substr_end=substr_begin+CORD_len(substr); + size_t substr_end=substr_begin+substr.length(); // and continuing with next fragment } } @@ -208,14 +195,14 @@ size_t String::pos(CORD substr, } size_t String::pos(const String& substr, - size_t this_offset, Untaint_lang lang) const { + size_t this_offset, Language 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) { + Language lang, int limit) const { size_t self_length=length(); if(size_t delim_length=strlen(delim)) { int pos_before; @@ -237,9 +224,9 @@ void String::split(ArrayString& result, void String::split(ArrayString& result, size_t& pos_after, - const String& delim, Untaint_lang lang, + const String& delim, Language lang, int limit) const { - if(delim) { + if(!delim.is_empty()) { int pos_before; // while we have 'delim'... for(; (pos_before=pos(delim, pos_after, lang))>=0 && limit; limit--) { @@ -257,7 +244,7 @@ void String::split(ArrayString& result, } } -static void regex_options(const String& options, int *result, bool& need_pre_post_match){ +static void regex_options(const String* options, int *result, bool& need_pre_post_match){ struct Regex_option { const char* keyL; const char* keyU; @@ -276,10 +263,10 @@ static void regex_options(const String& result[0]=PCRE_EXTRA | PCRE_DOTALL | PCRE_DOLLAR_ENDONLY; result[1]=0; - if(options) + if(options && !options->is_empty()) for(Regex_option *o=regex_option; o->keyL; o++) - if(options.pos(o->keyL)>=0 - || (o->keyU && options.pos(o->keyU)>=0)) { + if(options->pos(o->keyL)>=0 + || (o->keyU && options->pos(o->keyU)>=0)) { if(o->flag) *o->flag=true; else { // result @@ -291,10 +278,10 @@ static void regex_options(const String& Table* String::match(Charset& source_charset, const String& regexp, - const String& options, + const String* options, Row_action row_action, void *info, bool& just_matched) const { - if(!regexp) + if(regexp.is_empty()) throw Exception(0, 0, "regexp is empty"); @@ -303,7 +290,7 @@ Table* String::match(Charset& source_cha const char* errptr; int erroffset; bool need_pre_post_match=false; - int option_bits[2]; regex_options(options, option_bits, need_pre_post_match); + int option_bits[2]={0}; 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, @@ -329,7 +316,7 @@ Table* String::match(Charset& source_cha int ovector[oveclength]; // create table - Table* table=new Table(string_match_table_template); + Table& table=*new Table(string_match_table_template); int exec_option_bits=0; int prestart=0; @@ -344,7 +331,7 @@ Table* String::match(Charset& source_cha 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 + return &table; // global or with subpatterns=true+result else { just_matched=false; return 0; // not global=no result } @@ -381,7 +368,7 @@ Table* String::match(Charset& source_cha if(!global || prestart==poststart) { // not global | going to hang pcre_free(code); row_action(table, 0/*last time, no row*/, 0, 0, poststart, postfinish, info); - return table; + return &table; } prestart=poststart; @@ -392,8 +379,10 @@ Table* String::match(Charset& source_cha } } -String& String::change_case(Charset& source_charset, Change_case_kind kind) { +String& String::change_case(Charset& source_charset, Change_case_kind kind) const { String& result=*new String(); + if(is_empty()) + return result; const unsigned char *tables=source_charset.pcre_tables; @@ -428,7 +417,7 @@ String& String::change_case(Charset& sou *dest++=(char)c; } result.body=new_cstr; - result.fragments.append(fragments, 0, fragments.count()); + result.fragments.append(fragments); return result; } @@ -442,8 +431,8 @@ const String& String::replace(const Dict if(Table::element_type row=dict.first_that_begins(current)) { // prematch if(size_t prematch_length=current-prematch_begin) { - result.body=CORD_cat_char_star(result.body, prematch_begin, prematch_length); - result.fragments.append(fragments, prematch_begin-old_cstr, prematch_length); + result.body.append(prematch_begin, prematch_length); + result.fragments.append_positions(fragments, prematch_begin-old_cstr, current-old_cstr); } // match @@ -455,8 +444,8 @@ const String& String::replace(const Dict if(row->count()>1) { // are there any b? const String* b=row->get(1); if(size_t b_length=b->length()) { - result.body=CORD_cat(result.body, b->cstr_to_cord()); - result.fragments.append(b->fragments, 0, b->fragments.count()); + result.body.append(b->cstr_to_string_body()); + result.fragments.append(b->fragments); } } } else // simply advance @@ -464,9 +453,9 @@ const String& String::replace(const Dict } // postmatch - if(size_t prematch_length=current-prematch_begin) { - result.body=CORD_cat_char_star(result.body, prematch_begin, prematch_length); - result.fragments.append(fragments, prematch_begin-old_cstr, prematch_length); + if(size_t postmatch_length=current-prematch_begin) { + result.body.append(prematch_begin, postmatch_length); + result.fragments.append_positions(fragments, prematch_begin-old_cstr, current-old_cstr); } return result; @@ -540,17 +529,15 @@ inline uint uchars2uint(uchar *bytes) { | bytes[0]; } -static int CORD_batched_iter_fn_append(const char* s, void* client_data) { - char*& cur=*static_cast(client_data); - +static int serialize_body_piece(const char* s, char** cur) { size_t length=strlen(s); - memcpy(cur, s, length); cur+=length; + memcpy(*cur, s, length); *cur+=length; return 0; }; String::C String::serialize(size_t prolog_length) const { size_t buf_length= prolog_length - +fragments.count()*(sizeof(Untaint_lang)+sizeof(size_t)) + +fragments.count()*(sizeof(Language)+sizeof(size_t)) +length(); C result(new(PointerFreeGC) char[buf_length], buf_length); @@ -572,11 +559,11 @@ String::C String::serialize(size_t prolo } // 4: letters - CORD_iter5(body, 0, 0, CORD_batched_iter_fn_append, &cur); + body.for_each(serialize_body_piece, &cur); return result; } -bool String::deserialize(size_t prolog_length, void *buf, size_t buf_length, const char* file) { +bool String::deserialize(size_t prolog_length, void *buf, size_t buf_length) { if(buf_length<=prolog_length) return false; buf_length-=prolog_length; @@ -593,11 +580,11 @@ bool String::deserialize(size_t prolog_l // 3: lang info size_t total_length=0; for(size_t f=0; f(cur); cur+=sizeof(Untaint_lang); + Language lang=*reinterpret_cast(cur); cur+=sizeof(Language); size_t fragment_length=*reinterpret_cast(cur); cur+=sizeof(size_t); fragments+=Fragment(lang, fragment_length); total_length+=fragment_length;