--- parser3/src/include/pa_string.h 2002/02/20 09:13:07 1.125 +++ parser3/src/include/pa_string.h 2002/02/20 12:40:24 1.129 @@ -4,7 +4,7 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - $Id: pa_string.h,v 1.125 2002/02/20 09:13:07 paf Exp $ + $Id: pa_string.h,v 1.129 2002/02/20 12:40:24 paf Exp $ */ #ifndef PA_STRING_H @@ -109,6 +109,7 @@ public: String(Pool& apool, const char *src=0, size_t src_size=0, bool tainted=false); String(const String& src); + bool is_empty() const { return append_here==head.rows; } size_t size() const; /// convert to C string. if 'lang' known, forcing 'lang' to it char *cstr(Untaint_lang lang=UL_AS_IS, @@ -225,10 +226,14 @@ public: const Origin& origin() const; #endif -public: // debug private: +private: - /// several String fragments - struct Chunk { + /** several String fragments + + 'mutable' because can write after it's end, after it was appended to somebody + @see String::append + */ + mutable struct Chunk { typedef uchar count_type; count_type count; ///< the number of rows in chunk /// string fragment or a link to next chunk union @@ -247,28 +252,21 @@ public: // debug private: } rows[CR_PREALLOCATED_COUNT]; } head; ///< the head chunk of the chunk chain - Chunk *head_link; ///< next rows are here must go right after 'head' + Chunk *initial_head_link; ///< next rows initially are here[can shrink! @see String::append]. must go right after 'head' /// 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 - */ - Chunk::Row *link_row; - private: /// last chunk mutable Chunk *last_chunk; -public: //debug - uint used_rows() const; private: bool chunk_is_full() { - return append_here == link_row; + return append_here == last_chunk->rows+last_chunk->count; } - //uint used_rows() const; + uint used_rows() const; void expand(); Untaint_lang lang_of(size_t offset) const;