--- parser3/src/classes/string.C	2001/04/03 15:25:07	1.28
+++ 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.28 2001/04/03 15:25:07 paf Exp $
+	$Id: string.C,v 1.31 2001/04/03 16:34:26 paf Exp $
 */
 
 #include "pa_request.h"
@@ -137,27 +137,47 @@ 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 {
-	String *dest;
+	Request *request;  const String *origin;
+	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);
-	//table+=&row;
-	if(ai.first_time) { // begin
-		ai.first_time=false;
-		ai.dest->APPEND_CONST("B");
-	}
-	if(row) // middle
-		ai.dest->APPEND_CONST("M");
-	else // end
-		ai.dest->APPEND_CONST("E");
+	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;
+			table+=row;
+		} else
+			table.put(0, row);
+		{ // execute 'replacement_code' in 'table' context
+			VTable& vtable=*new(table.pool()) VTable(table.pool(), &table);
+			vtable.set_name(*ai.origin);
+
+			Junction *junction=ai.replacement_code->get_junction();
+			junction->rcontext/*=junction->self*/=&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_CONST(")");
+			//ai.dest->append(replaced.as_string(), String::UL_PASS_APPENDED);
+		}
+		ai.post_match=(String *)row->get(2/*post_match*/);
+	} else // end
+		ai.dest->append(*ai.post_match, String::UL_PASS_APPENDED);
 }
 
 /** search/replace
@@ -204,9 +224,11 @@ static void _match(Request& r, const Str
 
 		String& dest=*new(pool) String(pool);
 		Replace_action_info replace_action_info={
-			&dest,
+			&r, &method_name,
+			&src, &dest,
 			&replacement_code,
-			true
+			true,
+			&src
 		};
 		src.match(&method_name, 
 			r.process(regexp).as_string(), options,