--- parser3/src/classes/string.C	2001/04/03 15:54:46	1.30
+++ parser3/src/classes/string.C	2001/04/03 16:34:26	1.31
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: string.C,v 1.30 2001/04/03 15:54:46 paf Exp $
+	$Id: string.C,v 1.31 2001/04/03 16:34:26 paf Exp $
 */
 
 #include "pa_request.h"
@@ -137,26 +137,28 @@ 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, void *) {
+static void search_row_action(Table& table, Array *row, int, int, void *) {
 	if(row)
 		table+=row;
 }
 
 struct Replace_action_info {
 	Request *request;  const String *origin;
-	String *dest;
+	const String *src;  String *dest;
 	Value *replacement_code;
 	bool first_time;
 	const String *post_match;
 };
-static void replace_row_action(Table& table, Array *row, void *info) {
+static void replace_row_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
+	if(row) { // begin&middle
+		// piece from last match['start'] to beginning of this match['finish']
+		if(start!=finish)
+			ai.dest->APPEND_CONST("-");//ai.dest->append(ai.src->piece(start, finish), String::UL_PASS_APPENDED);
 		// store found parts in one-record Vtable
 		if(ai.first_time) { // begin
 			ai.first_time=false;
-			ai.dest->append(*(String *)row->get(0/*pre_match*/), 
-				String::UL_PASS_APPENDED);
 			table+=row;
 		} else
 			table.put(0, row);
@@ -168,7 +170,10 @@ static void replace_row_action(Table& ta
 			junction->rcontext/*=junction->self*/=&vtable;
 			Value& replaced=ai.request->process(*ai.replacement_code, ai.origin, false);
 
-			ai.dest->append(replaced.as_string(), String::UL_PASS_APPENDED);
+			ai.dest->APPEND_CONST("(");
+				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.post_match=(String *)row->get(2/*post_match*/);
 	} else // end
@@ -220,7 +225,7 @@ static void _match(Request& r, const Str
 		String& dest=*new(pool) String(pool);
 		Replace_action_info replace_action_info={
 			&r, &method_name,
-			&dest,
+			&src, &dest,
 			&replacement_code,
 			true,
 			&src