--- parser3/src/main/pa_string.C 2003/03/20 15:05:58 1.172.2.21.2.11 +++ parser3/src/main/pa_string.C 2003/03/20 16:57:43 1.172.2.21.2.13 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_STRING_C="$Date: 2003/03/20 15:05:58 $"; +static const char* IDENT_STRING_C="$Date: 2003/03/20 16:57:43 $"; #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; @@ -63,18 +63,15 @@ 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) { @@ -84,45 +81,19 @@ void String::ArrayFragment::mid(ArrayFra // String 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); + append(cstr, helper_length, tainted?UL_TAINTED:UL_CLEAN); } String::String(const String& src): body(src.body), fragments(src.fragments) {} -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; - - body=CORD_cat_char_star(body, heap_variable, length); - fragments+=Fragment(lang, length); - - return *this; -} - -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 helper_length, Untaint_lang lang) { + if(!str) return *this; - size_t use_length=helper_length?helper_length:strlen(auto_variable); + size_t use_length=helper_length?helper_length:strlen(str); if(!use_length) return *this; - body=pa_strdup(auto_variable, use_length); + body=CORD_cat_char_star(body, str, use_length); fragments+=Fragment(lang, use_length); return *this; @@ -153,7 +124,7 @@ const String& String::mid(size_t substr_ result.body=CORD_substr(body, 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'", //cstr(), substr_begin, substr_end, result.cstr()); @@ -182,11 +153,26 @@ size_t String::pos(CORD substr, if(substr_begin=fragment_end) // begin of substr OUT of current fragment? + continue; if(substr_end>fragment_end) // end of substr OUT of current fragment? - break; + 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); - return fragment.lang==lang?substr_end:STRING_NOT_FOUND; + 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); + if(substr_begin==CORD_NOT_FOUND) + return STRING_NOT_FOUND; + + size_t substr_end=substr_begin+CORD_len(substr); + // and continuing with next fragment + } } return STRING_NOT_FOUND; @@ -413,7 +399,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; } @@ -428,7 +414,7 @@ const String& String::replace(const Dict // 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.fragments.append_positions(fragments, prematch_begin-old_cstr, prematch_length); } // match @@ -441,7 +427,7 @@ const String& String::replace(const Dict 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.fragments.append(b->fragments); } } } else // simply advance @@ -449,9 +435,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=CORD_cat_char_star(result.body, prematch_begin, postmatch_length); + result.fragments.append_positions(fragments, prematch_begin-old_cstr, postmatch_length); } return result;