--- parser3/src/include/pa_string.h 2003/01/31 12:34:31 1.144.2.18 +++ parser3/src/include/pa_string.h 2003/10/21 05:11:00 1.151 @@ -8,222 +8,453 @@ #ifndef PA_STRING_H #define PA_STRING_H -static const char* IDENT_STRING_H="$Date: 2003/01/31 12:34:31 $"; +static const char* IDENT_STRING_H="$Date: 2003/10/21 05:11:00 $"; // includes -#include "pa_pool.h" #include "pa_types.h" #include "pa_array.h" +extern "C" { // cord's author forgot to do that +#define CORD_NO_IO +#include "cord.h" +}; + +// cord extension +/* Returns true if x does contain */ +/* char not_c at positions i..i+n. Value i,i+n must be < CORD_len(x). */ +int CORD_range_contains_chr_greater_then(CORD x, size_t i, size_t n, int c); +size_t CORD_block_count(CORD x); + // forwards +class Charset; class Table; -typedef object_ptr TablePtr; class SQL_Connection; class Dictionary; class Request_charsets; +class String; +typedef Array ArrayString; -// helpers +/// this is result of pos functions which mean that substr were not found +#define STRING_NOT_FOUND ((size_t)-1) -#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 -}; +template +inline size_t get_length(T current) { + return current; +} /** - String which knows the language of all it's fragments. + String which knows the lang of all it's langs. 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 + and the lang which should be used to detaint them */ - -class String: public Array { - size_t fsize; - int count() const; // hiding fro accidental use instead of size() +class String: public PA_Object { public: - /** piece is tainted or not. the language to use when detaint + /** piece is tainted or not. the lang to use when detaint remember to change String_Untaint_lang_name @ untaint.C along + + WARNING WARNING WARNING WARNING WARNING WARNING + + pos function compares(<=) languages, that is used in searching + for table column separator being L_CLEAN or L_AS_IS. + they search for AS_IS, meaning AS_IS|CLEAN [doing <=L_AS_IS check]. + + letters assigned for debugging, but it's important for no language-letter + come before L_AS_IS other then L_CLEAN + + WARNING WARNING WARNING WARNING WARNING WARNING */ - 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, ///< no real string has parts of this lange: it's just convinient to check when string's empty + // these two must go before others, there are checks for >L_AS_IS + L_CLEAN='0', ///< clean WARNING: read above warning before changing + L_AS_IS='A', ///< leave all characters intact WARNING: read above warning before changing - UL_PASS_APPENDED, + L_PASS_APPENDED='P', /**< - leave language built into string being appended. + leave lang built into string being appended. just a flag, that value not stored */ - UL_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_TAINTED='T', ///< tainted, untaint lang as assigned later + // untaint langs. assigned by ^untaint[lang]{...} + L_FILE_SPEC='F', ///< file specification + L_HTTP_HEADER='h', ///< text in HTTP response header + L_MAIL_HEADER='m', ///< text in mail header + L_URI='U', ///< text in uri + L_TABLE='L', ///< ^table:set body + L_SQL='Q', ///< ^table:sql body + L_JS='J', ///< JavaScript code + L_XML='X', ///< ^dom:set xml + L_HTML='H', ///< HTML code (for editing) + // READ WARNING ABOVE BEFORE ADDING ANYTHING + L_OPTIMIZE_BIT = 0x80 ///< flag, requiring cstr whitespace optimization + }; + + union Languages { + + struct { + Language lang:8; + int is_not_just_lang:sizeof(CORD)*8-8; + } opt; + CORD langs; + + template + CORD make_langs(C current) const { + return opt.is_not_just_lang? + langs + :CORD_chars((char)opt.lang, get_length(current)); + } + + CORD make_langs(size_t aoffset, size_t alength) const { + return opt.is_not_just_lang? + CORD_substr(langs, aoffset, alength) + :CORD_chars((char)opt.lang, alength); + } + + /// appending when 'langs' already contain something [simple cases hanled elsewhere] + template + void append(C current, + const CORD to_nonempty_target_langs) { + assert(langs); + + if(opt.is_not_just_lang) + langs=CORD_cat(langs, to_nonempty_target_langs); + else { // we were "just lang" + size_t current_size=get_length(current); + assert(current_size); + langs=CORD_cat( + CORD_chars((char)opt.lang, current_size), // first piece [making from just 'lang'] + to_nonempty_target_langs); // new piece + } + } + + public: + + const char* v() const; + + Languages(): langs(0) {} + Languages(Language alang) { + opt.lang=alang; + opt.is_not_just_lang=0; + } + + /// MUST be called exactly prior to modification of current [uses it's length] + template + void append(C current, Language alang, size_t asize) { + assert(alang); + assert(asize); + + if(!opt.is_not_just_lang) + if(opt.lang) { + if(opt.lang==alang) // same length? ignoring + return; + } else { + opt.lang=alang; // to uninitialized + return; + } + + append(current, CORD_chars((char)alang, asize)); + } + + /// MUST be called exactly prior to modification of current [uses it's length] + template + void append(C current, size_t appending_length, + const Languages src) { + assert(appending_length); + + if(!langs) + langs=src.langs; // to uninitialized + else if(!src.opt.is_not_just_lang) + append(current, src.opt.lang, appending_length); // simplifying when simple source + else + append(current, src.make_langs(appending_length)); + } + + /// MUST be called exactly prior to modification of current [uses it's length] + template + void append(C current, + const Languages src, size_t aoffset, size_t alength) { + assert(alength); + + if(!langs) // to uninitialized? + if(src.opt.is_not_just_lang) + langs=CORD_substr(src.langs, aoffset, alength); // to uninitialized complex + else + opt.lang=src.opt.lang; // to uninitialized simple + else + if(!opt.is_not_just_lang && !src.opt.is_not_just_lang && opt.lang==src.opt.lang) // both simple & of same language? + return; // ignoring + else + append(current, src.make_langs(aoffset, alength)); + } + + /// checks if we have lang<=alang all from aoffset to aoffset+alength + bool check_lang(Language alang, size_t aoffset, size_t alength) const { + if(alang==L_UNSPECIFIED) // ignore lang? + return true; + + if(opt.is_not_just_lang) + return CORD_range_contains_chr_greater_then(langs, aoffset, alength, (unsigned)alang)==0; + else + return opt.lang<=alang; + } + + /// @returns count of blocks + /// @todo currently there can be adjucent blocks of same language. someday merge them + size_t count() const { + return opt.is_not_just_lang? + CORD_block_count(langs) + : opt.lang? + 1 + : 0; + }; + + template + void for_each(C current, + int callback(char, size_t, I), I info) const { + + if(opt.is_not_just_lang) + CORD_block_iter(langs, 0, (CORD_block_iter_fn)callback, info); + else + callback(opt.lang, get_length(current), info); + } + + bool invariant(size_t current_length) { + if(!langs) + return current_length==0; + if(opt.is_not_just_lang) + return CORD_len(langs)==current_length; + return true; // uncheckable, actually + } + }; + + class Body { + + CORD body; + + public: + + const char* v() const; + + Body(): body(CORD_EMPTY) {} + Body(CORD abody): body(abody) { + assert(!body // no body + || *body // ordinary string + || body[1]==1 // CONCAT_HDR + || body[1]==4 // FN_HDR + || body[1]==6 // SUBSTR_HDR + ); + } + /// WARNING: length is only HELPER length, str in ANY case should be zero-terminated + Body(const char* str, size_t helper_length): body(CORD_EMPTY) { + append_know_length(str, helper_length?helper_length:strlen(str)); + } + static Body Format(int value); + + void clear() { body=CORD_EMPTY; } + + bool operator! () const { return is_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_know_length(const char *str, size_t known_length) { + if(known_length) + body=CORD_cat_char_star(body, str, known_length); + } + void append_strdup_know_length(const char* str, size_t known_length) { + if(known_length) + append_know_length(pa_strdup(str, known_length), known_length); + } + void append(char c) { body=CORD_cat_char(body, c); } + Body& operator << (const Body src) { body=CORD_cat(body, src.body); return *this; } + Body& operator << (const char* str) { append_know_length(str, strlen(str)); return *this; } + + // could not figure out why this operator is needed [should do this chain: string->simple->==] + bool operator < (const Body src) const { return CORD_cmp(body, src.body)<0; } + bool operator > (const Body src) const { return CORD_cmp(body, src.body)>0; } + bool operator <= (const Body src) const { return CORD_cmp(body, src.body)<=0; } + bool operator >= (const Body src) const { return CORD_cmp(body, src.body)>=0; } + bool operator != (const Body src) const { return CORD_cmp(body, src.body)!=0; } + bool operator == (const Body src) const { return CORD_cmp(body, src.body)==0; } + + int ncmp(size_t x_begin, const Body 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); } + Body mid(size_t index, size_t length) const { return CORD_substr(body, index, length); } + size_t pos(const char* substr, size_t offset=0) const { return CORD_str(body, offset, substr); } + size_t pos(const Body substr, size_t offset=0) const { + if(!substr.length()) + return STRING_NOT_FOUND; // in this case CORD_str returns 0 [parser users got used to -1] + + // CORD_str checks for bad offset [CORD_chr does not] + return CORD_str(body, offset, substr.body); + } + size_t pos(char c, + size_t offset=0) const { + if(offset>=length()) // CORD_chr does not check that [and ABORT's in that case] + return STRING_NOT_FOUND; + + return CORD_chr(body, offset, c); + } + + template void for_each( + int (*f1)(char c, I), + int (*f2)(const char* s, I), + I info) const { + CORD_iter5(body, 0, (CORD_iter_fn)f1, (CORD_batched_iter_fn)f2, info); + } + + void set_pos(CORD_pos& pos, size_t index) const { CORD_set_pos(pos, body, index); } + + /*Body normalize() const { + return Body(CORD_balance(body)); + }*/ + }; + + struct C { + const char *str; + size_t length; + operator const char *() { return str; } + C(const char *astr, size_t asize): str(astr), length(asize) {} + }; + + struct Cm { + char *str; + size_t length; + //operator char *() { return str; } + Cm(char *astr, size_t asize): str(astr), length(asize) {} }; +private: + + Languages langs; ///< string characters lang + Body body; ///< all characters of string + + const char* v() const; + +#define ASSERT_STRING_INVARIANT(string) \ + assert((string).langs.invariant((string).body.length())) + public: - explicit String(const char* src=0, size_t src_size=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 { + static const String Empty; - CharPtr result(new char[cstr_bufsize(lang, connection, charsets)]); - char *eol=store_to(result.get(), lang, connection, charsets); - *eol=0; - return result; + explicit String(const char* cstr=0, size_t helper_length=0, bool tainted=false); + explicit String(const C cstr, bool tainted=false); + String(Body abody, Language alang): body(abody), langs(alang) { + assert(!body.is_empty()); + ASSERT_STRING_INVARIANT(*this); + } + String(const String& src): body(src.body), langs(src.langs) { + ASSERT_STRING_INVARIANT(*this); } - char *cstr(Pool& pool, Untaint_lang lang=UL_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; + /// for convinient hash lookup + operator const Body() 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 + Body cstr_to_string_body(Language lang=L_AS_IS, + SQL_Connection* connection=0, + const Request_charsets *charsets=0) const; + + /// 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(); + } + /// 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 { + 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; + Cm 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 - */ - String& real_append(STRING_APPEND_PARAMS); - /// @return <0 ==0 or >0 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 deserialize(size_t prolog_size, void *buf, size_t buf_size); + /// @see Body::append_know_length + String& append_know_length(const char* str, size_t known_length, Language lang); + /// @see Body::append_help_length + String& append_help_length(const char* str, size_t helper_length, Language lang); + String& append_strdup(const char* str, size_t helper_length, Language lang); + + bool operator == (const char* y) const { return body==Body(y); } + bool operator != (const char* y) const { return body!=Body(y); } + + /// this starts with y + bool starts_with(const char* y) const { + return body.ncmp(0/*x_begin*/, Body(y), 0/*y_begin*/, strlen(y))==0; } - bool operator != (const String& src) const { int p; return cmp(p, src)!=0; } - - /** - @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; + /// x starts with this + bool this_starts(const char* x) const { + return Body(x).ncmp(0/*x_begin*/, body, 0/*y_begin*/, length())==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_help_length(src, 0, L_AS_IS); } + String& operator << (const Body src); /// 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 Body 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; + size_t pos(char c, + size_t this_offset=0) const { + return body.pos(c, this_offset); + } + + 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); @@ -234,68 +465,44 @@ 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, - 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 + String& change_case(Charset& source_charset, + Change_case_kind kind) const; + 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; } }; -/// simple hash code of string. used by Hash -inline uint hash_code(const String& self) { - return self.hash_code(); +template<> +inline size_t get_length(String::Body body) { + return body.length(); } + /// simple hash code of string. used by Hash -inline uint hash_code(StringPtr self) { - return self->hash_code(); +inline uint hash_code(const String::Body self) { + return self.hash_code(); } -// helpers -#define STRING_PREPARED_FOREACH_FRAGMENT(code) \ - for(; fragment