--- parser3/src/main/pa_string.C	2003/03/26 07:45:24	1.172.2.21.2.30
+++ parser3/src/main/pa_string.C	2003/03/27 10:04:08	1.172.2.21.2.32
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_STRING_C="$Date: 2003/03/26 07:45:24 $";
+static const char* IDENT_STRING_C="$Date: 2003/03/27 10:04:08 $";
 
 #include "pcre.h"
 
@@ -105,8 +105,8 @@ uint StringBody::hash_code() const {
 
 // String methods
 
-String::String(const char* cstr, size_t helper_length, bool tainted): body(CORD_EMPTY) {
-	append(cstr, helper_length, tainted?L_TAINTED:L_CLEAN);
+String::String(const char* cstr, size_t length, bool tainted): body(CORD_EMPTY) {
+	append(cstr, length, tainted?L_TAINTED:L_CLEAN);
 }
 
 String::String(const String& src): body(src.body) {
@@ -427,7 +427,8 @@ const String& String::replace(const Dict
 	const char* old_cstr=cstr();
 	const char* prematch_begin=old_cstr;
 
-	for(const char* current=old_cstr; *current; ) {
+	const char* current=old_cstr;
+	while(*current) {
 		if(Table::element_type row=dict.first_that_begins(current)) {
 			// prematch
 			if(size_t prematch_length=current-prematch_begin) {
@@ -444,7 +445,7 @@ const String& String::replace(const Dict
 			if(row->count()>1) { // are there any b?
 				const String* b=row->get(1);
 				if(size_t b_length=b->length()) {
-					result.body.append(b->cstr_to_string_body());
+					result.body<<b->cstr_to_string_body();
 					result.fragments.append(b->fragments);
 				}
 			}