--- parser3/src/include/pa_string.h 2003/01/24 11:33:02 1.144.2.5 +++ parser3/src/include/pa_string.h 2003/02/17 07:18:58 1.144.2.24 @@ -1,14 +1,16 @@ /** @file Parser: string class decl. - Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_STRING_H #define PA_STRING_H -static const char* IDENT_STRING_H="$Date: 2003/01/24 11:33:02 $"; +static const char* IDENT_STRING_H="$Date: 2003/02/17 07:18:58 $"; + +// includes #include "pa_pool.h" #include "pa_types.h" @@ -16,32 +18,27 @@ 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; DECLARE_OBJECT_PTR(Table); class SQL_Connection; class Dictionary; +class Request_charsets; +typedef Array ArrayString; DECLARE_OBJECT_PTR(ArrayString); // helpers #ifndef NO_STRING_ORIGIN # define STRING_APPEND_PARAMS \ - const char *src, size_t size, \ - uchar lang, \ - const char *file, uint line + 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, \ + 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) @@ -58,15 +55,17 @@ class Dictionary; /// 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 { - uchar/*Untaint_lang*/ lang; ///< untaint flag, later untaint language - const char *ptr; ///< pointer to the start + 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 + const char* file; ///< macros file name | load file name | sql query text uint line; ///< file line no | record no } origin; ///< origin #endif @@ -83,7 +82,7 @@ struct String_fragment { class String: public Array { size_t fsize; - int count() const; // hiding fro accidental use instead of size() + int count() const { return 0; } // hiding fro accidental use instead of size() public: /** piece is tainted or not. the language to use when detaint @@ -111,32 +110,38 @@ 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 const ConstStringPtr undefined_origin; - //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 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 - bool deserialize(size_t prolog_size, void *buf, size_t buf_size, const char *file); + 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 */ @@ -182,11 +187,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 char *src) { return APPEND_CONST(src); } + String& operator << (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 @@ -201,19 +210,19 @@ public: 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 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(ArrayString& 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, + const char* delim, size_t delim_size, + Untaint_lang lang=UL_UNSPECIFIED, int limit=-1); + void split(ArrayString& 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)(TablePtr table, ArrayStringPtr row, int prestart, int prefinish, int poststart, int postfinish, void *info); @@ -225,9 +234,9 @@ public: @endverbatim */ TablePtr match(Charset& source_charset, - ConstStringPtr aorigin, + StringPtr aorigin, const String& regexp, - ConstStringPtr options, + StringPtr options, Row_action row_action, void *info, bool *was_global=0) const; enum Change_case_kind { @@ -235,10 +244,10 @@ public: 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; @@ -247,22 +256,17 @@ public: const String_fragment::Origin& origin() const; #endif -private: - - Untaint_lang lang_of(size_t offset) const; - 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, - uchar& joined_lang, const char *& joined_ptr, size_t& joined_size) const; + uchar& joined_lang, const char* & joined_ptr, size_t& joined_size) const; */ private: //disabled @@ -270,9 +274,15 @@ private: //disabled }; -// statics -const ConstStringPtr String::undefined_origin=ConstStringPtr(0); +/// 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(StringPtr self) { + return self->hash_code(); +} // helpers