--- parser3/src/include/pa_string.h 2003/01/24 08:19:09 1.144.2.4 +++ parser3/src/include/pa_string.h 2003/01/29 09:16:15 1.144.2.13 @@ -8,16 +8,33 @@ #ifndef PA_STRING_H #define PA_STRING_H -static const char* IDENT_STRING_H="$Date: 2003/01/24 08:19:09 $"; +static const char* IDENT_STRING_H="$Date: 2003/01/29 09:16:15 $"; + +// includes #include "pa_pool.h" #include "pa_types.h" #include "pa_array.h" +// forwards + +class String; DECLARE_OBJECT_PTR(String); +typedef object_ptr ConstStringPtr; const ConstStringPtr ConstStringPtrZero(0); + +// forwards + +class Table; +typedef object_ptr TablePtr; +class SQL_Connection; +class Dictionary; +struct Request_charset_info; + +// helpers + #ifndef NO_STRING_ORIGIN # define STRING_APPEND_PARAMS \ const char *src, size_t size, \ - uchar lang, \ + String_UL lang, \ const char *file, uint line /// appends piece to String @see String::real_append # define APPEND(src, size, lang, file, line) \ @@ -26,7 +43,7 @@ static const char* IDENT_STRING_H="$Date # define STRING_APPEND_PARAMS \ const char *src, \ size_t size, \ - uchar lang + String_UL lang /// appends piece to String @see String::real_append # define APPEND(src, size, lang, file, line) \ real_append(src, size, lang) @@ -43,19 +60,12 @@ static const char* IDENT_STRING_H="$Date /// handy: appends const char* piece to String @see String::real_append #define APPEND_CONST(src) APPEND_AS_IS(src, 0, 0, 0) -class String; - -typedef object_ptr StringPtr; -typedef object_ptr ConstStringPtr; - -class Table; -class SQL_Connection; -class Dictionary; +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 - int/*Untaint_lang*/ lang; ///< untaint flag, later untaint language #ifndef NO_STRING_ORIGIN /// all String pieces hold information of where they come from @@ -77,6 +87,7 @@ struct String_fragment { 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 @@ -104,29 +115,37 @@ public: UL_JS, ///< JavaScript code UL_XML, ///< ^dom:set xml UL_HTML, ///< HTML code (for editing) - UL_OPTIMIZE_BIT = 0x80 ///< flag, requiring cstr whitespace optimization + UL_OPTIMIZE_BIT = 0x8000 ///< flag, requiring cstr whitespace optimization }; public: - //static String& OnPool(Pool& apool, const char *local_src=0, size_t src_size=0, bool tainted=false); - String(const char *src=0, size_t src_size=0, bool tainted=false); + 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 - char *cstr(Untaint_lang lang=UL_AS_IS, + CharPtr cstr(Untaint_lang lang=UL_AS_IS, SQL_Connection *connection=0, - Charset *cstr_charset=0, const char *cstr_charset_name=0) const { + const Request_charset_info *charsets=0) const { - char *result=(char *)malloc(cstr_bufsize(lang, connection, cstr_charset)); - char *eol=store_to(result, lang, connection, cstr_charset, cstr_charset_name); + CharPtr result(new char[cstr_bufsize(lang, connection, charsets)]); + char *eol=store_to(result.get(), lang, connection, charsets); *eol=0; return result; } - char *cstr_debug_origins() const; + char *cstr(Pool& pool, Untaint_lang lang=UL_AS_IS, + SQL_Connection *connection=0, + const Request_charset_info *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; + } + char *cstr_debug_origins(Pool& pool) const; /// puts pieces to buf - void serialize(size_t prolog_size, void *& buf, size_t& buf_size) const; + void serialize(Pool& pool, size_t prolog_size, char *& buf, size_t& buf_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 @@ -174,11 +193,15 @@ public: return cmp(partial, src_ptr, 0)!=0; } - String& append(const String& src, uchar lang, bool forced=false); + String& append_to(String& dest, uchar lang, bool forced) const; + String& append(const String& src, uchar lang, bool forced=false) { + return src.append_to(*this, lang, forced); + } String& operator << (const String& src) { return append(src, UL_PASS_APPENDED); } + String& operator << (const StringPtr src) { return append(*src, UL_PASS_APPENDED); } String& operator << (const char *src) { return APPEND_CONST(src); } - /// simple hash code of string. used by Hash + /// simple hash code of string uint hash_code() const; /// extracts first char of a string, if any @@ -196,62 +219,56 @@ public: int pos(const char *substr, size_t substr_size=0, int this_offset=0, Untaint_lang lang=UL_UNSPECIFIED) const; - void split(Array& result, + void split(Array& result, size_t *pos_after_ref, const char *delim, size_t delim_size, Untaint_lang lang=UL_UNSPECIFIED, int limit=-1) const; - void split(Array& result, + void split(Array& result, size_t *pos_after_ref, const String& delim, Untaint_lang lang=UL_UNSPECIFIED, int limit=-1) const; - typedef void (*Row_action)(Table& table, Array *row, + typedef void (*Row_action)(Table& table, Array *row, int prestart, int prefinish, int poststart, int postfinish, void *info); /** - @return true if fills table. + @return table of found items, if any. table format is defined and fixed[can be used by others]: @verbatim prematch/match/postmatch/1/2/3/... @endverbatim */ - bool match(Charset& source_charset, - const String *aorigin, + TablePtr match(Charset& source_charset, + ConstStringPtr aorigin, const String& regexp, - const String *options, - Table **table, + ConstStringPtr options, Row_action row_action, void *info, bool *was_global=0) const; enum Change_case_kind { CC_UPPER, CC_LOWER }; - String& change_case(Charset& source_charset, + StringPtr change_case(Pool& pool, Charset& source_charset, Change_case_kind kind) const; - String& replace(Dictionary& dict) const; + StringPtr replace(Pool& pool, Dictionary& dict) const; double as_double() const; int as_int() const; - String& join_chains(char** cstr) const; + StringPtr join_chains(Pool& pool) const; #ifndef NO_STRING_ORIGIN /// origin of string. calculated by first row const String_fragment::Origin& origin() const; #endif -private: - - Untaint_lang lang_of(size_t offset) const; - - size_t cstr_bufsize(Untaint_lang lang, - SQL_Connection *connection, - Charset *buf_charset) const; + size_t cstr_bufsize(Untaint_lang lang=UL_UNSPECIFIED, + SQL_Connection *connection=0, + const Request_charset_info *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, - Charset *store_to_charset=0, - const char *store_to_charset_name=0) const; + const Request_charset_info *charsets=0) const; /* void join_chain( const Chunk*& achunk, const Chunk::Row*& arow, uint& acountdown, @@ -263,4 +280,27 @@ private: //disabled }; +/// simple hash code of string. used by Hash +inline uint hash_code(const String& self) { + return self.hash_code(); +} +/// simple hash code of string. used by Hash +inline uint hash_code(ConstStringPtr self) { + return self->hash_code(); +} + +// helpers + +#define STRING_PREPARED_FOREACH_FRAGMENT(code) \ + for(; fragment