--- parser3/src/main/pa_string.C 2003/03/20 16:57:43 1.172.2.21.2.13 +++ parser3/src/main/pa_string.C 2003/04/02 10:10:01 1.172.2.21.2.35 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_STRING_C="$Date: 2003/03/20 16:57:43 $"; +static const char* IDENT_STRING_C="$Date: 2003/04/02 10:10:01 $"; #include "pcre.h" @@ -28,8 +28,7 @@ public: *this+=new String("match"); *this+=new String("postmatch"); for(int i=0; i i(src); ; fragment_begin=fragment_end) { - const element_type& fragment=i.next(); + 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' @@ -59,7 +61,7 @@ void String::ArrayFragment::append_posit while(substr_end>fragment_end) { // are there more fragments including pieces of 'substr'? fragment_begin=fragment_end; - const element_type& fragment=i.next(); + const element_type fragment=i.next(); fragment_end=fragment_begin+fragment.length; if(substr_end>fragment_end) // are there still more? @@ -73,45 +75,64 @@ void String::ArrayFragment::append_posit break; } } -/* -void String::ArrayFragment::mid(ArrayFragment& result, size_t substr_begin, size_t substr_end) { + +// StringBody methods + +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); +} + +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 methods -String::String(const char* cstr, size_t helper_length, bool tainted): body(CORD_EMPTY) { - append(cstr, helper_length, tainted?UL_TAINTED:UL_CLEAN); +String::String(const char* cstr, size_t help_length, bool tainted): body(CORD_EMPTY) { + append_help_length(cstr, help_length, tainted?L_TAINTED:L_CLEAN); } -String::String(const String& src): body(src.body), fragments(src.fragments) {} +String::String(const String& src): body(src.body) { + fragments.append(src.fragments); +} -String& String::append(const char* str, size_t helper_length, Untaint_lang lang) { +String& String::append_help_length(const char* str, size_t helper_length, Language lang) { if(!str) return *this; size_t use_length=helper_length?helper_length:strlen(str); if(!use_length) return *this; - body=CORD_cat_char_star(body, str, use_length); + body.append_help_length(str, use_length); fragments+=Fragment(lang, use_length); return *this; } +String& String::append_strdup(const char* str, size_t length, Language lang) { + body.append_strdup(str, length); + fragments+=Fragment(lang, length); -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; + return *this; } /// @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(); @@ -121,34 +142,34 @@ 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_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) { - const Fragment& fragment=i.next(); + const Fragment fragment=i.next(); fragment_end=fragment_begin+fragment.length; if(substr_begin=0 && limit; limit--) { @@ -228,7 +249,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; @@ -247,10 +268,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 @@ -262,10 +283,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"); @@ -274,7 +295,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, @@ -300,7 +321,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; @@ -315,7 +336,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 } @@ -352,7 +373,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; @@ -363,8 +384,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; @@ -409,12 +432,13 @@ const String& String::replace(const Dict const char* old_cstr=cstr(); const char* prematch_begin=old_cstr; - for(const char* current=old_cstr; *current; ) { + const char* current=old_cstr; + while(*current) { 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_positions(fragments, prematch_begin-old_cstr, prematch_length); + result.body.append_strdup(prematch_begin, prematch_length); + result.fragments.append_positions(fragments, prematch_begin-old_cstr, current-old_cstr); } // match @@ -426,7 +450,7 @@ 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.body<cstr_to_string_body(); result.fragments.append(b->fragments); } } @@ -436,8 +460,8 @@ const String& String::replace(const Dict // postmatch 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); + result.body.append_strdup(prematch_begin, postmatch_length); + result.fragments.append_positions(fragments, prematch_begin-old_cstr, current-old_cstr); } return result; @@ -511,17 +535,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); @@ -535,7 +557,7 @@ String::C String::serialize(size_t prolo // 3: lang info for(Array_iterator i(fragments); i.has_next(); ) { - const Fragment& fragment=i.next(); + const Fragment fragment=i.next(); // lang memcpy(cur, &fragment.lang, sizeof(fragment.lang)); cur+=sizeof(fragment.lang); // length @@ -543,11 +565,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; @@ -564,11 +586,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;