--- parser3/src/include/pa_string.h	2002/02/08 08:30:14	1.124
+++ parser3/src/include/pa_string.h	2002/02/21 14:36:54	1.130
@@ -4,7 +4,7 @@
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_string.h,v 1.124 2002/02/08 08:30:14 paf Exp $
+	$Id: pa_string.h,v 1.130 2002/02/21 14:36:54 paf Exp $
 */
 
 #ifndef PA_STRING_H
@@ -74,7 +74,7 @@ public:
 
 	enum {
 		CR_PREALLOCATED_COUNT=2, ///< default preallocated item count
-		CR_GROW_COUNT=2 ///< each time the String chunk_is_full() string expanded()
+		CR_GROW_COUNT=1 ///< each time the String chunk_is_full() string expanded()
 	};
 
 	/** piece is tainted or not. the language to use when detaint
@@ -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, 
@@ -165,12 +166,6 @@ public:
 		return cmp(partial, src_ptr, 0)!=0; 
 	}
 
-	/** 
-		appends other String.
-
-		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, 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); }
@@ -233,45 +228,47 @@ public:
 
 private:
 
-	/// several String fragments
-	struct Chunk {
-		ushort count; ///< the number of rows in 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
 		union Row {
+			typedef uchar item_size_type;
 			/// fragment
 			struct { 
 				const char *ptr;  ///< pointer to the start
-				ushort size;  ///< length
-				unsigned char/*Untaint_lang*/ lang; ///< untaint flag, later untaint language
+				item_size_type size;  ///< length
+				uchar/*Untaint_lang*/ lang; ///< untaint flag, later untaint language
 #ifndef NO_STRING_ORIGIN
 				Origin origin;  ///< origin
 #endif
 			} item;
 			Chunk *link;  ///< link to the next chunk in chain
-		} rows[CR_PREALLOCATED_COUNT];
+		} rows[CR_PREALLOCATED_COUNT+1/*for head.rows[CR_PREALLOCATED_COUNT].link*/];
 	}
 		head;  ///< the head chunk of the chunk chain
-	Chunk *head_link; ///< next rows are here
 
 	/// 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
-	Chunk *last_chunk;
+	mutable Chunk *last_chunk;
 
 private:
 
 	bool chunk_is_full() {
-		return append_here == link_row;
+		return append_here == last_chunk->rows+last_chunk->count;
 	}
 	uint used_rows() const;
 	void expand();
+	
+	Untaint_lang lang_of(size_t offset) const;
 
 	size_t cstr_bufsize(Untaint_lang lang,
 		SQL_Connection *connection,
@@ -283,7 +280,7 @@ private:
 
 	String& reconstruct(Pool& pool) const;
 	void join_chain(Pool& pool, 
-					   uint& ai, const Chunk*& achunk, const Chunk::Row*& arow,
+					   const Chunk*& achunk, const Chunk::Row*& arow, uint& acountdown, 
 					   uchar& joined_lang, const char *& joined_ptr, size_t& joined_size) const;
 	String& replace_in_reconstructed(Pool& pool, Dictionary& dict) const;
 
@@ -294,18 +291,23 @@ private: //disabled
 };
 #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; i<chunk->count; i++, row++) { \
-			if(row==(src).append_here) \
-				goto break2; \
-			\
-			body \
-		} \
-		chunk=row->link; \
-	} while(chunk); \
+#define STRING_PREPARED_FOREACH_ROW(self, body) \
+	while(row!=(self).append_here) { \
+		if(countdown==0) { \
+			chunk=row->link; \
+			row=chunk->rows; \
+			countdown=chunk->count; \
+		}; \
+		countdown--;\
+		{ body } \
+		row++; \
+	} 
+
+#define STRING_PREFIX_FOREACH_ROW(self, body) { \
+	const Chunk *chunk=&(self).head;  \
+	const Chunk::Row *row=chunk->rows; \
+	uint countdown=chunk->count; \
+	STRING_PREPARED_FOREACH_ROW(self, body) \
 }
 
 #define STRING_FOREACH_ROW(body) STRING_PREFIX_FOREACH_ROW(*this, body)