--- parser3/src/main/pa_string.C	2003/04/08 11:08:12	1.172.2.21.2.36
+++ parser3/src/main/pa_string.C	2003/04/08 12:47:31	1.172.2.21.2.37
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_STRING_C="$Date: 2003/04/08 11:08:12 $";
+static const char* IDENT_STRING_C="$Date: 2003/04/08 12:47:31 $";
 
 #include "pcre.h"
 
@@ -111,11 +111,26 @@ uint StringBody::hash_code() const {
 String::String(const char* cstr, size_t helper_length, bool tainted): body(CORD_EMPTY) {
 	append_help_length(cstr, helper_length, tainted?L_TAINTED:L_CLEAN);
 }
+String::String(String::C cstr, bool tainted): body(CORD_EMPTY) {
+	append_know_length(cstr, cstr.length, tainted?L_TAINTED:L_CLEAN);
+}
 
 String::String(const String& src): body(src.body) {
 	fragments.append(src.fragments);
+#ifndef NDEBUG
+	invariant();
+#endif
 }
 
+String& String::append_know_length(const char* str, size_t known_length, Language lang) {
+	body.append_know_length(str, known_length);
+	fragments+=Fragment(lang, known_length);
+
+#ifndef NDEBUG
+	invariant();
+#endif
+	return *this;
+}
 String& String::append_help_length(const char* str, size_t helper_length, Language lang) {
 	if(!str)
 		return *this;
@@ -123,10 +138,7 @@ String& String::append_help_length(const
 	if(!known_length)
 		return *this;
 
-	body.append_know_length(str, known_length);
-	fragments+=Fragment(lang, known_length);
-
-	return *this;
+	return append_know_length(str, known_length, lang);
 }
 String& String::append_strdup(const char* str, size_t helper_length, Language lang) {
 	size_t known_length=helper_length?helper_length:strlen(str);
@@ -136,6 +148,9 @@ String& String::append_strdup(const char
 	body.append_strdup_know_length(str, known_length);
 	fragments+=Fragment(lang, known_length);
 
+#ifndef NDEBUG
+	invariant();
+#endif
 	return *this;
 }
 
@@ -157,6 +172,10 @@ String& String::mid(size_t substr_begin,
 
 //	SAPI::log("piece of '%s' from %d to %d is '%s'",
 		//cstr(), substr_begin, substr_end, result.cstr());
+#ifndef NDEBUG
+	result.invariant();
+#endif
+
 	return result;
 }
 
@@ -469,6 +488,9 @@ const String& String::replace(const Dict
 		result.fragments.append_positions(fragments, prematch_begin-old_cstr, current-old_cstr);
 	}
 
+#ifndef NDEBUG
+	result.invariant();
+#endif
 	return result;
 }
 
@@ -545,12 +567,12 @@ static int serialize_body_piece(const ch
 	memcpy(*cur, s, length);  *cur+=length;
 	return 0;
 };
-String::C String::serialize(size_t prolog_length) const {
+String::Cm String::serialize(size_t prolog_length) const {
 	size_t buf_length=
 		prolog_length
 		+fragments.count()*(sizeof(Language)+sizeof(size_t))
 		+length();
-	C result(new(PointerFreeGC) char[buf_length], buf_length);
+	String::Cm result(new(PointerFreeGC) char[buf_length], buf_length);
 
 	// 1: prolog
 	char *cur=result.str+prolog_length;
@@ -611,5 +633,8 @@ bool String::deserialize(size_t prolog_l
 		body=StringBody(cur, buf_length);
 	}
 
+#ifndef NDEBUG
+	invariant();
+#endif
 	return true;
 }