--- parser3/src/include/pa_string.h	2003/04/07 11:57:29	1.144.2.28.2.45
+++ parser3/src/include/pa_string.h	2003/07/24 11:31:21	1.145
@@ -8,7 +8,7 @@
 #ifndef PA_STRING_H
 #define PA_STRING_H
 
-static const char* IDENT_STRING_H="$Date: 2003/04/07 11:57:29 $";
+static const char* IDENT_STRING_H="$Date: 2003/07/24 11:31:21 $";
 
 // includes
 
@@ -50,7 +50,7 @@ public:
 	}
 	/// WARNING: length is only HELPER length, str in ANY case should be zero-terminated
 	StringBody(const char* str, size_t helper_length): body(CORD_EMPTY) {
-		append_help_length(str, helper_length);
+		append_know_length(str, helper_length?helper_length:strlen(str));
 	}
 	static StringBody Format(int value);
 
@@ -67,20 +67,17 @@ public:
 
 	bool is_empty() const { return body==CORD_EMPTY; }
 
-	void append_help_length(const char *str, size_t help_length) {
-#ifndef NDEBUG
-		bool were_empty=is_empty();
-#endif
-		body=CORD_cat_char_star(body, str, help_length);
-
-		assert(!were_empty || body[0] /*append to empty must produce simple string*/);
-	}
-	void append_strdup(const char* str, size_t length) {
-		append_help_length(pa_strdup(str, length), length);
+	void append_know_length(const char *str, size_t known_length) {
+		if(known_length)
+			body=CORD_cat_char_star(body, str, known_length);
+	}
+	void append_strdup_know_length(const char* str, size_t known_length) {
+		if(known_length)
+			append_know_length(pa_strdup(str, known_length), known_length);
 	}
 	void append(char c) { body=CORD_cat_char(body, c); }
 	StringBody& operator << (const StringBody src) { body=CORD_cat(body, src.body); return *this; }
-	StringBody& operator << (const char* str) { body=CORD_cat_char_star(body, str, 0); return *this; }
+	StringBody& operator << (const char* str) { append_know_length(str, strlen(str)); return *this; }
 
 	// could not figure out why this operator is needed [should do this chain: string->simple->==]
 	bool operator < (const StringBody src) const { return CORD_cmp(body, src.body)<0; }
@@ -168,6 +165,7 @@ public:
 		size_t length;  ///< length
 		Fragment(Language alang, size_t asize): lang(alang), length(asize) {
 			assert(alang!=L_UNSPECIFIED);
+			assert(asize!=0);
 			assert(asize!=(size_t)-1);
 		}
 	};
@@ -193,15 +191,31 @@ public:
 			append(src);
 			return *this;
 		}
-		void append(const ArrayFragment& src) { append(src, 0, 0); }
+		void append(const ArrayFragment& src) { append(src, 0, ARRAY_OPTION_LIMIT_ALL); }
 		void append_positions(const ArrayFragment& src, size_t substr_begin, size_t substr_end);
+
+		size_t length() {
+			size_t result=0;
+			for(Array_iterator<element_type> i(*this); i.has_next(); ) {
+				const Fragment fragment=i.next();
+				result+=fragment.length;
+			}
+			return result;
+		}
 	};
 
 	struct C {
+		const char *str;
+		size_t length;
+		operator const char *() { return str; }
+		C(const char *astr, size_t asize): str(astr), length(asize) {}
+	};
+
+	struct Cm {
 		char *str;
 		size_t length;
-		operator char *() { return str; }
-		C(char *astr, size_t asize): str(astr), length(asize) {}
+		//operator char *() { return str; }
+		Cm(char *astr, size_t asize): str(astr), length(asize) {}
 	};
 
 private:
@@ -211,12 +225,16 @@ private:
 
 public:
 
-	explicit String(const char* cstr=0, size_t help_length=0, bool tainted=false);
+	explicit String(const char* cstr=0, size_t helper_length=0, bool tainted=false);
+	explicit String(const C cstr, bool tainted=false);
 	String(const String& src);
 	String(StringBody abody, Language alang): body(abody) {
 		fragments+=Fragment(alang, abody.length());
 	}
 
+#define ASSERT_STRING_INVARIANT(string) \
+	assert((string).body.length()==(string).fragments.length())
+
 	/// for convinient hash lookup
 	operator const StringBody() const { return body; }
 
@@ -241,12 +259,14 @@ public:
 		return cstr_to_string_body(lang, connection, charsets).cstrm();
 	}
 	/// puts pieces to buf
-	C serialize(size_t prolog_size) const;
+	Cm serialize(size_t prolog_size) const;
 	/// appends pieces from buf to self
 	bool deserialize(size_t prolog_size, void *buf, size_t buf_size);
+	/// @see StringBody::append_know_length
+	String& append_know_length(const char* str, size_t known_length, Language lang);
 	/// @see StringBody::append_help_length
 	String& append_help_length(const char* str, size_t helper_length, Language lang);
-	String& append_strdup(const char* str, size_t length, Language lang);
+	String& append_strdup(const char* str, size_t helper_length, Language lang);
 
 	bool operator == (const char* y) const { return body==StringBody(y); }
 	bool operator != (const char* y) const { return body!=StringBody(y); }