--- parser3/src/classes/string.C	2001/04/04 10:50:33	1.35
+++ parser3/src/classes/string.C	2001/04/08 13:11:15	1.37
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: string.C,v 1.35 2001/04/04 10:50:33 paf Exp $
+	$Id: string.C,v 1.37 2001/04/08 13:11:15 paf Exp $
 */
 
 #include "pa_request.h"
@@ -46,7 +46,7 @@ static void _double(Request& r, const St
 
 	Value& fmt=*static_cast<Value *>(params->get(0));
 	// forcing {this param type}
-	r.fail_if_junction_(false, fmt, method_name, "fmt must be junction");
+	r.fail_if_junction_(false, fmt, method_name, "fmt must be code");
 
 	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
 	char *buf=format(pool, r.self->as_double(), r.process(fmt).as_string().cstr());
@@ -87,7 +87,7 @@ static void _pos(Request& r, const Strin
 
 	Value& substr=*static_cast<Value *>(params->get(0));
 	// forcing [this param type]
-	r.fail_if_junction_(true, substr, method_name, "substr must not be junction");
+	r.fail_if_junction_(true, substr, method_name, "substr must not be code");
 	
 	const String& string=*static_cast<VString *>(r.self)->get_string();
 	r.write_assign_lang(*new(pool) VInt(pool, string.pos(substr.as_string())));
@@ -100,7 +100,7 @@ static void split_list(Request& r, const
 
 	Value& delim_value=*static_cast<Value *>(params->get(0));
 	// forcing [this param type]
-	r.fail_if_junction_(true, delim_value, method_name, "delimiter must not be junction");
+	r.fail_if_junction_(true, delim_value, method_name, "delimiter must not be code");
 
 	string.split(result, 0, delim_value.as_string(), String::UL_CLEAN, -1);
 }
@@ -154,7 +154,7 @@ static void replace_action(Table& table,
 	if(row) { // begin&middle
 		// piece from last match['start'] to beginning of this match['finish']
 		if(start!=finish)
-			ai.dest->append(ai.src->mid(start, finish), String::UL_PASS_APPENDED);//ai.dest->APPEND_CONST("-");
+			*ai.dest << ai.src->mid(start, finish);//ai.dest->APPEND_CONST("-");
 		// store found parts in one-record Vtable
 		if(table.size()) // middle
 			table.put(0, row);
@@ -170,14 +170,14 @@ static void replace_action(Table& table,
 
 			/*
 			ai.dest->APPEND_CONST("(");
-				ai.dest->append(*(String *)row->get(1/*match* /), String::UL_PASS_APPENDED);
+				*ai.dest << *(String *)row->get(1/*match* /);
 			ai.dest->APPEND_CONST(")");
 			*/
-			ai.dest->append(replaced.as_string(), String::UL_PASS_APPENDED);
+			*ai.dest << replaced.as_string();
 		}
 		ai.post_match=(String *)row->get(2/*post_match*/);
 	} else // end
-		ai.dest->append(*ai.post_match, String::UL_PASS_APPENDED);
+		*ai.dest << *ai.post_match;
 }
 
 /** search/replace
@@ -190,13 +190,13 @@ static void _match(Request& r, const Str
 
 	Value& regexp=*static_cast<Value *>(params->get(0));
 	// forcing [this param type]
-	r.fail_if_junction_(true, regexp, method_name, "regexp must not be junction");
+	r.fail_if_junction_(true, regexp, method_name, "regexp must not be code");
 
 	const String *options=0;
 	if(params->size()>1) {
 		Value& value=*static_cast<Value *>(params->get(1));
 		// forcing {this param type}
-		r.fail_if_junction_(true, value, method_name, "options must not be junction");
+		r.fail_if_junction_(true, value, method_name, "options must not be code");
 		options=&value.as_string();
 	}
 
@@ -220,7 +220,7 @@ static void _match(Request& r, const Str
 		Value& replacement_code=*static_cast<Value *>(params->get(2));
 		// forcing {this param type}
 		r.fail_if_junction_(false, replacement_code, 
-			method_name, "replacement code must be junction");
+			method_name, "replacement code must be code");
 
 		String& dest=*new(pool) String(pool);
 		Replace_action_info replace_action_info={