--- parser3/src/classes/string.C	2001/04/03 14:38:58	1.26
+++ parser3/src/classes/string.C	2001/04/03 15:25:07	1.28
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: string.C,v 1.26 2001/04/03 14:38:58 paf Exp $
+	$Id: string.C,v 1.28 2001/04/03 15:25:07 paf Exp $
 */
 
 #include "pa_request.h"
@@ -14,6 +14,7 @@
 #include "pa_vint.h"
 #include "pa_vtable.h"
 #include "pa_vbool.h"
+#include "pa_string.h"
 
 // global var
 
@@ -136,10 +137,36 @@ static void _rsplit(Request& r, const St
 	r.write_no_lang(*new(pool) VTable(pool, &table));
 }
 
-/// ^string.match{regexp}[options]
+static void search_row_action(Table& table, Array *row, void *) {
+	if(row)
+		table+=row;
+}
+
+struct Replace_action_info {
+	String *dest;
+	Value *replacement_code;
+	bool first_time;
+};
+static void replace_row_action(Table& table, Array *row, 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");
+}
+
+/** search/replace
+	^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}
@@ -153,21 +180,40 @@ static void _match(Request& r, const Str
 		options=&value.as_string();
 	}
 
+	Value *result;
 	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
 	Table *table;
-	Value *result;
-	if(string.match(&method_name, 
-		r.process(regexp).as_string(), options,
-		&table)) {
-		// matched
-		if(table->columns()->size()==3 && // just matched[3=pre/match/post], no substrings
-			table->size()==1)  // just one row, not Global search
-			result=new(pool) VBool(pool, true);
-		else // table of match column+substring columns
-			result=new(pool) VTable(pool, table);
-	} else // not global & not matched
-		result=new(pool) VBool(pool, false);
+	if(params->size()<3) { // search
+		if(src.match(&method_name, 
+			r.process(regexp).as_string(), options,
+			&table,
+			search_row_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
+				result=new(pool) VBool(pool, true);
+			else // table of pre/match/post+substrings
+				result=new(pool) VTable(pool, table);
+		} else // not matched [not global]
+			result=new(pool) VBool(pool, false);
+	} else { // replace
+		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");
 
+		String& dest=*new(pool) String(pool);
+		Replace_action_info replace_action_info={
+			&dest,
+			&replacement_code,
+			true
+		};
+		src.match(&method_name, 
+			r.process(regexp).as_string(), options,
+			&table,
+			replace_row_action, &replace_action_info);
+		result=new(pool) VString(dest);
+	}
 	result->set_name(method_name);
 	r.write_no_lang(*result);
 }
@@ -203,6 +249,7 @@ void initialize_string_class(Pool& pool,
 	vclass.add_native_method("rsplit", Method::CT_DYNAMIC, _rsplit, 1, 1);
 
 	// ^string.match{regexp}[options]
-	vclass.add_native_method("match", Method::CT_DYNAMIC, _match, 1, 2);
+	// ^string.match{regexp}[options]{replacement-code}
+	vclass.add_native_method("match", Method::CT_DYNAMIC, _match, 1, 3);
 }