--- parser3/src/include/pa_string.h 2003/01/27 15:07:47 1.144.2.7 +++ parser3/src/include/pa_string.h 2003/01/31 12:10:45 1.144.2.17 @@ -8,7 +8,9 @@ #ifndef PA_STRING_H #define PA_STRING_H -static const char* IDENT_STRING_H="$Date: 2003/01/27 15:07:47 $"; +static const char* IDENT_STRING_H="$Date: 2003/01/31 12:10:45 $"; + +// includes #include "pa_pool.h" #include "pa_types.h" @@ -16,16 +18,11 @@ static const char* IDENT_STRING_H="$Date // forwards -class String; - -typedef object_ptr StringPtr; -typedef object_ptr ConstStringPtr; -const ConstStringPtr ConstStringPtrZero(0); - -//class Table; -//typedef object_ptr TablePtr; +class Table; +typedef object_ptr
TablePtr; class SQL_Connection; class Dictionary; +class Request_charsets; // helpers @@ -117,9 +114,7 @@ public: }; public: - static const ConstStringPtr undefined_origin; - //static String& OnPool(Pool& apool, const char *local_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(); } @@ -127,14 +122,23 @@ public: /// convert to C string. if 'lang' known, forcing 'lang' to it 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_charsets *charsets=0) const { - CharPtr result(new char[cstr_bufsize(lang, connection, cstr_charset)]); - char *eol=store_to(result.get(), 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_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; + } + 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; /// appends pieces from buf to self @@ -184,8 +188,12 @@ 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 << (StringPtr src) { return append(*src, UL_PASS_APPENDED); } String& operator << (const char *src) { return APPEND_CONST(src); } /// simple hash code of string @@ -206,19 +214,19 @@ 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, + Untaint_lang lang=UL_UNSPECIFIED, int limit=-1); + void split(Array& result, size_t *pos_after_ref, const String& delim, - Untaint_lang lang=UL_UNSPECIFIED, int limit=-1) const; + Untaint_lang lang=UL_UNSPECIFIED, int limit=-1); -/* 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);*/ + void *info); /** @return table of found items, if any. table format is defined and fixed[can be used by others]: @@ -226,21 +234,21 @@ public: prematch/match/postmatch/1/2/3/... @endverbatim */ -/* TablePtr match(Charset& source_charset, - ConstStringPtr aorigin, + TablePtr match(Charset& source_charset, + StringPtr aorigin, const String& regexp, - ConstStringPtr options, + StringPtr options, Row_action row_action, void *info, - bool *was_global=0) const;*/ + bool *was_global=0) const; enum Change_case_kind { CC_UPPER, CC_LOWER }; StringPtr change_case(Pool& pool, Charset& source_charset, - Change_case_kind kind) const; + Change_case_kind kind); StringPtr replace(Pool& pool, Dictionary& dict) const; - double as_double() const; - int as_int() const; + double as_double(); + int as_int(); StringPtr join_chains(Pool& pool) const; @@ -251,12 +259,11 @@ public: size_t cstr_bufsize(Untaint_lang lang=UL_UNSPECIFIED, SQL_Connection *connection=0, - Charset *buf_charset=0) const; + 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, - Charset *store_to_charset=0, - const char *store_to_charset_name=0) const; + const Request_charsets *charsets=0) const; /* void join_chain( const Chunk*& achunk, const Chunk::Row*& arow, uint& acountdown, @@ -273,14 +280,10 @@ 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) { +inline uint hash_code(StringPtr self) { return self->hash_code(); } -// statics - -const ConstStringPtr String::undefined_origin=ConstStringPtr(0); - // helpers #define STRING_PREPARED_FOREACH_FRAGMENT(code) \