--- parser3/src/include/pa_string.h 2003/02/03 15:57:43 1.144.2.21 +++ parser3/src/include/pa_string.h 2003/03/24 09:39:55 1.144.2.28.2.22 @@ -8,221 +8,281 @@ #ifndef PA_STRING_H #define PA_STRING_H -static const char* IDENT_STRING_H="$Date: 2003/02/03 15:57:43 $"; +static const char* IDENT_STRING_H="$Date: 2003/03/24 09:39:55 $"; // includes -#include "pa_pool.h" #include "pa_types.h" #include "pa_array.h" +extern "C" { // cord's author forgot to do that +#include "cord.h" +}; + // forwards +class Charset; class Table; -typedef object_ptr TablePtr; class SQL_Connection; class Dictionary; class Request_charsets; +class String; +typedef Array ArrayString; // helpers +/* +/// appends clean piece to String @see String::append +#define APPEND_CLEAN(src, length) append(src, length, String::L_CLEAN) +/// appends piece to String as-is @see String::append +#define APPEND_AS_IS(src, length) append(src, length, String::L_AS_IS) +/// appends tainted piece to String @see String::append +#define APPEND_TAINTED(src, length) append(src, length, String::L_TAINTED) +/// handy: appends const char* piece to String @see String::append +#define APPEND_CONST(src) APPEND_AS_IS(src, 0) +*/ +/// this is result of pos functions which mean that substr were not found +#define STRING_NOT_FOUND ((size_t)-1) + +class StringBody { + + CORD body; + +public: + + StringBody(): body(CORD_EMPTY) {} + StringBody(CORD abody): body(abody) {} + explicit StringBody(const char* str, size_t length): body(CORD_EMPTY) { + append(str, length); + } + + void clear() { body=CORD_EMPTY; } + + uint hash_code() const; + + const char* cstr() const { return CORD_to_const_char_star(body); } + char* cstrm() const { return CORD_to_char_star(body); } + + size_t length() const { return CORD_len(body); } + + bool is_empty() const { return body==CORD_EMPTY; } + + void append(const char *str, size_t length) { + body=CORD_cat_char_star(body, str, length); + } + void append(char c) { body=CORD_cat_char(body, c); } + void append(StringBody src) { body=CORD_cat(body, src.body); } + + // could not figure out why this operator is needed [should do this chain: string->simple->==] + bool operator < (const StringBody& src) const { return CORD_cmp(body, src.body)<0; } + bool operator > (const StringBody& src) const { return CORD_cmp(body, src.body)>0; } + bool operator <= (const StringBody& src) const { return CORD_cmp(body, src.body)<=0; } + bool operator >= (const StringBody& src) const { return CORD_cmp(body, src.body)>=0; } + bool operator != (const StringBody& src) const { return CORD_cmp(body, src.body)!=0; } + bool operator == (const StringBody& src) const { return CORD_cmp(body, src.body)==0; } + + int ncmp(size_t x_begin, const StringBody y, size_t y_begin, size_t size) const { + return CORD_ncmp(body, x_begin, y.body, y_begin, size); + } + + char fetch(size_t index) const { return CORD_fetch(body, index); } + StringBody mid(size_t index, size_t length) const { return CORD_substr(body, index, length); } + size_t pos(size_t offset, const char* substr) const { return CORD_str(body, offset, substr); } + size_t pos(size_t offset, const StringBody substr) const { return CORD_str(body, offset, substr.body); } + + template void for_each(int (*callback)(const char* s, I), I info) const { + CORD_iter5(body, 0, 0, (CORD_batched_iter_fn)callback, info); + } + + void set_pos(CORD_pos& pos, size_t index) const { CORD_set_pos(pos, body, index); } -#ifndef NO_STRING_ORIGIN -# define STRING_APPEND_PARAMS \ - const char* src, size_t size, \ - String_UL lang, \ - const char* file, uint line -/// appends piece to String @see String::real_append -# define APPEND(src, size, lang, file, line) \ - real_append(src, size, lang, file, line) -#else -# define STRING_APPEND_PARAMS \ - const char* src, \ - size_t size, \ - String_UL lang -/// appends piece to String @see String::real_append -# define APPEND(src, size, lang, file, line) \ - real_append(src, size, lang) -#endif -/// appends clean piece to String @see String::real_append -#define APPEND_CLEAN(src, size, file, line) \ - APPEND(src, size, String::UL_CLEAN, file, line) -/// appends piece to String as-is @see String::real_append -#define APPEND_AS_IS(src, size, file, line) \ - APPEND(src, size, String::UL_AS_IS, file, line) -/// appends tainted piece to String @see String::real_append -#define APPEND_TAINTED(src, size, file, line) \ - APPEND(src, size, String::UL_TAINTED, file, line) -/// handy: appends const char* piece to String @see String::real_append -#define APPEND_CONST(src) APPEND_AS_IS(src, 0, 0, 0) - -typedef uint String_UL; - -struct String_fragment { - String_UL/*Untaint_lang*/ lang; ///< untaint flag, later untaint language - const char* ptr; ///< pointer to the start - size_t size; ///< length - -#ifndef NO_STRING_ORIGIN - /// all String pieces hold information of where they come from - struct Origin { - const char* file; ///< macros file name | load file name | sql query text - uint line; ///< file line no | record no - } origin; ///< origin -#endif }; /** String which knows the language of all it's fragments. All pieces remember - - the file and its line they are from [can be turned off by NO_STRING_ORIGIN] - whether they are tainted or not, and the language which should be used to detaint them */ +class String: public PA_Object { + +// friend class StringBody; -class String: public Array { - size_t fsize; - int count() const; // hiding fro accidental use instead of size() public: /** piece is tainted or not. the language to use when detaint remember to change String_Untaint_lang_name @ untaint.C along */ - enum Untaint_lang { - UL_UNSPECIFIED=0, ///< zero value handy for hash lookup @see untaint_lang_name2enum - // these two must go before others, there are checks for >UL_AS_IS - UL_CLEAN, ///< clean - UL_AS_IS, ///< leave all characters intact + enum Language { + L_UNSPECIFIED=0, ///< zero value handy for hash lookup @see untaint_lang_name2enum + // these two must go before others, there are checks for >L_AS_IS + L_CLEAN, ///< clean + L_AS_IS, ///< leave all characters intact - UL_PASS_APPENDED, + L_PASS_APPENDED, /**< leave language built into string being appended. just a flag, that value not stored */ - UL_TAINTED, ///< tainted, untaint language as assigned later + L_TAINTED, ///< tainted, untaint language as assigned later // untaint languages. assigned by ^untaint[lang]{...} - UL_FILE_SPEC, ///< file specification - UL_HTTP_HEADER, ///< text in HTTP response header - UL_MAIL_HEADER, ///< text in mail header - UL_URI, ///< text in uri - UL_TABLE, ///< ^table:set body - UL_SQL, ///< ^table:sql body - UL_JS, ///< JavaScript code - UL_XML, ///< ^dom:set xml - UL_HTML, ///< HTML code (for editing) - UL_OPTIMIZE_BIT = 0x8000 ///< flag, requiring cstr whitespace optimization + L_FILE_SPEC, ///< file specification + L_HTTP_HEADER, ///< text in HTTP response header + L_MAIL_HEADER, ///< text in mail header + L_URI, ///< text in uri + L_TABLE, ///< ^table:set body + L_SQL, ///< ^table:sql body + L_JS, ///< JavaScript code + L_XML, ///< ^dom:set xml + L_HTML, ///< HTML code (for editing) + L_OPTIMIZE_BIT = 0x8000 ///< flag, requiring cstr whitespace optimization + }; + + struct Fragment { + Language lang; ///< untaint flag, later untaint language + size_t length; ///< length + Fragment(Language alang, size_t asize): lang(alang), length(asize) {} + }; + + class ArrayFragment: public Array { + void append(element_type src) { + *static_cast *>(this)+=src; + } + /// hiding from accidental USE, use append_positions + void append(const ArrayFragment& src, int offset, int limit) { + static_cast *>(this)->append(src, offset, limit); + } + public: + ArrayFragment& operator += (element_type src) { + if(count()) { // not empty? + // try to join with last + Fragment& last=get(count()-1); + if(last.lang==src.lang) { + last.length+=src.length; + return *this; + } + } + append(src); + return *this; + } + void append(const ArrayFragment& src) { append(src, 0, 0); } + void append_positions(const ArrayFragment& src, size_t substr_begin, size_t substr_end); + }; + + struct C { + char *str; + size_t length; + operator char *() { return str; } + C(char *astr, size_t asize): str(astr), length(asize) {} }; +private: + + StringBody body; ///< all characters of string + ArrayFragment fragments; ///< fragment language+length info + public: - explicit String(const char* src=0, size_t src_size=0, bool tainted=false); + /// @todo check all places for length to be only HELPER length, and never be !=strlen(cstr) + explicit String(const char* cstr=0, size_t helper_length=0, bool tainted=false); String(const String& src); - bool is_empty() const { return !size(); } - size_t size() const { return fsize; } - /// convert to C string. if 'lang' known, forcing 'lang' to it - CharPtr cstr(Untaint_lang lang=UL_AS_IS, - SQL_Connection *connection=0, - const Request_charsets *charsets=0) const { + String(StringBody abody, Language alang): body(abody) { + fragments+=Fragment(alang, abody.length()); + } + + /// for convinient hash lookup + operator const StringBody() const { return body; } + + bool is_empty() const { return body.is_empty(); } + size_t length() const { return body.length(); } + + /// convert to CORD. if 'lang' known, forcing 'lang' to it + StringBody cstr_to_string_body(Language lang=L_AS_IS, + SQL_Connection* connection=0, + const Request_charsets *charsets=0) const; - CharPtr result(new char[cstr_bufsize(lang, connection, charsets)]); - char *eol=store_to(result.get(), lang, connection, charsets); - *eol=0; - return result; + /// convert to constant C string. if 'lang' known, forcing 'lang' to it + const char* cstr(Language lang=L_AS_IS, + SQL_Connection* connection=0, + const Request_charsets *charsets=0) const { + return cstr_to_string_body(lang, connection, charsets).cstr(); } - char *cstr(Pool& pool, Untaint_lang lang=UL_AS_IS, - SQL_Connection *connection=0, + /// convert to Modifiable C string. if 'lang' known, forcing 'lang' to it + char *cstrm(Language lang=L_AS_IS, + SQL_Connection* connection=0, const Request_charsets *charsets=0) const { - char *result=new(pool) char[cstr_bufsize(lang, connection, charsets)]; - char *eol=store_to(result, lang, connection, charsets); - *eol=0; - return result; + return cstr_to_string_body(lang, connection, charsets).cstrm(); } - char *cstr_debug_origins(Pool& pool) const; /// puts pieces to buf - void serialize(Pool& pool, size_t prolog_size, char *& buf, size_t& buf_size) const; + C serialize(size_t prolog_size) const; /// appends pieces from buf to self bool deserialize(size_t prolog_size, void *buf, size_t buf_size, const char* file); - /** append fragment - @see APPEND_AS_IS, APPEND_CLEAN, APPEND_TAINTED, APPEND_CONST + /** append fragment, + @c length can be zero, it will be autocalced + when length0 depending on comparison result - int cmp (int& partial, const String& src, - size_t this_offset=0, Untaint_lang lang=UL_UNSPECIFIED) const; - bool operator < (const String& src) const { int p; return cmp(p, src)<0; } - bool operator > (const String& src) const { int p; return cmp(p, src)>0; } - bool operator <= (const String& src) const { int p; return cmp(p, src)<=0; } - bool operator >= (const String& src) const { int p; return cmp(p, src)>=0; } - bool operator == (const String& src) const { - if(size()!=src.size()) // can speed up in trivial case - return false; - int p; return cmp(p, src)==0; - } - bool operator != (const String& src) const { int p; return cmp(p, src)!=0; } + String& append(const char* str, size_t length, Language lang); - /** - @param partial - returns partial match status. - - -1: strings too different - - 0: full match - - 1: means @c this starts @c src - - 2: means @src starts @this - */ - int cmp(int& partial, const char* src_ptr, size_t src_size=0, - size_t this_offset=0, Untaint_lang lang=UL_UNSPECIFIED) const; - /// this starts with src - bool starts_with(const char* src_ptr, size_t src_size=0) const { - int p; cmp(p, src_ptr, src_size); - return p==0 || p==2; - } - bool operator == (const char* src_ptr) const { - size_t src_size=src_ptr?strlen(src_ptr):0; - if(size() != src_size) - return false; - int partial; // unused - return cmp(partial, src_ptr, src_size)==0; - } - bool operator != (const char* src_ptr) const { - int partial; // unused - return cmp(partial, src_ptr, 0)!=0; + bool operator == (const char* y) const { return body==StringBody(y); } + bool operator != (const char* y) const { return body!=StringBody(y); } + + /// this starts with y + bool starts_with(const char* y) const { + return body.ncmp(0/*x_begin*/, StringBody(y), 0/*y_begin*/, strlen(y))==0; + } + /// y starts with this + bool this_starts(const char* y) const { + return body.ncmp(0/*x_begin*/, StringBody(y), 0/*y_begin*/, strlen(y))==0; } - String& append_to(String& dest, uchar lang, bool forced) const; - String& append(const String& src, uchar lang, bool forced=false) { + String& append_to(String& dest, Language lang, bool forced) const; + String& append(const String& src, Language lang, bool forced=false) { return src.append_to(*this, lang, forced); } - String& operator << (const String& src) { return append(src, UL_PASS_APPENDED); } - String& operator << (StringPtr src) { return append(*src, UL_PASS_APPENDED); } - String& operator << (const char* src) { return APPEND_CONST(src); } - - /// simple hash code of string - uint hash_code() const; + String& operator << (const String& src) { return append(src, L_PASS_APPENDED); } + String& operator << (const char* src) { return append(src, 0, L_AS_IS); } + String& operator << (const StringBody& src) { + body.append(src); + fragments+=Fragment(L_AS_IS, src.length()); + return *this; + } /// extracts first char of a string, if any char first_char() const { - return is_empty()?0:*felements[0].ptr; + return is_empty()?0:body.fetch(0); } + bool operator < (const String& src) const { return body (const String& src) const { return body>src.body; } + bool operator <= (const String& src) const { return body<=src.body; } + bool operator >= (const String& src) const { return body>=src.body; } + bool operator != (const String& src) const { return body!=src.body; } + bool operator == (const String& src) const { return body==src.body; } + /// extracts [start, finish) piece of string - StringPtr mid(size_t start, size_t finish) const; + String& mid(size_t substr_begin, size_t substr_end) const; - /// @return position of substr in string, -1 means "not found" [String version] - int pos(const String& substr, - int this_offset=0, Untaint_lang lang=UL_UNSPECIFIED) const; - /// @return position of substr in string, -1 means "not found" [const char* version] - int pos(const char* substr, size_t substr_size=0, - int this_offset=0, Untaint_lang lang=UL_UNSPECIFIED) const; - - void split(Array& result, - size_t *pos_after_ref, - const char* delim, size_t delim_size, - Untaint_lang lang=UL_UNSPECIFIED, int limit=-1); - void split(Array& result, - size_t *pos_after_ref, + /** + ignore lang if it's L_UNSPECIFIED + but when specified: look for substring that lies in ONE fragment in THAT lang + @return position of substr in string, -1 means "not found" [const char* version] + */ + size_t pos(const StringBody substr, + size_t this_offset=0, Language lang=L_UNSPECIFIED) const; + /// String version of @see pos(const char*, int, Language) + size_t pos(const String& substr, + size_t this_offset=0, Language lang=L_UNSPECIFIED) const; + + void split(ArrayString& result, + size_t& pos_after, + const char* delim, + Language lang=L_UNSPECIFIED, int limit=-1) const; + void split(ArrayString& result, + size_t& pos_after, const String& delim, - Untaint_lang lang=UL_UNSPECIFIED, int limit=-1); + Language lang=L_UNSPECIFIED, int limit=-1) const; - typedef void (*Row_action)(Table& table, Array *row, + typedef void (*Row_action)(Table* table, ArrayString* row, int prestart, int prefinish, int poststart, int postfinish, void *info); @@ -233,41 +293,21 @@ public: prematch/match/postmatch/1/2/3/... @endverbatim */ - TablePtr match(Charset& source_charset, - StringPtr aorigin, + Table* match(Charset& source_charset, const String& regexp, - StringPtr options, + const String& options, Row_action row_action, void *info, - bool *was_global=0) const; + bool& just_matched) const; enum Change_case_kind { CC_UPPER, CC_LOWER }; - StringPtr change_case(Pool& pool, Charset& source_charset, + String& change_case(Charset& source_charset, Change_case_kind kind); - StringPtr replace(Pool& pool, Dictionary& dict) const; - double as_double(); - int as_int(); - - StringPtr join_chains(Pool& pool) const; - -#ifndef NO_STRING_ORIGIN - /// origin of string. calculated by first row - const String_fragment::Origin& origin() const; -#endif + const String& replace(const Dictionary& dict) const; + double as_double() const; + int as_int() const; - size_t cstr_bufsize(Untaint_lang lang=UL_UNSPECIFIED, - SQL_Connection *connection=0, - const Request_charsets *charsets=0) const; - /// convert to C string, store to 'dest' which must be big enough for proper untaint - char *store_to(char *dest, Untaint_lang lang=UL_UNSPECIFIED, - SQL_Connection *connection=0, - const Request_charsets *charsets=0) const; -/* - void join_chain( - const Chunk*& achunk, const Chunk::Row*& arow, uint& acountdown, - uchar& joined_lang, const char* & joined_ptr, size_t& joined_size) const; -*/ private: //disabled String& operator = (const String&) { return *this; } @@ -275,26 +315,8 @@ private: //disabled }; /// simple hash code of string. used by Hash -inline uint hash_code(const String& self) { +inline uint hash_code(const StringBody& self) { return self.hash_code(); } -/// simple hash code of string. used by Hash -inline uint hash_code(StringPtr self) { - return self->hash_code(); -} - -// helpers - -#define STRING_PREPARED_FOREACH_FRAGMENT(code) \ - for(; fragment