--- parser3/src/include/pa_string.h 2001/04/28 13:38:12 1.85 +++ parser3/src/include/pa_string.h 2001/05/16 16:48:56 1.92 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_string.h,v 1.85 2001/04/28 13:38:12 paf Exp $ + $Id: pa_string.h,v 1.92 2001/05/16 16:48:56 parser Exp $ */ #ifndef PA_STRING_H @@ -22,7 +22,8 @@ class Table; /** - $MAIN:html-typo table elements must enlarge string not more that that + $MAIN:html-typo table elements must enlarge string not more that that. + that's a tradeoff - otherwise we'd have to scan string twice: - first for buffer length - second for replacements themselves @@ -85,8 +86,8 @@ class String : public Pooled { public: enum { - CR_PREALLOCATED_COUNT=5, ///< default preallocated item count - CR_GROW_PERCENT=60 ///< each time the Array chunk_is_full() array expanded() + CR_PREALLOCATED_COUNT=2, ///< default preallocated item count + CR_GROW_COUNT=2 ///< each time the String chunk_is_full() string expanded() }; /// piece is tainted or not. the language to use when detaint @@ -121,6 +122,7 @@ public: char *cstr(Untaint_lang lang=UL_UNSPECIFIED, SQL_Connection *connection=0, const char *charset=0) const { + char *result=(char *)malloc(size()*UNTAINT_TIMES_BIGGER+1); char *eol=store_to(result, lang, connection, charset); *eol=0; @@ -193,20 +195,33 @@ public: void split(Array& result, size_t *pos_after_ref, const char *delim, size_t delim_size, - Untaint_lang lang, int limit=-1) const; + Untaint_lang lang=UL_UNSPECIFIED, int limit=-1) const; void split(Array& result, size_t *pos_after_ref, const String& delim, - Untaint_lang lang, int limit=-1) const; + Untaint_lang lang=UL_UNSPECIFIED, int limit=-1) const; typedef void (*Row_action)(Table& table, Array *row, int start, int finish, void *info); + /** + @return true if fills table. + table format is defined and fixed[can be used by others]: + @verbatim + prematch/match/postmatch/1/2/3/... + @endverbatim + */ bool match(const unsigned char *pcre_tables, const String *aorigin, const String& regexp, const String *options, Table **table, Row_action row_action, void *info) const; + enum Change_case_kind { + CC_UPPER, + CC_LOWER + }; + String& change_case(Pool& pool, const unsigned char *pcre_tables, + Change_case_kind kind) const; #ifndef NO_STRING_ORIGIN /// origin of string. calculated by first row