--- parser3/src/include/pa_string.h 2001/04/09 14:31:40 1.78 +++ parser3/src/include/pa_string.h 2001/12/17 18:44:51 1.121 @@ -2,37 +2,23 @@ Parser: string class decl. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_string.h,v 1.78 2001/04/09 14:31:40 paf Exp $ + $Id: pa_string.h,v 1.121 2001/12/17 18:44:51 paf Exp $ */ #ifndef PA_STRING_H #define PA_STRING_H -#include "pa_config_includes.h" - -#include -#include - #include "pa_pool.h" #include "pa_types.h" class Table; -/** - $MAIN:html-typo table elements must enlarge string not more that that - that's a tradeoff - otherwise we'd have to scan string twice: - - first for buffer length - - second for replacements themselves -*/ -#define UNTAINT_TIMES_BIGGER 10 - #ifndef NO_STRING_ORIGIN # define STRING_APPEND_PARAMS \ const char *src, size_t size, \ - String::Untaint_lang lang, \ + uchar lang, \ const char *file, uint line /// appends piece to String @see String::real_append # define APPEND(src, size, lang, file, line) \ @@ -41,22 +27,26 @@ class Table; # define STRING_APPEND_PARAMS \ const char *src, \ size_t size, \ - String::Untaint_lang lang + uchar 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 +/// 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_CLEAN(src, 0, 0, 0) +#define APPEND_CONST(src) APPEND_AS_IS(src, 0, 0, 0) class Array; class SQL_Connection; +class Dictionary; /** Pooled string. @@ -78,15 +68,18 @@ class SQL_Connection; - whether they are tainted or not, and the language which should be used to detaint them */ +#include "pa_pragma_pack_begin.h" class String : public Pooled { public: enum { - CR_PREALLOCATED_COUNT=5, ///< default preallocated item count - CR_GROW_PERCENT=60 ///< each time the Array chunk_is_full() array expanded() + CR_PREALLOCATED_COUNT=2, ///< default preallocated item count + CR_GROW_COUNT=2 ///< each time the String chunk_is_full() string expanded() }; - /// piece is tainted or not. the language to use when detaint + /** 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 UL_CLEAN, ///< clean @@ -98,34 +91,40 @@ public: just a flag, that value not stored */ UL_AS_IS, ///< leave all characters intact - UL_FILE_NAME, ///< filename + 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_HTML_TYPO ///< HTML code with TYPOgraphic replacements (for showing) + UL_OPTIMIZE_BIT = 0x80 ///< flag, requiring cstr whitespace optimization }; public: String(Pool& apool, const char *src=0, size_t src_size=0, bool tainted=false); String(const String& src); - size_t size() const { return fsize; } - /// 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; + size_t size() const; /// convert to C string. if 'lang' known, forcing 'lang' to it - char *cstr(Untaint_lang lang=UL_UNSPECIFIED, SQL_Connection *connection=0) const { - char *result=(char *)malloc(size()*UNTAINT_TIMES_BIGGER+1); - char *eol=store_to(result, lang, connection); + char *cstr(Untaint_lang lang=UL_AS_IS, + SQL_Connection *connection=0, + Charset *cstr_charset=0) const { + + char *result=(char *)malloc(cstr_bufsize(lang, connection, cstr_charset)); + char *eol=store_to(result, lang, connection, cstr_charset); *eol=0; return result; } + char *cstr_debug_origins() const; + /// puts pieces to buf + void serialize(size_t prolog_size, void *& buf, size_t& buf_size) const; + /// appends pieces from buf to self + void deserialize(size_t prolog_size, void *buf, size_t buf_size, const char *file); /** append fragment - @see APPEND_CLEAN, APPEND_TAINTED, APPEND_CONST + @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 @@ -159,6 +158,10 @@ public: 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; + } /** appends other String. @@ -166,39 +169,60 @@ public: marking all tainted pieces of it with @a lang. or marking ALL pieces of it with a @a lang when @a forced to. */ - String& append(const String& src, Untaint_lang lang, bool forced=false); + String& append(const String& src, uchar lang, bool forced=false); String& operator << (const String& src) { return append(src, UL_PASS_APPENDED); } String& operator << (const char *src) { return APPEND_CONST(src); } /// simple hash code of string. used by Hash uint hash_code() const; + /// extracts first char of a string + char first_char() const; + /// extracts [start, finish) piece of string String& mid(size_t start, size_t finish) const; /// @return position of substr in string, -1 means "not found" [String version] int pos(const String& substr, - size_t this_offset=0, Untaint_lang lang=UL_UNSPECIFIED) const; + 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, - size_t this_offset=0, Untaint_lang lang=UL_UNSPECIFIED) const; + 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, int limit=-1) const; + Untaint_lang lang=UL_UNSPECIFIED, int limit=-1) const; void split(Array& result, size_t *pos_after_ref, const String& delim, - Untaint_lang lang, int limit=-1) const; + Untaint_lang lang=UL_UNSPECIFIED, int limit=-1) const; typedef void (*Row_action)(Table& table, Array *row, int start, int finish, void *info); - bool match(const String *aorigin, + /** + @return true if fills table. + table format is defined and fixed[can be used by others]: + @verbatim + prematch/match/postmatch/1/2/3/... + @endverbatim + */ + bool match( + const String *aorigin, const String& regexp, const String *options, Table **table, - Row_action row_action, void *info) const; + Row_action row_action, void *info, + bool *was_global=0) const; + enum Change_case_kind { + CC_UPPER, + CC_LOWER + }; + String& change_case(Pool& pool, + Change_case_kind kind) const; + String& replace(Pool& pool, Dictionary& dict) const; + double as_double() const; + int as_int() const; #ifndef NO_STRING_ORIGIN /// origin of string. calculated by first row @@ -207,54 +231,82 @@ public: private: + /// several String fragments struct Chunk { - // the number of rows in chunk - size_t count; + ushort count; ///< the number of rows in chunk + /// string fragment or a link to next chunk union union Row { - // fragment + /// fragment struct { - const char *ptr; // pointer to the start - size_t size; // length - Untaint_lang lang; // untaint flag, later untaint language + const char *ptr; ///< pointer to the start + ushort size; ///< length + unsigned char/*Untaint_lang*/ lang; ///< untaint flag, later untaint language #ifndef NO_STRING_ORIGIN - Origin origin; // origin + Origin origin; ///< origin #endif } item; - Chunk *link; // link to the next chunk in chain + Chunk *link; ///< link to the next chunk in chain } rows[CR_PREALLOCATED_COUNT]; - // next rows are here - Chunk *preallocated_link; } - head; // the head chunk of the chunk chain + head; ///< the head chunk of the chunk chain + Chunk *head_link; ///< next rows are here - // next append would write to this record + /// next append would write to this record Chunk::Row *append_here; - // the address of place where lies address - // of the link to the next chunk to allocate + /** the address of place where lies address + of the link to the next chunk to allocate + */ Chunk::Row *link_row; private: - // last chunk + /// last chunk Chunk *last_chunk; - // string size - size_t fsize; - - // used rows in all chunks - int fused_rows; - private: bool chunk_is_full() { return append_here == link_row; } + uint used_rows() const; void expand(); + size_t cstr_bufsize(Untaint_lang lang, + SQL_Connection *connection, + Charset *buf_charset) 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; + + String& reconstruct(Pool& pool) const; + void join_chain(Pool& pool, + uint& ai, const Chunk*& achunk, const Chunk::Row*& arow, + uchar& joined_lang, const char *& joined_ptr, size_t& joined_size) const; + String& replace_in_reconstructed(Pool& pool, Dictionary& dict) const; + private: //disabled String& operator = (const String&) { return *this; } }; +#include "pa_pragma_pack_end.h" + +#define STRING_PREFIX_FOREACH_ROW(src, body) { \ + const Chunk *chunk=&(src).head; \ + do { \ + const Chunk::Row *row=chunk->rows; \ + for(uint i=0; icount; i++, row++) { \ + if(row==(src).append_here) \ + goto break2; \ + \ + body \ + } \ + chunk=row->link; \ + } while(chunk); \ +} + +#define STRING_FOREACH_ROW(body) STRING_PREFIX_FOREACH_ROW(*this, body) +#define STRING_SRC_FOREACH_ROW(body) STRING_PREFIX_FOREACH_ROW(src, body) #endif