--- parser3/src/classes/string.C	2001/04/03 15:07:31	1.27
+++ parser3/src/classes/string.C	2001/04/03 17:01:01	1.32
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: string.C,v 1.27 2001/04/03 15:07:31 paf Exp $
+	$Id: string.C,v 1.32 2001/04/03 17:01:01 paf Exp $
 */
 
 #include "pa_request.h"
@@ -137,31 +137,58 @@ 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 *) {
-	table+=&row;
+static void search_row_action(Table& table, Array *row, int, int, void *) {
+	if(row)
+		table+=row;
 }
 
 struct Replace_action_info {
-	String *string;
+	Request *request;  const String *origin;
+	const String *src;  String *dest;
 	Value *replacement_code;
+	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;
-	ai.string->APPEND_CONST("R!");
+	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("-");
+		// store found parts in one-record Vtable
+		if(table.size()) // middle
+			table.put(0, row);
+		else // begin
+			table+=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
-	^string.match{regexp}[options]
-	^string.match{regexp}[options]{replacement-code}
+	^string.match[regexp][options]
+	^string.match[regexp][options]{replacement-code}
 */
 static void _match(Request& r, const String& method_name, Array *params) {
 	Pool& pool=r.pool();
-	const String& string=*static_cast<VString *>(r.self)->get_string();
+	const String& src=*static_cast<VString *>(r.self)->get_string();
 
 	Value& regexp=*static_cast<Value *>(params->get(0));
-	// forcing {this param type}
-	r.fail_if_junction_(false, regexp, method_name, "regexp must be junction");
+	// forcing [this param type]
+	r.fail_if_junction_(true, regexp, method_name, "regexp must not be junction");
 
 	const String *options=0;
 	if(params->size()>1) {
@@ -175,8 +202,8 @@ static void _match(Request& r, const Str
 	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
 	Table *table;
 	if(params->size()<3) { // search
-		if(string.match(&method_name, 
-			r.process(regexp).as_string(), options,
+		if(src.match(&method_name, 
+			regexp.as_string(), options,
 			&table,
 			search_row_action, 0)) {
 			// matched
@@ -193,16 +220,18 @@ static void _match(Request& r, const Str
 		r.fail_if_junction_(false, replacement_code, 
 			method_name, "replacement code must be junction");
 
-		String& string=*new(pool) String(pool);
+		String& dest=*new(pool) String(pool);
 		Replace_action_info replace_action_info={
-			&string,
-			&replacement_code
+			&r, &method_name,
+			&src, &dest,
+			&replacement_code,
+			&src
 		};
-		string.match(&method_name, 
+		src.match(&method_name, 
 			r.process(regexp).as_string(), options,
 			&table,
 			replace_row_action, &replace_action_info);
-		result=new(pool) VString(string);
+		result=new(pool) VString(dest);
 	}
 	result->set_name(method_name);
 	r.write_no_lang(*result);
@@ -238,8 +267,8 @@ void initialize_string_class(Pool& pool,
 	// ^string.rsplit[delim]
 	vclass.add_native_method("rsplit", Method::CT_DYNAMIC, _rsplit, 1, 1);
 
-	// ^string.match{regexp}[options]
-	// ^string.match{regexp}[options]{replacement-code}
-	vclass.add_native_method("match", Method::CT_DYNAMIC, _match, 1, 2);
+	// ^string.match[regexp][options]
+	// ^string.match[regexp][options]{replacement-code}
+	vclass.add_native_method("match", Method::CT_DYNAMIC, _match, 1, 3);
 }