--- parser3/src/classes/string.C	2001/04/03 17:01:01	1.32
+++ parser3/src/classes/string.C	2001/04/04 10:50:33	1.35
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: string.C,v 1.32 2001/04/03 17:01:01 paf Exp $
+	$Id: string.C,v 1.35 2001/04/04 10:50:33 paf Exp $
 */
 
 #include "pa_request.h"
@@ -60,7 +60,7 @@ static void _left(Request& r, const Stri
 	size_t n=(size_t)r.process(*static_cast<Value *>(params->get(0))).as_double();
 	
 	const String& string=*static_cast<VString *>(r.self)->get_string();
-	r.write_assign_lang(*new(pool) VString(string.piece(0, n)));
+	r.write_assign_lang(*new(pool) VString(string.mid(0, n)));
 }
 
 static void _right(Request& r, const String&, Array *params) {
@@ -69,7 +69,7 @@ static void _right(Request& r, const Str
 	size_t n=(size_t)r.process(*static_cast<Value *>(params->get(0))).as_double();
 	
 	const String& string=*static_cast<VString *>(r.self)->get_string();
-	r.write_assign_lang(*new(pool) VString(string.piece(string.size()-n, string.size())));
+	r.write_assign_lang(*new(pool) VString(string.mid(string.size()-n, string.size())));
 }
 
 static void _mid(Request& r, const String&, Array *params) {
@@ -79,7 +79,7 @@ static void _mid(Request& r, const Strin
 	size_t n=(size_t)r.process(*static_cast<Value *>(params->get(1))).as_double();
 	
 	const String& string=*static_cast<VString *>(r.self)->get_string();
-	r.write_assign_lang(*new(pool) VString(string.piece(p, p+n)));
+	r.write_assign_lang(*new(pool) VString(string.mid(p, p+n)));
 }
 
 static void _pos(Request& r, const String& method_name, Array *params) {
@@ -137,7 +137,7 @@ static void _rsplit(Request& r, const St
 	r.write_no_lang(*new(pool) VTable(pool, &table));
 }
 
-static void search_row_action(Table& table, Array *row, int, int, void *) {
+static void search_action(Table& table, Array *row, int, int, void *) {
 	if(row)
 		table+=row;
 }
@@ -148,13 +148,13 @@ struct Replace_action_info {
 	Value *replacement_code;
 	const String *post_match;
 };
-static void replace_row_action(Table& table, Array *row, int start, int finish, 
+static void replace_action(Table& table, Array *row, int start, int finish, 
 							   void *info) {
 	Replace_action_info& ai=*static_cast<Replace_action_info *>(info);
 	if(row) { // begin&middle
 		// piece from last match['start'] to beginning of this match['finish']
 		if(start!=finish)
-			ai.dest->append(ai.src->piece(start, finish), String::UL_PASS_APPENDED);//ai.dest->APPEND_CONST("-");
+			ai.dest->append(ai.src->mid(start, finish), String::UL_PASS_APPENDED);//ai.dest->APPEND_CONST("-");
 		// store found parts in one-record Vtable
 		if(table.size()) // middle
 			table.put(0, row);
@@ -165,13 +165,15 @@ static void replace_row_action(Table& ta
 			vtable.set_name(*ai.origin);
 
 			Junction *junction=ai.replacement_code->get_junction();
-			junction->rcontext/*=junction->self*/=&vtable;
+			junction->rcontext=junction->root=&vtable;
 			Value& replaced=ai.request->process(*ai.replacement_code, ai.origin, false);
 
+			/*
 			ai.dest->APPEND_CONST("(");
-				ai.dest->append(*(String *)row->get(1/*match*/), String::UL_PASS_APPENDED);
+				ai.dest->append(*(String *)row->get(1/*match* /), String::UL_PASS_APPENDED);
 			ai.dest->APPEND_CONST(")");
-			//ai.dest->append(replaced.as_string(), String::UL_PASS_APPENDED);
+			*/
+			ai.dest->append(replaced.as_string(), String::UL_PASS_APPENDED);
 		}
 		ai.post_match=(String *)row->get(2/*post_match*/);
 	} else // end
@@ -205,7 +207,7 @@ static void _match(Request& r, const Str
 		if(src.match(&method_name, 
 			regexp.as_string(), options,
 			&table,
-			search_row_action, 0)) {
+			search_action, 0)) {
 			// matched
 			if(table->columns()->size()==3 && // just matched[3=pre/match/post], no substrings
 				table->size()==1)  // just one row, not /g_lobal search
@@ -230,11 +232,11 @@ static void _match(Request& r, const Str
 		src.match(&method_name, 
 			r.process(regexp).as_string(), options,
 			&table,
-			replace_row_action, &replace_action_info);
+			replace_action, &replace_action_info);
 		result=new(pool) VString(dest);
 	}
 	result->set_name(method_name);
-	r.write_no_lang(*result);
+	r.write_assign_lang(*result);
 }
 
 // initialize